diff --git a/mozilla/webtools/bugzilla/.bzrrev b/mozilla/webtools/bugzilla/.bzrrev
index 3f9c617863c..e486d4f0c8c 100644
--- a/mozilla/webtools/bugzilla/.bzrrev
+++ b/mozilla/webtools/bugzilla/.bzrrev
@@ -1 +1 @@
-8915
\ No newline at end of file
+8916
\ No newline at end of file
diff --git a/mozilla/webtools/bugzilla/chart.cgi b/mozilla/webtools/bugzilla/chart.cgi
index d6f090afef9..015077650f0 100755
--- a/mozilla/webtools/bugzilla/chart.cgi
+++ b/mozilla/webtools/bugzilla/chart.cgi
@@ -65,7 +65,7 @@ if (grep(/^cmd-/, $cgi->param())) {
 
 my $action = $cgi->param('action');
 my $series_id = $cgi->param('series_id');
-$vars->{'doc_section'} = 'reporting.html#charts';
+$vars->{'doc_section'} = 'using.html#charts';
 
 # Because some actions are chosen by buttons, we can't encode them as the value
 # of the action param, because that value is localization-dependent. So, we
diff --git a/mozilla/webtools/bugzilla/createaccount.cgi b/mozilla/webtools/bugzilla/createaccount.cgi
index e2dbbf62fa2..c9516ab00fc 100755
--- a/mozilla/webtools/bugzilla/createaccount.cgi
+++ b/mozilla/webtools/bugzilla/createaccount.cgi
@@ -21,7 +21,7 @@ use Bugzilla::Token;
 my $user = Bugzilla->login(LOGIN_OPTIONAL);
 my $cgi = Bugzilla->cgi;
 my $template = Bugzilla->template;
-my $vars = { doc_section => 'myaccount.html' };
+my $vars = { doc_section => 'using.html#create-a-bugzilla-account' };
 
 print $cgi->header();
 
diff --git a/mozilla/webtools/bugzilla/docs/en/rst/using.rst b/mozilla/webtools/bugzilla/docs/en/rst/using.rst
index 0fe1da3fc67..5be1a2582e7 100644
--- a/mozilla/webtools/bugzilla/docs/en/rst/using.rst
+++ b/mozilla/webtools/bugzilla/docs/en/rst/using.rst
@@ -993,8 +993,8 @@ the Search show up in the footer of the group's direct members by default.
 
 .. _accountpreferences:
 
-Name and Password
-=================
+Account Information
+===================
 
 On this tab, you can change your basic account information,
 including your password, email address and real name. For security
diff --git a/mozilla/webtools/bugzilla/editclassifications.cgi b/mozilla/webtools/bugzilla/editclassifications.cgi
index d47853133e0..149433b250d 100755
--- a/mozilla/webtools/bugzilla/editclassifications.cgi
+++ b/mozilla/webtools/bugzilla/editclassifications.cgi
@@ -32,7 +32,7 @@ sub LoadTemplate {
       if ($action eq 'select');
     # There is currently only one section about classifications,
     # so all pages point to it. Let's define it here.
-    $vars->{'doc_section'} = 'classifications.html';
+    $vars->{'doc_section'} = 'administration.html#classifications';
 
     $action =~ /(\w+)/;
     $action = $1;
diff --git a/mozilla/webtools/bugzilla/editcomponents.cgi b/mozilla/webtools/bugzilla/editcomponents.cgi
index 12a449fd459..4423931fe31 100755
--- a/mozilla/webtools/bugzilla/editcomponents.cgi
+++ b/mozilla/webtools/bugzilla/editcomponents.cgi
@@ -23,7 +23,7 @@ my $template = Bugzilla->template;
 my $vars = {};
 # There is only one section about components in the documentation,
 # so all actions point to the same page.
-$vars->{'doc_section'} = 'components.html';
+$vars->{'doc_section'} = 'administration.html#components';
 
 #
 # Preliminary checks:
diff --git a/mozilla/webtools/bugzilla/editmilestones.cgi b/mozilla/webtools/bugzilla/editmilestones.cgi
index 3eeb300ab3a..927c1a9d1b6 100755
--- a/mozilla/webtools/bugzilla/editmilestones.cgi
+++ b/mozilla/webtools/bugzilla/editmilestones.cgi
@@ -23,7 +23,7 @@ my $template = Bugzilla->template;
 my $vars = {};
 # There is only one section about milestones in the documentation,
 # so all actions point to the same page.
-$vars->{'doc_section'} = 'milestones.html';
+$vars->{'doc_section'} = 'administration.html#milestones';
 
 #
 # Preliminary checks:
diff --git a/mozilla/webtools/bugzilla/editproducts.cgi b/mozilla/webtools/bugzilla/editproducts.cgi
index 137f1428550..77d112f46a6 100755
--- a/mozilla/webtools/bugzilla/editproducts.cgi
+++ b/mozilla/webtools/bugzilla/editproducts.cgi
@@ -33,7 +33,7 @@ my $template = Bugzilla->template;
 my $vars = {};
 # Remove this as soon as the documentation about products has been
 # improved and each action has its own section.
-$vars->{'doc_section'} = 'products.html';
+$vars->{'doc_section'} = 'administration.html#products';
 
 print $cgi->header();
 
diff --git a/mozilla/webtools/bugzilla/editvalues.cgi b/mozilla/webtools/bugzilla/editvalues.cgi
index 61fe2472340..5bceed761ba 100755
--- a/mozilla/webtools/bugzilla/editvalues.cgi
+++ b/mozilla/webtools/bugzilla/editvalues.cgi
@@ -49,7 +49,7 @@ my $vars = {};
 
 # Replace this entry by separate entries in templates when
 # the documentation about legal values becomes bigger.
-$vars->{'doc_section'} = 'edit-values.html';
+$vars->{'doc_section'} = 'administration.html#legal-values';
 
 print $cgi->header();
 
diff --git a/mozilla/webtools/bugzilla/editversions.cgi b/mozilla/webtools/bugzilla/editversions.cgi
index 06f2f580c25..2dce7bd0a2b 100755
--- a/mozilla/webtools/bugzilla/editversions.cgi
+++ b/mozilla/webtools/bugzilla/editversions.cgi
@@ -23,7 +23,7 @@ my $template = Bugzilla->template;
 my $vars = {};
 # There is only one section about versions in the documentation,
 # so all actions point to the same page.
-$vars->{'doc_section'} = 'versions.html';
+$vars->{'doc_section'} = 'administration.html#versions';
 
 #
 # Preliminary checks:
diff --git a/mozilla/webtools/bugzilla/enter_bug.cgi b/mozilla/webtools/bugzilla/enter_bug.cgi
index 617fdde67aa..da80e9d15b1 100755
--- a/mozilla/webtools/bugzilla/enter_bug.cgi
+++ b/mozilla/webtools/bugzilla/enter_bug.cgi
@@ -45,7 +45,7 @@ my $template = Bugzilla->template;
 my $vars = {};
 
 # All pages point to the same part of the documentation.
-$vars->{'doc_section'} = 'bugreports.html';
+$vars->{'doc_section'} = 'using.html#filing-bugs';
 
 my $product_name = trim($cgi->param('product') || '');
 # Will contain the product object the bug is created in.
diff --git a/mozilla/webtools/bugzilla/report.cgi b/mozilla/webtools/bugzilla/report.cgi
index cefe96d5a9c..4cfa6a6a421 100755
--- a/mozilla/webtools/bugzilla/report.cgi
+++ b/mozilla/webtools/bugzilla/report.cgi
@@ -373,7 +373,7 @@ if ($cgi->param('debug')) {
 }
 
 # All formats point to the same section of the documentation.
-$vars->{'doc_section'} = 'reporting.html#reports';
+$vars->{'doc_section'} = 'using.html#reports-and-charts';
 
 disable_utf8() if ($format->{'ctype'} =~ /^image\//);
 
diff --git a/mozilla/webtools/bugzilla/template/en/default/account/prefs/prefs.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/account/prefs/prefs.html.tmpl
index 4681299dda9..faa18d58194 100644
--- a/mozilla/webtools/bugzilla/template/en/default/account/prefs/prefs.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/account/prefs/prefs.html.tmpl
@@ -25,15 +25,20 @@
 [% filtered_login = user.login FILTER html %]
 
 [% tabs = [{ name => "settings", label => "General Preferences",
-              link => "userprefs.cgi?tab=settings", saveable => "1" },
-            { name => "email", label => "Email Preferences", 
-              link => "userprefs.cgi?tab=email", saveable => "1" },
-            { name => "saved-searches", label => "Saved Searches", 
-              link => "userprefs.cgi?tab=saved-searches", saveable => "1" },
+              link => "userprefs.cgi?tab=settings", saveable => "1",
+              doc_section => "using.html#general-preferences" },
+            { name => "email", label => "Email Preferences",
+              link => "userprefs.cgi?tab=email", saveable => "1",
+              doc_section => "using.html#email-preferences" },
+            { name => "saved-searches", label => "Saved Searches",
+              link => "userprefs.cgi?tab=saved-searches", saveable => "1",
+              doc_section => "using.html#saved-searches" },
             { name => "account", label => "Account Information",
-              link => "userprefs.cgi?tab=account", saveable => "1" },
-            { name => "permissions", label => "Permissions", 
-              link => "userprefs.cgi?tab=permissions", saveable => "0" } ] %]
+              link => "userprefs.cgi?tab=account", saveable => "1",
+              doc_section => "using.html#account-information" },
+            { name => "permissions", label => "Permissions",
+              link => "userprefs.cgi?tab=permissions", saveable => "0",
+              doc_section => "using.html#permissions" } ] %]
 
 [% Hook.process('tabs') %]
 
