Rev 5117: Merge NEWS entry as agreed upon with poolie in file:///home/vila/src/bzr/bugs/583667-lp-no-edge-2.2/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/583667-lp-no-edge-2.2/

------------------------------------------------------------
revno: 5117 [merge]
revision-id: v.ladeuil+lp at free.fr-20101202092310-nhjnqztoja68zx68
parent: v.ladeuil+lp at free.fr-20101202092237-ms2n0imzyzyus0ft
parent: v.ladeuil+lp at free.fr-20101202092111-fuky4066023k1yfb
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 583667-lp-no-edge-2.2
timestamp: Thu 2010-12-02 10:23:10 +0100
message:
   Merge NEWS entry as agreed upon with poolie
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  doc/en/whats-new/whats-new-in-2.1.txt whatsnewin2.1.txt-20100219022615-9hp8102qyo9brhla-1
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS	2010-12-02 09:22:37 +0000
+++ b/NEWS	2010-12-02 09:23:10 +0000
@@ -231,12 +231,11 @@
 Compatibility Breaks
 ********************
 
-* The ``edge.launchpad.net`` server has been deprecated and all references to
-  it have been removed from the code base. This ensures that users upgrading
-  to bzr 2.0.7 or better will never try to contact the 'edge' server. Users of
-  previous versions can workaround connection problems by setting the
-  ``BZR_LP_XMLRPC_URL`` environment variable to
-  ``http://xmlrpc.launchpad.net/bazaar/``.  (Vincent Ladeuil, #583667)
+* 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)
 
 New Features
 ************
@@ -353,6 +352,42 @@
   (Martin Pool, John Arbash Meinel)
 
 
+bzr 2.0.7
+#########
+
+:2.0.7: NOT RELEASED YET
+
+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)
+
+New Features
+************
+
+Bug Fixes
+*********
+
+Improvements
+************
+
+Documentation
+*************
+
+API Changes
+***********
+
+Internals
+*********
+
+Testing
+*******
+
+
 bzr 2.0.6
 #########
 
@@ -3368,7 +3403,7 @@
   
 * The ``--hardlink`` option to ``branch`` and ``checkout`` is not
   supported at the moment on workingtree formats that can do content
-  filtering.  (See <https://bugs.edge.launchpad.net/bzr/+bug/408193>.)
+  filtering.  (See <https://bugs.launchpad.net/bzr/+bug/408193>.)
   bzr now says so, rather than just ignoring the option.  (Martin Pool)
 
 * There was a bug in ``osutils.relpath`` that was only triggered on

=== modified file 'doc/en/whats-new/whats-new-in-2.1.txt'
--- a/doc/en/whats-new/whats-new-in-2.1.txt	2010-02-19 05:08:31 +0000
+++ b/doc/en/whats-new/whats-new-in-2.1.txt	2010-12-02 09:21:11 +0000
@@ -62,6 +62,16 @@
 or just say ``today`` (instead of saying ``date:today``). Prefixes
 are now only required if the revision spec could be ambiguous.
 
+Launchpad compatibility
+-----------------------
+
+Launchpad has `announced
+<http://blog.launchpad.net/general/edge-is-deprecated>`_ that the
+``edge.launchpad.net`` instance is deprecated and may be shut down in the
+future . Bazaar has therefore been updated in this release to talk to the main
+(``launchpad.net``) servers, rather than the ``edge`` ones (the same code is
+running on both servers during the interim).
+
 
 New ignore patterns
 -------------------