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

Proposed by Alexander Belchenko on 2010-09-18
Status: Merged
Approved by: Andrew Bennetts on 2010-09-21
Approved revision: 4763
Merged at revision: 4762
Proposed branch: lp:~bialix/bzr/2.0-bug-523069
Merge into: lp:bzr/2.0
Diff against target: 110 lines (+9/-9)
8 files modified
doc/en/user-guide/branching_a_project.txt (+1/-1)
doc/en/user-guide/bug_trackers.txt (+1/-1)
doc/en/user-guide/configuring_bazaar.txt (+2/-2)
doc/en/user-guide/hooks.txt (+1/-1)
doc/en/user-guide/sending_changes.txt (+1/-1)
doc/en/user-guide/setting_up_email.txt (+1/-1)
doc/en/user-guide/specifying_revisions.txt (+1/-1)
doc/en/user-guide/version_info.txt (+1/-1)
To merge this branch: bzr merge lp:~bialix/bzr/2.0-bug-523069
Reviewer Review Type Date Requested Status
Parth Malwankar 2010-09-18 Approve on 2010-09-18
Review via email: mp+35912@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
Parth Malwankar (parthm) wrote :

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) wrote :

Oh, thank you for catching this.

Alexander Belchenko (bialix) wrote :

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) wrote :

sent to pqm by email

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
27prefix indicating the transfer technology. If no prefix is given,27prefix indicating the transfer technology. If no prefix is given,
28normal filenames are assumed. For a complete list of supported28normal filenames are assumed. For a complete list of supported
29protocols, see the ``urlspec`` online help topic or the29protocols, see the ``urlspec`` online help topic or the
30`URL Identifiers <../user-reference/bzr_man.html#url-identifiers>`_30`URL Identifiers <../user-reference/index.html#url-identifiers>`_
31section of the Bazaar User Reference.31section of the Bazaar User Reference.
3232
33A reminder about shared repositories33A reminder about shared repositories
3434
=== 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 @@
20to configure this for Bugzilla, Trac, Roundup and other bug/issue trackers,20to configure this for Bugzilla, Trac, Roundup and other bug/issue trackers,
21refer to `Bug Tracker Settings`_ in the Bazaar User Reference.21refer to `Bug Tracker Settings`_ in the Bazaar User Reference.
2222
23.. _Bug Tracker Settings: ../user-reference/bzr_man.html#bug-tracker-settings23.. _Bug Tracker Settings: ../user-reference/index.html#bug-tracker-settings
2424
25Metadata recording vs bug tracker updating25Metadata recording vs bug tracker updating
26------------------------------------------26------------------------------------------
2727
=== 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 @@
44 email = Your Name <email@example.com>44 email = Your Name <email@example.com>
4545
46For further details on the syntax and configuration settings supported, see46For further details on the syntax and configuration settings supported, see
47`Configuration Settings <../user-reference/bzr_man.html#configuration-settings>`_47`Configuration Settings <../user-reference/index.html#configuration-settings>`_
48in the Bazaar User Reference.48in the Bazaar User Reference.
4949
5050
@@ -56,5 +56,5 @@
56``BZR_HOME/rules``.56``BZR_HOME/rules``.
5757
58For further information on how rules are searched and the detailed syntax of58For further information on how rules are searched and the detailed syntax of
59the relevant files, see `Rules <../user-reference/bzr_man.html#rules>`_59the relevant files, see `Rules <../user-reference/index.html#rules>`_
60in the Bazaar User Reference.60in the Bazaar User Reference.
6161
=== 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 @@
8perform actions before or after certain Bazaar operations. The operations8perform actions before or after certain Bazaar operations. The operations
9include ``commit``, ``push``, ``pull``, and ``uncommit``.9include ``commit``, ``push``, ``pull``, and ``uncommit``.
10For a complete list of hooks and their parameters, see `Hooks10For a complete list of hooks and their parameters, see `Hooks
11<../user-reference/bzr_man.html#hooks>`_ in the User Reference.11<../user-reference/index.html#hooks>`_ in the User Reference.
1212
13Most hooks are run on the client, but a few are run on the server. (Also13Most hooks are run on the client, but a few are run on the server. (Also
14see the `bzr-push-and-update`_ plugin that handles one special case of14see the `bzr-push-and-update`_ plugin that handles one special case of
1515
=== 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 @@
42``send`` without options will create a merge directive, fire up your email42``send`` without options will create a merge directive, fire up your email
43tool and attach it, ready for you to add the explanatory text bit.43tool and attach it, ready for you to add the explanatory text bit.
44(See the online help for ``send`` and44(See the online help for ``send`` and
45`Configuration Settings <../user-reference/bzr_man.html#configuration-settings>`_45`Configuration Settings <../user-reference/index.html#configuration-settings>`_
46in the User Reference for further details on how to configure this.)46in the User Reference for further details on how to configure this.)
4747
48Most projects like people to add some explanation to the mail along with48Most projects like people to add some explanation to the mail along with
4949
=== 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 @@
74For more information on the ini file format, see `Configuration Settings`_ in74For more information on the ini file format, see `Configuration Settings`_ in
75the Bazaar User Reference.75the Bazaar User Reference.
7676
77.. _Configuration Settings: ../user-reference/bzr_man.html#configuration-settings77.. _Configuration Settings: ../user-reference/index.html#configuration-settings
7878
79Setting email on a per-branch basis79Setting email on a per-branch basis
80-----------------------------------80-----------------------------------
8181
=== 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 @@
59For complete details, see `Revision Identifiers`_ in the59For complete details, see `Revision Identifiers`_ in the
60Bazaar User Reference.60Bazaar User Reference.
6161
62.. _Revision Identifiers: ../user-reference/bzr_man.html#revision-identifiers62.. _Revision Identifiers: ../user-reference/index.html#revision-identifiers
6363
64Numbers64Numbers
65~~~~~~~65~~~~~~~
6666
=== 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 @@
87variables that can be used in templates, see `Version Info`_ in the87variables that can be used in templates, see `Version Info`_ in the
88Bazaar User Reference.88Bazaar User Reference.
8989
90.. _Version Info: ../user-reference/bzr_man.html#version-info90.. _Version Info: ../user-reference/index.html#version-info
9191
92Predefined formats for dumping version information in specific languages92Predefined formats for dumping version information in specific languages
93are currently in development. Please contact us on the mailing list about93are currently in development. Please contact us on the mailing list about

Subscribers

People subscribed via source and target branches