@@ -49,7 +54,7 @@
    subheader = filtered_login
    style_urls = ['skins/standard/admin.css']
    javascript_urls = ['js/util.js', 'js/field.js']
-   doc_section = "userpreferences.html"
+   doc_section = current_tab.doc_section
    yui = ['autocomplete']
  %]
 
diff --git a/mozilla/webtools/bugzilla/template/en/default/admin/custom_fields/confirm-delete.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/admin/custom_fields/confirm-delete.html.tmpl
index 471d7a1c415..43f33512af0 100644
--- a/mozilla/webtools/bugzilla/template/en/default/admin/custom_fields/confirm-delete.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/admin/custom_fields/confirm-delete.html.tmpl
@@ -20,7 +20,7 @@
 [% PROCESS global/header.html.tmpl
            title = title
            style_urls = ['skins/standard/admin.css']
-           doc_section = "custom-fields.html#delete-custom-fields"
+           doc_section = "administration.html#deleting-custom-fields"
 %]
 
 <table id="admin_table">
diff --git a/mozilla/webtools/bugzilla/template/en/default/admin/custom_fields/create.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/admin/custom_fields/create.html.tmpl
index d610a68dc30..1f6f713600d 100644
--- a/mozilla/webtools/bugzilla/template/en/default/admin/custom_fields/create.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/admin/custom_fields/create.html.tmpl
@@ -18,7 +18,7 @@
            title = "Add a new Custom Field"
            onload = "document.getElementById('new_bugmail').disabled = true;"
            javascript_urls = [ 'js/util.js' ]
