Some doc fixes.

diff --git a/babel/messages/extract.py b/babel/messages/extract.py
index 104277053329e36c45aa51025954de532ba8a728..cb7b99a74da175df4ab922ff156c76cca94e398c 100644 (file)
--- a/babel/messages/extract.py
+++ b/babel/messages/extract.py
@@ -90,7 +90,7 @@ def extract_from_dir(dirname=os.getcwd(), method_map=DEFAULT_MAPPING,
     
     >>> options_map = {
     ...     '**/templates/**.txt': {
-    ...         'template_class': 'genshi.template.text.TextTemplate',
+    ...         'template_class': 'genshi.template:TextTemplate',
     ...         'encoding': 'latin-1'
     ...     },
     ...     '**/templates/**.html': {

diff --git a/babel/messages/frontend.py b/babel/messages/frontend.py
index 53c5b0b6eb0bdd7c17b5f4b63536030e5f9e2265..0250d9b95d723e1c34e5a84ed8b6c785cc0067cd 100755 (executable)
--- a/babel/messages/frontend.py
+++ b/babel/messages/frontend.py
@@ -554,7 +554,7 @@ def parse_mapping(fileobj, filename=None):
     ... [genshi: **/templates/**.html]
     ... include_attrs =
     ... [genshi: **/templates/**.txt]
-    ... template_class = genshi.template.text.TextTemplate
+    ... template_class = genshi.template:TextTemplate
     ... encoding = latin-1
     ... ''')
 
@@ -571,7 +571,7 @@ def parse_mapping(fileobj, filename=None):
     >>> method_map[2]
     ('**/templates/**.txt', 'genshi')
     >>> options_map['**/templates/**.txt']['template_class']
-    'genshi.template.text.TextTemplate'
+    'genshi.template:TextTemplate'
     >>> options_map['**/templates/**.txt']['encoding']
     'latin-1'
 

diff --git a/doc/messages.txt b/doc/messages.txt
index 0da487c117e20a2632de6c8ac453d3159d7d553f..fea3b7f98899ef198e14d9775a72282b6b8b537f 100644 (file)
--- a/doc/messages.txt
+++ b/doc/messages.txt
@@ -118,7 +118,7 @@ Genshi markup templates and text templates:
     include_attrs = alt title summary
     
     [genshi: foobar/**/templates/**.txt]
-    template_class = genshi.template.text:TextTemplate
+    template_class = genshi.template:TextTemplate
     encoding = ISO-8819-15
 
 The configuration file syntax is based on the format commonly found in ``.INI``

diff --git a/doc/setup.txt b/doc/setup.txt
index 34a13d79d6c3a562583b6e39ef37d7b4e70098e0..850a8184a7586c57c62c72551fd81ea8c0e5f001 100644 (file)
--- a/doc/setup.txt
+++ b/doc/setup.txt
@@ -77,7 +77,7 @@ function:
                 ('**.py',                'python', None),
                 ('**/templates/**.html', 'genshi', None),
                 ('**/templates/**.txt',  'genshi', {
-                    'template_class': 'genshi.template.text.TextTemplate'
+                    'template_class': 'genshi.template:TextTemplate'
                 })
             ],
         },