Merge lp:~jelmer/brz/docs-on-homepage into lp:brz

[Jelmer Vernooij]

Some improvements to the documentation.

Some improvements to the documentation.

Replace Bazaar with Breezy in a few places.
Pick a new Sphinx theme.

[Martin Packman (gz)]

Thanks!

review: Approve

=== modified file 'breezy/doc_generate/autodoc_rstx.py'
--- breezy/doc_generate/autodoc_rstx.py	2018-11-11 04:08:32 +0000
+++ breezy/doc_generate/autodoc_rstx.py	2018-11-18 10:41:41 +0000
@@ -17,7 +17,7 @@
 """Generate reStructuredText source for the User Reference Manual.
 Loosely based on the manpage generator autodoc_man.py.
 
-Written by the Bazaar community.
+Written by the Bazaar/Breezy community.
 """
 
 from __future__ import absolute_import
@@ -149,13 +149,13 @@
 
 rstx_head = """\
 #####################
-Bazaar User Reference
+Breezy User Reference
 #####################
 
 About This Manual
 #################
 
-This manual is generated from Bazaar's online help. To use
+This manual is generated from Breezy's online help. To use
 the online help system, try the following commands.
 
     Introduction including a list of commonly used commands::
@@ -174,10 +174,10 @@
 
         brz help topic-or-command-name
 
-The following web sites provide further information on Bazaar:
+The following web sites provide further information on Breezy:
 
 :Home page:                     http://www.breezy-vcs.org/
-:Bazaar docs:                   http://doc.bazaar.canonical.com/
+:Breezy docs:                   http://www.breezy-vcs.org/doc/
 :Launchpad:                     https://launchpad.net/brz/
 """
 

=== modified file 'breezy/doc_generate/conf.py'
--- breezy/doc_generate/conf.py	2018-11-11 04:08:32 +0000
+++ breezy/doc_generate/conf.py	2018-11-18 10:41:41 +0000
@@ -37,7 +37,7 @@
 
 # General information about the project.
 project = u'Breezy'
-copyright = u'2009-2011 Canonical Ltd'
+copyright = u'2009-2011 Canonical Ltd, 2017-2018 Breezy Developers'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -91,7 +91,7 @@
 
 # The theme to use for HTML and HTML Help pages.  Major themes that come with
 # Sphinx are currently 'default' and 'sphinxdoc'.
-html_theme = 'default'
+html_theme = 'agogo'
 
 # 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

=== modified file 'doc/en/admin-guide/index-plain.txt'
--- doc/en/admin-guide/index-plain.txt	2011-05-16 10:05:25 +0000
+++ doc/en/admin-guide/index-plain.txt	2018-11-18 10:41:41 +0000
@@ -1,5 +1,5 @@
 ###################################
-Bazaar System Administrator's Guide
+Breezy System Administrator's Guide
 ###################################
 
 .. Please mark sections in included files as following:

=== modified file 'doc/en/admin-guide/index.txt'
--- doc/en/admin-guide/index.txt	2011-05-16 10:05:25 +0000
+++ doc/en/admin-guide/index.txt	2018-11-18 10:41:41 +0000
@@ -1,5 +1,5 @@
 ###################################
-Bazaar System Administrator's Guide
+Breezy System Administrator's Guide
 ###################################
 
 .. Please mark sections in included files as following:

=== modified file 'doc/en/conf.py'
--- doc/en/conf.py	2018-11-16 13:05:23 +0000
+++ doc/en/conf.py	2018-11-18 10:41:41 +0000
@@ -72,8 +72,8 @@
     ('tutorials/centralized_workflow',
      'brz-%s-tutorial-centralized' % (brz_locale,),
      brz_title(u'Centralized Workflow Tutorial'), brz_team, 'howto'),
-    ('whats-new/whats-new-in-2.1', 'brz-%s-whats-new' % (brz_locale,),
-     brz_title(u"What's New in Breezy 2.1?"), brz_team, 'howto'),
+    ('whats-new/whats-new-in-3.0', 'brz-%s-whats-new' % (brz_locale,),
+     brz_title(u"What's New in Breezy 3.0?"), brz_team, 'howto'),
 ]
 
 latex_documents = [

=== modified file 'doc/index.txt'
--- doc/index.txt	2010-08-17 06:45:33 +0000
+++ doc/index.txt	2018-11-18 10:41:41 +0000
@@ -1,9 +1,9 @@
 ============================
-Bazaar Main Document Catalog
+Breezy Main Document Catalog
 ============================
 
-The latest version of these documents are available from Bazaar's
-documentation site, <http://doc.bazaar.canonical.com/>, and more documentation
+The latest version of these documents are available from Breezy's
+documentation site, <http://doc.breezy.canonical.com/>, and more documentation
 may be linked from <http://wiki.bazaar.canonical.com/Documentation>.
 
 Core Documentation
@@ -19,17 +19,17 @@
 
 * `Release Notes <en/release-notes/NEWS.html>`_
 
-* `2.0 Upgrade Guide <en/upgrade-guide/index.html>`_
+* `3.0 Upgrade Guide <en/upgrade-guide/index.html>`_
 
 
 Tutorials
 =========
 
-* `Bazaar in five minutes <en/mini-tutorial/index.html>`_
+* `Breezy in five minutes <en/mini-tutorial/index.html>`_
 
 * `A longer tutorial <en/tutorials/tutorial.html>`_
 
-* `Using Bazaar with Launchpad <en/tutorials/using_bazaar_with_launchpad.html>`_
+* `Using Breezy with Launchpad <en/tutorials/using_breezy_with_launchpad.html>`_
 
 * `Centralized workflow <en/tutorials/centralized_workflow.html>`_
 
@@ -38,7 +38,7 @@
 =======================
 
 * `Developer Document Catalog <developers/index-plain.html>`_ |--| for developers
-  of Bazaar and plugins
+  of Breezy and plugins
 
 Web links
 =========
@@ -53,14 +53,6 @@
 
 * `Frequently Asked Questions <http://wiki.bazaar.canonical.com/FAQ>`_
 
-
-Other Languages
-===============
-
-* `Spanish Documentation <index.es.html>`_
-* `Russian Documentation <index.ru.html>`_ |--| документация на русском
-* `Japanese Documentation <index.ja.html>`_ |--| 日本語のドキュメント
-
 .. |--| unicode:: U+2014
 
 ..

=== modified file 'tools/generate_release_notes.py'
--- tools/generate_release_notes.py	2018-05-07 12:48:12 +0000
+++ tools/generate_release_notes.py	2018-11-18 10:41:41 +0000
@@ -35,7 +35,7 @@
 
 preamble_plain = """\
 ####################
-Bazaar Release Notes
+Breezy Release Notes
 ####################
 
 
@@ -46,7 +46,7 @@
 
 preamble_sphinx = """\
 ####################
-Bazaar Release Notes
+Breezy Release Notes
 ####################
 
 
@@ -92,7 +92,7 @@
     for line in lines:
         if line == '####################\n':
             line = '#' * len(title) + '\n'
-        elif line == 'Bazaar Release Notes\n':
+        elif line == 'Breezy Release Notes\n':
             line = title + '\n'
         elif line == '.. toctree::\n':
             continue