-           doc_section = "custom-fields.html#add-custom-fields"
+           doc_section = "administration.html#adding-custom-fields"
            style_urls = ['skins/standard/admin.css']
 %]
 
diff --git a/mozilla/webtools/bugzilla/template/en/default/admin/custom_fields/edit.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/admin/custom_fields/edit.html.tmpl
index 7cc09e6ec23..b8365b300f3 100644
--- a/mozilla/webtools/bugzilla/template/en/default/admin/custom_fields/edit.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/admin/custom_fields/edit.html.tmpl
@@ -22,7 +22,7 @@
            title = title
            onload = "toggleCheckbox(document.getElementById('enter_bug'), 'new_bugmail');"
            javascript_urls = [ 'js/util.js' ]
-           doc_section = "custom-fields.html#edit-custom-fields"
+           doc_section = "administration.html#editing-custom-fields"
            style_urls = ['skins/standard/admin.css']
 %]
 
diff --git a/mozilla/webtools/bugzilla/template/en/default/admin/custom_fields/list.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/admin/custom_fields/list.html.tmpl
index 7d54926b006..918b440ad04 100644
--- a/mozilla/webtools/bugzilla/template/en/default/admin/custom_fields/list.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/admin/custom_fields/list.html.tmpl
@@ -15,7 +15,7 @@
 [% PROCESS global/header.html.tmpl
   title = "Custom Fields"
   style_urls = ['skins/standard/admin.css']
-  doc_section = "custom-fields.html"
+  doc_section = "administration.html#custom-fields"
 %]
 
 [% delete_contentlink = BLOCK %]editfields.cgi?action=del&amp;name=%%name%%[% END %]
