Rev 2919: Add environment vars to config document in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 2919
revision-id: pqm at pqm.ubuntu.com-20071019183933-ponmwcztrwpn9o7w
parent: pqm at pqm.ubuntu.com-20071019170010-qyc4akzhu3rdko4b
parent: abentley at panoramicfeedback.com-20071019135148-7567ag3iu82is1xk
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-10-19 19:39:33 +0100
message:
  Add environment vars to config document
modified:
  doc/en/user-guide/configuration.txt configuration.txt-20060314161707-868350809502af01
    ------------------------------------------------------------
    revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.77.1.3.1.20
    merged: abentley at panoramicfeedback.com-20071019135148-7567ag3iu82is1xk
    parent: abentley at panoramicfeedback.com-20071018204240-y3zxj6r4rmaxx0ey
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's mergeable stuff
    timestamp: Fri 2007-10-19 09:51:48 -0400
    message:
      Add environment vars to config document
    ------------------------------------------------------------
    revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.77.1.3.1.19
    merged: abentley at panoramicfeedback.com-20071018204240-y3zxj6r4rmaxx0ey
    parent: abentley at panoramicfeedback.com-20071005145504-mod67bj9io6yi16k
    parent: pqm at pqm.ubuntu.com-20071018040514-3hc1k2nj1umg3tig
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's mergeable stuff
    timestamp: Thu 2007-10-18 16:42:40 -0400
    message:
      Merge bzr.dev
=== modified file 'doc/en/user-guide/configuration.txt'
--- a/doc/en/user-guide/configuration.txt	2007-10-05 14:52:02 +0000
+++ b/doc/en/user-guide/configuration.txt	2007-10-19 13:51:48 +0000
@@ -7,6 +7,63 @@
 .. TODO: Should have some explanation of why you'd want things in
 .. branch.conf.
 
+
+Environment variables
+=====================
+While most configuration is handled by configuration files, some options
+which may be semi-permanent can also be controlled through the environment.
+
+BZR_EMAIL
+---------
+Override the email id used by Bazaar.  Typical format::
+
+  "John Doe <jdoe at example.com>"
+
+See also the ``email`` configuration value.
+
+BZR_PROGRESS_BAR
+----------------
+Override the progress display.  Possible values are "none", "dots", "tty"
+
+BZR_SIGQUIT_PDB
+---------------
+Control whether SIGQUIT behaves normally or invokes a breakin debugger.
+0 = Standard SIGQUIT behavior
+1 = Invoke breakin debugger (default)
+
+BZR_HOME
+--------
+Override the home directory used by Bazaar.
+
+BZR_SSH
+-------
+Select a different SSH implementation.
+
+BZR_PDB
+-------
+Control whether to launch a debugger on error.
+0 = Standard behavior
+1 = Launch debugger
+
+BZR_REMOTE_PATH
+---------------
+Path to the Bazaar executable to use when using the bzr+ssh protocol.
+
+See also the ``bzr_remote_path`` configuration value
+
+BZR_EDITOR
+----------
+Path to the editor Bazaar should use for commit messages, etc.
+
+BZR_PLUGIN_PATH
+---------------
+The path to the plugins directory that Bazaar should use.
+
+BZRPATH
+-------
+The path where Bazaar should look for shell plugin external commands.
+
+
 Location of configuration files
 ===============================
 Each user gets a pair of configurations files in ``$HOME/.bazaar``. The first
@@ -250,9 +307,9 @@
 Branch 6 Options
 ================
 
-These options apply only to branches that use the "experimental-branch6"
-format.  They are usually set in ``.bzr/branch/branch.conf`` automatically, but
-may be manually set in ``locations.conf`` or ``bazaar.conf``.
+These options apply only to branches that use the "dirstate-tags" format.  They
+are usually set in ``.bzr/branch/branch.conf`` automatically, but may be
+manually set in ``locations.conf`` or ``bazaar.conf``.
 
 append_revisions_only
 ---------------------