Rev 5911: (jam) Merge bzr-2.3 into bzr.dev in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 5911 [merge]
revision-id: pqm at pqm.ubuntu.com-20110524144029-owqlr788c9s99jv5
parent: pqm at pqm.ubuntu.com-20110524104754-8lbkci07588aigq2
parent: pqm at pqm.ubuntu.com-20110524112316-6nv9mvjm7nai7znr
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2011-05-24 14:40:29 +0000
message:
  (jam) Merge bzr-2.3 into bzr.dev
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	2011-05-18 01:02:52 +0000
+++ b/bzrlib/help_topics/en/configuration.txt	2011-05-24 14:40:29 +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
 ~~~~~~~~~~~~~~~