Rev 4874: Merge 2.1 again in file:///home/vila/src/bzr/bugs/583667-lp-no-edge-2.1/

[Vincent Ladeuil]

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

------------------------------------------------------------
revno: 4874 [merge]
revision-id: v.ladeuil+lp at free.fr-20101202092016-ae6wup9jbg9j5i00
parent: v.ladeuil+lp at free.fr-20101130205839-gyz8jkgckbuuo1pb
parent: pqm at pqm.ubuntu.com-20101202083935-zdejub2adb1w1eau
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 583667-lp-no-edge-2.1
timestamp: Thu 2010-12-02 10:20:16 +0100
message:
  Merge 2.1 again
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS	2010-11-30 20:42:42 +0000
+++ b/NEWS	2010-12-02 09:20:16 +0000
@@ -17,9 +17,7 @@
   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. 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)
+  rather than the ``edge`` ones. (Vincent Ladeuil, #583667)
 
 New Features
 ************
@@ -148,9 +146,7 @@
   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. 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)
+  rather than the ``edge`` ones. (Vincent Ladeuil, #583667)
 
 New Features
 ************