Merge lp:~lifeless/bzr/env-variable-help into lp:bzr

[Robert Collins]

Add reference to configuration in 'bzr help env-variables'

I went 'bzr help env-variables' wanting to remember the BZR_PLUGINS_AT variable, but the help there was minimal, turns out that bzr help configuration is /much/ more helpful, so I've added a cross-reference sentence.

Could look at doing more, but this is a driveby make-it-a-little-better patch.

[Vincent Ladeuil (vila)]

review: Approve

[Vincent Ladeuil (vila)]

sent to pqm by email

=== modified file 'bzrlib/help_topics/__init__.py'
--- bzrlib/help_topics/__init__.py	2012-03-15 15:36:12 +0000
+++ bzrlib/help_topics/__init__.py	2012-09-25 08:36:28 +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'
--- doc/en/release-notes/bzr-2.6.txt	2012-09-20 08:27:39 +0000
+++ doc/en/release-notes/bzr-2.6.txt	2012-09-25 08:36:28 +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)