Rev 6034: (mbp) correct progress bar documentation (bug 735417) in file:///home/pqm/archives/thelove/bzr/2.4/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 6034 [merge]
revision-id: pqm at pqm.ubuntu.com-20110815113100-9kg4d1t11th0myu5
parent: pqm at pqm.ubuntu.com-20110813220938-gw2gkvz4q5uq0qry
parent: mbp at canonical.com-20110815072901-ujook48jblv01wh3
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 2.4
timestamp: Mon 2011-08-15 11:31:00 +0000
message:
  (mbp) correct progress bar documentation (bug 735417)
modified:
  bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
  doc/en/release-notes/bzr-2.4.txt bzr2.4.txt-20110114053217-k7ym9jfz243fddjm-1
=== modified file 'bzrlib/help_topics/__init__.py'
--- a/bzrlib/help_topics/__init__.py	2011-05-28 13:46:51 +0000
+++ b/bzrlib/help_topics/__init__.py	2011-08-15 07:29:01 +0000
@@ -612,8 +612,7 @@
 BZR_LOG (Win32)     Location of .bzr.log (use 'NUL' to suppress log).
 BZR_COLUMNS         Override implicit terminal width.
 BZR_CONCURRENCY     Number of processes that can be run concurrently (selftest)
-BZR_PROGRESS_BAR    Override the progress display. Values are 'none', 'dots',
-                    or 'tty'.
+BZR_PROGRESS_BAR    Override the progress display. Values are 'none' or 'text'.
 BZR_PDB             Control whether to launch a debugger on error.
 BZR_SIGQUIT_PDB     Control whether SIGQUIT behaves normally or invokes a
                     breakin debugger.

=== modified file 'doc/en/release-notes/bzr-2.4.txt'
--- a/doc/en/release-notes/bzr-2.4.txt	2011-08-11 12:45:01 +0000
+++ b/doc/en/release-notes/bzr-2.4.txt	2011-08-15 07:29:01 +0000
@@ -37,6 +37,9 @@
 
 .. Improved or updated documentation.
 
+* Corrected documentation for BZR_PROGRESS_BAR. 
+  (Dennis Benzinger, #735417)
+
 API Changes
 ***********