Rev 4804: (mbp, trivial) further consistency of sphinx in Japanese in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 4804 [merge]
revision-id: pqm at pqm.ubuntu.com-20091117081438-lpxzjcdybf7mlbh0
parent: pqm at pqm.ubuntu.com-20091117073137-rc2denyvkonkh4s6
parent: mbp at sourcefrog.net-20091117071245-a666to275wd1i2rs
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2009-11-17 08:14:38 +0000
message:
  (mbp, trivial) further consistency of sphinx in Japanese
modified:
  doc/ja/conf.py                 conf.py-20091029100035-1rni8rgpen0pe1g2-10
=== modified file 'doc/ja/conf.py'
--- a/doc/ja/conf.py	2009-10-29 10:01:19 +0000
+++ b/doc/ja/conf.py	2009-11-17 07:12:45 +0000
@@ -10,12 +10,10 @@
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
-#sys.path = [os.path.abspath('../..')] + sys.path
-sys.path = [os.path.abspath('.')] + sys.path
+sys.path = [os.path.abspath('../..')] + sys.path
 
 # Most of the configuration for Bazaar docs is defined here ...
-#from bzrlib.doc_generate.sphinx_conf import *
-from sphinx_conf import *
+from bzrlib.doc_generate.sphinx_conf import *
 
 
 ## Configuration specific to this site ##
@@ -47,7 +45,7 @@
 
 # Additional templates that should be rendered to pages, maps page names to
 # template names.
-#html_additional_pages = {'index': 'index.html'}
+html_additional_pages = {'index': 'index.html'}
 
 # Output file base name for HTML help builder.
 htmlhelp_basename = 'bzr-%s' % (bzr_locale,)
@@ -86,6 +84,10 @@
     #'user-guide/resolving_conflicts',
     #'user-guide/version_info',
     # Plain-style documentation generation stuff
-    #'user-guide/index-plain',
+    'release-notes/NEWS',
+    'user-reference/bzr_man',
+    'user-guide/index-plain',
+    # Miscellaneous
+    'user-reference/readme',
 ]