changeset 887:f719f5c0bd4e

Merge with main.
author Alexander Schremmer <alex AT alexanderweb DOT de>
date Thu, 06 Jul 2006 20:40:56 +0200
parents 203686df2c6d (current diff) 51eae6ce2be7 (diff)
children 48ec584812a1 6cc24670fd0f
files
diffstat 1 files changed, 9 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/parser/text_rst.py	Thu Jul 06 20:39:35 2006 +0200
+++ b/MoinMoin/parser/text_rst.py	Thu Jul 06 20:40:56 2006 +0200
@@ -28,8 +28,8 @@
 
 # --- make docutils safe by overriding all module-scoped names related to IO ---
 
-# TODO: Add an error message to dummyOpen so that the user knows what they did
-# requested an unsupported feature of docutils in MoinMoin.
+# TODO: Add an error message to dummyOpen so that the user knows that
+# they requested an unsupported feature of Docutils in MoinMoin.
 def dummyOpen(x, y=None, z=None): return
 
 class dummyIO(StringIO.StringIO):
@@ -70,7 +70,7 @@
             _ = self.request.getText
             from MoinMoin.parser.text import Parser as TextParser
             self.request.write(formatter.sysmsg(1) +
-                               formatter.rawHTML(_('Rendering of reStructured text is not possible, ''please'' install docutils.')) +
+                               formatter.rawHTML(_('Rendering of reStructured text is not possible, please install Docutils.')) +
                                formatter.sysmsg(0))
             TextParser(self.raw, self.request).format(formatter)
     
@@ -165,7 +165,7 @@
                                  self)
         self.document.walkabout(visitor)
         self.visitor = visitor
-        # Docutils 0.5.0 and later require the writer to have the visitor 
+        # Docutils 0.5 and later require the writer to have the visitor 
         # attributes.
         if (hasattr(html4css1.Writer, 'visitor_attributes')):
             for attr in html4css1.Writer.visitor_attributes:
@@ -200,10 +200,12 @@
 
         html = []
         if parts['title']:
+            # Document title.
             html.append(formatter.rawHTML('<h1>%s</h1>' % parts['title']))
-        # If there is only one subtitle then it is held in parts['subtitle'].
-        # However, if there is more than one subtitle then this is empty and
-        # fragment contains all of the subtitles.
+        # If there is only one subtitle it is propagated by Docutils
+        # to a document subtitle and is held in parts['subtitle'].
+        # However, if there is more than one subtitle then this is
+        # empty and fragment contains all of the subtitles.
         if parts['subtitle']:
             html.append(formatter.rawHTML('<h2>%s</h2>' % parts['subtitle']))
         if parts['docinfo']: