Rev 4704: (mbp) cherrypick Japanese Sphinx additions to 2.0 in file:///home/pqm/archives/thelove/bzr/2.0/

Canonical.com Patch Queue Manager pqm at pqm.ubuntu.com
Tue Nov 17 10:29:15 GMT 2009


At file:///home/pqm/archives/thelove/bzr/2.0/

------------------------------------------------------------
revno: 4704 [merge]
revision-id: pqm at pqm.ubuntu.com-20091117102914-os8bgni6p03cbx65
parent: pqm at pqm.ubuntu.com-20091116054105-mvmu09tpolkcn7mg
parent: mbp at sourcefrog.net-20091117084255-ixn3ehjqm4r1hni2
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 2.0
timestamp: Tue 2009-11-17 10:29:14 +0000
message:
  (mbp) cherrypick Japanese Sphinx additions to 2.0
removed:
  doc/ja/sphinx_conf.py          sphinx_conf.py-20091029100035-1rni8rgpen0pe1g2-12
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 08:42:55 +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',
 ]
 

=== removed file 'doc/ja/sphinx_conf.py'
--- a/doc/ja/sphinx_conf.py	2009-10-29 10:01:19 +0000
+++ b/doc/ja/sphinx_conf.py	1970-01-01 00:00:00 +0000
@@ -1,214 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Bazaar documentation build configuration file, created by
-# sphinx-quickstart on Tue Jul 21 17:04:52 2009.
-#
-# All configuration values have a default; values that are commented out
-# serve to show the default.
-
-import sys, os
-
-# 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.append(os.path.abspath('.'))
-
-
-# -- General configuration -----------------------------------------------------
-
-# Add any Sphinx extension module names here, as strings. They can be extensions
-# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = ['sphinx.ext.ifconfig']
-
-# Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
-
-# The suffix of source filenames.
-source_suffix = '.txt'
-
-# The encoding of source files.
-#source_encoding = 'utf-8'
-
-# The master toctree document.
-master_doc = 'index'
-
-# General information about the project.
-project = u'Bazaar'
-copyright = u'2009, Canonical Ltd'
-
-# The version info for the project you're documenting, acts as replacement for
-# |version| and |release|, also used in various other places throughout the
-# built documents.
-#
-# The short X.Y version.
-import bzrlib
-version = '.'.join(str(p) for p in bzrlib.version_info[:2])
-# The full version, including alpha/beta/rc tags.
-release = bzrlib.version_string
-
-# The language for content autogenerated by Sphinx. Refer to documentation
-# for a list of supported languages.
-#language = None
-
-# There are two options for replacing |today|: either, you set today to some
-# non-false value, then it is used:
-#today = ''
-# Else, today_fmt is used as the format for a strftime call.
-#today_fmt = '%B %d, %Y'
-
-# List of documents that shouldn't be included in the build.
-#unused_docs = []
-
-# List of directories, relative to source directory, that shouldn't be searched
-# for source files.
-exclude_trees = ['_build']
-
-# The reST default role (used for this markup: `text`) to use for all documents.
-#default_role = None
-
-# If true, '()' will be appended to :func: etc. cross-reference text.
-#add_function_parentheses = True
-
-# If true, the current module name will be prepended to all description
-# unit titles (such as .. function::).
-#add_module_names = True
-
-# If true, sectionauthor and moduleauthor directives will be shown in the
-# output. They are ignored by default.
-#show_authors = False
-
-# The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
-
-# A list of ignored prefixes for module index sorting.
-#modindex_common_prefix = []
-
-
-# -- Options for HTML output ---------------------------------------------------
-
-# The theme to use for HTML and HTML Help pages.  Major themes that come with
-# Sphinx are currently 'default' and 'sphinxdoc'.
-html_theme = 'default'
-
-# Theme options are theme-specific and customize the look and feel of a theme
-# further.  For a list of options available for each theme, see the
-# documentation.
-html_theme_options = {
-    # Unfortunately, the right sidebar breaks under IE6 and maybe IE7.
-    # So we stick with the default left placement to cater for users stuck
-    # on those browsers.
-    #'rightsidebar': True,
-
-    # Non-document areas: header (relbar), footer, sidebar, etc.
-    # Some useful colours here:
-    # * blue: darkblue, mediumblue, darkslateblue, cornflowerblue, royalblue,
-    #   midnightblue
-    # * gray: dimgray, slategray, lightslategray
-    'sidebarbgcolor':   "cornflowerblue",
-    'sidebarlinkcolor': "midnightblue",
-    'relbarbgcolor':    "darkblue",
-    'footerbgcolor':    "lightslategray",
-
-    # Text, heading and code colouring
-    'codebgcolor':      "lightyellow",
-    'codetextcolor':    "firebrick",
-    'linkcolor':        "mediumblue",
-    }
-
-# Add any paths that contain custom themes here, relative to this directory.
-#html_theme_path = []
-
-# The name for this set of Sphinx documents.  If None, it defaults to
-# "<project> v<release> documentation".
-#html_title = None
-
-# A shorter title for the navigation bar.  Default is the same as html_title.
-#html_short_title = None
-
-# The name of an image file (relative to this directory) to place at the top
-# of the sidebar.
-#html_logo = None
-
-# The name of an image file (within the static path) to use as favicon of the
-# docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
-# pixels large.
-html_favicon = "bzr.ico"
-
-# Add any paths that contain custom static files (such as style sheets) here,
-# relative to this directory. They are copied after the builtin static files,
-# so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
-
-# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
-# using the given strftime format.
-#html_last_updated_fmt = '%b %d, %Y'
-
-# If true, SmartyPants will be used to convert quotes and dashes to
-# typographically correct entities.
-#html_use_smartypants = True
-
-# Custom sidebar templates, maps document names to template names.
-#html_sidebars = {}
-
-# Additional templates that should be rendered to pages, maps page names to
-# template names.
-#html_additional_pages = {}
-
-# If false, no module index is generated.
-html_use_modindex = False
-
-# If false, no index is generated.
-html_use_index = False
-
-# If true, the index is split into individual pages for each letter.
-#html_split_index = False
-
-# If true, links to the reST sources are added to the pages.
-html_show_sourcelink = True
-
-# If true, an OpenSearch description file will be output, and all pages will
-# contain a <link> tag referring to it.  The value of this option must be the
-# base URL from which the finished HTML is served.
-#html_use_opensearch = ''
-
-# If nonempty, this is the file name suffix for HTML files (e.g. ".xhtml").
-#html_file_suffix = ''
-
-# Output file base name for HTML help builder.
-htmlhelp_basename = 'bzr-docs'
-
-
-# -- Options for LaTeX output --------------------------------------------------
-
-# The paper size ('letter' or 'a4').
-#latex_paper_size = 'letter'
-
-# The font size ('10pt', '11pt' or '12pt').
-#latex_font_size = '10pt'
-
-# Grouping the document tree into LaTeX files. List of tuples
-# (source start file, target name, title, author, documentclass [howto/manual]).
-latex_documents = []
-
-# The name of an image file (relative to this directory) to place at the top of
-# the title page.
-latex_logo = '../Bazaar-Logo-For-Manuals.png'
-
-# For "manual" documents, if this is true, then toplevel headings are parts,
-# not chapters.
-#latex_use_parts = False
-
-# Additional stuff for the LaTeX preamble.
-#latex_preamble = ''
-
-# Documents to append as an appendix to all manuals.
-#latex_appendices = []
-
-# If false, no module index is generated.
-#latex_use_modindex = True
-
-
-# -- Bazaar-specific configuration ---------------------------------------------
-
-# Authors of the documents
-bzr_team = u'Bazaar Developers'




More information about the bazaar-commits mailing list