diff --git a/mozilla/webtools/bugzilla/template/en/default/admin/flag-type/confirm-delete.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/admin/flag-type/confirm-delete.html.tmpl
index 72a928b4296..4cc5890eded 100644
--- a/mozilla/webtools/bugzilla/template/en/default/admin/flag-type/confirm-delete.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/admin/flag-type/confirm-delete.html.tmpl
@@ -11,7 +11,7 @@
 [% PROCESS global/header.html.tmpl
   title = title
   style_urls = ['skins/standard/admin.css']
-  doc_section = "flags-overview.html#flags-delete"
+  doc_section = "administration.html#deleting-a-flag"
 %]
 
 <p>
diff --git a/mozilla/webtools/bugzilla/template/en/default/admin/flag-type/edit.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/admin/flag-type/edit.html.tmpl
index 2c71180f3fd..e52d58a9a5d 100644
--- a/mozilla/webtools/bugzilla/template/en/default/admin/flag-type/edit.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/admin/flag-type/edit.html.tmpl
@@ -15,10 +15,8 @@
       Based on [% type.name FILTER html %]
     [% END %]
   [% END %]
-  [% doc_section = "flags-overview.html#flags-create" %]
 [% ELSE %]
   [% title = BLOCK %]Edit Flag Type [% type.name FILTER html %][% END %]
-  [% doc_section = "flags-overview.html#flags-edit" %]
 [% END %]
 
 [% PROCESS global/header.html.tmpl
@@ -27,7 +25,7 @@
   onload="var f = document.forms['flagtype_properties'];
           selectProduct(f.product, f.component, null, null, '__Any__');"
   javascript_urls=["js/productform.js"]
-  doc_section = doc_section
+  doc_section = "administration.html#administering-flags"
 %]
 
 <form id="flagtype_properties" method="post" action="editflagtypes.cgi">
diff --git a/mozilla/webtools/bugzilla/template/en/default/admin/flag-type/list.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/admin/flag-type/list.html.tmpl
index 375f6297833..3783cade839 100644
--- a/mozilla/webtools/bugzilla/template/en/default/admin/flag-type/list.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/admin/flag-type/list.html.tmpl
@@ -13,7 +13,7 @@
   style_urls = ['skins/standard/admin.css']
   onload="var f = document.flagtype_form; selectProduct(f.product, f.component, null, null, '__All__');"
   javascript_urls=["js/productform.js"]
-  doc_section = "flags-overview.html#flag-types"
+  doc_section = "administration.html#two-types-of-flags"
 %]
 
 <p>
diff --git a/mozilla/webtools/bugzilla/template/en/default/admin/groups/confirm-remove.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/admin/groups/confirm-remove.html.tmpl
index bc9698aee5d..d626ca2bab5 100644
--- a/mozilla/webtools/bugzilla/template/en/default/admin/groups/confirm-remove.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/admin/groups/confirm-remove.html.tmpl
@@ -19,7 +19,7 @@
 
 [% PROCESS global/header.html.tmpl
   title = title
-  doc_section = "groups.html"
+  doc_section = "administration.html#groups-and-group-security"
 %]
 
 [% IF regexp %]
diff --git a/mozilla/webtools/bugzilla/template/en/default/admin/groups/create.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/admin/groups/create.html.tmpl
index ca95bab56aa..06396926cdf 100644
--- a/mozilla/webtools/bugzilla/template/en/default/admin/groups/create.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/admin/groups/create.html.tmpl
@@ -14,7 +14,7 @@
   title = "Add group"
   subheader = "This page allows you to define a new user group."
   style_urls = ['skins/standard/admin.css']
-  doc_section = "groups.html#create-groups"
+  doc_section = "administration.html#creating-groups"
 %]
 
 <form method="post" action="editgroups.cgi">
