Merge lp:~jelmer/brz/docs into lp:brz

[Jelmer Vernooij]

Remove more references to the Bazaar site.

Remove more references to the Bazaar site.

[Jelmer Vernooij (jelmer)]

review: Approve

=== modified file 'Makefile'
--- Makefile	2021-08-20 01:28:55 +0000
+++ Makefile	2021-11-17 20:41:22 +0000
@@ -295,9 +295,9 @@
 	$(PYTHON) ./brz export-pot --include-duplicates > po/brz.pot
 	echo $(TRANSLATABLE_PYFILES) | xargs \
 	  xgettext --package-name "brz" \
-	  --msgid-bugs-address "<[e-mail]>" \
-	  --copyright-holder "Canonical" \
-	  --from-code ISO-8859-1 --join --sort-by-file --add-comments=i18n: \
+	  --msgid-bugs-address "<[e-mail]>" \
+	  --copyright-holder "Breezy Developers" \
+	  --from-code UTF-8 --join --sort-by-file --add-comments=i18n: \
 	  -d bzr -p po -o brz.pot
 
 

=== modified file 'breezy/builtins.py'
--- breezy/builtins.py	2021-11-13 13:01:39 +0000
+++ breezy/builtins.py	2021-11-17 20:41:22 +0000
@@ -2661,7 +2661,7 @@
       GUI tools and IDEs are often better at exploring history than command
       line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the
       bzr-explorer shell, or the Loggerhead web interface.  See the Bazaar
-      Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/> and
+      Plugin Guide <https://www.breezy-vcs.org/doc/plugins/en/> and
       <http://wiki.bazaar.canonical.com/IDEIntegration>.
 
       You may find it useful to add the aliases below to ``breezy.conf``::
@@ -5208,7 +5208,7 @@
     adding new commands, providing additional network transports and
     customizing log output.
 
-    See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>
+    See the Bazaar Plugin Guide <https://www.breezy-vcs.org/doc/plugins/en/>
     for further information on plugins including where to find them and how to
     install them. Instructions are also provided there on how to write new
     plugins using the Python programming language.

=== modified file 'breezy/bzr/bzrdir.py'
--- breezy/bzr/bzrdir.py	2020-07-18 23:14:00 +0000
+++ breezy/bzr/bzrdir.py	2021-11-17 20:41:22 +0000
@@ -76,7 +76,7 @@
 class MissingFeature(errors.BzrError):
 
     _fmt = ("Missing feature %(feature)s not provided by this "
-            "version of Bazaar or any plugin.")
+            "version of Breezy or any plugin.")
 
     def __init__(self, feature):
         self.feature = feature

=== modified file 'breezy/help_topics/en/rules.txt'
--- breezy/help_topics/en/rules.txt	2017-05-21 14:47:52 +0000
+++ breezy/help_topics/en/rules.txt	2021-11-17 20:41:22 +0000
@@ -18,7 +18,7 @@
 provide custom behaviour for selected files.  For more information on 
 end of line conversion see :doc:`eol-help`.
 Keyword support is provided by the `keywords plugin
-<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_.
+<https://www.breezy-vcs.org/doc/plugins/en/keywords-plugin.html>`_.
 
 Files
 -----

=== modified file 'doc/developers/releasing.txt'
--- doc/developers/releasing.txt	2020-06-10 23:47:24 +0000
+++ doc/developers/releasing.txt	2021-11-17 20:41:22 +0000
@@ -516,23 +516,10 @@
 
 #. Announce on the Breezy website.
 
-#. Check that the documentation for this release is available in
-   <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``::
-
-     ssh escudero.canonical.com
-     sudo -u brz-web -s
-     cd /srv/doc.bazaar.canonical.com/
-     brz branch lp:brz/2.7 brz/brz.2.7
-
-   And the ``brz/bin/update-brz-docs`` script needs to refer to it.
-
-   The ``lp:brz-alldocs`` branch also needs to be updated when a new series
-   is introduced, see the ``README`` file there for more instructions
-   (looking at the branch history is also a good way to understand what
-   needs to be done and to document any policy changes).
+#. Check that the documentation for this release is available on
+   https://www.breezy-vcs.org/doc/en/.
+
+   This documentation is currently generated by a cron job run by Jelmer.
 
 Announcing the release
 ----------------------

=== modified file 'doc/en/_templates/index.html'
--- doc/en/_templates/index.html	2021-05-03 12:53:04 +0000
+++ doc/en/_templates/index.html	2021-11-17 20:41:22 +0000
@@ -39,7 +39,7 @@
 
   <table class="contentstable" align="center" style="margin-left: 30px"><tr>
     <td width="50%">
