Rev 5337: (mbp) developer docs about testing (Martin Pool) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 5337 [merge]
revision-id: pqm at pqm.ubuntu.com-20100707040332-we60v2hsd39rumlr
parent: pqm at pqm.ubuntu.com-20100706211152-zefffwpvfwm5ayza
parent: mbp at sourcefrog.net-20100707015526-es8mwmqd4wc8an2e
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2010-07-07 05:03:32 +0100
message:
  (mbp) developer docs about testing (Martin Pool)
modified:
  bzrlib/help_topics/en/configuration.txt configuration.txt-20060314161707-868350809502af01
  doc/en/user-guide/configuring_bazaar.txt configuring_bazaar.t-20071128000722-ncxiua259xwbdbg7-1
=== modified file 'bzrlib/help_topics/en/configuration.txt'
--- a/bzrlib/help_topics/en/configuration.txt	2010-06-21 22:29:38 +0000
+++ b/bzrlib/help_topics/en/configuration.txt	2010-07-06 01:26:59 +0000
@@ -179,6 +179,15 @@
 The path where Bazaar should look for shell plugin external commands.
 
 
+http_proxy, https_proxy
+~~~~~~~~~~~~~~~~~~~~~~~
+
+Specifies the network proxy for outgoing connections, for example::
+
+  http_proxy=http://proxy.example.com:3128/ 
+  https_proxy=http://proxy.example.com:3128/
+
+
 Configuration files
 -------------------
 

=== modified file 'doc/en/user-guide/configuring_bazaar.txt'
--- a/doc/en/user-guide/configuring_bazaar.txt	2010-06-02 05:03:31 +0000
+++ b/doc/en/user-guide/configuring_bazaar.txt	2010-07-07 01:55:26 +0000
@@ -16,6 +16,28 @@
 
 If ``whoami`` is used without an argument, the current value is displayed.
 
+Using a network proxy
+---------------------
+
+If your network requires that you use an http proxy for outbound
+connections, you must set the ``http_proxy`` variable.  If the proxy is
+also required for https connections, you need to set ``https_proxy`` too.
+If you need these and don't have them set, you may find that connections
+to Launchpad or other external servers fail or time out.
+
+On Unix you typically want to set these in ``/etc/environment`` or
+``~/.bash_profile`` and on Windows in the user profile.
+
+::
+
+  http_proxy=http://proxy.example.com:3128/
+  https_proxy=http://proxy.example.com:3128/
+
+The ``no_proxy`` variable can be set to a comma-separated list of hosts
+which shouldn't be reached by the proxy.  (See
+<http://docs.python.org/library/urllib.html> for more details.)
+
+
 Configuration files
 -------------------