Bug 364013: "Add individual bugs to..." should be reworded - Patch by Frédéric...

diff --git a/docs/xml/using.xml b/docs/xml/using.xml
index 3a16d8287fd990319db531ae5b323edf6ed3dcb3..d87b76e363ef9c957f460626aec8da68ac7ef653 100644 (file)
--- a/docs/xml/using.xml
+++ b/docs/xml/using.xml
@@ -658,27 +658,28 @@
     </section>
 
     <section id="individual-buglists">
-      <title>Adding/removing individual bugs from bug lists</title>
+      <title>Adding/removing tags to/from bugs</title>
       <para>
-        You can at any time add and remove individual bugs to a special type
-        of saved searches, known as <quote>lists of bugs</quote>. The distinction
-        between both types is that saved searches, as described in the previous
-        section, are stored in the form of a list of matching criteria, while
-        a list of bugs is an enumerated list of bug numbers. As it is a simple
-        list of bug numbers, you can easily edit this list by either adding or
-        removing bugs from it. To enable this feature, you have to turn on the
-        <quote>Add individual bugs to saved searches</quote> user preference,
-        see <xref linkend="userpreferences" />. This feature is disabled by
-        default.
+        You can add and remove tags from individual bugs, which let you find and
+        manage them more easily. Creating a new tag automatically generates a saved
+        search - whose name is the name of the tag - which lists bugs with this tag.
+        This saved search will be displayed in the footer of pages by default, as
+        all other saved searches. The main difference between tags and normal saved
+        searches is that saved searches, as described in the previous section, are
+        stored in the form of a list of matching criteria, while the saved search
+        generated by tags is a list of bug numbers. Consequently, you can easily
+        edit this list by either adding or removing tags from bugs. To enable this
+        feature, you have to turn on the <quote>Enable tags for bugs</quote> user
+        preference, see <xref linkend="userpreferences" />. This feature is disabled
+        by default.
       </para>
 
       <para>
         This feature is useful when you want to keep track of several bugs, but
         for different reasons. Instead of adding yourself to the CC list of all
         these bugs and mixing all these reasons, you can now store these bugs in
-        different lists, e.g. <quote>Bugs I want to see fixed before the next
-        release</quote>, <quote>Interesting bugs</quote>, or <quote>Bugs I have
-        to think about</quote>. One big advantage of this way to manage bug lists
+        separate lists, e.g. <quote>Keep in mind</quote>, <quote>Interesting bugs</quote>,
+        or <quote>Triage</quote>. One big advantage of this way to manage bugs
         is that you can easily add or remove bugs one by one, which is not
         possible to do with saved searches without having to edit the search
         criteria again.

diff --git a/template/en/default/global/per-bug-queries.html.tmpl b/template/en/default/global/per-bug-queries.html.tmpl
index c70d59e7e878c2fa06cfcd0d8f357ef63de7711a..fa682ebc95ceb36c4d1af027c59540d6a7cb89ee 100644 (file)
--- a/template/en/default/global/per-bug-queries.html.tmpl
+++ b/template/en/default/global/per-bug-queries.html.tmpl
@@ -71,9 +71,7 @@
             <option value="remove">Remove</option>
           [% END %]
         </select>
-        [%+ terms.bugs %]
-        <input type="text" name="bug_ids" size="12" maxlength="80">
-        <span id="lob_direction">to</span>
+        <a href="[% Param('docs_urlbase') %]query.html#individual-buglists">the named tag</a>
         [% IF lists_of_bugs.size %]
           <select id="lob_oldqueryname" name="oldqueryname">
             [% FOREACH query = lists_of_bugs %]
@@ -82,11 +80,14 @@
           </select>
         [% END %]
         <span id="lob_new_query_text">
-          [% " or to" IF lists_of_bugs.size %] the new saved search:
+          [% " or create and add the tag" IF lists_of_bugs.size %]
           <input class="txt" type="text" id="lob_newqueryname"
                  size="20" maxlength="64" name="newqueryname"
                  onkeyup="manage_old_lists();">
         </span>
+        <span id="lob_direction">to</span>
+        [%+ terms.bugs %]
+        <input type="text" name="bug_ids" size="12" maxlength="80">
         <input type="submit" value="Commit" id="commit_list_of_bugs">
       </form>
     </li></ul>

diff --git a/template/en/default/global/setting-descs.none.tmpl b/template/en/default/global/setting-descs.none.tmpl
index e62ec0b63b114ad254b5fb3ca9952e558d9883e5..3992e1208b7d239603dc2e03becc00dc16817c88 100644 (file)
--- a/template/en/default/global/setting-descs.none.tmpl
+++ b/template/en/default/global/setting-descs.none.tmpl
@@ -29,7 +29,7 @@
    "off"                              => "Off",
    "oldest_to_newest"                 => "Oldest to Newest",
    "on"                               => "On",
-   "per_bug_queries"                  => "Add individual $terms.bugs to saved searches",
+   "per_bug_queries"                  => "Enable tags for $terms.bugs",
    "post_bug_submit_action"           => "After changing $terms.abug",
    "next_bug"                         => "Show next $terms.bug in my list",
    "same_bug"                         => "Show the updated $terms.bug",