diff --git a/mozilla/webtools/bugzilla/template/en/default/admin/groups/delete.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/admin/groups/delete.html.tmpl
index 915a88b7292..78a1352d326 100644
--- a/mozilla/webtools/bugzilla/template/en/default/admin/groups/delete.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/admin/groups/delete.html.tmpl
@@ -17,7 +17,7 @@
 [% PROCESS global/header.html.tmpl
   title = title
   style_urls = ['skins/standard/admin.css']
-  doc_section = "groups.html"
+  doc_section = "administration.html#groups-and-group-security"
 %]
 
 <table id="admin_table">
diff --git a/mozilla/webtools/bugzilla/template/en/default/admin/groups/edit.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/admin/groups/edit.html.tmpl
index a14795be77c..c9883ce42da 100644
--- a/mozilla/webtools/bugzilla/template/en/default/admin/groups/edit.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/admin/groups/edit.html.tmpl
@@ -19,7 +19,7 @@
 [% PROCESS global/header.html.tmpl
   title = title
   style_urls = ['skins/standard/admin.css']
-  doc_section = "groups.html#edit-groups"
+  doc_section = "administration.html#editing-groups-and-assigning-group-permissions"
 %]
 
 <form method="post" action="editgroups.cgi">
diff --git a/mozilla/webtools/bugzilla/template/en/default/admin/groups/list.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/admin/groups/list.html.tmpl
index ba61da3ee8f..7a15703dfa6 100644
--- a/mozilla/webtools/bugzilla/template/en/default/admin/groups/list.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/admin/groups/list.html.tmpl
@@ -20,7 +20,7 @@
   title = "Edit Groups"
   subheader = "This lets you edit the groups available to put users in."
   style_urls = ['skins/standard/admin.css']
-  doc_section = "groups.html"
+  doc_section = "administration.html#groups-and-group-security"
 %]
 
 [% edit_contentlink = "editgroups.cgi?action=changeform&amp;group=%%id%%" %]
diff --git a/mozilla/webtools/bugzilla/template/en/default/admin/params/editparams.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/admin/params/editparams.html.tmpl
index 2e7d2245add..4cc22da990a 100644
--- a/mozilla/webtools/bugzilla/template/en/default/admin/params/editparams.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/admin/params/editparams.html.tmpl
@@ -37,7 +37,7 @@
    message = message
    style_urls = ['skins/standard/params.css']
    javascript_urls = ['js/params.js', 'js/util.js']
-   doc_section = "parameters.html"
+   doc_section = "administration.html#bugzilla-configuration"
 %]
 
 <div class="table">
diff --git a/mozilla/webtools/bugzilla/template/en/default/admin/sudo.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/admin/sudo.html.tmpl
index 9065206d5b2..a5f13a015d6 100644
--- a/mozilla/webtools/bugzilla/template/en/default/admin/sudo.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/admin/sudo.html.tmpl
@@ -9,7 +9,7 @@
 [% PROCESS global/header.html.tmpl
    title = "Begin sudo session"
    style_urls = ['skins/standard/admin.css']
-   doc_section = "useradmin.html#impersonatingusers"
+   doc_section = "administration.html#impersonating-users"
  %]
  
 [% DEFAULT target_login = "" %]
diff --git a/mozilla/webtools/bugzilla/template/en/default/admin/users/confirm-delete.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/admin/users/confirm-delete.html.tmpl
index 20100a86bd9..e59c01534cd 100644
--- a/mozilla/webtools/bugzilla/template/en/default/admin/users/confirm-delete.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/admin/users/confirm-delete.html.tmpl
@@ -40,7 +40,7 @@
   title = title
   style_urls = ['skins/standard/admin.css',
                 'skins/standard/editusers.css']
