Index: mozilla/webtools/bugzilla/docs/rel_notes.txt
===================================================================
RCS file: /cvsroot/mozilla/webtools/bugzilla/docs/rel_notes.txt,v
retrieving revision 1.42
diff -pu -r1.42 mozilla/webtools/bugzilla/docs/rel_notes.txt
--- mozilla/webtools/bugzilla/docs/rel_notes.txt
+++ mozilla/webtools/bugzilla/docs/rel_notes.txt
@@ -255,11 +255,13 @@ It now:
   * Is much more forgiving about small problems in the XML
 
 
-Adding Individual Bugs to Saved Searches
-----------------------------------------
+Adding Individual Bugs to Saved Searches (Tagging)
+--------------------------------------------------
 Users now have the option of adding an individual bug to any
-particular Saved Search. If you don't like having the entry box in
-your footer for this feature, you can disable it in your Preferences.
+particular Saved Search. Individual users that disagree with the site
+default can add or remove this feature (which appears as an entry box
+visible in the footer) by changing the General Preferences setting
+called "Enable tags for bugs".
 
 
 Attach URLs
Index: mozilla/webtools/bugzilla/docs/xml/faq.xml
===================================================================
RCS file: /cvsroot/mozilla/webtools/bugzilla/docs/xml/faq.xml,v
retrieving revision 1.46
diff -pu -r1.46 mozilla/webtools/bugzilla/docs/xml/faq.xml
--- mozilla/webtools/bugzilla/docs/xml/faq.xml
+++ mozilla/webtools/bugzilla/docs/xml/faq.xml
@@ -1390,8 +1390,10 @@ password=mypassword
         </question>
         <answer>
           <para>
-            New in 2.16 - go to the Account section of the Preferences. You
-            will be emailed at both addresses for confirmation.
+            New in 2.16 - you can change it from the Name and Password
+            section in Preferences. You will be emailed at both addresses for
+            confirmation. 'Administrative Policies' must have the
+            'allowemailchange' parameter set to <quote>On</quote>.
           </para>
         </answer>
       </qandaentry>
Index: mozilla/webtools/bugzilla/template/en/default/admin/settings/updated.html.tmpl
===================================================================
RCS file: /cvsroot/mozilla/webtools/bugzilla/template/en/default/admin/settings/updated.html.tmpl,v
retrieving revision 1.2
diff -pu -r1.2 mozilla/webtools/bugzilla/template/en/default/admin/settings/updated.html.tmpl
--- mozilla/webtools/bugzilla/template/en/default/admin/settings/updated.html.tmpl
+++ mozilla/webtools/bugzilla/template/en/default/admin/settings/updated.html.tmpl
@@ -16,7 +16,7 @@
   #%]
 
 [% PROCESS global/header.html.tmpl
-   title = "Preferences Updated"
+   title = "Default Preferences Updated"
  %]
 
 Your changes to the Default Preferences have been saved.<br>
Index: mozilla/webtools/bugzilla/template/en/default/global/useful-links.html.tmpl
===================================================================
RCS file: /cvsroot/mozilla/webtools/bugzilla/template/en/default/global/useful-links.html.tmpl,v
retrieving revision 1.53
diff -pu -r1.53 mozilla/webtools/bugzilla/template/en/default/global/useful-links.html.tmpl
--- mozilla/webtools/bugzilla/template/en/default/global/useful-links.html.tmpl
+++ mozilla/webtools/bugzilla/template/en/default/global/useful-links.html.tmpl
@@ -47,7 +47,7 @@
         [% IF user.groups.tweakparams %]
           <li><span class="separator">[% sep %]</span><a href="editparams.cgi">Parameters</a></li>
           [% sep = "| " %]
-          <li><span class="separator">[% sep %]</span><a href="editsettings.cgi">User Preferences</a></li>
+          <li><span class="separator">[% sep %]</span><a href="editsettings.cgi">Default Preferences</a></li>
           <li><span class="separator">[% sep %]</span><a href="sanitycheck.cgi">Sanity Check</a></li>
         [% END %]
         [% IF user.groups.editusers || user.can_bless %]