Merge lp:~bialix/bzr/2.0-bug-523069 into lp:bzr/2.0

[Alexander Belchenko]

Change links to user-reference/bzr_man.html to user-reference/index.html everywhere in the User Guide.

Change links to user-reference/bzr_man.html to user-reference/index.html everywhere in the User Guide.

[Parth Malwankar (parthm)]

The "see _Rules_" link on the same page is also broken. That also points to bzr_man.html. It would be nice to fix that also while you are at it :-)

review: Approve

[Alexander Belchenko (bialix)]

Oh, thank you for catching this.

[Alexander Belchenko (bialix)]

Should I add a note to the NEWS? The change itself is trivial. I've just grepped for bzr_man and then updated all links.

[Andrew Bennetts (spiv)]

sent to pqm by email

=== modified file 'doc/en/user-guide/branching_a_project.txt'
--- doc/en/user-guide/branching_a_project.txt	2009-09-09 15:30:59 +0000
+++ doc/en/user-guide/branching_a_project.txt	2010-09-20 07:04:43 +0000
@@ -27,7 +27,7 @@
 prefix indicating the transfer technology. If no prefix is given,
 normal filenames are assumed. For a complete list of supported
 protocols, see the ``urlspec`` online help topic or the
-`URL Identifiers <../user-reference/bzr_man.html#url-identifiers>`_
+`URL Identifiers <../user-reference/index.html#url-identifiers>`_
 section of the Bazaar User Reference.
 
 A reminder about shared repositories
 
=== modified file 'doc/en/user-guide/bug_trackers.txt'
--- doc/en/user-guide/bug_trackers.txt	2008-05-16 21:00:25 +0000
+++ doc/en/user-guide/bug_trackers.txt	2010-09-20 07:04:43 +0000
@@ -20,7 +20,7 @@
 to configure this for Bugzilla, Trac, Roundup and other bug/issue trackers,
 refer to `Bug Tracker Settings`_ in the Bazaar User Reference.
 
-.. _Bug Tracker Settings: ../user-reference/bzr_man.html#bug-tracker-settings
+.. _Bug Tracker Settings: ../user-reference/index.html#bug-tracker-settings
 
 Metadata recording vs bug tracker updating
 ------------------------------------------
 
=== modified file 'doc/en/user-guide/configuring_bazaar.txt'
--- doc/en/user-guide/configuring_bazaar.txt	2008-08-14 17:25:43 +0000
+++ doc/en/user-guide/configuring_bazaar.txt	2010-09-20 07:04:43 +0000
@@ -44,7 +44,7 @@
   email = Your Name <[e-mail]>
 
 For further details on the syntax and configuration settings supported, see
-`Configuration Settings <../user-reference/bzr_man.html#configuration-settings>`_
+`Configuration Settings <../user-reference/index.html#configuration-settings>`_
 in the Bazaar User Reference.
 
 
@@ -56,5 +56,5 @@
 ``BZR_HOME/rules``.
 
 For further information on how rules are searched and the detailed syntax of
-the relevant files, see `Rules <../user-reference/bzr_man.html#rules>`_
+the relevant files, see `Rules <../user-reference/index.html#rules>`_
 in the Bazaar User Reference.
 
=== modified file 'doc/en/user-guide/hooks.txt'
--- doc/en/user-guide/hooks.txt	2008-10-29 06:10:45 +0000
+++ doc/en/user-guide/hooks.txt	2010-09-20 07:04:43 +0000
@@ -8,7 +8,7 @@
 perform actions before or after certain Bazaar operations.  The operations
 include ``commit``, ``push``, ``pull``, and ``uncommit``.
 For a complete list of hooks and their parameters, see `Hooks
-<../user-reference/bzr_man.html#hooks>`_ in the User Reference.
+<../user-reference/index.html#hooks>`_ in the User Reference.
 
 Most hooks are run on the client, but a few are run on the server.  (Also
 see the `bzr-push-and-update`_ plugin that handles one special case of
 
=== modified file 'doc/en/user-guide/sending_changes.txt'
--- doc/en/user-guide/sending_changes.txt	2008-04-24 01:27:26 +0000
+++ doc/en/user-guide/sending_changes.txt	2010-09-20 07:04:43 +0000
@@ -42,7 +42,7 @@
 ``send`` without options will create a merge directive, fire up your email
 tool and attach it, ready for you to add the explanatory text bit.
 (See the online help for ``send`` and
-`Configuration Settings <../user-reference/bzr_man.html#configuration-settings>`_
+`Configuration Settings <../user-reference/index.html#configuration-settings>`_
 in the User Reference for further details on how to configure this.)
 
 Most projects like people to add some explanation to the mail along with
 
=== modified file 'doc/en/user-guide/setting_up_email.txt'
--- doc/en/user-guide/setting_up_email.txt	2009-04-04 02:50:01 +0000
+++ doc/en/user-guide/setting_up_email.txt	2010-09-20 07:04:43 +0000
@@ -74,7 +74,7 @@
 For more information on the ini file format, see `Configuration Settings`_ in
 the Bazaar User Reference.
 
-.. _Configuration Settings: ../user-reference/bzr_man.html#configuration-settings
+.. _Configuration Settings: ../user-reference/index.html#configuration-settings
 
 Setting email on a per-branch basis
 -----------------------------------
 
=== modified file 'doc/en/user-guide/specifying_revisions.txt'
--- doc/en/user-guide/specifying_revisions.txt	2009-04-04 02:57:47 +0000
+++ doc/en/user-guide/specifying_revisions.txt	2010-09-20 07:04:43 +0000
@@ -59,7 +59,7 @@
 For complete details, see `Revision Identifiers`_ in the
 Bazaar User Reference.
 
-.. _Revision Identifiers: ../user-reference/bzr_man.html#revision-identifiers
+.. _Revision Identifiers: ../user-reference/index.html#revision-identifiers
 
 Numbers
 ~~~~~~~
 
=== modified file 'doc/en/user-guide/version_info.txt'
--- doc/en/user-guide/version_info.txt	2008-03-13 18:51:13 +0000
+++ doc/en/user-guide/version_info.txt	2010-09-20 07:04:43 +0000
@@ -87,7 +87,7 @@
 variables that can be used in templates, see `Version Info`_ in the
 Bazaar User Reference.
 
-.. _Version Info: ../user-reference/bzr_man.html#version-info
+.. _Version Info: ../user-reference/index.html#version-info
 
 Predefined formats for dumping version information in specific languages
 are currently in development. Please contact us on the mailing list about