From 323acaaecd742e195c718e696e3206c516ccda32 Mon Sep 17 00:00:00 2001
From: Gervase Markham <gerv@mozilla.org>
Date: Thu, 18 Dec 2014 16:08:19 +0000
Subject: Bug 399068: Remove the docs_urlbase parameter. r=LpSolit, a=dkl.

---
 template/en/default/admin/params/general.html.tmpl | 8 --------
 template/en/default/global/common-links.html.tmpl  | 2 +-
 template/en/default/global/docslinks.html.tmpl     | 3 +--
 template/en/default/index.html.tmpl                | 8 +++-----
 4 files changed, 5 insertions(+), 16 deletions(-)

(limited to 'template')

diff --git a/template/en/default/admin/params/general.html.tmpl b/template/en/default/admin/params/general.html.tmpl
index 4c94bc747..6ebef8ea2 100644
--- a/template/en/default/admin/params/general.html.tmpl
+++ b/template/en/default/admin/params/general.html.tmpl
@@ -16,14 +16,6 @@
     "The email address of the person who maintains this installation "
     _ " of Bugzilla.",
 
-  docs_urlbase => 
-    "The URL that is the common initial leading part of all"
-    _ " $terms.Bugzilla documentation URLs. It may be an absolute URL,"
-    _ " or a URL relative to the <var>urlbase</var> parameter. Leave this"
-    _ " empty to suppress links to the documentation."
-    _ "'%lang%' will be replaced by user's preferred language (if"
-    _ " documentation is available in that language).",
-
   utf8 => 
     "Use UTF-8 (Unicode) encoding for all text in ${terms.Bugzilla}. New"
     _ " installations should set this to true to avoid character encoding"
diff --git a/template/en/default/global/common-links.html.tmpl b/template/en/default/global/common-links.html.tmpl
index ec23f551e..78b4eb80a 100644
--- a/template/en/default/global/common-links.html.tmpl
+++ b/template/en/default/global/common-links.html.tmpl
@@ -100,7 +100,7 @@
 
 [% Hook.process("link-row") %]
 [% BLOCK link_to_documentation %]
-    [% IF doc_section && Param('docs_urlbase') %]
+    [% IF doc_section %]
       <li>
         <span class="separator">| </span>
         <a href="[% docs_urlbase _ doc_section FILTER html %]" target="_blank">Help</a>
diff --git a/template/en/default/global/docslinks.html.tmpl b/template/en/default/global/docslinks.html.tmpl
index c2cc830fa..e33aa3b17 100644
--- a/template/en/default/global/docslinks.html.tmpl
+++ b/template/en/default/global/docslinks.html.tmpl
@@ -22,8 +22,7 @@
   #                 members of the admin group.
   #%]
 
-[% IF Param('docs_urlbase') &&
-      docslinks.keys.size || (admindocslinks.keys.size && user.in_group('admin')) %]
+[% IF docslinks.keys.size || (admindocslinks.keys.size && user.in_group('admin')) %]
   <div id="docslinks">
     <h2>Related documentation</h2>
     <ul>
diff --git a/template/en/default/index.html.tmpl b/template/en/default/index.html.tmpl
index aa50a60e9..84a5b7d5c 100644
--- a/template/en/default/index.html.tmpl
+++ b/template/en/default/index.html.tmpl
@@ -83,11 +83,9 @@
             href="?GoAheadAndLogIn=1"><span>Log In</span></a>
           [% END %]
       </li>
-      [% IF Param("docs_urlbase") %]
-        <li>
-          <a id="help" href="[% docs_urlbase FILTER html %]using.html"><span>Documentation</span></a>
-        </li>
-      [% END %]
+      <li>
+        <a id="help" href="[% docs_urlbase FILTER html %]using/index.html"><span>Documentation</span></a>
+      </li>
     </ul>
   </div>
 
-- 
cgit v1.2.3-24-g4f1b