-  doc_section = "useradmin.html#user-account-deletion"
+  doc_section = "administration.html#deleting-users"
 %]
 
 [% PROCESS admin/users/listselectvars.html.tmpl
diff --git a/mozilla/webtools/bugzilla/template/en/default/admin/users/create.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/admin/users/create.html.tmpl
index 279c610a7de..497616745bc 100644
--- a/mozilla/webtools/bugzilla/template/en/default/admin/users/create.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/admin/users/create.html.tmpl
@@ -15,7 +15,7 @@
 [% PROCESS global/header.html.tmpl
   title = "Add user"
   style_urls = ['skins/standard/editusers.css']
-  doc_section = "useradmin.html#createnewusers"
+  doc_section = "administration.html#creating-new-users"
 %]
 
 [% PROCESS admin/users/listselectvars.html.tmpl
diff --git a/mozilla/webtools/bugzilla/template/en/default/admin/users/edit.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/admin/users/edit.html.tmpl
index 3f4fb76b9a1..3e0eb3c3468 100644
--- a/mozilla/webtools/bugzilla/template/en/default/admin/users/edit.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/admin/users/edit.html.tmpl
@@ -23,7 +23,7 @@
   title = title
   message = message
   style_urls = ['skins/standard/admin.css', 'skins/standard/editusers.css']
-  doc_section = "useradmin.html#modifyusers"
+  doc_section = "administration.html#modifying-users"
   javascript_urls = [ 'js/field.js' ]
 %]
 
diff --git a/mozilla/webtools/bugzilla/template/en/default/admin/users/list.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/admin/users/list.html.tmpl
index 38f36f57fc6..3fcb6ca8164 100644
--- a/mozilla/webtools/bugzilla/template/en/default/admin/users/list.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/admin/users/list.html.tmpl
@@ -17,7 +17,7 @@
 [% PROCESS global/header.html.tmpl
   title = "Select user"
   style_urls = ['skins/standard/admin.css', 'skins/standard/editusers.css']
-  doc_section = "useradmin.html"
+  doc_section = "administration.html#user-administration"
 %]
 
 [% PROCESS admin/users/listselectvars.html.tmpl
diff --git a/mozilla/webtools/bugzilla/template/en/default/admin/users/search.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/admin/users/search.html.tmpl
index 97431bcad6b..2d3bb819aba 100644
--- a/mozilla/webtools/bugzilla/template/en/default/admin/users/search.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/admin/users/search.html.tmpl
@@ -18,7 +18,7 @@
 [% PROCESS global/header.html.tmpl
   title = "Search users"
   style_urls = ['skins/standard/editusers.css']
-  doc_section = "useradmin.html#user-account-search"
+  doc_section = "administration.html#managing-other-users"
 %]
 
 [% PROCESS admin/users/listselectvars.html.tmpl
diff --git a/mozilla/webtools/bugzilla/template/en/default/attachment/confirm-delete.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/attachment/confirm-delete.html.tmpl
index fe613567934..dfc95c8f832 100644
--- a/mozilla/webtools/bugzilla/template/en/default/attachment/confirm-delete.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/attachment/confirm-delete.html.tmpl
@@ -18,7 +18,7 @@
 [% PROCESS global/header.html.tmpl
   title = title
   style_urls = ['skins/standard/admin.css']
-  doc_section = "attachments.html"
+  doc_section = "using.html#attachments"
 %]
 
 <table id="admin_table">
diff --git a/mozilla/webtools/bugzilla/template/en/default/attachment/create.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/attachment/create.html.tmpl
index abc0f97bf13..5c2384d5109 100644
--- a/mozilla/webtools/bugzilla/template/en/default/attachment/create.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/attachment/create.html.tmpl
@@ -19,7 +19,7 @@
   style_urls = [ 'skins/standard/attachment.css' ]
   yui = [ 'autocomplete' ]
   javascript_urls = [ "js/attachment.js", 'js/field.js', "js/util.js", "js/TUI.js" ]
-  doc_section = "attachments.html"
+  doc_section = "using.html#attachments"
 %]
 
 <script type="text/javascript">
diff --git a/mozilla/webtools/bugzilla/template/en/default/attachment/diff-header.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/attachment/diff-header.html.tmpl
index 63fe7345e9d..8d89f532e51 100644
--- a/mozilla/webtools/bugzilla/template/en/default/attachment/diff-header.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/attachment/diff-header.html.tmpl
@@ -37,7 +37,7 @@ Interdiff of #[% oldid %] and #[% newid %] for [% terms.bug %] #[% bugid %]
   [% subheader = BLOCK %]
     [% bugsummary FILTER html %]
   [% END %]
-  [% PROCESS global/header.html.tmpl doc_section = "attachments.html#patchviewer"
+  [% PROCESS global/header.html.tmpl doc_section = "using.html#patch-viewer"
                                      javascript_urls = "js/attachment.js"
                                      style_urls = ['skins/standard/attachment.css'] %]
 [% ELSE %]
diff --git a/mozilla/webtools/bugzilla/template/en/default/attachment/edit.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/attachment/edit.html.tmpl
index 518737788ac..54c7e07fbeb 100644
--- a/mozilla/webtools/bugzilla/template/en/default/attachment/edit.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/attachment/edit.html.tmpl
@@ -20,7 +20,7 @@
   title = title
   header = header
   subheader = subheader
-  doc_section = "attachments.html"
+  doc_section = "using.html#attachments"
   javascript_urls = ['js/attachment.js', 'js/field.js']
   style_urls = ['skins/standard/attachment.css']
   yui = [ 'autocomplete' ]
diff --git a/mozilla/webtools/bugzilla/template/en/default/bug/dependency-tree.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/bug/dependency-tree.html.tmpl
index 61994cf280f..51bf7791fe0 100644
--- a/mozilla/webtools/bugzilla/template/en/default/bug/dependency-tree.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/bug/dependency-tree.html.tmpl
@@ -14,7 +14,7 @@
    javascript_urls = ["js/expanding-tree.js"]
    style_urls      = ["skins/standard/dependency-tree.css"]
    subheader      = filtered_desc
-   doc_section = "hintsandtips.html#dependencytree"
+   doc_section = "using.html#dependency-tree"
 %]
 
 [% PROCESS depthControlToolbar %]
diff --git a/mozilla/webtools/bugzilla/template/en/default/bug/show-header.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/bug/show-header.html.tmpl
index 1061b90143b..0dbf5182f64 100644
--- a/mozilla/webtools/bugzilla/template/en/default/bug/show-header.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/bug/show-header.html.tmpl
@@ -57,7 +57,7 @@
   [% END %]
 [% END %]
 [% style_urls = [ "skins/standard/show_bug.css" ] %]
-[% doc_section = "bug_page.html" %]
+[% doc_section = "using.html#anatomy-of-a-bug" %]
 [% bodyclasses = ['bz_bug',
                   "bz_status_$bug.bug_status",
                   "bz_product_$bug.product",
diff --git a/mozilla/webtools/bugzilla/template/en/default/bug/show-multiple.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/bug/show-multiple.html.tmpl
index e55a7cad447..de872973b78 100644
--- a/mozilla/webtools/bugzilla/template/en/default/bug/show-multiple.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/bug/show-multiple.html.tmpl
@@ -11,7 +11,7 @@
   h1 = ""
   style_urls = ["skins/standard/show_multiple.css",
                 "skins/standard/buglist.css"]
-  doc_section = "bug_page.html"
+  doc_section = "using.html#anatomy-of-a-bug"
 %]
 [% PROCESS bug/time.html.tmpl %]
 [% IF bugs.first %]
diff --git a/mozilla/webtools/bugzilla/template/en/default/bug/summarize-time.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/bug/summarize-time.html.tmpl
index c3c233494e9..6bdc62a9a39 100644
--- a/mozilla/webtools/bugzilla/template/en/default/bug/summarize-time.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/bug/summarize-time.html.tmpl
@@ -21,7 +21,7 @@
     title = title 
     header = header 
     style_urls = ["skins/standard/summarize-time.css"]
-    doc_section = "timetracking.html"
+    doc_section = "using.html#time-tracking-information"
     yui = ['calendar']
     javascript_urls = [ "js/util.js", "js/field.js" ]
     %]
diff --git a/mozilla/webtools/bugzilla/template/en/default/list/list.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/list/list.html.tmpl
index 6b1e10a4a2f..6fafefe21bb 100644
--- a/mozilla/webtools/bugzilla/template/en/default/list/list.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/list/list.html.tmpl
@@ -61,7 +61,7 @@
   yui = [ 'autocomplete', 'calendar' ]
   javascript_urls = [ "js/util.js", "js/field.js", "js/TUI.js" ]
   style_urls = [ "skins/standard/buglist.css" ]
-  doc_section = "query.html#list"
+  doc_section = "using.html#bug-lists"
 %]
 
 <div class="bz_query_head">
diff --git a/mozilla/webtools/bugzilla/template/en/default/reports/menu.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/reports/menu.html.tmpl
index 7bf9d8d504b..b1dfa23fe12 100644
--- a/mozilla/webtools/bugzilla/template/en/default/reports/menu.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/reports/menu.html.tmpl
@@ -13,7 +13,7 @@
 
 [% PROCESS global/header.html.tmpl
   title = "Reporting and Charting Kitchen"
-  doc_section = "reporting.html"
+  doc_section = "using.html#reports-and-charts"
   style_urls = ['skins/standard/reports.css']
 %]
 
diff --git a/mozilla/webtools/bugzilla/template/en/default/reports/old-charts.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/reports/old-charts.html.tmpl
index 96e387b7898..9e2ced2b46f 100644
--- a/mozilla/webtools/bugzilla/template/en/default/reports/old-charts.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/reports/old-charts.html.tmpl
@@ -16,7 +16,7 @@
   title = "$terms.Bug Charts"
   h1 = "Welcome to the $terms.Bugzilla Charting Kitchen"
   style_urls = ['skins/standard/reports.css']
-  doc_section = "reporting.html#charts"
+  doc_section = "using.html#charts"
 %]
 
 [% IF url_image %]
