Rev 5650: (jam) Merge bzr-2.2 into bzr-2.3 in file:///home/pqm/archives/thelove/bzr/2.3/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/2.3/

------------------------------------------------------------
revno: 5650 [merge]
revision-id: pqm at pqm.ubuntu.com-20110524112316-6nv9mvjm7nai7znr
parent: pqm at pqm.ubuntu.com-20110518114537-l5pyj32i4ktye2y4
parent: pqm at pqm.ubuntu.com-20110521205014-3n765a7c4mjyhxnc
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 2.3
timestamp: Tue 2011-05-24 11:23:16 +0000
message:
  (jam) Merge bzr-2.2 into bzr-2.3
modified:
  bzrlib/help_topics/en/configuration.txt configuration.txt-20060314161707-868350809502af01
=== modified file 'bzrlib/help_topics/en/configuration.txt'
--- a/bzrlib/help_topics/en/configuration.txt	2010-12-07 09:06:39 +0000
+++ b/bzrlib/help_topics/en/configuration.txt	2011-05-24 11:23:16 +0000
@@ -19,7 +19,9 @@
 BZR_PROGRESS_BAR
 ~~~~~~~~~~~~~~~~
 
-Override the progress display.  Possible values are "none", "dots", "tty"
+Override the progress display.  Possible values are "none" or "text".  If
+the value is "none" then no progress bar is displayed.  The value "text" draws
+the ordinary command line progress bar.
 
 BZR_SIGQUIT_PDB
 ~~~~~~~~~~~~~~~