1.1 --- a/README.txt Sat Feb 02 00:47:24 2013 +0100
1.2 +++ b/README.txt Sat Feb 02 01:09:39 2013 +0100
1.3 @@ -261,8 +261,8 @@
1.4
1.5 https://hg.boddie.org.uk/vContent
1.6
1.7 -Troubleshooting
1.8 ----------------
1.9 +Troubleshooting: Categories
1.10 +---------------------------
1.11
1.12 See here for a bug related to category recognition:
1.13
1.14 @@ -271,6 +271,9 @@
1.15 This affects installations where migrations between versions have occurred,
1.16 yet the Wiki configuration retains old regular expression details.
1.17
1.18 +Troubleshooting: Xapian
1.19 +-----------------------
1.20 +
1.21 Xapian can be troublesome, especially where file permissions are concerned: if
1.22 something acquires a lock on the index (for example, the moin script, possibly
1.23 invoked via moinsetup) nothing else will be able to modify the index, and this
1.24 @@ -285,6 +288,21 @@
1.25
1.26 find path-to-wiki/data/cache/xapian -depth -name "*-lock" -type d -exec rmdir '{}' \;
1.27
1.28 +Troubleshooting: Plain Text Formatting
1.29 +--------------------------------------
1.30 +
1.31 +Plain text formatting is used in certain places in EventAggregator, but the
1.32 +formatter is rather broken in MoinMoin 1.8 and in previous releases. See the
1.33 +following page for a summary:
1.34 +
1.35 +http://moinmo.in/FeatureRequests/TextPlainFormatterRewrite
1.36 +
1.37 +A patch is supplied in the patches directory to fix link formatting in the
1.38 +plain text formatter, and once copied into the root directory of the MoinMoin
1.39 +1.8 sources it can be applied as follows:
1.40 +
1.41 +patch -p1 < patch-plain-text-link-formatting-1.8.diff
1.42 +
1.43 Contact, Copyright and Licence Information
1.44 ------------------------------------------
1.45
2.1 --- a/TO_DO.txt Sat Feb 02 00:47:24 2013 +0100
2.2 +++ b/TO_DO.txt Sat Feb 02 01:09:39 2013 +0100
2.3 @@ -117,15 +117,6 @@
2.4 for authors to include a UID property identifying each event, using the same
2.5 value regardless of where the event is being published.
2.6
2.7 -Formatting in HTML Output
2.8 --------------------------
2.9 -
2.10 -Locations are sometimes expressed using more advanced formatting than plain
2.11 -text, leading to Wiki notation being shown as plain text in, for example, the
2.12 -day view or in pop-up elements. Such information should be formatted
2.13 -appropriately. This may mean rendering location links to text before putting
2.14 -them in the location pop-up headings used by the map view.
2.15 -
2.16 Formatting in iCalendar Output
2.17 ------------------------------
2.18
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
3.2 +++ b/patches/patch-plain-text-link-formatting-1.8.diff Sat Feb 02 01:09:39 2013 +0100
3.3 @@ -0,0 +1,52 @@
3.4 +# HG changeset patch
3.5 +# User Paul Boddie <paul@boddie.org.uk>
3.6 +# Date 1359762149 -3600
3.7 +# Node ID f192339c4473f140b07a1522ecac636abe616350
3.8 +# Parent f548add9c9d5a0c445c752c82fb6465c2b442d21
3.9 +Fixed the plain text formatting of links.
3.10 +
3.11 +diff -r f548add9c9d5 -r f192339c4473 MoinMoin/formatter/text_plain.py
3.12 +--- a/MoinMoin/formatter/text_plain.py Fri Feb 01 01:38:47 2013 +0100
3.13 ++++ b/MoinMoin/formatter/text_plain.py Sat Feb 02 00:42:29 2013 +0100
3.14 +@@ -45,14 +45,14 @@
3.15 + self._text = []
3.16 + return u''
3.17 + else:
3.18 +- if "".join(self._text) == self._url:
3.19 ++ try:
3.20 ++ if "".join(self._text) == self._url:
3.21 ++ return ''
3.22 ++ else:
3.23 ++ return u' [%s]' % self._url
3.24 ++ finally:
3.25 + self._url = None
3.26 + self._text = None
3.27 +- return ''
3.28 +- else:
3.29 +- self._url = None
3.30 +- self._text = None
3.31 +- return u' [%s]' % (self._url)
3.32 +
3.33 + def url(self, on, url='', css=None, **kw):
3.34 + if on:
3.35 +@@ -60,14 +60,14 @@
3.36 + self._text = []
3.37 + return u''
3.38 + else:
3.39 +- if "".join(self._text) == self._url:
3.40 ++ try:
3.41 ++ if "".join(self._text) == self._url:
3.42 ++ return ''
3.43 ++ else:
3.44 ++ return u' [%s]' % self._url
3.45 ++ finally:
3.46 + self._url = None
3.47 + self._text = None
3.48 +- return ''
3.49 +- else:
3.50 +- self._url = None
3.51 +- self._text = None
3.52 +- return u' [%s]' % (self._url)
3.53 +
3.54 + def attachment_link(self, on, url=None, **kw):
3.55 + if on: