Rev 4152: (mbp) small doc corrections in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 4152
revision-id: pqm at pqm.ubuntu.com-20090317005047-1qd1zwlgpc5y8t1i
parent: pqm at pqm.ubuntu.com-20090316232437-0hj1iw4cedo312l3
parent: mbp at sourcefrog.net-20090303002910-i94np5zftoj4c7vv
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2009-03-17 00:50:47 +0000
message:
  (mbp) small doc corrections
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  doc/developers/releasing.txt   releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
    ------------------------------------------------------------
    revno: 4070.10.2
    revision-id: mbp at sourcefrog.net-20090303002910-i94np5zftoj4c7vv
    parent: mbp at sourcefrog.net-20090303002754-3eezfty73azm8hm4
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: doc
    timestamp: Tue 2009-03-03 11:29:10 +1100
    message:
      doc to maintain bzr/current branch
    modified:
      doc/developers/releasing.txt   releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
    ------------------------------------------------------------
    revno: 4070.10.1
    revision-id: mbp at sourcefrog.net-20090303002754-3eezfty73azm8hm4
    parent: pqm at pqm.ubuntu.com-20090302155409-89pygn9tisbc0lir
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: doc
    timestamp: Tue 2009-03-03 11:27:54 +1100
    message:
      Fix mislabelled NEWS entry
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
=== modified file 'NEWS'
--- a/NEWS	2009-03-16 12:35:31 +0000
+++ b/NEWS	2009-03-17 00:50:47 +0000
@@ -2900,8 +2900,8 @@
   No changes from 1.3.1rc1.
 
 
-bzr 1.3rc1 2008-04-04
----------------------
+bzr 1.3.1rc1 2008-04-04
+-----------------------
 
   BUG FIXES:
 

=== modified file 'doc/developers/releasing.txt'
--- a/doc/developers/releasing.txt	2009-03-12 00:34:43 +0000
+++ b/doc/developers/releasing.txt	2009-03-17 00:50:47 +0000
@@ -198,6 +198,10 @@
 the version number in ``bzr`` and ``bzrlib/__init__.py``.  Submit this
 back into pqm for bzr.dev.
 
+You should also merge (not pull) the release branch into
+``lp:~bzr/bzr/current``, so that branch contains the current released code
+at any time.
+
 
 See also
 --------