diff --git a/mozilla/webtools/bugzilla/template/en/default/search/search-advanced.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/search/search-advanced.html.tmpl
index 2bff834bc37..a4868571929 100644
--- a/mozilla/webtools/bugzilla/template/en/default/search/search-advanced.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/search/search-advanced.html.tmpl
@@ -30,7 +30,7 @@ function remove_token() {
   javascript = javascript
   javascript_urls = [ "js/util.js", "js/TUI.js", "js/field.js"]
   style_urls = [ "skins/standard/search_form.css" ]
-  doc_section = "query.html"
+  doc_section = "using.html#searching-for-bugs"
 %]
 
 [% WRAPPER search/tabs.html.tmpl %]
diff --git a/mozilla/webtools/bugzilla/template/en/default/search/search-create-series.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/search/search-create-series.html.tmpl
index a9b02eeb9d1..3c9c933d709 100644
--- a/mozilla/webtools/bugzilla/template/en/default/search/search-create-series.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/search/search-create-series.html.tmpl
@@ -23,7 +23,7 @@
   javascript = js_data 
   javascript_urls = [ "js/util.js", "js/TUI.js", "js/field.js" ]
   style_urls = [ "skins/standard/reports.css", "skins/standard/search_form.css" ]
-  doc_section = "reporting.html#charts-new-series"
+  doc_section = "using.html#creating-new-data-sets"
 %]
 
 <form method="get" action="chart.cgi" name="chartform">
