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

Proposed by Jelmer Vernooij on 2012-10-13
Status: Merged
Approved by: Vincent Ladeuil on 2012-10-13
Approved revision: 6570
Merged at revision: 6570
Proposed branch: lp:~jelmer/bzr/docutils-0.9.1
Merge into: lp:bzr
Diff against target: 27 lines (+5/-1)
2 files modified
doc/en/release-notes/bzr-2.6.txt (+4/-0)
doc/ja/user-guide/http_smart_server.txt (+1/-1)
To merge this branch: bzr merge lp:~jelmer/bzr/docutils-0.9.1
Reviewer Review Type Date Requested Status
bzr-core 2012-10-13 Pending
Review via email: mp+129561@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
Jelmer Vernooij (jelmer) wrote :

sent to pqm by email

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'doc/en/release-notes/bzr-2.6.txt'
2--- doc/en/release-notes/bzr-2.6.txt 2012-10-10 18:45:21 +0000
3+++ doc/en/release-notes/bzr-2.6.txt 2012-10-13 15:15:30 +0000
4@@ -57,6 +57,10 @@
5 and would be ignored.
6 (Haw Loeung, #932515)
7
8+* Fixed a syntax error in ``doc/ja/user-guide/http_smart_server.txt`` that
9+ causes breakage with docutils 0.9.1.
10+ (Vincent Ladeuil, Jelmer Vernooij, #1066307)
11+
12 * ``Authentication.Config`` now always returns unicode user names and passwords.
13 (Vincent Ladeuil, #514301)
14
15
16=== modified file 'doc/ja/user-guide/http_smart_server.txt'
17--- doc/ja/user-guide/http_smart_server.txt 2011-05-18 06:01:08 +0000
18+++ doc/ja/user-guide/http_smart_server.txt 2012-10-13 15:15:30 +0000
19@@ -158,7 +158,7 @@
20
21 fcgi.WSGIServer(smart_server_app).run()
22
23- `fcgi`のモジュールはhttp://svn.saddi.com/py-lib/trunk/fcgi.pyで見つかります。
24+ `fcgi` のモジュールはhttp://svn.saddi.com/py-lib/trunk/fcgi.pyで見つかります。
25 これは flup_ の一部です。
26
27 .. _flup: http://www.saddi.com/software/flup/