Merge lp:~jelmer/brz/more-doc-improvements into lp:brz

[Jelmer Vernooij]

Update more links, add API documentation.

Update more links, add API documentation.

[Martin Packman (gz)]

Thanks! Makefile changes look reasonable.

review: Approve

[The Breezy Bot (the-breezy-bot)]

Running landing tests failed
https://ci.breezy-vcs.org/job/brz/job/brz-land/87/

=== modified file '.bzrignore'
--- .bzrignore	2018-08-26 13:52:48 +0000
+++ .bzrignore	2018-11-18 17:25:59 +0000
@@ -73,3 +73,4 @@
 .testrepository
 selftest.log
 .coverage
+doc/developers/api

=== modified file 'Makefile'
--- Makefile	2018-11-16 13:07:04 +0000
+++ Makefile	2018-11-18 17:25:59 +0000
@@ -105,12 +105,6 @@
 	rm -f breezy/*_pyx.c breezy/bzr/*_pyx.c
 	rm -f breezy/_simple_set_pyx.h breezy/_simple_set_pyx_api.h
 
-# Build API documentation
-docfiles = brz breezy
-api-docs:
-	mkdir -p api/html
-	pydoctor --make-html --docformat='restructuredtext' --html-output=api/html $(docfiles)
-
 # build tags for emacs and vim
 TAGS:
 	ctags -R -e breezy
@@ -159,8 +153,8 @@
 
 # Clean out generated documentation
 clean-sphinx:
-	cd doc/en && make clean
-	cd doc/developers && make clean
+	$(MAKE) -C doc/en clean
+	$(MAKE) -C doc/developers clean
 
 SPHINX_DEPENDENCIES = \
         doc/en/release-notes/index.txt \
@@ -184,8 +178,8 @@
 
 # Build the html docs using Sphinx.
 html-sphinx: $(SPHINX_DEPENDENCIES)
-	cd doc/en && make html
-	cd doc/developers && make html
+	$(MAKE) -C doc/en html
+	$(MAKE) -C doc/developers api html
 
 # Build the PDF docs using Sphinx. This requires numerous LaTeX
 # packages. See http://sphinx.pocoo.org/builders.html for details.
@@ -193,23 +187,23 @@
 # they require additional packages to be installed (to handle
 # Russian hyphenation rules, etc.)
 pdf-sphinx: $(SPHINX_DEPENDENCIES)
-	cd doc/en && make latex
-	cd doc/developers && make latex
-	cd doc/en/_build/latex && make all-pdf
-	cd doc/developers/_build/latex && make all-pdf
+	$(MAKE) -C doc/en latex
+	$(MAKE) -C doc/developers latex
+	$(MAKE) -C doc/en/_build/latex all-pdf
+	$(MAKE) -C doc/developers/_build/latex all-pdf
 
 # Build the CHM (Windows Help) docs using Sphinx.
 # Note: HtmlHelp Workshop needs to be used on the generated hhp files
 # to generate the final chm files.
 chm-sphinx: $(SPHINX_DEPENDENCIES)
-	cd doc/en && make htmlhelp
-	cd doc/developers && make htmlhelp
+	$(MAKE) -C doc/en htmlhelp
+	$(MAKE) -C doc/developers htmlhelp
 
 
 # Build the texinfo files using Sphinx.
 texinfo-sphinx: $(SPHINX_DEPENDENCIES)
-	cd doc/en && make texinfo
-	cd doc/developers && make texinfo
+	$(MAKE) -C doc/en texinfo
+	$(MAKE) -C doc/developers texinfo
 
 ### Documentation Website ###
 

=== modified file 'breezy/bzr/smart/medium.py'
--- breezy/bzr/smart/medium.py	2018-11-11 04:08:32 +0000
+++ breezy/bzr/smart/medium.py	2018-11-18 17:25:59 +0000
@@ -32,12 +32,16 @@
 import sys
 import time
 
+try:
+    import _thread
+except ImportError:
+    import thread as _thread
+
 import breezy
 from ...lazy_import import lazy_import
 lazy_import(globals(), """
 import select
 import socket
-import thread
 import weakref
 
 from breezy import (
@@ -432,7 +436,7 @@
         tstart = osutils.timer_func()
         osutils.send_all(self.socket, bytes, self._report_activity)
         if 'hpss' in debug.debug_flags:
-            thread_id = thread.get_ident()
+            thread_id = _thread.get_ident()
             trace.mutter('%12s: [%s] %d bytes to the socket in %.3fs'
                          % ('wrote', thread_id, len(bytes),
                             osutils.timer_func() - tstart))

=== modified file 'breezy/doc_generate/conf.py'
--- breezy/doc_generate/conf.py	2018-11-18 02:43:52 +0000
+++ breezy/doc_generate/conf.py	2018-11-18 17:25:59 +0000
@@ -21,7 +21,13 @@
 
 # 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', ]
+extensions = [
+    'sphinx.ext.ifconfig',
+    'sphinx.ext.autodoc',
+    'sphinx.ext.intersphinx',
+    'sphinx_epytext',
+    # 'sphinxcontrib.napoleon', # TODO: for Google docstrings
+    ]
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
@@ -107,15 +113,15 @@
     # * blue: darkblue, mediumblue, darkslateblue, cornflowerblue, royalblue,
     #   midnightblue
     # * gray: dimgray, slategray, lightslategray
-    'sidebarbgcolor': "cornflowerblue",
-    'sidebarlinkcolor': "midnightblue",
-    'relbarbgcolor': "darkblue",
-    'footerbgcolor': "lightslategray",
+    #'sidebarbgcolor': "cornflowerblue",
+    #'sidebarlinkcolor': "midnightblue",
+    #'relbarbgcolor': "darkblue",
+    #'footerbgcolor': "lightslategray",
 
     # Text, heading and code colouring
-    'codebgcolor': "lightyellow",
-    'codetextcolor': "firebrick",
-    'linkcolor': "mediumblue",
+    #'codebgcolor': "lightyellow",
+    #'codetextcolor': "firebrick",
+    #'linkcolor': "mediumblue",
     }
 
 # Add any paths that contain custom themes here, relative to this directory.
@@ -216,3 +222,7 @@
 
 # Authors of the documents
 brz_team = u'Breezy Developers'
+
+intersphinx_mapping = {
+    'python': ('https://docs.python.org/3', None),
+}

=== removed file 'breezy/git/Makefile'
--- breezy/git/Makefile	2018-03-26 22:28:24 +0000
+++ breezy/git/Makefile	1970-01-01 00:00:00 +0000
@@ -1,80 +0,0 @@
-DEBUGGER ?= 
-BRZ_OPTIONS ?= 
-BRZ ?= $(shell which brz)
-PYTHON ?= $(shell which python)
-SETUP ?= ./setup.py
-PYDOCTOR ?= pydoctor
-CTAGS ?= ctags
-PYLINT ?= pylint
-RST2HTML ?= rst2html
-TESTS ?= ^breezy.plugins.git. Git breezy.tests.test_info.TestInfo.test_describe_tree_format breezy.tests.test_errors.TestErrors.test_no_arg_named_message breezy.tests.test_info.TestInfo.test_describe_checkout_format
-SUBUNIT_FILTER ?= subunit-filter --fixup-expected-failures=xfail --success --xfail
-SUBUNIT_FORMATTER = subunit2pyunit
-
-all:: build 
-
-build::
-	$(SETUP) build
-
-build-inplace::
-
-install::
-	$(SETUP) install
-
-clean::
-	$(SETUP) clean
-	rm -f *.so
-
-check:: build-inplace 
-	BRZ_PLUGINS_AT=git@$(shell pwd) BRZ_PLUGIN_PATH=-site:-user $(DEBUGGER) $(PYTHON) $(PYTHON_OPTIONS) $(BRZ) $(BRZ_OPTIONS) selftest --subunit2 $(TEST_OPTIONS) $(TESTS) | $(SUBUNIT_FILTER) | $(SUBUNIT_FORMATTER)
-
-list-failing-tests:
-	$(MAKE) check SUBUNIT_FILTER="subunit-filter -F" SUBUNIT_FORMATTER=subunit-ls | grep -e "^breezy\\." | sort
-
-xfail:
-	$(MAKE) -s list-failing-tests > xfail
-
-check-all::
-	$(MAKE) check TESTS="^breezy.plugins.git. Git" SUBUNIT_FILTER=cat
-
-check-verbose::
-	$(MAKE) check TEST_OPTIONS=-v
-
-check-one::
-	$(MAKE) check TEST_OPTIONS=--one
-
-check-random::
-	$(MAKE) check TEST_OPTIONS="--random=now --verbose --one"
-
-show-plugins::
-	BRZ_PLUGINS_AT=git@$(shell pwd) $(BRZ) plugins -v
-
-lint::
-	$(PYLINT) -f parseable *.py */*.py
-
-tags::
-	$(CTAGS) -R .
-
-ctags:: tags
-
-coverage::
-	$(MAKE) check BRZ_OPTIONS="--coverage coverage"
-
-.PHONY: update-pot po/brz-git.pot
-update-pot: po/brz-git.pot
-
-TRANSLATABLE_PYFILES:=$(shell find . -name '*.py' \
-		| grep -v 'tests/' \
-		)
-
-po/brz-git.pot: $(PYFILES) $(DOCFILES)
-	BRZ_PLUGINS_AT=git@$(shell pwd) brz export-pot \
-          --plugin=git > po/brz-git.pot
-	echo $(TRANSLATABLE_PYFILES) | xargs \
-	xgettext --package-name "brz-git" \
-	  --msgid-bugs-address "<[e-mail]>" \
-	  --copyright-holder "Canonical Ltd <[e-mail]>" \
-	  --from-code ISO-8859-1 --sort-by-file --join --add-comments=i18n: \
-	  -d brz-git -p po -o brz-git.pot
-
-.PHONY: xfail

