Merge lp:~mbp/bzr/doc into lp:bzr

Two small fixes.

> Two small fixes.

This still doesn't have a diff to review after about 2 hours sitting in the review queue. I think something is seriously off about lp:mad, given that the code review on one of my submissions was about 3 revisions old.

Maybe you did what I do and start a submission for code review before the final push (so you can start typing the message). But now the code review system checks a revision id at the "submit this for review" time rather than the final "submit" button being pushed.

Here's the diff

=== modified file 'doc/developers/releasing.txt'
--- doc/developers/releasing.txt 2009-08-30 21:34:42 +0000
+++ doc/developers/releasing.txt 2009-09-14 06:39:21 +0000
@@ -188,18 +188,33 @@
    failures.

-Publishing the release
-----------------------
-
-Now you have the beta or releasable product. The next step is making it
-available to the world.
-
-go to the release
+Publishing the source tarball
+-----------------------------
+
+#. Go to the relevant milestone page in Launchpad.

 #. Within that release, upload the source tarball and zipfile and the GPG
    signature. Or, if you prefer, use the
    ``tools/packaging/lp-upload-release`` script to do this.

+
+Announcing the source freeze
+----------------------------
+
+#. Post to the ``bazaar`` list, saying that the source has been frozen.
+ This is the cue for platform maintainers and plugin authors to update
+ their code. This is done before the general public announcement of the
+ release.
+
+
+Publishing the release
+----------------------
+
+There is normally a delay of a few days after the source freeze to allow
+for binaries to be built on various platforms. Once they have been built,
+we have a releasable product. The next step is to make it generally
+available to the world.
+
 #. Link from http://bazaar-vcs.org/Download to the tarball and signature.

 #. Announce on the `Bazaar home page <http://bazaar-vcs.org/>`_.

=== modified file 'doc/en/user-guide/getting_help.txt'
--- doc/en/user-guide/getting_help.txt 2007-11-28 00:07:56 +0000
+++ doc/en/user-guide/getting_help.txt 2009-09-14 06:39:21 +0000
@@ -1,18 +1,20 @@
 Getting help
 ============

-Bazaar comes with a built-in on-line help system. To see the list of topics,
-the command is::
+Bazaar comes with a built-in on-line help system, accessed through::

   bzr help

-To see the list of commands, the command is::
+You can ask for help on a command, or on non-command topics. To see a
+list of available help of each kind, use either::

   bzr help commands
-
-To get help on topic xxx or command xxx, the command is::
-
- bzr help xxx
+ bzr help topics
+
+For help on a particular command, use either of these forms::
+
+ bzr help status
+ bzr status --help

 If you wish to search the help or read it as a larger document, the
 information is also available in the Bazaar User Reference.

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Martin Pool wrote:
> Here's the diff
>

Thanks

 review: approve
 merge: approve

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAkqvf50ACgkQJdeBCYSNAAPPsgCdGKzpFv2uWGLiTX633BCHpjhP
Y90An0rGFgOJEtiGfQB11xn3eF2Akw2n
=ffcs
-----END PGP SIGNATURE-----