From 7f0c7dddde8bb8d619b3449b3fb19aabe9fea686 Mon Sep 17 00:00:00 2001
From: "lpsolit%gmail.com" <>
Date: Thu, 2 Aug 2007 17:34:21 +0000
Subject: Bug 380375: The local XML file './data/bugzilla-update.xml' cannot be
 created if the proxy requires authentication - Patch by Frédéric Buclin
 <LpSolit@gmail.com> r=mkanat a=LpSolit
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 template/en/default/admin/params/core.html.tmpl | 3 ++-
 template/en/default/index.html.tmpl             | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'template')

diff --git a/template/en/default/admin/params/core.html.tmpl b/template/en/default/admin/params/core.html.tmpl
index 9ad312cfb..3fe66de27 100644
--- a/template/en/default/admin/params/core.html.tmpl
+++ b/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/template/en/default/index.html.tmpl b/template/en/default/index.html.tmpl
index 132b77c74..c8448398f 100644
--- a/template/en/default/index.html.tmpl
+++ b/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>
-- 
cgit v1.2.3-24-g4f1b