Merge lp:~jelmer/bzr/docutils-0.9.1 into lp:bzr

[Jelmer Vernooij]

Fix trivial syntax error in the Japanese docs that breaks with docutils 0.9.1.

Fix trivial syntax error in the Japanese docs that breaks with docutils 0.9.1.

[Jelmer Vernooij (jelmer)]

sent to pqm by email

=== modified file 'doc/en/release-notes/bzr-2.6.txt'
--- doc/en/release-notes/bzr-2.6.txt	2012-10-10 18:45:21 +0000
+++ doc/en/release-notes/bzr-2.6.txt	2012-10-13 15:15:30 +0000
@@ -57,6 +57,10 @@
   and would be ignored.
   (Haw Loeung, #932515)
 
+* Fixed a syntax error in ``doc/ja/user-guide/http_smart_server.txt`` that
+  causes breakage with docutils 0.9.1.
+  (Vincent Ladeuil, Jelmer Vernooij, #1066307)
+
 * ``Authentication.Config`` now always returns unicode user names and passwords.
   (Vincent Ladeuil, #514301)
 

=== modified file 'doc/ja/user-guide/http_smart_server.txt'
--- doc/ja/user-guide/http_smart_server.txt	2011-05-18 06:01:08 +0000
+++ doc/ja/user-guide/http_smart_server.txt	2012-10-13 15:15:30 +0000
@@ -158,7 +158,7 @@
 
     fcgi.WSGIServer(smart_server_app).run()
         
-　`fcgi`のモジュールはhttp://svn.saddi.com/py-lib/trunk/fcgi.pyで見つかります。
+　`fcgi` のモジュールはhttp://svn.saddi.com/py-lib/trunk/fcgi.pyで見つかります。
 これは flup_ の一部です。
 
 .. _flup: http://www.saddi.com/software/flup/