From 81c0c249e1dab7e8bef7c4923a7a805220d9daf1 Mon Sep 17 00:00:00 2001
From: Max Kanat-Alexander <mkanat@bugzilla.org>
Date: Tue, 9 Aug 2011 16:03:20 -0700
Subject: Fix bustage from fixing "Severity" to field_descs.bug_severity.

---
 template/en/default/bug/create/create-guided.html.tmpl | 2 --
 template/en/default/list/edit-multiple.html.tmpl       | 6 ++----
 template/en/default/pages/release-notes.html.tmpl      | 3 +--
 template/en/default/whine/mail.txt.tmpl                | 2 --
 4 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/template/en/default/bug/create/create-guided.html.tmpl b/template/en/default/bug/create/create-guided.html.tmpl
index 7c291d4dd..9c01e2342 100644
--- a/template/en/default/bug/create/create-guided.html.tmpl
+++ b/template/en/default/bug/create/create-guided.html.tmpl
@@ -23,8 +23,6 @@
   # This template has the same interface as create.html.tmpl
   #%]
 
-[% PROCESS global/field-descs.none.tmpl %]
-
 [% USE Bugzilla %]
 [% cgi = Bugzilla.cgi %]
 
diff --git a/template/en/default/list/edit-multiple.html.tmpl b/template/en/default/list/edit-multiple.html.tmpl
index fb37631b2..c51dc233a 100644
--- a/template/en/default/list/edit-multiple.html.tmpl
+++ b/template/en/default/list/edit-multiple.html.tmpl
@@ -22,8 +22,6 @@
   #                 Reed Loden <reed@reedloden.com>
   #%]
 
-[% PROCESS global/field-descs.none.tmpl %]
-
 [% dontchange = "--do_not_change--" %]
 <input type="hidden" name="dontchange" value="[% dontchange FILTER html %]">
 <input type="hidden" name="token" value="[% token FILTER html %]">
@@ -107,8 +105,8 @@
 
     <th>
       <label for="bug_severity">
-        <a href="page.cgi?id=fields.html#bug_severity">[% field_descs.bug_severity
-          FILTER html %]</a>:
+        <a href="page.cgi?id=fields.html#bug_severity">
+          [% field_descs.bug_severity FILTER html %]</a>:
       </label>
     </th>
     <td>
diff --git a/template/en/default/pages/release-notes.html.tmpl b/template/en/default/pages/release-notes.html.tmpl
index ee3fed0ad..e21ce2ed7 100644
--- a/template/en/default/pages/release-notes.html.tmpl
+++ b/template/en/default/pages/release-notes.html.tmpl
@@ -1267,8 +1267,7 @@
     type something that matches the first few characters of a [% 
     field_descs.bug_severity FILTER html %]. You can explicitly
     search the [% field_descs.bug_severity FILTER html %] field if you want to
-    find [% terms.bugs %] by [% field_descs.bug_severity FILTER
-    html %].</li>
+    find [% terms.bugs %] by [% field_descs.bug_severity FILTER html %].</li>
   <li>Searching the Priority field if you typed something that exactly
     matched the name of a priority. You can explicitly search the
     Priority field if you want to find [% terms.bugs %] by priority.</li>
diff --git a/template/en/default/whine/mail.txt.tmpl b/template/en/default/whine/mail.txt.tmpl
index eb6631fa5..aa830243d 100644
--- a/template/en/default/whine/mail.txt.tmpl
+++ b/template/en/default/whine/mail.txt.tmpl
@@ -28,8 +28,6 @@
   # recipient: user object for the intended recipient of the message
   #%]
 
-[% PROCESS global/field-descs.none.tmpl %]
-
 [% body %]
 
 [% IF author.login == recipient.login %]
-- 
cgit v1.2.3-24-g4f1b