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

Proposed by Alexander Belchenko on 2010-09-18
Status: Merged
Approved by: Andrew Bennetts on 2010-09-21
Approved revision: 5094
Merged at revision: 5095
Proposed branch: lp:~bialix/bzr/2.2-bug-523069
Merge into: lp:bzr/2.2
Diff against target: 114 lines (+11/-11)
8 files modified
doc/en/user-guide/branching_a_project.txt (+1/-1)
doc/en/user-guide/configuring_bazaar.txt (+2/-2)
doc/en/user-guide/plugins.txt (+2/-2)
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)
doc/en/user-guide/writing_a_plugin.txt (+2/-2)
To merge this branch: bzr merge lp:~bialix/bzr/2.2-bug-523069
Reviewer Review Type Date Requested Status
Andrew Bennetts 2010-09-18 Approve on 2010-09-21
Review via email: mp+35915@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
Alexander Belchenko (bialix) wrote :

This is the same fix as for 2.1 branch, just replayed on top of 2.2 branch.

Andrew Bennetts (spiv) :
review: Approve
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 2010-06-02 05:03:31 +0000
3+++ doc/en/user-guide/branching_a_project.txt 2010-09-20 07:35:56 +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/urlspec-help.html>`_
10 section of the Bazaar User Reference.
11
12 URLs are normally resolved relative to the root directory of the server,
13
14=== modified file 'doc/en/user-guide/configuring_bazaar.txt'
15--- doc/en/user-guide/configuring_bazaar.txt 2010-07-07 01:55:26 +0000
16+++ doc/en/user-guide/configuring_bazaar.txt 2010-09-20 07:35:56 +0000
17@@ -66,7 +66,7 @@
18 email = Your Name <email@example.com>
19
20 For further details on the syntax and configuration settings supported, see
21-`Configuration Settings <../user-reference/bzr_man.html#configuration-settings>`_
22+`Configuration Settings <../user-reference/configuration-help.html>`_
23 in the Bazaar User Reference.
24
25
26@@ -78,5 +78,5 @@
27 ``BZR_HOME/rules``.
28
29 For further information on how rules are searched and the detailed syntax of
30-the relevant files, see `Rules <../user-reference/bzr_man.html#rules>`_
31+the relevant files, see `Rules <../user-reference/rules-help.html>`_
32 in the Bazaar User Reference.
33
34=== modified file 'doc/en/user-guide/plugins.txt'
35--- doc/en/user-guide/plugins.txt 2010-08-13 19:08:57 +0000
36+++ doc/en/user-guide/plugins.txt 2010-09-20 07:35:56 +0000
37@@ -59,8 +59,8 @@
38 If you have the necessary permissions, plugins can also be installed on a
39 system-wide basis. One can additionally override the personal plugins
40 location by setting the environment variable ``BZR_PLUGIN_PATH`` (see `User
41-Reference <../user-reference/bzr_man.html#bzr-plugin-path>`_ for a detailed
42-explanation).
43+Reference <../user-reference/configuration-help.html#bzr-plugin-path>`_
44+for a detailed explanation).
45
46 Listing the installed plugins
47 -----------------------------
48
49=== modified file 'doc/en/user-guide/sending_changes.txt'
50--- doc/en/user-guide/sending_changes.txt 2009-12-02 20:34:07 +0000
51+++ doc/en/user-guide/sending_changes.txt 2010-09-20 07:35:56 +0000
52@@ -42,7 +42,7 @@
53 ``send`` without options will create a merge directive, fire up your email
54 tool and attach it, ready for you to add the explanatory text bit.
55 (See the online help for ``send`` and
56-`Configuration Settings <../user-reference/bzr_man.html#configuration-settings>`_
57+`Configuration Settings <../user-reference/configuration-help.html>`_
58 in the User Reference for further details on how to configure this.)
59
60 Most projects like people to add some explanation to the mail along with
61
62=== modified file 'doc/en/user-guide/setting_up_email.txt'
63--- doc/en/user-guide/setting_up_email.txt 2010-06-02 05:03:31 +0000
64+++ doc/en/user-guide/setting_up_email.txt 2010-09-20 07:35:56 +0000
65@@ -74,7 +74,7 @@
66 For more information on the ini file format, see `Configuration Settings`_ in
67 the Bazaar User Reference.
68
69-.. _Configuration Settings: ../user-reference/bzr_man.html#configuration-settings
70+.. _Configuration Settings: ../user-reference/configuration-help.html
71
72 Setting email on a per-branch basis
73 -----------------------------------
74
75=== modified file 'doc/en/user-guide/specifying_revisions.txt'
76--- doc/en/user-guide/specifying_revisions.txt 2009-12-02 23:09:40 +0000
77+++ doc/en/user-guide/specifying_revisions.txt 2010-09-20 07:35:56 +0000
78@@ -65,7 +65,7 @@
79 For complete details, see `Revision Identifiers`_ in the
80 Bazaar User Reference.
81
82-.. _Revision Identifiers: ../user-reference/bzr_man.html#revision-identifiers
83+.. _Revision Identifiers: ../user-reference/revisionspec-help.html
84
85 Numbers
86 ~~~~~~~
87
88=== modified file 'doc/en/user-guide/version_info.txt'
89--- doc/en/user-guide/version_info.txt 2010-06-02 05:03:31 +0000
90+++ doc/en/user-guide/version_info.txt 2010-09-20 07:35:56 +0000
91@@ -87,7 +87,7 @@
92 variables that can be used in templates, see `Version Info`_ in the
93 Bazaar User Reference.
94
95-.. _Version Info: ../user-reference/bzr_man.html#version-info
96+.. _Version Info: ../user-reference/version-info-help.html
97
98 Predefined formats for dumping version information in specific languages
99 are currently in development. Please contact us on the mailing list about
100
101=== modified file 'doc/en/user-guide/writing_a_plugin.txt'
102--- doc/en/user-guide/writing_a_plugin.txt 2010-04-21 07:52:31 +0000
103+++ doc/en/user-guide/writing_a_plugin.txt 2010-09-20 07:35:56 +0000
104@@ -42,8 +42,8 @@
105
106 Bzr will scan ``~/.bazaar/plugins`` and ``bzrlib/plugins`` for plugins
107 by default. You can override this with ``BZR_PLUGIN_PATH``
108-(see `User Reference <../user-reference/bzr_man.html#bzr-plugin-path>`_
109-for details).
110+(see `User Reference
111+<../user-reference/configuration-help.html#bzr-plugin-path>`_ for details).
112
113 Plugins may be either modules or packages. If your plugin is a single
114 file, you can structure it as a module. If it has multiple files, or if

Subscribers

People subscribed via source and target branches