Rev 5626: Cleanup wrong merge across the 2.2/2.3 frontier. in http://bazaar.launchpad.net/~vila/bzr/2.3-integration/

[Vincent Ladeuil]

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

------------------------------------------------------------
revno: 5626
revision-id: v.ladeuil+lp at free.fr-20110310110508-en4uzrmofqxpgkpl
parent: pqm at pqm.ubuntu.com-20110309101803-cvqbhtd698dw1gvg
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 2.3.1-dev
timestamp: Thu 2011-03-10 12:05:08 +0100
message:
  Cleanup wrong merge across the 2.2/2.3 frontier.
-------------- next part --------------
=== modified file 'doc/en/release-notes/bzr-2.2.txt'
--- a/doc/en/release-notes/bzr-2.2.txt	2011-02-20 15:01:25 +0000
+++ b/doc/en/release-notes/bzr-2.2.txt	2011-03-10 11:05:08 +0000
@@ -2,8 +2,8 @@
 Bazaar Release Notes
 ####################
 
-.. contents:: List of Releases
-   :depth: 1
+.. toctree::
+   :maxdepth: 1
 
 bzr 2.2.5
 #########
@@ -80,42 +80,6 @@
   been updated in this release to talk to the main (``launchpad.net``) servers,
   rather than the ``edge`` ones. (Vincent Ladeuil, #583667)
 
-bzr 2.2.4
-#########
-
-:2.2.4: 2011-02-04
-
-This is a bugfix release. Only one bug has been fixed, a regression from 2.2.3
-involving only certain operations with launchpad. Upgrading is recommended for
-all users on earlier 2.2 releases.
-
-Bug Fixes
-*********
-
-* Fix communications with the Launchpad web service when using
-  launchpadlib >= 1.5.5.  This was a latent bug in bzr's communication
-  with Launchpad's production instance, which only became a problem when
-  the default instance was switched from edge to production in bzr 2.2.3.
-  (Max Bowsher, #707075)
-
-
-bzr 2.2.3
-#########
-
-:2.2.3: 2011-01-20
-
-This is a bugfix release. Upgrading is recommended for all users
-on earlier 2.2 releases.
-
-Compatibility Breaks
-********************
-
-* Launchpad has announced that the ``edge.launchpad.net`` instance is
-  deprecated and may be shut down in the future
-  <http://blog.launchpad.net/general/edge-is-deprecated>.  Bazaar has therefore
-  been updated in this release to talk to the main (``launchpad.net``) servers,
-  rather than the ``edge`` ones. (Vincent Ladeuil, #583667)
-
 Bug Fixes
 *********