Rev 6324: Fix news entries to avoid confusion. In particular, bug #819604 has not landed in older releases yet in http://bazaar.launchpad.net/~vila/bzr/integration/

[Vincent Ladeuil]

At http://bazaar.launchpad.net/~vila/bzr/integration/

------------------------------------------------------------
revno: 6324
revision-id: v.ladeuil+lp at free.fr-20111129120633-miq0k8vjbuw5izzq
parent: pqm at pqm.ubuntu.com-20111129111307-5aj61u7nfe43cla7
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: trunk
timestamp: Tue 2011-11-29 13:06:33 +0100
message:
  Fix news entries to avoid confusion. In particular, bug #819604 has not landed in older releases yet
-------------- next part --------------
=== modified file 'doc/en/release-notes/bzr-2.1.txt'
--- a/doc/en/release-notes/bzr-2.1.txt	2011-10-10 13:43:54 +0000
+++ b/doc/en/release-notes/bzr-2.1.txt	2011-11-29 12:06:33 +0000
@@ -43,11 +43,6 @@
 
   (John Arbash Meinel, #609187, #812928)
 
-* Teach the bzr client how to reconnect if we get ``ConnectionReset``
-  while making an RPC request. This doesn't handle all possible network
-  disconnects, but it should at least handle when the server is asked to
-  shutdown gracefully. (John Arbash Meinel, #819604)
-
 Improvements
 ************
 

=== modified file 'doc/en/release-notes/bzr-2.2.txt'
--- a/doc/en/release-notes/bzr-2.2.txt	2011-10-10 13:51:29 +0000
+++ b/doc/en/release-notes/bzr-2.2.txt	2011-11-29 12:06:33 +0000
@@ -19,11 +19,6 @@
 Bug Fixes
 *********
 
-* Teach the bzr client how to reconnect if we get ``ConnectionReset``
-  while making an RPC request. This doesn't handle all possible network
-  disconnects, but it should at least handle when the server is asked to
-  shutdown gracefully. (John Arbash Meinel, #819604)
-
 Improvements
 ************
 

=== modified file 'doc/en/release-notes/bzr-2.3.txt'
--- a/doc/en/release-notes/bzr-2.3.txt	2011-11-25 17:54:52 +0000
+++ b/doc/en/release-notes/bzr-2.3.txt	2011-11-29 12:06:33 +0000
@@ -38,11 +38,6 @@
 * Fix "Unprintable exception" error when a RetryWithNewPacks error is
   displayed.  (Andrew Bennetts)
 
-* Teach the bzr client how to reconnect if we get ``ConnectionReset``
-  while making an RPC request. This doesn't handle all possible network
-  disconnects, but it should at least handle when the server is asked to
-  shutdown gracefully. (John Arbash Meinel, #819604)
-
 Documentation
 *************
 

=== modified file 'doc/en/release-notes/bzr-2.4.txt'
--- a/doc/en/release-notes/bzr-2.4.txt	2011-11-25 17:54:52 +0000
+++ b/doc/en/release-notes/bzr-2.4.txt	2011-11-29 12:06:33 +0000
@@ -114,11 +114,6 @@
   avoids raising a spurious MemoryError on certain platforms such as AIX.
   (John Arbash Meinel, #856731)
 
-* Teach the bzr client how to reconnect if we get ``ConnectionReset``
-  while making an RPC request. This doesn't handle all possible network
-  disconnects, but it should at least handle when the server is asked to
-  shutdown gracefully. (John Arbash Meinel, #819604)
-
 Documentation
 *************
 

=== modified file 'doc/en/release-notes/bzr-2.5.txt'
--- a/doc/en/release-notes/bzr-2.5.txt	2011-11-29 11:13:07 +0000
+++ b/doc/en/release-notes/bzr-2.5.txt	2011-11-29 12:06:33 +0000
@@ -34,6 +34,9 @@
   branch, the relative branch name should no longer be url-encoded.
   (Jelmer Vernooij)
 
+* ``bzr rmbranch`` can now remove colocated branches.
+  (Jelmer Vernooij, #831464)
+
 * ``bzr switch`` now accepts colocated branch names to switch to.
   (Jelmer Vernooij, #826814)
 
@@ -62,6 +65,9 @@
   from remote repositories.  (Jelmer Vernooij, #368717, #762330,
   #608640)
 
+* ``bzr info`` no longer shows empty output if only a control
+  directory is present. (Jelmer Vernooij, #159098)
+
 * Cope with missing revision ids being specified to
   ``Repository.gather_stats`` HPSS call. (Jelmer Vernooij, #411290)
 
@@ -73,6 +79,9 @@
   and gives a better error message if the time zone offset is not given.
   (Matt Giuca, #892657)
 
+* Raise BadIndexKey exception in btree_index when a key is too large, fixing 
+  an infinite recursion issue. (Shannon Weyrick, #720853)
+
 * Resolve regression from colocated branch path handling, by ensuring that
   unreserved characters are unquoted in URLs. (Martin Packman, #842223)
 
@@ -112,6 +121,8 @@
 * ``BzrDir.open_branch`` and ``BranchFormat.open`` now take an optional
   ``possible_transports`` argument. (Jelmer Vernooij)
 
+* New method ``Transport.set_segment_parameter``.  (Jelmer Vernooij)
+
 * ``Repository.verify_revision`` has been renamed to
   ``Repository.verify_revision_signature``. (Jelmer Vernooij)
 
@@ -219,9 +230,6 @@
 * ``bzr revno`` now takes a ``--revision`` argument.
   (Jelmer Vernooij, #870649)
 
-* ``bzr rmbranch`` can now remove colocated branches.
-  (Jelmer Vernooij, #831464)
-
 * ``bzr serve`` now can serve from URLs rather than just from the
   file system. I.e.: ``bzr serve -d lp:bzr`` or
   ``bzr serve -d file:///data/bzr`` (Jelmer Vernooij)
@@ -237,9 +245,6 @@
 * ``bzr info`` now shows the master branch location too for
   treeless local branches. (Jelmer Vernooij, #258355)
 
-* ``bzr info`` no longer shows empty output if only a control
-  directory is present. (Jelmer Vernooij, #159098)
-
 * ``bzr mkdir --quiet`` now does not print a line for every created
   directory. (Martin von Gagern, #869915)
 
@@ -286,8 +291,6 @@
   being referenced from e.g. a branch history at the same time.
   (Jelmer Vernooij)
 
-* New method ``Transport.set_segment_parameter``.  (Jelmer Vernooij)
-
 * ``UIFactory.choose`` has been added: prompt the user for a list of
   choices. (Beno��t Pierre)
 
@@ -633,9 +636,6 @@
   operations that use it, like merge, can now create trees without a root.
   (Aaron Bentley)
 
-* Raise BadIndexKey exception in btree_index when a key is too large, fixing 
-  an infinite recursion issue. (Shannon Weyrick, #720853)
-
 Documentation
 *************