Bug 363908 Consistently name the Settings control panel (User Preferences)

r=wicked a=lpsolit
thanks to wicked for updating this patch

5 files changed, 13 insertions, 9 deletions

diff --git a/docs/rel_notes.txt b/docs/rel_notes.txt
index 47317d0a3..295a70cff 100644
--- a/docs/rel_notes.txt
+++ b/docs/rel_notes.txt
@@ -274,11 +274,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
diff --git a/docs/xml/faq.xml b/docs/xml/faq.xml
index 80f411375..870d5c983 100644
--- a/docs/xml/faq.xml
+++ b/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>
diff --git a/template/en/default/admin/admin.html.tmpl b/template/en/default/admin/admin.html.tmpl
index 0555cf0f5..d2ac81435 100644
--- a/template/en/default/admin/admin.html.tmpl
+++ b/template/en/default/admin/admin.html.tmpl
@@ -44,7 +44,7 @@
         the mail transfer agent to send email notifications, choose which group of
         users can use charts and share queries, and much more.</dd>
 
-        <dt class="[% class %]"><a href="editsettings.cgi">User Preferences</a></dt>
+        <dt class="[% class %]"><a href="editsettings.cgi">Default Preferences</a></dt>
         <dd class="[% class %]">Set the default user preferences. These are the values
         which will be used by default for all users. Users will be able to edit their
         own preferences from the <a href="userprefs.cgi?tab=settings">Preferences</a>.</dd>
diff --git a/template/en/default/admin/settings/updated.html.tmpl b/template/en/default/admin/settings/updated.html.tmpl
index 4a569ab8e..0b83a27bb 100644
--- a/template/en/default/admin/settings/updated.html.tmpl
+++ b/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>
diff --git a/template/en/default/sidebar.xul.tmpl b/template/en/default/sidebar.xul.tmpl
index e2d0d8e22..6161e5f85 100644
--- a/template/en/default/sidebar.xul.tmpl
+++ b/template/en/default/sidebar.xul.tmpl
@@ -72,7 +72,7 @@ function normal_keypress_handler( aEvent ) {
       <text class="text-link" onclick="load_relative_url('userprefs.cgi')" value="edit prefs"/>
   [%- IF user.groups.tweakparams %]
       <text class="text-link" onclick="load_relative_url('editparams.cgi')" value="edit params"/>
-      <text class="text-link" onclick="load_relative_url('editsettings.cgi')" value="edit user settings"/>
+      <text class="text-link" onclick="load_relative_url('editsettings.cgi')" value="edit default preferences"/>
   [%- END %]
   [%- IF user.groups.editusers || user.can_bless %]
       <text class="text-link" onclick="load_relative_url('editusers.cgi')" value="edit users"/>