From b2bc839e8c213c30c46230c8b07d6505ef36e4f0 Mon Sep 17 00:00:00 2001
From: "bzrmirror%bugzilla.org"
 <bzrmirror%bugzilla.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 13 Aug 2013 18:56:09 +0000
Subject: [PATCH] Bug 861582: Missing description in the "Bug Fields" page for
 "Importance" r=sgreen a=justdave

git-svn-id: svn://10.0.0.236/trunk@264965 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/webtools/bugzilla/.bzrrev                            | 2 +-
 .../bugzilla/template/en/default/bug/field-help.none.tmpl    | 4 ++++
 .../bugzilla/template/en/default/pages/fields.html.tmpl      | 5 +++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/mozilla/webtools/bugzilla/.bzrrev b/mozilla/webtools/bugzilla/.bzrrev
index df58e1978d8..b015a0487e4 100644
--- a/mozilla/webtools/bugzilla/.bzrrev
+++ b/mozilla/webtools/bugzilla/.bzrrev
@@ -1 +1 @@
-8696
\ No newline at end of file
+8697
\ No newline at end of file
diff --git a/mozilla/webtools/bugzilla/template/en/default/bug/field-help.none.tmpl b/mozilla/webtools/bugzilla/template/en/default/bug/field-help.none.tmpl
index 238f01db09f..c07ee579253 100644
--- a/mozilla/webtools/bugzilla/template/en/default/bug/field-help.none.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/bug/field-help.none.tmpl
@@ -76,6 +76,10 @@ estimated_time =>
   "The amount of time that has been estimated it will take to resolve
    this ${terms.bug}.",
 
+importance =>
+  "The importance of $terms.abug is described as the combination of
+   its $vars.field_descs.priority and ${vars.field_descs.bug_severity}.",
+
 keywords =>
    "You can add keywords from a defined list to $terms.bugs, in order"
    _ " to easily identify and group them.",
diff --git a/mozilla/webtools/bugzilla/template/en/default/pages/fields.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/pages/fields.html.tmpl
index 7412829d931..48b09aee0ca 100644
--- a/mozilla/webtools/bugzilla/template/en/default/pages/fields.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/pages/fields.html.tmpl
@@ -181,6 +181,11 @@
                                     field => field } %]
 [% END %]
 
+[%# This field is not a real one, but its label is visible in bugs. %]
+
+[% field_help_map.Importance = { help  => help_html.importance,
+                                 field => "importance" } %]
+
 [%# These are fields that don't need to be documented, either because
   # they have docs somewhere else in the UI, or they don't show up on bugs. 
   # %]