From e83cc8304b37be6fd7e815a63e171a38b2bdd98a Mon Sep 17 00:00:00 2001
From: "lpsolit%gmail.com"
 <lpsolit%gmail.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 2 Aug 2007 12:36:32 +0000
Subject: [PATCH] =?UTF-8?q?Bug=20380375:=20The=20local=20XML=20file=20'./d?=
 =?UTF-8?q?ata/bugzilla-update.xml'=20cannot=20be=20created=20if=20the=20p?=
 =?UTF-8?q?roxy=20requires=20authentication=20-=20Patch=20by=20Fr=C3=83?=
 =?UTF-8?q?=C2=A9d=C3=83=C2=A9ric=20Buclin=20<LpSolit@gmail.com>=20r=3Dmka?=
 =?UTF-8?q?nat=20a=3DLpSolit?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: svn://10.0.0.236/trunk@231295 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/webtools/bugzilla/docs/xml/administration.xml    | 9 ++++++---
 .../template/en/default/admin/params/core.html.tmpl      | 3 ++-
 .../bugzilla/template/en/default/index.html.tmpl         | 4 +++-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/mozilla/webtools/bugzilla/docs/xml/administration.xml b/mozilla/webtools/bugzilla/docs/xml/administration.xml
index 1fe8b9d7247..9c85248a5cc 100644
--- a/mozilla/webtools/bugzilla/docs/xml/administration.xml
+++ b/mozilla/webtools/bugzilla/docs/xml/administration.xml
@@ -1850,9 +1850,12 @@ Support: ENTRY, DEFAULT/MANDATORY, CANEDIT
         <literal>upgrade_notification</literal> parameter, see
         <xref linkend="parameters"/>. Administrators will see these
         notifications when they access the <filename>index.cgi</filename>
-        page, i.e. generally when logging in. Bugzilla will check once a
-        week for new releases, unless the parameter is set to
-        <quote>disabled</quote>.
+        page, i.e. generally when logging in. Bugzilla will check once per
+        day for new releases, unless the parameter is set to
+        <quote>disabled</quote>. If you are behind a proxy, you may have to set
+        the <literal>proxy_url</literal> parameter accordingly. If the proxy
+        requires authentication, use the
+        <literal>http://user:pass@proxy_url/</literal> syntax.
       </para>
     </section>
 
diff --git a/mozilla/webtools/bugzilla/template/en/default/admin/params/core.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/admin/params/core.html.tmpl
index 9ad312cfb1d..3fe66de2738 100644
--- a/mozilla/webtools/bugzilla/template/en/default/admin/params/core.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/admin/params/core.html.tmpl
@@ -92,7 +92,8 @@
   proxy_url => "$terms.Bugzilla may have to access the web to get notifications about new " _
                "releases, see the <tt>upgrade_notification</tt> parameter. In case you are " _
                "behind a proxy, it may be necessary to enter its URL if the web server " _
-               "group cannot access the HTTP_PROXY environment variable.",
+               "group cannot access the HTTP_PROXY environment variable. If you have to " _
+               "authenticate, use the <code>http://user:pass@proxy_url/</code> syntax.",
 
   upgrade_notification => "<p>$terms.Bugzilla can inform you when a new release is available. " _
                           "The notification will appear on the $terms.Bugzilla homepage, " _
diff --git a/mozilla/webtools/bugzilla/template/en/default/index.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/index.html.tmpl
index 132b77c745b..c8448398f96 100644
--- a/mozilla/webtools/bugzilla/template/en/default/index.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/index.html.tmpl
@@ -80,7 +80,9 @@ function addSidebar() {
       <a href="editparams.cgi?section=core#upgrade_notification">notify you about new releases</a>.</p>
     [% ELSIF release.error == "cannot_download" %]
       <p>The local XML file '[% release.xml_file FILTER html %]' cannot be created.
-      Please make sure the web server can write in this directory.</p>
+      Please make sure the web server can write in this directory and that you can access
+      the web. If you are behind a proxy, set the
+      <a href="editparams.cgi?section=core#proxy_url">proxy_url</a> parameter correctly.</p>
     [% ELSIF release.error == "no_update" %]
       <p>The local XML file '[% release.xml_file FILTER html %]' cannot be updated.
       Please make sure the web server can edit this file.</p>