diff --git a/mozilla/webtools/bugzilla/template/en/default/search/search-report-graph.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/search/search-report-graph.html.tmpl
index 71876ef4290..a5e91f79053 100644
--- a/mozilla/webtools/bugzilla/template/en/default/search/search-report-graph.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/search/search-report-graph.html.tmpl
@@ -22,7 +22,7 @@ var queryform = "reportform"
   javascript = js_data
   javascript_urls = [ "js/util.js", "js/TUI.js", "js/field.js" ]
   style_urls = [ "skins/standard/search_form.css" ]
-  doc_section = "reporting.html#reports"
+  doc_section = "using.html#reports"
 %]
 
 [% PROCESS "search/search-report-select.html.tmpl" %]
diff --git a/mozilla/webtools/bugzilla/template/en/default/search/search-report-table.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/search/search-report-table.html.tmpl
index d5a1ba52715..de5d357fd1e 100644
--- a/mozilla/webtools/bugzilla/template/en/default/search/search-report-table.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/search/search-report-table.html.tmpl
@@ -22,7 +22,7 @@ var queryform = "reportform"
   javascript = js_data
   javascript_urls = [ "js/util.js", "js/TUI.js", "js/field.js" ]
   style_urls = [ "skins/standard/search_form.css" ]
-  doc_section = "reporting.html#reports"
+  doc_section = "using.html#reports"
 %]
 
 [% PROCESS "search/search-report-select.html.tmpl" %]
diff --git a/mozilla/webtools/bugzilla/template/en/default/whine/schedule.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/whine/schedule.html.tmpl
index 9694e13add2..a421d928f3f 100644
--- a/mozilla/webtools/bugzilla/template/en/default/whine/schedule.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/whine/schedule.html.tmpl
@@ -23,7 +23,7 @@
 [% PROCESS global/header.html.tmpl
   title = title
   style_urls = ['skins/standard/admin.css']
-  doc_section = "whining.html"
+  doc_section = "using.html#whining"
 %]
 
 <p>