-      <p class="biglink"><a class="biglink" href="http://doc.bazaar.canonical.com/explorer/en/guide/">Desktop Guide</a><br/>
+      <p class="biglink"><a class="biglink" href="https://www.breezy-vcs.org/doc/explorer/en/guide/">Desktop Guide</a><br/>
       <span class="linkdescr">how to use our GUI applications</span>
       </p>
         <p class="biglink"><a class="biglink" href="https://answers.launchpad.net/brz/+faqs">FAQ</a><br/>
@@ -53,10 +53,10 @@
       <p class="biglink"><a class="biglink" href="{{ pathto("developers/index") }}">Developer Docs</a><br/>
         <span class="linkdescr">improving and extending brz</span>
       </p>
-      <p class="biglink"><a class="biglink" href="http://doc.bazaar.canonical.com/migration/en/">Migration Docs</a><br/>
+      <p class="biglink"><a class="biglink" href="https://www.breezy-vcs.org/doc/migration/en/">Migration Docs</a><br/>
       <span class="linkdescr">for refugees of other tools</span>
       </p>
-      <p class="biglink"><a class="biglink" href="http://doc.bazaar.canonical.com/plugins/en/">Plugins Guide</a><br/>
+      <p class="biglink"><a class="biglink" href="https://www.breezy-vcs.org/doc/plugins/en/">Plugins Guide</a><br/>
       <span class="linkdescr">help on popular plugins</span>
       </p>
     </td></tr>

=== modified file 'doc/en/admin-guide/hooks-plugins.txt'
--- doc/en/admin-guide/hooks-plugins.txt	2020-08-13 18:22:05 +0000
+++ doc/en/admin-guide/hooks-plugins.txt	2021-11-17 20:41:22 +0000
@@ -22,7 +22,7 @@
 purposes, as well as for backups and mirroring.
 
 Information on the whole range of Bazaar plugins is available at
-http://doc.bazaar.canonical.com/plugins/en/.  For purposes of installation,
+https://www.breezy-vcs.org/doc/plugins/en/.  For purposes of installation,
 plugins are simply python packages.  They can be installed alongside Bazaar in
 the ``breezy.plugins`` package using each plugin's ``setup.py``.  They can
 also be installed in the plugin path which is the user's
@@ -59,7 +59,7 @@
 mail should be sent.  If it isn't set, email is sent via ``/usr/bin/mail``.
 It can also be configured to communicate directly with an SMTP server.
 For more details on configuring this plugin, see
-http://doc.bazaar.canonical.com/plugins/en/email-plugin.html.  As examples,
+https://www.breezy-vcs.org/doc/plugins/en/email-plugin.html.  As examples,
 consider the following two possible configurations.  A minimal one (uses
 ``/usr/bin/mail``)
 

=== modified file 'doc/en/admin-guide/migration.txt'
--- doc/en/admin-guide/migration.txt	2020-08-13 18:22:05 +0000
+++ doc/en/admin-guide/migration.txt	2021-11-17 20:41:22 +0000
@@ -3,7 +3,7 @@
 
 Migrating between version control systems can be a complicated process, and
 Bazaar has extensive documentation on the process at 
-http://doc.bazaar.canonical.com/migration/en and we won't attempt to repeat that
+https://www.breezy-vcs.org/doc/migration/en and we won't attempt to repeat that
 here.  We will try to give a few motivating examples for conversion from
 Mercurial and Subversion.
 
@@ -43,7 +43,7 @@
 Bazaar's `svn`_ plugin provides tools for interaction with Subversion
 projects.  In fact, Bazaar can be used transparently with projects stored in
 Subversion, but that is beyond the scope of this document.  (See
-http://doc.bazaar.canonical.com/migration/en/foreign/bzr-on-svn-projects.html for
+https://www.breezy-vcs.org/doc/migration/en/foreign/bzr-on-svn-projects.html for
 more on that subject.)  What is relevant here is the ``svn-import`` command
 provided by that plugin.  This can import an entire subversion repository
 including tags and branches, particularly if they are stored in Subversion's

=== modified file 'doc/en/user-guide/hooks.txt'
--- doc/en/user-guide/hooks.txt	2020-12-11 15:47:15 +0000
+++ doc/en/user-guide/hooks.txt	2021-11-17 20:41:22 +0000
@@ -14,7 +14,7 @@
 see the `push-and-update plugin`_ that handles one special case of
 server-side operations.)
 
-.. _push-and-update plugin: http://doc.bazaar.canonical.com/plugins/en/push-and-update-plugin.html
+.. _push-and-update plugin: https://www.breezy-vcs.org/doc/plugins/en/push-and-update-plugin.html
 
 Using hooks
 -----------

