Rev 3289: post-1.3 fixes in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 3289
revision-id:pqm at pqm.ubuntu.com-20080317032118-1731brhtravarpa7
parent: pqm at pqm.ubuntu.com-20080317014832-s8bbb26w0qnrklcp
parent: mbp at sourcefrog.net-20080316230200-inw4wrjt6qlx76f2
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2008-03-17 03:21:18 +0000
message:
  post-1.3 fixes
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
    ------------------------------------------------------------
    revno: 3280.2.4.1.2
    revision-id:mbp at sourcefrog.net-20080316230200-inw4wrjt6qlx76f2
    parent: mbp at sourcefrog.net-20080316230049-1ewc4zcs0rhmhfau
    author: Matt Nordhoff
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: prepare-1.3
    timestamp: Mon 2008-03-17 10:02:00 +1100
    message:
      Fix NEWS typo
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
    ------------------------------------------------------------
    revno: 3280.2.4.1.1
    revision-id:mbp at sourcefrog.net-20080316230049-1ewc4zcs0rhmhfau
    parent: mbp at sourcefrog.net-20080316093156-kdb1p636vt0sb2pt
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: prepare-1.3
    timestamp: Mon 2008-03-17 10:00:49 +1100
    message:
      Backup directory name is a user-affecting change (Matt Nordhoff)
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
=== modified file 'NEWS'
--- a/NEWS	2008-03-16 23:55:02 +0000
+++ b/NEWS	2008-03-17 03:21:18 +0000
@@ -38,7 +38,8 @@
 
   NOTES WHEN UPGRADING:
 
-    No special action is required from the user for this release.
+    * The backup directory created by ``upgrade`` is now called
+      ``backup.bzr``, not ``.bzr.backup``. (Martin Albisetti)
 
   CHANGES:
 
@@ -65,9 +66,6 @@
     * Version number is now shown as "1.2" or "1.2pr2", without zeroed or
       missing final fields.  (Martin Pool)
 
-    * The backup directory created by ``upgrade`` is now called
-      ``backup.bzr``, not ``.bzr.backup``. (Martin Albisetti)
-
   FEATURES:
 
     * ``branch`` and ``checkout`` can hard-link working tree files, which is