Rev 4867: Merge 2.0 into 2.1 resolving conflicts in http://bazaar.launchpad.net/~vila/bzr/2.1-integration/

[Vincent Ladeuil]

At http://bazaar.launchpad.net/~vila/bzr/2.1-integration/

------------------------------------------------------------
revno: 4867 [merge]
revision-id: v.ladeuil+lp at free.fr-20101008100539-xoeukg17jk5vy0gb
parent: pqm at pqm.ubuntu.com-20100930105322-nusv8edabr65pw3p
parent: v.ladeuil+lp at free.fr-20101008091020-homllkdy3kd7zslt
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 2.1.4-dev
timestamp: Fri 2010-10-08 12:05:39 +0200
message:
  Merge 2.0 into 2.1 resolving conflicts
modified:
  doc/en/user-guide/branching_a_project.txt branching_a_project.-20071122141511-0knao2lklsdsvb1q-2
  doc/en/user-guide/configuring_bazaar.txt configuring_bazaar.t-20071128000722-ncxiua259xwbdbg7-1
  doc/en/user-guide/hooks.txt    hooks.txt-20070829200551-7nr6e5a1io6x78uf-1
  doc/en/user-guide/sending_changes.txt sending_changes.txt-20071123154453-dk2mjhrg1vpjm5w2-4
  doc/en/user-guide/setting_up_email.txt setting_up_email.txt-20060314161707-fd242c8944346173
  doc/en/user-guide/specifying_revisions.txt specifying_revisions.txt-20060314161707-19deb139101bea33
  doc/en/user-guide/version_info.txt version_info.txt-20060921215543-gju6o5xdic8w25np-1
-------------- next part --------------
=== modified file 'doc/en/user-guide/branching_a_project.txt'
--- a/doc/en/user-guide/branching_a_project.txt	2010-09-20 07:18:01 +0000
+++ b/doc/en/user-guide/branching_a_project.txt	2010-10-08 10:05:39 +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/urlspec-help.html>`_
+`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/configuring_bazaar.txt'
--- a/doc/en/user-guide/configuring_bazaar.txt	2010-09-20 07:18:01 +0000
+++ b/doc/en/user-guide/configuring_bazaar.txt	2010-10-08 10:05:39 +0000
@@ -44,7 +44,7 @@
   email = Your Name <email at example.com>
 
 For further details on the syntax and configuration settings supported, see
-`Configuration Settings <../user-reference/configuration-help.html>`_
+`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/rules-help.html>`_
+the relevant files, see `Rules <../user-reference/index.html#rules>`_
 in the Bazaar User Reference.

=== modified file 'doc/en/user-guide/hooks.txt'
--- a/doc/en/user-guide/hooks.txt	2010-01-03 03:49:07 +0000
+++ b/doc/en/user-guide/hooks.txt	2010-10-08 10:05:39 +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/hooks-help.html>`_ 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 `push-and-update plugin`_ that handles one special case of

=== modified file 'doc/en/user-guide/sending_changes.txt'
--- a/doc/en/user-guide/sending_changes.txt	2010-09-20 07:18:01 +0000
+++ b/doc/en/user-guide/sending_changes.txt	2010-10-08 10:05:39 +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/configuration-help.html>`_
+`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'
--- a/doc/en/user-guide/setting_up_email.txt	2010-09-20 07:18:01 +0000
+++ b/doc/en/user-guide/setting_up_email.txt	2010-10-08 10:05:39 +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/configuration-help.html
+.. _Configuration Settings: ../user-reference/index.html#configuration-settings
 
 Setting email on a per-branch basis
 -----------------------------------

=== modified file 'doc/en/user-guide/specifying_revisions.txt'
--- a/doc/en/user-guide/specifying_revisions.txt	2010-09-20 07:18:01 +0000
+++ b/doc/en/user-guide/specifying_revisions.txt	2010-10-08 10:05:39 +0000
@@ -65,7 +65,7 @@
 For complete details, see `Revision Identifiers`_ in the
 Bazaar User Reference.
 
-.. _Revision Identifiers: ../user-reference/revisionspec-help.html
+.. _Revision Identifiers: ../user-reference/index.html#revision-identifiers
 
 Numbers
 ~~~~~~~

=== modified file 'doc/en/user-guide/version_info.txt'
--- a/doc/en/user-guide/version_info.txt	2010-09-20 07:18:01 +0000
+++ b/doc/en/user-guide/version_info.txt	2010-10-08 10:05:39 +0000
@@ -87,7 +87,7 @@
 variables that can be used in templates, see `Version Info`_ in the
 Bazaar User Reference.
 
-.. _Version Info: ../user-reference/version-info-help.html
+.. _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