Patch for bug 251502: Remove queryhelp.cgi (redundant, badly out of date); patch by me, r=wurblzap (Marc), r=gerv, a=justdave.

3 files changed, 9 insertions, 19 deletions

diff --git a/template/en/default/search/boolean-charts.html.tmpl b/template/en/default/search/boolean-charts.html.tmpl
index ba88b67b4..19ae7bb0e 100644
--- a/template/en/default/search/boolean-charts.html.tmpl
+++ b/template/en/default/search/boolean-charts.html.tmpl
@@ -45,8 +45,7 @@
 
   <p>
     <strong>
-      <a name="chart" href="queryhelp.cgi#advancedquerying">
-      Advanced Searching Using Boolean Charts</a>:
+      Advanced Searching Using Boolean Charts:
     </strong>
   </p>
 
diff --git a/template/en/default/search/form.html.tmpl b/template/en/default/search/form.html.tmpl
index 2fd458148..f0f3c5ae4 100644
--- a/template/en/default/search/form.html.tmpl
+++ b/template/en/default/search/form.html.tmpl
@@ -513,7 +513,7 @@ function selectProduct(f) {
     <td>
       <table>
         <tr>
-          <th align="left"><a href="queryhelp.cgi#status">St<u>a</u>tus</a>:</th>
+          <th align="left">St<u>a</u>tus:</th>
         </tr>
         <tr valign="top">
           [% PROCESS select sel = { name => 'bug_status',
@@ -526,7 +526,7 @@ function selectProduct(f) {
       <table>
         <tr>
           <th align="left">
-            <a href="queryhelp.cgi#resolution"><u>R</u>esolution</a>:
+            <u>R</u>esolution:
           </th>
         </tr>
         <tr valign="top">
@@ -539,7 +539,7 @@ function selectProduct(f) {
     <td>
       <table>
         <tr>
-          <th align="left"><a href="queryhelp.cgi#severity">S<u>e</u>verity</a>:</th>
+          <th align="left">S<u>e</u>verity:</th>
         </tr>
         <tr valign="top">
           [% PROCESS select sel = { name => 'bug_severity',
@@ -551,7 +551,7 @@ function selectProduct(f) {
     <td>
       <table>
         <tr>
-          <th align="left"><a href="queryhelp.cgi#priority">Pr<u>i</u>ority</a>:</th>
+          <th align="left">Pr<u>i</u>ority:</th>
         </tr>
         <tr valign="top">
           [% PROCESS select sel = { name => 'priority',
@@ -563,7 +563,7 @@ function selectProduct(f) {
     <td>
       <table>
         <tr>
-          <th align="left"><a href="queryhelp.cgi#platform"><u>H</u>ardware</a>:</th>
+          <th align="left"><u>H</u>ardware:</th>
         </tr>
         <tr valign="top">
           [% PROCESS select sel = { name => 'rep_platform',
@@ -575,7 +575,7 @@ function selectProduct(f) {
     <td>
       <table>
         <tr>
-          <th align="left"><a href="queryhelp.cgi#opsys"><u>O</u>S</a>:</th>
+          <th align="left"><u>O</u>S:</th>
         </tr>
         <tr valign="top">
           [% PROCESS select sel = { name => 'op_sys',
@@ -597,7 +597,7 @@ function selectProduct(f) {
       <fieldset>
         <legend>
           <strong>
-            <a href="queryhelp.cgi#peopleinvolved">Email</a> and Numbering
+            Email and Numbering
           </strong>
         </legend>
 
@@ -739,7 +739,7 @@ function selectProduct(f) {
   <dd>
     <input name="chfieldfrom" size="10" value="[% default.chfieldfrom.0 FILTER html %]">
     and <input name="chfieldto" size="10" value="[% default.chfieldto.0 FILTER html %]">
-    <br>(YYYY-MM-DD or <a href="queryhelp.cgi#changedbetween">relative dates</a>)
+    <br>(YYYY-MM-DD or relative dates)
   </dd>
   <dt>where one or more of the following changed:</dt>
   <dd>
diff --git a/template/en/default/search/search-advanced.html.tmpl b/template/en/default/search/search-advanced.html.tmpl
index 7c06ad29f..92c9640cf 100644
--- a/template/en/default/search/search-advanced.html.tmpl
+++ b/template/en/default/search/search-advanced.html.tmpl
@@ -58,11 +58,6 @@
       document.write("<p><a href='query.cgi?help=1&amp;format=advanced'>Give me some help</a> (reloads page.)</p>");
       // -->
     </script>
-    <noscript>
-      <p><a href="queryhelp.cgi">Give me help</a> with this form.</p>
-    </noscript>
-  [% ELSE %]
-      <p><a href="queryhelp.cgi">Give me help</a> with this form.</p>
   [% END %]
 [% ELSE %]
   <p>
@@ -86,10 +81,6 @@
 
 [% PROCESS "search/boolean-charts.html.tmpl" %]
 
-<p>
-  Give me a <a href="queryhelp.cgi">clue</a> about how to use this form.
-</p>
-
 </form>
 
 [% PROCESS "search/search-help.html.tmpl" IF help %]