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
1=== modified file 'doc/en/user-guide/branching_a_project.txt'
2--- doc/en/user-guide/branching_a_project.txt 2009-09-09 15:30:59 +0000
3+++ doc/en/user-guide/branching_a_project.txt 2010-09-20 07:04:43 +0000
4@@ -27,7 +27,7 @@
5 prefix indicating the transfer technology. If no prefix is given,
6 normal filenames are assumed. For a complete list of supported
7 protocols, see the ``urlspec`` online help topic or the
8-`URL Identifiers <../user-reference/bzr_man.html#url-identifiers>`_
9+`URL Identifiers <../user-reference/index.html#url-identifiers>`_
10 section of the Bazaar User Reference.
11
12 A reminder about shared repositories
13
14=== modified file 'doc/en/user-guide/bug_trackers.txt'
15--- doc/en/user-guide/bug_trackers.txt 2008-05-16 21:00:25 +0000
16+++ doc/en/user-guide/bug_trackers.txt 2010-09-20 07:04:43 +0000
17@@ -20,7 +20,7 @@
18 to configure this for Bugzilla, Trac, Roundup and other bug/issue trackers,
19 refer to `Bug Tracker Settings`_ in the Bazaar User Reference.
20
21-.. _Bug Tracker Settings: ../user-reference/bzr_man.html#bug-tracker-settings
22+.. _Bug Tracker Settings: ../user-reference/index.html#bug-tracker-settings
23
24 Metadata recording vs bug tracker updating
25 ------------------------------------------
26
27=== modified file 'doc/en/user-guide/configuring_bazaar.txt'
28--- doc/en/user-guide/configuring_bazaar.txt 2008-08-14 17:25:43 +0000
29+++ doc/en/user-guide/configuring_bazaar.txt 2010-09-20 07:04:43 +0000
30@@ -44,7 +44,7 @@
31 email = Your Name <email@example.com>
32
33 For further details on the syntax and configuration settings supported, see
34-`Configuration Settings <../user-reference/bzr_man.html#configuration-settings>`_
35+`Configuration Settings <../user-reference/index.html#configuration-settings>`_
36 in the Bazaar User Reference.
37
38
39@@ -56,5 +56,5 @@
40 ``BZR_HOME/rules``.
41
42 For further information on how rules are searched and the detailed syntax of
43-the relevant files, see `Rules <../user-reference/bzr_man.html#rules>`_
44+the relevant files, see `Rules <../user-reference/index.html#rules>`_
45 in the Bazaar User Reference.
46
47=== modified file 'doc/en/user-guide/hooks.txt'
48--- doc/en/user-guide/hooks.txt 2008-10-29 06:10:45 +0000
49+++ doc/en/user-guide/hooks.txt 2010-09-20 07:04:43 +0000
50@@ -8,7 +8,7 @@
51 perform actions before or after certain Bazaar operations. The operations
52 include ``commit``, ``push``, ``pull``, and ``uncommit``.
53 For a complete list of hooks and their parameters, see `Hooks
54-<../user-reference/bzr_man.html#hooks>`_ in the User Reference.
55+<../user-reference/index.html#hooks>`_ in the User Reference.
56
57 Most hooks are run on the client, but a few are run on the server. (Also
58 see the `bzr-push-and-update`_ plugin that handles one special case of
59
60=== modified file 'doc/en/user-guide/sending_changes.txt'
61--- doc/en/user-guide/sending_changes.txt 2008-04-24 01:27:26 +0000
62+++ doc/en/user-guide/sending_changes.txt 2010-09-20 07:04:43 +0000
63@@ -42,7 +42,7 @@
64 ``send`` without options will create a merge directive, fire up your email
65 tool and attach it, ready for you to add the explanatory text bit.
66 (See the online help for ``send`` and
67-`Configuration Settings <../user-reference/bzr_man.html#configuration-settings>`_
68+`Configuration Settings <../user-reference/index.html#configuration-settings>`_
69 in the User Reference for further details on how to configure this.)
70
71 Most projects like people to add some explanation to the mail along with
72
73=== modified file 'doc/en/user-guide/setting_up_email.txt'
74--- doc/en/user-guide/setting_up_email.txt 2009-04-04 02:50:01 +0000
75+++ doc/en/user-guide/setting_up_email.txt 2010-09-20 07:04:43 +0000
76@@ -74,7 +74,7 @@
77 For more information on the ini file format, see `Configuration Settings`_ in
78 the Bazaar User Reference.
79
80-.. _Configuration Settings: ../user-reference/bzr_man.html#configuration-settings
81+.. _Configuration Settings: ../user-reference/index.html#configuration-settings
82
83 Setting email on a per-branch basis
84 -----------------------------------
85
86=== modified file 'doc/en/user-guide/specifying_revisions.txt'
87--- doc/en/user-guide/specifying_revisions.txt 2009-04-04 02:57:47 +0000
88+++ doc/en/user-guide/specifying_revisions.txt 2010-09-20 07:04:43 +0000
89@@ -59,7 +59,7 @@
90 For complete details, see `Revision Identifiers`_ in the
91 Bazaar User Reference.
92
93-.. _Revision Identifiers: ../user-reference/bzr_man.html#revision-identifiers
94+.. _Revision Identifiers: ../user-reference/index.html#revision-identifiers
95
96 Numbers
97 ~~~~~~~
98
99=== modified file 'doc/en/user-guide/version_info.txt'
100--- doc/en/user-guide/version_info.txt 2008-03-13 18:51:13 +0000
101+++ doc/en/user-guide/version_info.txt 2010-09-20 07:04:43 +0000
102@@ -87,7 +87,7 @@
103 variables that can be used in templates, see `Version Info`_ in the
104 Bazaar User Reference.
105
106-.. _Version Info: ../user-reference/bzr_man.html#version-info
107+.. _Version Info: ../user-reference/index.html#version-info
108
109 Predefined formats for dumping version information in specific languages
110 are currently in development. Please contact us on the mailing list about

Subscribers

People subscribed via source and target branches