@@ -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
 
@@ -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();
 
 
@@ -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
 
@@ -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;
 
@@ -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:
 
@@ -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:
 
@@ -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();
 
 
@@ -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();
 
 
@@ -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:
 
@@ -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.
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ my $template = Bugzilla->template;`
`23`	`23`	`my $vars = {};`
`24`	`24`	`# There is only one section about components in the documentation,`
`25`	`25`	`# so all actions point to the same page.`
`26`		`-$vars->{'doc_section'} = 'components.html';`
	`26`	`+$vars->{'doc_section'} = 'administration.html#components';`
`27`	`27`
`28`	`28`	`#`
`29`	`29`	`# Preliminary checks:`