=== modified file 'byov.conf'
--- byov.conf	2018-11-18 17:25:59 +0000
+++ byov.conf	2018-11-18 17:25:59 +0000
@@ -9,6 +9,8 @@
 fastimport.clone = (git clone git://jelmer.uk/python-fastimport.git ../fastimport.git)
 fastimport.install = (cd ../fastimport.git && ./setup.py install --user)
 fastimport.install3 = (cd ../fastimport.git && python3 ./setup.py install --user)
+sphinx_epytext.install = (pip install sphinx_epytext)
+sphinx_epytext.install3 = (pip3 install sphinx_epytext)
 flake8.install = (pip install flake8)
 flake8.install3 = (pip3 install flake8)
 
@@ -28,7 +30,7 @@
 vm.packages = {brz.build_deps}, {subunit.build_deps}, bzr, git, python-junitxml
 [brz-xenial]
 vm.release = xenial
-byoci.setup.command = ({dulwich.clone} && {dulwich.install} && {dulwich.install3} && {fastimport.clone} && {fastimport.install} && {fastimport.install3} && {subunit.clone} && {flake8.install} && {flake8.install3})
+byoci.setup.command = ({dulwich.clone} && {dulwich.install} && {dulwich.install3} && {fastimport.clone} && {fastimport.install} && {fastimport.install3} && {subunit.clone} && {flake8.install} && {flake8.install3} && {sphinx_epytext.install} && {sphinx_epytext.install3})
 # FIXME: bzr log -l2 should be by default -- vila 2018-03-09
 byoci.tests.command = bash -o pipefail -c "bzr log -l2 && PYTHONPATH=../subunit/python:$PYTHONPATH PATH=../subunit/filters:$PATH make check-ci | subunit2junitxml -o ../results.xml -f | subunit2pyunit"
 [brz-bionic]

=== modified file 'doc/developers/HACKING.txt'
--- doc/developers/HACKING.txt	2018-04-01 17:37:15 +0000
+++ doc/developers/HACKING.txt	2018-11-18 17:25:59 +0000
@@ -12,7 +12,7 @@
 document, send a merge request or new text to the mailing list.
 
 The latest developer documentation can be found online at
-http://doc.bazaar.canonical.com/developers/.
+https://www.breezy-vcs.org/developers/.
 
 Getting Started
 ###############
@@ -52,7 +52,7 @@
 
 There is a very active community around Breezy. Mostly we meet on IRC
 (#bzr on irc.freenode.net) and on the mailing list. To join the Breezy
-community, see http://wiki.bazaar.canonical.com/BzrSupport.
+community, see https://www.breezy-vcs.org/pages/support.html.
 
 If you are planning to make a change, it's a very good idea to mention it
 on the IRC channel and/or on the mailing list. There are many advantages
@@ -205,9 +205,7 @@
 
 * Patch Queue Manager - https://launchpad.net/pqm/
 
-For further information, see <http://wiki.bazaar.canonical.com/BzrDevelopment>.
-
-
+For further information, see <https://www.breezy-vcs.org/developers/>.
 
 
 Preparing a Sandbox for Making Changes to Breezy
@@ -294,10 +292,10 @@
 
 
 Automatically-generated API reference information is available at
-<http://people.canonical.com/~mwh/bzrlibapi/>.
+<https://www.breezy-vcs.org/developers/api/>.
 
 See also the `Breezy Architectural Overview
-<http://doc.bazaar.canonical.com/developers/overview.html>`_.
+<https://www.breezy-vcs.org/developers/overview.html>`_.
 
 
 Core Topics
@@ -533,7 +531,7 @@
 
 * reviewing changes
 * planning releases
-* managing releases (see `Releasing Breezy <http://doc.bazaar.canonical.com/developers/releasing.html>`_)
+* managing releases (see `Releasing Breezy <https://www.breezy-vcs.org/developers/releasing.html>`_)
 
 .. note::
   Removing barriers to community participation is a key reason for adopting

=== added file 'doc/developers/api-readme.txt'
--- doc/developers/api-readme.txt	1970-01-01 00:00:00 +0000
+++ doc/developers/api-readme.txt	2018-11-18 17:25:59 +0000
@@ -0,0 +1,3 @@
+This is the API documentation for Breezy.
+
+It's still a work in progress.

=== modified file 'doc/developers/code-style.txt'
--- doc/developers/code-style.txt	2017-11-11 12:51:45 +0000
+++ doc/developers/code-style.txt	2018-11-18 17:25:59 +0000
@@ -396,7 +396,7 @@
 =============
 
 All code should be exercised by the test suite.  See the `Bazaar Testing
-Guide <http://doc.bazaar.canonical.com/developers/testing.html>`_ for detailed
+Guide <http://www.breezy-vcs.org/developers/testing.html>`_ for detailed
 information about writing tests.
 
 

=== modified file 'doc/developers/conf.py'
--- doc/developers/conf.py	2018-11-16 13:05:23 +0000
+++ doc/developers/conf.py	2018-11-18 17:25:59 +0000
@@ -10,7 +10,7 @@
 # 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('../..'), os.path.abspath('api')] + sys.path
 
 # Most of the configuration for Breezy docs is defined here ...
 from breezy.doc_generate.conf import *

=== modified file 'doc/developers/contribution-quickstart.txt'
--- doc/developers/contribution-quickstart.txt	2017-11-11 12:51:45 +0000
+++ doc/developers/contribution-quickstart.txt	2018-11-18 17:25:59 +0000
@@ -8,14 +8,9 @@
 You can ask at any time for help, on the list, on irc, or through a merge
 proposal on Launchpad.
 
-In particular, the rostered
-`Patch Pilot <http://wiki.bazaar.canonical.com/PatchPilot>`_ 
-is an experienced developer who will help you get your changes in, through
-code review, advice, debugging, writing tests, or whatever it takes.
-
 * `Bazaar mailing list <http://lists.ubuntu.com/mailman/listinfo/bazaar>`_
 
-* IRC in channel ``#bzr`` on ``irc.ubuntu.com``
+* IRC in channel ``#bzr`` on ``irc.freenode.net``
 
 
 Starting

=== modified file 'doc/developers/development-repo.txt'
--- doc/developers/development-repo.txt	2017-11-11 12:51:45 +0000
+++ doc/developers/development-repo.txt	2018-11-18 17:25:59 +0000
@@ -171,7 +171,7 @@
 
 If you need any help or encounter any problems, please contact the developers
 via the usual ways, i.e. chat to us on IRC or send a message to our mailing
-list. See http://wiki.bazaar.canonical.com/BzrSupport for contact details.
+list. See https://www.breezy-vcs.org/pages/support.html for contact details.
 
 
 Technical notes

=== modified file 'doc/developers/index-plain.txt'
--- doc/developers/index-plain.txt	2017-11-11 12:51:45 +0000
+++ doc/developers/index-plain.txt	2018-11-18 17:25:59 +0000
@@ -11,7 +11,7 @@
 * `Architectural Overview <overview.html>`_ |--| describes some of the
   most important classes and concepts.
 
-* `bzrlib API reference <http://people.canonical.com/~mwh/bzrlibapi/>`_
+* `breezy API reference <https://www.breezy-vcs.org/developers/api/>`_
   (external link)
   |--| automatically generated API reference information
 
@@ -77,7 +77,7 @@
 Specifications
 ==============
 
-* `API versioning <api-versioning.html>`_ |--| bzrlib API versioning.
+* `API versioning <api-versioning.html>`_ |--| breezy API versioning.
 
 * `Apport error reporting <apport.html>`_ |--| Capture data to report
   bugs.
@@ -93,7 +93,8 @@
 * `Groupcompress <groupcompress-design.html>`_ |--| Notes on the compression
   technology used in CHK repositories.
 
-* `Indices <indices.html>`_ |--| The index facilities available within bzrlib.
+* `Indices <indices.html>`_ |--| The index facilities available within
+  breezy.
 
 * `Inventories <inventory.html>`_ |--| Tree shape abstraction.
 
@@ -108,7 +109,7 @@
 * `Repository stream <repository-stream.html>`_ |--| Notes on streaming data
   for repositories (a layer above the container format).
 
-* `Integration Guide <integration.html>`_ |--| A guide to integrate bzrlib into
+* `Integration Guide <integration.html>`_ |--| A guide to integrate breezy into
   any python application.
 
 * `Breezy and case-insensitive file systems <case-insensitive-file-systems.html>`_

=== modified file 'doc/developers/index.txt'
--- doc/developers/index.txt	2017-11-11 12:51:45 +0000
+++ doc/developers/index.txt	2018-11-18 17:25:59 +0000
@@ -51,7 +51,7 @@
    ec2 
 
 
-Developing using bzrlib
+Developing using breezy
 =======================
 
 .. toctree::
@@ -62,8 +62,7 @@
 
 * `Writing plugins for Breezy <http://doc.bazaar.canonical.com/plugins/en/plugin-development.html>`_ (web link)
 
-* `bzrlib API reference <http://people.canonical.com/~mwh/bzrlibapi/>`_
-  (web link)
+* `breezy API reference <api/index.txt>`_
 
 
 Other documents
@@ -82,7 +81,10 @@
 Licence
 ============
 
-Copyright 2005-2011 Canonical Ltd. Breezy is free software, and you
+Copyright 2005-2011 Canonical Ltd.
+Copyright 2018 Breezy Developers
+
+Breezy is free software, and you
 may use, modify and redistribute both Breezy and this document under
 the terms of the GNU General Public License version 2 or later.  See
 <http://www.gnu.org/licenses/>.

=== modified file 'doc/developers/overview.txt'
--- doc/developers/overview.txt	2017-11-11 12:51:45 +0000
+++ doc/developers/overview.txt	2018-11-18 17:25:59 +0000
@@ -425,7 +425,7 @@
 Stores cryptographic signatures of revision contents.  The keys match
 those of the revision store.
 
-.. _Core Concepts: http://doc.bazaar.canonical.com/latest/en/user-guide/core_concepts.html
+.. _Core Concepts: https://www.breezy-vcs.org/doc/en/user-guide/core_concepts.html
 
 ..
    vim: ft=rst tw=74 ai

=== modified file 'doc/developers/packrepo.txt'
--- doc/developers/packrepo.txt	2017-11-11 12:51:45 +0000
+++ doc/developers/packrepo.txt	2018-11-18 17:25:59 +0000
@@ -138,7 +138,7 @@
 
 If you need any help or encounter any problems, please contact the developers
 via the usual ways, i.e. chat to us on IRC or send a message to our mailing
-list. See http://wiki.bazaar.canonical.com/BzrSupport for contact details.
+list. See https://www.breezy-vcs.org/pages/support.html for contact details.
 
 
 Technical notes

=== modified file 'doc/developers/ppa.txt'
--- doc/developers/ppa.txt	2017-11-11 12:51:45 +0000
+++ doc/developers/ppa.txt	2018-11-18 17:25:59 +0000
@@ -74,11 +74,11 @@
 We build packages for every supported Ubuntu release
 <https://wiki.ubuntu.com/Releases>.  Packages need no longer be updated
 when the release passes end-of-life because all users should
-have upgraded by then.  
+have upgraded by then.
 
 As of August 2010, the following releases are supported:
 
-* Maverick 
+* Maverick
 * Lucid LTS
 * Karmic
 * Jaunty (support ends October 2010)

=== modified file 'doc/developers/releasing.txt'
--- doc/developers/releasing.txt	2018-11-17 19:23:43 +0000
+++ doc/developers/releasing.txt	2018-11-18 17:25:59 +0000
@@ -4,7 +4,7 @@
 This document describes the processes for making and announcing a Breezy
 release, and managing the release process.  This is just one phase of the
 `overall development cycle
-<http://doc.bazaar.canonical.com/developers/cycle.html>`_, (go re-read this
+<https://www.breezy-vcs.org/developers/cycle.html>`_, (go re-read this
 document to ensure it hasn't been updated since you last read it) but it's
 the most complex part.
 
@@ -518,7 +518,7 @@
 #. Announce on the Breezy website.
 
 #. Check that the documentation for this release is available in
-   <http://doc.bazaar.canonical.com>.  It should be automatically build when
+   <https://www.breezy-vcs.org/doc/en/>.  It should be automatically build when
    the branch is created, by a cron script ``update-brz-docs`` on
    ``escudero``. When the first release is created in a new series, a branch
    needs to be created on ``escudero``::

=== modified file 'doc/en/Makefile'
--- doc/en/Makefile	2012-03-09 16:48:55 +0000
+++ doc/en/Makefile	2018-11-18 17:25:59 +0000
@@ -11,22 +11,6 @@
 PAPEROPT_letter = -D latex_paper_size=letter
 ALLSPHINXOPTS   = -d _build/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
 
-# Note that this assumes name of the output dir is same as name of the rule.
-define make_output_dirs
-# Create output directory (only needed for sphinx < 0.5)
-[ -d _build ] || mkdir _build
-[ -d "_build/$@" ] || mkdir "_build/$@"
-# Workaround for a bug in sphinx < 0.5 where it tries to delete
-# nonexistent static dirs and does not catch the exception.  This was
-# fixed in svn+ssh://[e-mail]/doctools/branches/0.4.x
-# at r65551 and merged as 280b62246342 in hg branch released as 0.5.
-[ -d "_build/$@/_static" ] || mkdir "_build/$@/_static"
-for fn in _static/*; do \
-    [ ! -d "$$fn" ] && continue; \
-    [ -d "_build/$@/$$fn" ] || mkdir "_build/$@/$$fn"; \
-done
-endef
-
 .PHONY: help clean html dirhtml pickle json htmlhelp qthelp latex changes linkcheck doctest
 
 help:
@@ -45,6 +29,9 @@
 clean:
 	-rm -rf _build/*
 
+api:
+	sphinx-apidoc -feM -s txt -o api ../../breezy
+
 html:
 	$(make_output_dirs)
 	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) _build/html

=== modified file 'doc/en/_templates/index.html'
--- doc/en/_templates/index.html	2018-09-14 09:31:24 +0000
+++ doc/en/_templates/index.html	2018-11-18 17:25:59 +0000
@@ -60,12 +60,6 @@
       <span class="linkdescr">help on popular plugins</span>
       </p>
     </td></tr>
-
-    <tr><td colspan="2">
-	These documents are also available in <a href="../es/index.html">Spanish</a>,
-	<a href="../ja/index.html">Japanese</a>, 
-	and <a href="../ru/index.html">Russian</a>.
-    </td></tr>
   </table>
 
 {% endblock %}

=== modified file 'doc/en/admin-guide/backup.txt'
--- doc/en/admin-guide/backup.txt	2009-12-16 02:03:31 +0000
+++ doc/en/admin-guide/backup.txt	2018-11-18 17:25:59 +0000
@@ -57,8 +57,8 @@
 ::
 
   $ cd /var/backup
-  $ bzr branch bzr+ssh://server.example.com/srv/bzr/trunk
-  $ bzr branch bzr+ssh://server.example.com/srv/bzr/feature-gui
+  $ brz branch bzr+ssh://server.example.com/srv/bzr/trunk
+  $ brz branch bzr+ssh://server.example.com/srv/bzr/feature-gui
 
 to create the branches on the backup server.  Then, we could regularly (for
 example from ``cron``) do
@@ -66,9 +66,9 @@
 ::
 
   $ cd /var/backup/trunk
-  $ bzr pull  # the location to pull from is remembered
+  $ brz pull  # the location to pull from is remembered
   $ cd ../var/backup/feature-gui
-  $ bzr pull  # again, the parent location is remembered
+  $ brz pull  # again, the parent location is remembered
 
 The action of pulling from the parent for all branches in some directory is
 common enough that there is a plugin to do it.  The `bzrtools`_ plugin
@@ -82,7 +82,7 @@
 ::
 
   $ cd /var/backup
-  $ bzr multi-pull
+  $ brz multi-pull
 
 Note that ``multi-pull`` does a pull in *every* branch in the specified
 directory (the current directory by default) and care should be taken that
@@ -108,18 +108,18 @@
 ::
 
   $ cd /srv/bzr/projectx/trunk
-  $ bzr push bzr+ssh://backup.example.com/var/backup/trunk
+  $ brz push bzr+ssh://backup.example.com/var/backup/trunk
   $ cd ../feature-gui
-  $ bzr push bzr+ssh://backup.example.com/var/backup/feature-gui
+  $ brz push bzr+ssh://backup.example.com/var/backup/feature-gui
 
 and then we need to bind the main branches to their backups
 
 ::
 
   $ cd ../trunk
-  $ bzr bind bzr+ssh://backup.example.com/var/backup/trunk
+  $ brz bind bzr+ssh://backup.example.com/var/backup/trunk
   $ cd ../feature-gui
-  $ bzr bind bzr+ssh://backup.example.com/var/backup/feature-gui
+  $ brz bind bzr+ssh://backup.example.com/var/backup/feature-gui
 
 A branch can only be bound to a single location, so multiple backups cannot
 be created using this method.  
@@ -197,8 +197,8 @@
   $ cd /srv
   $ mv bzr bzr.old
   $ cd bzr
-  $ bzr branch bzr+ssh://backup.example.com/var/backup/trunk
-  $ bzr branch bzr+ssh://backup.example.com/var/backup/feature-gui
+  $ brz branch bzr+ssh://backup.example.com/var/backup/trunk
+  $ brz branch bzr+ssh://backup.example.com/var/backup/feature-gui
 
 If there are multiple backups, then change the URL above to restore from the
 other backups.  

=== modified file 'doc/en/admin-guide/hooks-plugins.txt'
--- doc/en/admin-guide/hooks-plugins.txt	2010-08-13 19:08:57 +0000
+++ doc/en/admin-guide/hooks-plugins.txt	2018-11-18 17:25:59 +0000
@@ -96,7 +96,7 @@
 
 ::
 
-  $ bzr_hookless_email.py --email=[e-mail] \
+  $ brz_hookless_email.py --email=[e-mail] \
   --recurse /srv/bzr
 
 email-notifier
@@ -143,7 +143,7 @@
 
 ::
  
-  $ bzr-email-notifier.py --config=/srv/bzr/email-notifier.conf /srv/bzr/projectx
+  $ brz-email-notifier.py --config=/srv/bzr/email-notifier.conf /srv/bzr/projectx
 
 will watch all branches under the given directory for commits, branch
 creations and branch deletions.

=== modified file 'doc/en/admin-guide/licence.txt'
--- doc/en/admin-guide/licence.txt	2011-05-16 10:05:25 +0000
+++ doc/en/admin-guide/licence.txt	2018-11-18 17:25:59 +0000
@@ -1,7 +1,10 @@
 Licence
 ===============
 
-Copyright 2008-2011 Canonical Ltd. Bazaar is free software, and you
-may use, modify and redistribute both Bazaar and this document under
+Copyright 2008-2011 Canonical Ltd.
+Copyright 2018 Breezy Developers
+
+Breezy is free software, and you
+may use, modify and redistribute both Breezy and this document under
 the terms of the GNU General Public License version 2 or later.  See
 <http://www.gnu.org/licenses/>.

=== modified file 'doc/en/admin-guide/migration.txt'
--- doc/en/admin-guide/migration.txt	2012-01-17 17:22:36 +0000
+++ doc/en/admin-guide/migration.txt	2018-11-18 17:25:59 +0000
@@ -35,9 +35,9 @@
 ::
 
   $ cd /srv/bzr/projectx
-  $ bzr fast-export-from-hg ../../hg/projectx projectx.fi
-  $ bzr init trunk
-  $ bzr fast-import projectx.fi trunk
+  $ brz fast-export-from-hg ../../hg/projectx projectx.fi
+  $ brz init trunk
+  $ brz fast-import projectx.fi trunk
 
 Subversion Conversion
 ---------------------

=== modified file 'doc/en/admin-guide/simple-setups.txt'
--- doc/en/admin-guide/simple-setups.txt	2011-08-24 09:34:35 +0000
+++ doc/en/admin-guide/simple-setups.txt	2018-11-18 17:25:59 +0000
@@ -37,12 +37,12 @@
 Clients can access the branches using URLs with the ``bzr+ssh://`` prefix.  For
 example, to get a local copy of the ProjectX trunk, a developer could do::
 
-  $ bzr branch bzr+ssh://server.example.com/srv/bzr/projectx/trunk projectx
+  $ brz branch bzr+ssh://server.example.com/srv/bzr/projectx/trunk projectx
 
 If the developers have write access to the ``/srv/bzr/projectx`` directory, then
 they can create new branches themselves using::
   
-  $ bzr branch bzr+ssh://server.example.com/srv/bzr/projectx/trunk \
+  $ brz branch bzr+ssh://server.example.com/srv/bzr/projectx/trunk \
   bzr+ssh://server.example.com/srv/bzr/projectx/feature-gui
 
 Of course, if this isn't desired, then developers should not have write access
@@ -55,7 +55,7 @@
 shared repository to hold all of the branches.  To set this up, do::
 
   $ cd /srv/bzr
-  $ bzr init-repo --no-trees projectx
+  $ brz init-repo --no-trees projectx
 
 The ``--no-trees`` option saves space by not creating a copy of the working
 files on the server's filesystem.  Then, any branch created under
@@ -69,7 +69,7 @@
 ``BZR_REMOTE_PATH`` environment variable.  For example, if the Bazaar executable
 is installed in ``/usr/local/bzr-2.0/bin/bzr``, then a developer could use::
 
-  $ BZR_REMOTE_PATH=/usr/local/bzr-2.0/bin/bzr bzr info \
+  $ brz_REMOTE_PATH=/usr/local/bzr-2.0/bin/bzr bzr info \
   bzr+ssh://server.example.com/srv/bzr/proectx/trunk
 
 to get information about the trunk branch.  The remote path can also be
@@ -81,11 +81,11 @@
 refer to the home directory of user ``username``.  For example, if there are two
 developers ``alice`` and ``bob``, then Bob could use::
 
-  $ bzr log bzr+ssh://server.example.com/~/fix-1023
+  $ brz log bzr+ssh://server.example.com/~/fix-1023
 
 to refer to one of his bug fix branches and::
 
-  $ bzr log bzr+ssh://server.example.com/~alice/fix-2047
+  $ brz log bzr+ssh://server.example.com/~alice/fix-2047
   
 to refer to one of Alice's branches. [#]_
 
@@ -133,10 +133,10 @@
 
 If Alice logs in she uses the following command for her fix-1023 branch::
 
-  $ bzr log bzr+ssh://[e-mail]/fix-1023
+  $ brz log bzr+ssh://[e-mail]/fix-1023
 
 If Repo Manager logs in he uses the following command to access Alice's
 fix-1023::
 
-  $ bzr log bzr+ssh://[e-mail]/alice/fix-1023
+  $ brz log bzr+ssh://[e-mail]/alice/fix-1023
 

=== modified file 'doc/en/tutorials/centralized_workflow.txt'
--- doc/en/tutorials/centralized_workflow.txt	2017-06-02 21:28:05 +0000
+++ doc/en/tutorials/centralized_workflow.txt	2018-11-18 17:25:59 +0000
@@ -215,28 +215,13 @@
 we have a checkout, any commits made in the ``~/work/sigil/doodle-fixes/``
 will also show up on ``centralhost``. [#nestedbranches]_ It is also
 possible to have two developers collaborate on one of these branches, just
-like they would have collaborated on the ``dev`` branch. [#cbranch]_
+like they would have collaborated on the ``dev`` branch.
 
 .. [#nestedbranches] It may look odd to have a branch in a subdirectory of
    another branch. This is just fine, and you can think of it as a
    hierarchical namespace where the nested branch is derived from the
    outer branch.
 
-.. [#cbranch] When using lots of independent branches, having to retype
-   the full URL all the time takes a lot of typing. We are looking into
-   various methods to help with this, such as branch aliases, etc. For
-   now, though, the brztools_ plugin provides the ``brz cbranch`` command.
-   Which is designed to take a base branch, create a new public branch,
-   and create a checkout of that branch, all with much less typing.
-   Configuring ``cbranch`` is outside the scope of this document, but the
-   final commands are similar to:
-
-::
-
-   % brz cbranch dev my-feature-branch
-
-.. _brztools: http://wiki.bazaar.canonical.com/brzTools
-
 
 Merging changes back
 --------------------
@@ -282,8 +267,7 @@
                brz+ssh://centralhost/srv/brz/sigil/user-b
 
 This gives each developer their own branch to work on. And, they can
-easily create a new feature branch for themselves with just [#cbranch]_
-::
+easily create a new feature branch for themselves::
 
   % brz branch brz+ssh://centralhost/srv/brz/sigil/user-a \
                brz+ssh://centralhost/srv/brz/sigil/user-a/feature

=== modified file 'doc/en/tutorials/licence.txt'
--- doc/en/tutorials/licence.txt	2017-05-21 13:35:49 +0000
+++ doc/en/tutorials/licence.txt	2018-11-18 17:25:59 +0000
@@ -1,7 +1,10 @@
 Licence
 ===============
 
-Copyright 2005-2011 Canonical Ltd. Breezy is free software, and you
+Copyright 2005-2011 Canonical Ltd.
+Copyright 2018 Breezy Developers
+
+Breezy is free software, and you
 may use, modify and redistribute both Breezy and this document under
 the terms of the GNU General Public License version 2 or later.  See
 <http://www.gnu.org/licenses/>.

=== modified file 'doc/en/tutorials/using_breezy_with_launchpad.txt'
--- doc/en/tutorials/using_breezy_with_launchpad.txt	2017-05-21 13:35:49 +0000
+++ doc/en/tutorials/using_breezy_with_launchpad.txt	2018-11-18 17:25:59 +0000
@@ -88,19 +88,6 @@
 in a sustainable way is no easy task.
 
 
-Breezy: Launchpad's VCS client
-------------------------------
-
-This tutorial looks at how Breezy and Launchpad can be used together
-and how they complement each other. It is important to remember that:
-
-1. Breezy can be used without Launchpad
-2. Launchpad can be used without Breezy.
-
-By design though, their sum is greater than the individual
-parts.
-
-
 Finding and browsing branches using Launchpad
 =============================================
 

=== modified file 'doc/en/upgrade-guide/licence.txt'
--- doc/en/upgrade-guide/licence.txt	2011-05-16 10:22:06 +0000
+++ doc/en/upgrade-guide/licence.txt	2018-11-18 17:25:59 +0000
@@ -1,7 +1,10 @@
 Licence
 ===============
 
-Copyright 2009-2011 Canonical Ltd. Bazaar is free software, and you
+Copyright 2009-2011 Canonical Ltd.
+Copyright 2018 Breezy Developers
+
+Bazaar is free software, and you
 may use, modify and redistribute both Bazaar and this document under
 the terms of the GNU General Public License version 2 or later.  See
 <http://www.gnu.org/licenses/>.

=== modified file 'doc/en/upgrade-guide/overview.txt'
--- doc/en/upgrade-guide/overview.txt	2017-05-21 13:35:49 +0000
+++ doc/en/upgrade-guide/overview.txt	2018-11-18 17:25:59 +0000
@@ -56,7 +56,7 @@
 2. Upgrade to the latest version using **sudo port upgrade brz**
 
 For further information on installing and upgrading, see
-http://wiki.bazaar.canonical.com/Download.
+https://www.breezy-vcs.org/pages/download.html
 
 
 Upgrading required plugins

=== modified file 'doc/en/user-guide/installing_breezy.txt'
--- doc/en/user-guide/installing_breezy.txt	2017-08-26 15:42:59 +0000
+++ doc/en/user-guide/installing_breezy.txt	2018-11-18 17:25:59 +0000
@@ -6,7 +6,7 @@
 
 Breezy packages are available for most popular GNU/Linux distributions
 including Ubuntu, Debian, Red Hat and Gentoo.
-See http://wiki.bazaar.canonical.com/Download for the latest instructions.
+See https://www.breezy-vcs.org/pages/download.html for the latest instructions.
 
 Windows
 -------
@@ -14,7 +14,7 @@
 For Windows users, an installer is available that includes
 the core Breezy package together with necessary pre-requisites
 and some useful plug-ins.
-See http://wiki.bazaar.canonical.com/Download for the latest instructions.
+See https://www.breezy-vcs.org/pages/download.html for the latest instructions.
 
 Note: If you are running Cygwin on Windows, a Breezy for Cygwin package
 is available and ought to be used instead of the Windows version.
@@ -24,7 +24,7 @@
 
 Beyond Linux and Windows, Breezy packages are available for a large
 range of other operating systems include Mac OS X, FreeBSD and Solaris.
-See http://wiki.bazaar.canonical.com/Download for the latest instructions.
+See https://www.breezy-vcs.org/pages/download.html for the latest instructions.
 
 
 Installing from scratch
@@ -33,10 +33,10 @@
 If you wish to install Breezy from scratch rather than using a
 pre-built package, the steps are:
 
-  1. If it is not installed already, install Python 2.6 or later.
+  1. If it is not installed already, install Python 2.7 or later.
 
-  2. Download the ``bazaar-xxx.tar.gz`` file (where xxx is the version
-     number) from http://wiki.bazaar.canonical.com/Download or from Launchpad
+  2. Download the ``breezy-xxx.tar.gz`` file (where xxx is the version
+     number) from https://www.breezy-vcs.org/pages/download.html or from Launchpad
      (https://launchpad.net/~brz/).
 
   3. Unpack the archive using tar, WinZip or equivalent.

=== modified file 'doc/en/user-guide/introducing_breezy.txt'
--- doc/en/user-guide/introducing_breezy.txt	2017-08-26 15:42:59 +0000
+++ doc/en/user-guide/introducing_breezy.txt	2018-11-18 17:25:59 +0000
@@ -98,12 +98,12 @@
 While Breezy is not the only distributed VCS tool around, it does have some
 notable features that make it an excellent choice for many teams and
 communities. A summary of these and comparisons with other VCS tools
-can be found on the Breezy Wiki, http://wiki.bazaar.canonical.com.
+can be found on the Bazaar Wiki, http://wiki.bazaar.canonical.com.
 
 Of the many features, one in particular is worth highlighting:
 Breezy is completely free software written in Python. As a result,
 it is easy to contribute improvements. If you wish to get involved,
-please see http://wiki.bazaar.canonical.com/BzrSupport.
+please see https://www.breezy-vcs.org/pages/support.html.
 
 
 Learning more

=== modified file 'doc/en/user-guide/licence.txt'
--- doc/en/user-guide/licence.txt	2017-05-21 13:41:54 +0000
+++ doc/en/user-guide/licence.txt	2018-11-18 17:25:59 +0000
@@ -1,7 +1,10 @@
 Licence
 ===============
 
-Copyright 2009-2011 Canonical Ltd. Breezy is free software, and you
+Copyright 2009-2011 Canonical Ltd.
+Copyright 2018 Breezy Developers
+
+Breezy is free software, and you
 may use, modify and redistribute both Breezy and this document under
 the terms of the GNU General Public License version 2 or later.  See
 <http://www.gnu.org/licenses/>.

=== modified file 'doc/en/user-reference/readme.txt'
--- doc/en/user-reference/readme.txt	2017-05-21 18:10:28 +0000
+++ doc/en/user-reference/readme.txt	2018-11-18 17:25:59 +0000
@@ -5,4 +5,4 @@
 registries, e.g. the set of available file formats. If you're
 not sure where to find the source content you're looking for,
 please contact the developers on the mailing list or IRC.
-See http://wiki.bazaar.canonical.com/BzrSupport for contact details.
+See https://www.breezy-vcs.org/pages/support.html for contact details.

=== modified file 'doc/index.txt'
--- doc/index.txt	2018-11-18 02:43:52 +0000
+++ doc/index.txt	2018-11-18 17:25:59 +0000
@@ -4,7 +4,7 @@
 
 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>.
+may be linked from <https://www.breezy-vcs.org/doc/>.
 
 Core Documentation
 ==================
@@ -51,7 +51,7 @@
 
 * `Glossary <http://wiki.bazaar.canonical.com/BzrGlossary>`_
 
-* `Frequently Asked Questions <http://wiki.bazaar.canonical.com/FAQ>`_
+* `Frequently Asked Questions <https://answers.launchpad.net/brz/+faqs>`_
 
 .. |--| unicode:: U+2014