=== modified file 'doc/en/whats-new/whats-new-in-2.1.txt'
--- doc/en/whats-new/whats-new-in-2.1.txt	2010-12-02 09:21:11 +0000
+++ doc/en/whats-new/whats-new-in-2.1.txt	2021-11-17 20:41:22 +0000
@@ -124,8 +124,8 @@
 can now be read by standard Bazaar clients. Changes can also
 be written back via the dpush command.
 
-.. _git: http://doc.bazaar.canonical.com/plugins/en/git-plugin.html
-.. _hg: http://doc.bazaar.canonical.com/plugins/en/hg-plugin.html
+.. _git: https://www.breezy-vcs.org/doc/plugins/en/git-plugin.html
+.. _hg: https://www.breezy-vcs.org/doc/plugins/en/hg-plugin.html
 
 
 Metaprojects
@@ -144,9 +144,9 @@
    be useful for building test images for a QA team or disk images
    for installers, say.
 
-.. _builder: http://doc.bazaar.canonical.com/plugins/en/builder-plugin.html
-.. _externals: http://doc.bazaar.canonical.com/plugins/en/externals-plugin.html
-.. _builddeb: http://doc.bazaar.canonical.com/plugins/en/builddeb-plugin.html
+.. _builder: https://www.breezy-vcs.org/doc/plugins/en/builder-plugin.html
+.. _externals: https://www.breezy-vcs.org/doc/plugins/en/externals-plugin.html
+.. _builddeb: https://www.breezy-vcs.org/doc/plugins/en/builddeb-plugin.html
 
 
 Colocated branch workspaces
@@ -156,7 +156,7 @@
 across one or more branches managed at that same location. This
 is now supported by the new colo_ plugin and by Bazaar Explorer.
 
-.. _colo: http://doc.bazaar.canonical.com/plugins/en/colo-plugin.html
+.. _colo: https://www.breezy-vcs.org/doc/plugins/en/colo-plugin.html
 
 
 Better documentation
@@ -173,7 +173,7 @@
 navigate through and print selected sections of.
 
 To assist users migrating from other tools, a
-`Survival Guide <http://doc.bazaar.canonical.com/migration/en/survival/index.html>`_
+`Survival Guide <https://www.breezy-vcs.org/doc/migration/en/survival/index.html>`_
 has been published explaining Bazaar to users of other tools in terms they
 already know. Sections are provided for existing users of 
 CVS, Subversion, ClearCase, Perforce, Visual SourceSafe, Git, Mercurial,
@@ -195,7 +195,7 @@
 a better working tree browser and a submit delta report showing the
 cumulative effect of a series of commits.
 See `What's New in Bazaar Explorer 1.0?
-<http://doc.bazaar.canonical.com/explorer/en/whats-new/whats-new-in-1.0.html>`_
+<https://www.breezy-vcs.org/doc/explorer/en/whats-new/whats-new-in-1.0.html>`_
 for more information.
 
 

=== modified file 'po/brz.pot'
--- po/brz.pot	2021-05-03 12:53:04 +0000
+++ po/brz.pot	2021-11-17 20:41:22 +0000
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: brz\n"
-"Report-Msgid-Bugs-To: <[e-mail]>\n"
+"Report-Msgid-Bugs-To: <[e-mail]>\n"
 "POT-Creation-Date: 2021-05-03 13:48+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -1852,7 +1852,7 @@
 "  GUI tools and IDEs are often better at exploring history than command\n"
 "  line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
 "  bzr-explorer shell, or the Loggerhead web interface.  See the Bazaar\n"
-"  Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
+"  Plugin Guide <https://www.breezy-vcs.org/doc/plugins/en/> and\n"
 "  <http://wiki.bazaar.canonical.com/IDEIntegration>."
 msgstr ""
 
@@ -3468,7 +3468,7 @@
 
 #: breezy/builtins.py:5212
 msgid ""
-"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
+"See the Bazaar Plugin Guide <https://www.breezy-vcs.org/doc/plugins/en/>\n"
 "for further information on plugins including where to find them and how to\n"
 "install them. Instructions are also provided there on how to write new\n"
 "plugins using the Python programming language."
@@ -14660,7 +14660,7 @@
 "provide custom behaviour for selected files.  For more information on \n"
 "end of line conversion see :doc:`eol-help`.\n"
 "Keyword support is provided by the `keywords plugin\n"
-"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
+"<https://www.breezy-vcs.org/doc/plugins/en/keywords-plugin.html>`_."
 msgstr ""
 
 #: en/help_topics/rules.txt:23