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

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 5131 [merge]
revision-id: pqm at pqm.ubuntu.com-20110521205014-3n765a7c4mjyhxnc
parent: pqm at pqm.ubuntu.com-20110517111941-nrx9u4z1q8laajwp
parent: pqm at pqm.ubuntu.com-20110521184143-27wqc18biic54hfq
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 2.2
timestamp: Sat 2011-05-21 20:50:14 +0000
message:
  (jam) Merge bzr-2.1 into bzr-2.2
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-07-06 01:26:59 +0000
+++ b/bzrlib/help_topics/en/configuration.txt	2011-05-21 20:50:14 +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
 ~~~~~~~~~~~~~~~