Rev 5587: (jelmer) Refer to ppa:bzr/daily rather than no longer updated in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 5587 [merge]
revision-id: pqm at pqm.ubuntu.com-20110111062833-41itkag3h5akzw81
parent: pqm at pqm.ubuntu.com-20110111055426-pt4g3igwip5epm7q
parent: jelmer at samba.org-20110103234817-b92i7rtsznzl0fat
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2011-01-11 06:28:33 +0000
message:
  (jelmer) Refer to ppa:bzr/daily rather than no longer updated
   ppa:bzr-nightly-ppa/ppa in the documentation. (Jelmer Vernooij)
modified:
  doc/developers/cycle.txt       cycle.txt-20081017031739-rw24r0cywm2ok3xu-1
  doc/developers/ppa.txt         ppa.txt-20080722055539-606u7t2z32t3ae4w-1
=== modified file 'doc/developers/cycle.txt'
--- a/doc/developers/cycle.txt	2010-10-12 15:50:39 +0000
+++ b/doc/developers/cycle.txt	2011-01-03 23:48:17 +0000
@@ -274,10 +274,9 @@
 ---------
 
 At present we have three upstream-maintained PPAs containing Ubuntu packages
-of Bazaar: ``~bzr-nightly-ppa``, ``~bzr-beta-ppa`` (beta releases) and
-``~bzr`` (ie stable).  We will keep these PPAs, and reorient beta to contain
-the monthly beta releases, and the stable PPA to contain stable releases and
-bugfixes to those releases.
+of Bazaar: ``bzr/daily`` (snapshots), ``bzr-beta-ppa/ppa`` (beta releases) and
+``bzr/ppa`` (ie stable).  Beta contains the monthly beta releases, and the
+stable PPA contains stable releases and bugfixes to those releases.
 
 Some platforms with relatively less active packagers may choose to ship
 only the stable releases.  This is probably better than having them only

=== modified file 'doc/developers/ppa.txt'
--- a/doc/developers/ppa.txt	2010-10-12 15:50:39 +0000
+++ b/doc/developers/ppa.txt	2011-01-02 04:38:21 +0000
@@ -25,10 +25,10 @@
 <https://launchpad.net/~bzr-beta-ppa/+archive>
     Beta releases.
 
-<https://launchpad.net/~bzr-nightly-ppa/+archive>
+<https://launchpad.net/~bzr/+archive/daily>
     Automatic nightly builds from trunk.
 
-We build a distinct package for each distrorelease.  
+We build a distinct package for each distrorelease.
 If you upload a release-specific version, you should add a suffix to the
 package version, e.g. ``bzr.1.3-1~bazaar1~dapper1``.