Merge lp:~jml/bzr/fix-news into lp:bzr/1.16

[Jonathan Lange]

[Jonathan Lange (jml)]

To a "normal" end user reading the 1.16 release notes, it sounds like bzr 1.6 contains two brand new formats. There's nothing that clearly indicates indicates which one they should use.

This patch moves the --development7-rich-root announcement to "Internals" and changes the comment to indicate that ``2a`` is the preferred nomenclature.

[Martin Pool (mbp)]

review: Approve

=== modified file 'NEWS'
--- NEWS	2009-06-12 04:16:21 +0000
+++ NEWS	2009-06-15 03:35:12 +0000
@@ -50,10 +50,6 @@
   If you use stacked branches, you must upgrade the stacked branches
   before the stacked-on branches.  (See <https://bugs.launchpad.net/bugs/374735>)
 
-* ``--development7-rich-root`` is a new dev format, similar to ``--dev6``
-  but using a Revision serializer using bencode rather than XML.
-  (Jelmer Vernooij, John Arbash Meinel)
-
 * mail_client=claws now supports --body (and message body hooks).  Also uses
   configured from address.  (Barry Warsaw)
 
@@ -180,6 +176,12 @@
 Internals
 *********
 
+* ``--development7-rich-root`` is a new dev format, similar to ``--dev6``
+  but using a Revision serializer using bencode rather than XML. Note that
+  this format has been superseded in favor of the ``2a`` format, which is the
+  same in all but name.
+  (Jelmer Vernooij, John Arbash Meinel)
+
 * Remove ``weave.py`` script for accessing internals of old weave-format
   repositories.  (Martin Pool)