Do not mention codename of testing where possible

Avoid mentionning the codename of the current testing distribution where
possible as this gets out of date -- except in the rebuild README where
the current testig is really what we want.

4 files changed, 15 insertions, 15 deletions

diff --git a/examples/rebuild/README b/examples/rebuild/README
index d34ad26..34b5d78 100644
--- a/examples/rebuild/README
+++ b/examples/rebuild/README
@@ -2,18 +2,18 @@
 ============================
 
   sudo aptitude install cowdancer grep-dctrl wget
-  sudo cowbuilder --create --distribution lenny --basepath /var/cache/pbuilder/testing-base.cow
+  sudo cowbuilder --create --distribution squeeze --basepath /var/cache/pbuilder/testing-base.cow
 
 2. Getting the list of packages to build:
 =========================================
 
-  getlist lenny
+  getlist squeeze
 
 Will fetch the Sources.gz for main and contrib of the distribution you
 choose and creates two files:
 
-  1. list.lenny
-  2. list.lenny.i368
+  1. list.squeeze
+  2. list.squeeze.i368
 
 The first list contains the name of all packages followed by all
 architectures it can be build on. The second list Contains the names of
@@ -30,7 +30,7 @@ The other settings BUILDDIR and LOGDIR are optional.
 4. Rebuilding the archive
 =========================
 
-  rebuild list.lenny.i386 lenny
+  rebuild list.squeeze.i386 squeeze
 
 Will attempt to build all packages appearing in list.testing.i368. It will
 temporarily build them in $BUILDDIR/$PACKAGE and will use $LOGDIR to create
diff --git a/pbuilder-modules b/pbuilder-modules
index e048b68..8a3f21e 100644
--- a/pbuilder-modules
+++ b/pbuilder-modules
@@ -28,10 +28,10 @@ pbuilder [operation] [pbuilder-options]
 pdebuild [pdebuild-options] -- [pbuilder-options]
 
 command lines:
-pbuilder --create [--basetgz base.tgz-path] [--distribution etch|lenny|sid|experimental]
+pbuilder --create [--basetgz base.tgz-path] [--distribution sid|experimental|...]
   Creates a base.tgz
 
-pbuilder --update [--basetgz base.tgz-path] [--distribution etch|lenny|sid|experimental]
+pbuilder --update [--basetgz base.tgz-path] [--distribution sid|experimental|...]
   Updates a base.tgz
 
 pbuilder --build [--basetgz base.tgz-path] pbuilder_2.2.0-1.dsc
@@ -53,7 +53,7 @@ pbuilder-options:
  --mirror [mirror location]
  --othermirror [other mirror location in apt deb-line format, delimited with | signs]
  --http-proxy [proxy]
- --distribution [distribution(sid|etch|lenny|experimental)]
+ --distribution [distribution(sid|experimental|...)]
  --components [components]
  --buildresult [location-to-copy-build-result]
  --aptcache [location of retrieved package files]
diff --git a/pbuilder.8 b/pbuilder.8
index eefcd4d..d4a7c21 100644
--- a/pbuilder.8
+++ b/pbuilder.8
@@ -39,8 +39,8 @@ the given options and settings in the configuration file
 for the base.tgz.
 
 For example, to switch the distribution of an existing
-base.tgz to lenny, specify the
-.B "\-\-distribution lenny \-\-override\-config" 
+base.tgz to sid, specify the
+.B "\-\-distribution sid \-\-override\-config"
 options to update.
 
 .TP
@@ -181,11 +181,11 @@ listed in
 
 .TP
 .BI "\-\-distribution [" "distribution" "]"
-Specifies the distribution used. Currently the supported values are
+Specifies the distribution used.  The supported values are the ones debootstrap
+supports, plus experimental which is special cased in pbuilder.  For instance
+you may use:
 .B "sid"
-.B "etch"
-.B "lenny"
-and 
+or
 .B "experimental".
 
 .TP
diff --git a/pbuilderrc b/pbuilderrc
index 77873d7..388ca31 100755
--- a/pbuilderrc
+++ b/pbuilderrc
@@ -14,7 +14,7 @@ USEDEVFS=no
 BUILDRESULT=/var/cache/pbuilder/result/
 
 # specifying the distribution forces the distribution on "pbuilder update"
-#DISTRIBUTION=lenny
+#DISTRIBUTION=sid
 # specifying the components of the distribution, for instance to enable all
 # components on Debian use "main contrib non-free" and on Ubuntu "main
 # restricted universe multiverse"