Rev 6566: (vila) Add reference to configuration in 'bzr help env-variables' (Robert in file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

[Patch Queue Manager]

At file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 6566 [merge]
revision-id: pqm at pqm.ubuntu.com-20120927064423-uu4honp6xds8afgg
parent: pqm at pqm.ubuntu.com-20120920085624-385anak017pj0wod
parent: robertc at robertcollins.net-20120925082601-sykhddmq2sxdt6oq
committer: Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2012-09-27 06:44:23 +0000
message:
  (vila) Add reference to configuration in 'bzr help env-variables' (Robert
   Collins)
modified:
  bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
  doc/en/release-notes/bzr-2.6.txt bzr2.6.txt-20120116134316-8w1xxom1c7vcu1t5-1
=== modified file 'bzrlib/help_topics/__init__.py'
--- a/bzrlib/help_topics/__init__.py	2012-03-15 15:36:12 +0000
+++ b/bzrlib/help_topics/__init__.py	2012-09-25 08:26:01 +0000
@@ -620,7 +620,8 @@
 
 def _env_variables(topic):
     import textwrap
-    ret = ["Environment Variables\n\n"]
+    ret = ["Environment Variables\n\n"
+        "See bzr help configuration for more details.\n\n"]
     max_key_len = max([len(k[0]) for k in known_env_variables])
     desc_len = (80 - max_key_len - 2)
     ret.append("=" * max_key_len + " " + "=" * desc_len + "\n")

=== modified file 'doc/en/release-notes/bzr-2.6.txt'
--- a/doc/en/release-notes/bzr-2.6.txt	2012-09-20 08:27:39 +0000
+++ b/doc/en/release-notes/bzr-2.6.txt	2012-09-25 08:26:01 +0000
@@ -30,6 +30,10 @@
 Improvements
 ************
 
+* ``bzr help env-variables`` now points users at ``bzr help configuration``
+  which has much more detailed information on the same stuff.
+  (Robert Collins)
+
 * ``bzr lp-find-proposal`` now only cares about the revision-id that is
   specified, not the branch you use.  This was enabled by a new API call in
   Launchpad's web service.  (Aaron Bentley)