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

[Alexander Belchenko]

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

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

[Alexander Belchenko (bialix)]

Should I update the NEWS?

[Andrew Bennetts (spiv)]

Seems fine to me. A NEWS entry would be good if you'd like to add one.

review: Approve

[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-12-02 20:34:07 +0000
+++ doc/en/user-guide/branching_a_project.txt	2010-09-20 07:20:56 +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/urlspec-help.html>`_
 section of the Bazaar User Reference.
 
 A reminder about shared repositories
 
=== modified file 'doc/en/user-guide/configuring_bazaar.txt'
--- doc/en/user-guide/configuring_bazaar.txt	2009-12-02 20:34:07 +0000
+++ doc/en/user-guide/configuring_bazaar.txt	2010-09-20 07:20:56 +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/configuration-help.html>`_
 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/rules-help.html>`_
 in the Bazaar User Reference.
 
=== modified file 'doc/en/user-guide/plugins.txt'
--- doc/en/user-guide/plugins.txt	2009-12-02 20:34:07 +0000
+++ doc/en/user-guide/plugins.txt	2010-09-20 07:20:56 +0000
@@ -59,8 +59,8 @@
 If you have the necessary permissions, plugins can also be installed on a
 system-wide basis.  One can additionally override the personal plugins
 location by setting the environment variable ``BZR_PLUGIN_PATH`` (see `User
-Reference <../user-reference/bzr_man.html#bzr-plugin-path>`_ for a detailed
-explanation).
+Reference <../user-reference/configuration-help.html#bzr-plugin-path>`_ 
+for a detailed explanation).
 
 Listing the installed plugins
 -----------------------------
 
=== modified file 'doc/en/user-guide/sending_changes.txt'
--- doc/en/user-guide/sending_changes.txt	2009-12-02 20:34:07 +0000
+++ doc/en/user-guide/sending_changes.txt	2010-09-20 07:20:56 +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/configuration-help.html>`_
 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-12-02 20:34:07 +0000
+++ doc/en/user-guide/setting_up_email.txt	2010-09-20 07:20:56 +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/configuration-help.html
 
 Setting email on a per-branch basis
 -----------------------------------
 
=== modified file 'doc/en/user-guide/specifying_revisions.txt'
--- doc/en/user-guide/specifying_revisions.txt	2009-12-02 23:09:40 +0000
+++ doc/en/user-guide/specifying_revisions.txt	2010-09-20 07:20:56 +0000
@@ -65,7 +65,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/revisionspec-help.html
 
 Numbers
 ~~~~~~~
 
=== modified file 'doc/en/user-guide/version_info.txt'
--- doc/en/user-guide/version_info.txt	2009-12-02 20:34:07 +0000
+++ doc/en/user-guide/version_info.txt	2010-09-20 07:20:56 +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/version-info-help.html
 
 Predefined formats for dumping version information in specific languages
 are currently in development. Please contact us on the mailing list about
 
=== modified file 'doc/en/user-guide/writing_a_plugin.txt'
--- doc/en/user-guide/writing_a_plugin.txt	2009-08-20 13:26:36 +0000
+++ doc/en/user-guide/writing_a_plugin.txt	2010-09-20 07:20:56 +0000
@@ -34,8 +34,8 @@
 
 Bzr will scan ``~/.bazaar/plugins``  and ``bzrlib/plugins`` for plugins
 by default.  You can override this with  ``BZR_PLUGIN_PATH``
-(see `User Reference <../user-reference/bzr_man.html#bzr-plugin-path>`_
-for details).
+(see `User Reference 
+<../user-reference/configuration-help.html#bzr-plugin-path>`_ for details).
 
 Plugins may be either modules or packages.  If your plugin is a single
 file, you can structure it as a module.  If it has multiple files, or if