Bazaar

Merge lp:~mbp/bzr/doc into lp:bzr

  1. doc
  2. Merge into bzr.dev
Proposed by Martin Pool
Status: Merged
Approved by: John A Meinel
Approved revision: no longer in the source branch.
Merged at revision: not available
Proposed branch: lp:~mbp/bzr/doc
Merge into: lp:bzr
Diff against target: 439 lines (+58/-80)
20 files modified
INSTALL (+3/-2)
Makefile (+1/-16)
README (+13/-14)
bzrlib/builtins.py (+8/-11)
bzrlib/bzrdir.py (+6/-10)
bzrlib/doc_generate/autodoc_man.py (+2/-2)
bzrlib/help_topics/__init__.py (+1/-1)
bzrlib/plugins/launchpad/lp_registration.py (+1/-1)
bzrlib/tests/test_http.py (+3/-3)
bzrlib/version.py (+1/-1)
doc/developers/_templates/layout.html (+2/-2)
doc/en/_static/en/bzr-en-quick-reference.svg (+2/-2)
doc/en/_templates/index.html (+3/-3)
doc/en/_templates/layout.html (+2/-2)
doc/es/_static/es/bzr-es-quick-reference.svg (+2/-2)
doc/es/_templates/layout.html (+2/-2)
doc/ru/_static/ru/bzr-ru-quick-reference.svg (+2/-2)
doc/ru/_templates/layout.html (+2/-2)
setup.py (+1/-1)
tools/win32/bzr_postinstall.py (+1/-1)
To merge this branch: bzr merge lp:~mbp/bzr/doc
Reviewer Review Type Date Requested Status
John A Meinel Needs Fixing
Review via email: mp+18250@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Martin Pool (mbp) wrote :

This fixes urls in the docs and source

 * bazaar-vcs.org -> bazaar.canonical.com
 * wiki pages on there to wiki.b.c.c
 * spanish docs should link to the spanish top-level page
 * some other small corrections

It doesn't change most uses of our url as test data.

The change is not just mechanical so please read it carefully.

thanks

Revision history for this message
John A Meinel (jameinel) wrote :

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Martin Pool wrote:
> Martin Pool has proposed merging lp:~mbp/bzr/doc into lp:bzr.
>
> Requested reviews:
> bzr-core (bzr-core)
> Related bugs:
> #512385 Broken link to "quick start card" in online user guide
> https://bugs.launchpad.net/bugs/512385
>
>
> This fixes urls in the docs and source
>
> * bazaar-vcs.org -> bazaar.canonical.com
> * wiki pages on there to wiki.b.c.c
> * spanish docs should link to the spanish top-level page
> * some other small corrections
>
> It doesn't change most uses of our url as test data.
>
> The change is not just mechanical so please read it carefully.
>
> thanks
>

+Ready-to-install packages are available for most popular operating
systems from
+<http://www.bazaar.canonical.com/Download/> or you can install from
source by
+following the instructions in the INSTALL file.

^- http://wiki.bazaar.canonical.com/Download

=== modified file 'doc/es/_templates/layout.html'
- --- doc/es/_templates/layout.html 2009-10-30 07:51:16 +0000
+++ doc/es/_templates/layout.html 2010-01-29 10:56:19 +0000
@@ -1,9 +1,9 @@
 {% extends "!layout.html" %}

 {% block rootrellink %}
- -<li><a href="http://bazaar-vcs.org/">
+<li><a href="http://bazaar.canonical.com/">
     <img src="{{ pathto("_static/bzr icon 16.png", 1) }}" />
Inicio</a>&nbsp;|&nbsp;</li>
- -<a
href="http://doc.bazaar-vcs.org/en/">Documentación</a>&nbsp;|&nbsp;</li>
+<a
href="http://doc.bazaar.canonical.com/es/">Documentación</a>&nbsp;|&nbsp;</li>

^- There is no: http://doc.bazaar.canonical.com/es/
Not sure what to do with that. Are we just missing a step in the build
process. The /ru change seems to be correct, though.

I checked all the other links, and they seem ok.

 review: needs_fixing
 merge: approve

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAktiwMIACgkQJdeBCYSNAAPk9QCgwZurXUdjAPcHi5fINksAVYnV
F4kAnjoIaWKhy/wMkoFW0AcTQbkkmv5h
=THDk
-----END PGP SIGNATURE-----

review: Needs Fixing
Revision history for this message
Martin Pool (mbp) wrote :

I filed https://bugs.edge.launchpad.net/bzr-alldocs/+bug/514312 for not having top level Spanish pages, and I'll revert that.

Thanks for the review.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'INSTALL'
2--- INSTALL 2007-08-16 00:54:00 +0000
3+++ INSTALL 2010-01-29 14:12:18 +0000
4@@ -43,5 +43,6 @@
5 python setup.py install
6
7 For more information on installation, see
8-http://bazaar-vcs.org/InstallationFaq
9-or write to bazaar@lists.canonical.com.
10+<http://wiki.bazaar.canonical.com/InstallationFaq>
11+or write to bazaar@lists.canonical.com, or ask a question at
12+<https://answers.launchpad.net/bzr/>.
13
14=== modified file 'Makefile'
15--- Makefile 2010-01-07 06:44:05 +0000
16+++ Makefile 2010-01-29 14:12:18 +0000
17@@ -406,7 +406,7 @@
18
19 ### Packaging Targets ###
20
21-.PHONY: dist dist-upload-escudero check-dist-tarball
22+.PHONY: dist check-dist-tarball
23
24 # build a distribution source tarball
25 #
26@@ -434,18 +434,3 @@
27 tar Cxz $$tmpdir -f $$tarball && \
28 $(MAKE) -C $$tmpdir/bzr-$$version check && \
29 rm -rf $$tmpdir
30-
31-
32-# upload previously built tarball to the download directory on bazaar-vcs.org,
33-# and verify that it can be downloaded ok.
34-dist-upload-escudero:
35- version=`./bzr version --short` && \
36- tarball=../bzr-$$version.tar.gz && \
37- scp $$tarball $$tarball.sig \
38- escudero.ubuntu.com:/srv/bazaar.canonical.com/www/releases/src \
39- && \
40- echo verifying over http... && \
41- curl http://bazaar-vcs.org/releases/src/bzr-$$version.tar.gz \
42- | diff -s - $$tarball && \
43- curl http://bazaar-vcs.org/releases/src/bzr-$$version.tar.gz.sig \
44- | diff -s - $$tarball.sig
45
46=== modified file 'README'
47--- README 2009-10-06 07:41:02 +0000
48+++ README 2010-01-29 14:12:18 +0000
49@@ -3,25 +3,24 @@
50 =================
51
52 Bazaar (``bzr``) is a decentralized revision control system, designed to be
53-easy for developers and end users alike. Bazaar is part of the GNU project
54-to develop a complete free operating system.
55-
56-To install Bazaar, follow the instructions given at
57-http://bazaar-vcs.org/Download. Ready-to-install packages are available
58-for most popular operating systems or you can install from source.
59-
60-To learn how to use Bazaar, see the official documentation at:
61-
62- http://doc.bazaar-vcs.org/en/
63+easy for developers and end users alike. Bazaar is part of the GNU project to
64+develop a complete free operating system <http://www.gnu.org/>, and a project
65+of Canonical <http://www.canonical.com/>.
66+
67+Ready-to-install packages are available for most popular operating systems from
68+<http://wiki.bazaar.canonical.com/Download/> or you can install from source by
69+following the instructions in the INSTALL file.
70+
71+To learn how to use Bazaar, see the official documentation in the `doc`
72+directory or at <http://doc.bazaar.canonical.com/en/>.
73
74 For additional training materials including screencasts and slides,
75 visit our community wiki documentation page at:
76
77- http://bazaar-vcs.org/Documentation/
78+ http://wiki.bazaar.canonical.com/Documentation/
79
80-Bazaar is written in Python, and is sponsored by Canonical Limited, the
81-founders of Ubuntu and Launchpad. Bazaar is Free Software, and is released
82-under the GNU General Public License.
83+Bazaar is Free Software, and is released under the GNU General Public License,
84+version 2 or later.
85
86 Bazaar highlights
87 =================
88
89=== modified file 'bzrlib/builtins.py'
90--- bzrlib/builtins.py 2010-01-22 14:32:37 +0000
91+++ bzrlib/builtins.py 2010-01-29 14:12:18 +0000
92@@ -2191,13 +2191,10 @@
93 :Tips & tricks:
94
95 GUI tools and IDEs are often better at exploring history than command
96- line tools. You may prefer qlog or viz from the QBzr and Bzr-Gtk packages
97- respectively for example. (TortoiseBzr uses qlog for displaying logs.) See
98- http://bazaar-vcs.org/BzrPlugins and http://bazaar-vcs.org/IDEIntegration.
99-
100- Web interfaces are often better at exploring history than command line
101- tools, particularly for branches on servers. You may prefer Loggerhead
102- or one of its alternatives. See http://bazaar-vcs.org/WebInterface.
103+ line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the
104+ bzr-explorer shell, or the Loggerhead web interface. See the Plugin
105+ Guide <http://doc.bazaar.canonical.com/plugins/en/> and
106+ <http://wiki.bazaar.canonical.com/IDEIntegration>.
107
108 You may find it useful to add the aliases below to ``bazaar.conf``::
109
110@@ -4408,10 +4405,10 @@
111 adding new commands, providing additional network transports and
112 customizing log output.
113
114- See the Bazaar web site, http://bazaar-vcs.org, for further
115- information on plugins including where to find them and how to
116- install them. Instructions are also provided there on how to
117- write new plugins using the Python programming language.
118+ See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>
119+ for further information on plugins including where to find them and how to
120+ install them. Instructions are also provided there on how to write new
121+ plugins using the Python programming language.
122 """
123 takes_options = ['verbose']
124
125
126=== modified file 'bzrlib/bzrdir.py'
127--- bzrlib/bzrdir.py 2010-01-20 23:28:35 +0000
128+++ bzrlib/bzrdir.py 2010-01-29 14:12:18 +0000
129@@ -3772,9 +3772,7 @@
130 help='New in 0.92: Pack-based format with data compatible with '
131 'dirstate-tags format repositories. Interoperates with '
132 'bzr repositories before 0.92 but cannot be read by bzr < 0.92. '
133- 'Previously called knitpack-experimental. '
134- 'For more information, see '
135- 'http://doc.bazaar-vcs.org/latest/developers/packrepo.html.',
136+ ,
137 branch_format='bzrlib.branch.BzrBranchFormat6',
138 tree_format='bzrlib.workingtree.WorkingTreeFormat4',
139 )
140@@ -3783,9 +3781,7 @@
141 help='New in 0.92: Pack-based format with data compatible with '
142 'dirstate-with-subtree format repositories. Interoperates with '
143 'bzr repositories before 0.92 but cannot be read by bzr < 0.92. '
144- 'Previously called knitpack-experimental. '
145- 'For more information, see '
146- 'http://doc.bazaar-vcs.org/latest/developers/packrepo.html.',
147+ ,
148 branch_format='bzrlib.branch.BzrBranchFormat6',
149 tree_format='bzrlib.workingtree.WorkingTreeFormat4',
150 hidden=True,
151@@ -3853,7 +3849,7 @@
152 'to and from rich-root-pack (and anything compatible with '
153 'rich-root-pack) format repositories. Repositories and branches in '
154 'this format can only be read by bzr.dev. Please read '
155- 'http://doc.bazaar-vcs.org/latest/developers/development-repo.html '
156+ 'http://doc.bazaar.canonical.com/latest/developers/development-repo.html '
157 'before use.',
158 branch_format='bzrlib.branch.BzrBranchFormat7',
159 tree_format='bzrlib.workingtree.WorkingTreeFormat6',
160@@ -3867,7 +3863,7 @@
161 'from pack-0.92-subtree (and anything compatible with '
162 'pack-0.92-subtree) format repositories. Repositories and branches in '
163 'this format can only be read by bzr.dev. Please read '
164- 'http://doc.bazaar-vcs.org/latest/developers/development-repo.html '
165+ 'http://doc.bazaar.canonical.com/latest/developers/development-repo.html '
166 'before use.',
167 branch_format='bzrlib.branch.BzrBranchFormat7',
168 tree_format='bzrlib.workingtree.WorkingTreeFormat6',
169@@ -3883,7 +3879,7 @@
170 'bzrlib.repofmt.groupcompress_repo.RepositoryFormatCHK1',
171 help='pack-1.9 with 255-way hashed CHK inv, group compress, rich roots '
172 'Please read '
173- 'http://doc.bazaar-vcs.org/latest/developers/development-repo.html '
174+ 'http://doc.bazaar.canonical.com/latest/developers/development-repo.html '
175 'before use.',
176 branch_format='bzrlib.branch.BzrBranchFormat7',
177 tree_format='bzrlib.workingtree.WorkingTreeFormat6',
178@@ -3895,7 +3891,7 @@
179 'bzrlib.repofmt.groupcompress_repo.RepositoryFormatCHK2',
180 help='pack-1.9 with 255-way hashed CHK inv, bencode revision, group compress, '
181 'rich roots. Please read '
182- 'http://doc.bazaar-vcs.org/latest/developers/development-repo.html '
183+ 'http://doc.bazaar.canonical.com/latest/developers/development-repo.html '
184 'before use.',
185 branch_format='bzrlib.branch.BzrBranchFormat7',
186 tree_format='bzrlib.workingtree.WorkingTreeFormat6',
187
188=== modified file 'bzrlib/doc_generate/autodoc_man.py'
189--- bzrlib/doc_generate/autodoc_man.py 2009-11-04 12:25:49 +0000
190+++ bzrlib/doc_generate/autodoc_man.py 2010-01-29 14:12:18 +0000
191@@ -241,7 +241,7 @@
192 .br
193 log10 = log --short -r -10..-1
194 .SH "SEE ALSO"
195-.UR http://www.bazaar-vcs.org/
196-.BR http://www.bazaar-vcs.org/
197+.UR http://www.bazaar.canonical.com/
198+.BR http://www.bazaar.canonical.com/
199 """
200
201
202=== modified file 'bzrlib/help_topics/__init__.py'
203--- bzrlib/help_topics/__init__.py 2010-01-20 14:53:08 +0000
204+++ bzrlib/help_topics/__init__.py 2010-01-29 14:12:18 +0000
205@@ -276,7 +276,7 @@
206
207 _basic_help = \
208 """Bazaar -- a free distributed version-control tool
209-http://bazaar-vcs.org/
210+http://www.bazaar.canonical.com/
211
212 Basic commands:
213 bzr init makes this directory a versioned branch
214
215=== modified file 'bzrlib/plugins/launchpad/lp_registration.py'
216--- bzrlib/plugins/launchpad/lp_registration.py 2009-12-09 09:20:42 +0000
217+++ bzrlib/plugins/launchpad/lp_registration.py 2010-01-29 14:12:18 +0000
218@@ -81,7 +81,7 @@
219 class LaunchpadService(object):
220 """A service to talk to Launchpad via XMLRPC.
221
222- See http://bazaar-vcs.org/Specs/LaunchpadRpc for the methods we can call.
223+ See http://wiki.bazaar.canonical.com/Specs/LaunchpadRpc for the methods we can call.
224 """
225
226 LAUNCHPAD_DOMAINS = {
227
228=== modified file 'bzrlib/tests/test_http.py'
229--- bzrlib/tests/test_http.py 2010-01-25 17:48:22 +0000
230+++ bzrlib/tests/test_http.py 2010-01-29 14:12:18 +0000
231@@ -391,10 +391,10 @@
232 self.assertEqual('http://example.com', url)
233 self.assertEqual(0, len(f.credentials))
234 url = http.extract_auth(
235- 'http://user:pass@www.bazaar-vcs.org/bzr/bzr.dev', f)
236- self.assertEqual('http://www.bazaar-vcs.org/bzr/bzr.dev', url)
237+ 'http://user:pass@example.com/bzr/bzr.dev', f)
238+ self.assertEqual('http://example.com/bzr/bzr.dev', url)
239 self.assertEqual(1, len(f.credentials))
240- self.assertEqual([None, 'www.bazaar-vcs.org', 'user', 'pass'],
241+ self.assertEqual([None, 'example.com', 'user', 'pass'],
242 f.credentials[0])
243
244
245
246=== modified file 'bzrlib/version.py'
247--- bzrlib/version.py 2009-12-10 00:13:16 +0000
248+++ bzrlib/version.py 2010-01-29 14:12:18 +0000
249@@ -83,7 +83,7 @@
250 if show_copyright:
251 to_file.write('\n')
252 to_file.write(bzrlib.__copyright__ + '\n')
253- to_file.write("http://bazaar-vcs.org/\n")
254+ to_file.write("http://bazaar.canonical.com/\n")
255 to_file.write('\n')
256 to_file.write("bzr comes with ABSOLUTELY NO WARRANTY. bzr is free software, and\n")
257 to_file.write("you may use, modify and redistribute it under the terms of the GNU\n")
258
259=== modified file 'doc/developers/_templates/layout.html'
260--- doc/developers/_templates/layout.html 2009-11-18 02:08:40 +0000
261+++ doc/developers/_templates/layout.html 2010-01-29 14:12:18 +0000
262@@ -6,9 +6,9 @@
263 {% endblock %}
264
265 {% block rootrellink %}
266-<li><a href="http://bazaar-vcs.org/">
267+<li><a href="http://bazaar.canonical.com/">
268 <img src="{{ pathto("_static/bzr icon 16.png", 1) }}" /> Home</a>&nbsp;|&nbsp;</li>
269-<a href="http://doc.bazaar-vcs.org/en/">Documentation</a>&nbsp;|&nbsp;</li>
270+<a href="http://doc.bazaar.canonical.com/en/">Documentation</a>&nbsp;|&nbsp;</li>
271 {{ super() }}
272 {% endblock %}
273
274
275=== modified file 'doc/en/_static/en/bzr-en-quick-reference.svg'
276--- doc/en/_static/en/bzr-en-quick-reference.svg 2009-09-09 00:49:50 +0000
277+++ doc/en/_static/en/bzr-en-quick-reference.svg 2010-01-29 14:12:18 +0000
278@@ -1579,7 +1579,7 @@
279 <a
280 id="a6316"
281 style="fill:#333333;fill-opacity:1"
282- xlink:href="http://bazaar-vcs.org">
283+ xlink:href="http://bazaar.canonical.com">
284 <text
285 sodipodi:linespacing="100%"
286 id="text6302"
287@@ -1590,7 +1590,7 @@
288 y="97.901367"
289 x="787.79535"
290 id="tspan6304"
291- sodipodi:role="line">http://bazaar-vcs.org</tspan></text>
292+ sodipodi:role="line">http://bazaar.canonical.com</tspan></text>
293 </a>
294 </g>
295 </g>
296
297=== modified file 'doc/en/_templates/index.html'
298--- doc/en/_templates/index.html 2010-01-08 00:27:40 +0000
299+++ doc/en/_templates/index.html 2010-01-29 14:12:18 +0000
300@@ -39,7 +39,7 @@
301 <p class="biglink"><a class="biglink" href="https://answers.launchpad.net/bzr/+faqs">FAQ</a><br/>
302 <span class="linkdescr">frequently asked questions</span>
303 </p>
304- <p class="biglink"><a class="biglink" href="http://bazaar-vcs.org/BzrGlossary/">Glossary</a><br/>
305+ <p class="biglink"><a class="biglink" href="http://bazaar.canonical.com/BzrGlossary/">Glossary</a><br/>
306 <span class="linkdescr">help with terminology</span>
307 </p>
308 <p class="biglink"><a class="biglink" href="../developers/">Developer Docs</a><br/>
309@@ -47,10 +47,10 @@
310 </p>
311 </td>
312 <td width="50%">
313- <p class="biglink"><a class="biglink" href="http://doc.bazaar-vcs.org/migration/en/">Migration Docs</a><br/>
314+ <p class="biglink"><a class="biglink" href="http://doc.bazaar.canonical.com/migration/en/">Migration Docs</a><br/>
315 <span class="linkdescr">for refugees of other tools</span>
316 </p>
317- <p class="biglink"><a class="biglink" href="http://doc.bazaar-vcs.org/plugins/en/">Plugins Guide</a><br/>
318+ <p class="biglink"><a class="biglink" href="http://doc.bazaar.canonical.com/plugins/en/">Plugins Guide</a><br/>
319 <span class="linkdescr">help on popular plugins</span>
320 </p>
321 </td></tr>
322
323=== modified file 'doc/en/_templates/layout.html'
324--- doc/en/_templates/layout.html 2009-10-30 07:51:16 +0000
325+++ doc/en/_templates/layout.html 2010-01-29 14:12:18 +0000
326@@ -1,9 +1,9 @@
327 {% extends "!layout.html" %}
328
329 {% block rootrellink %}
330-<li><a href="http://bazaar-vcs.org/">
331+<li><a href="http://bazaar.canonical.com/">
332 <img src="{{ pathto("_static/bzr icon 16.png", 1) }}" /> Home</a>&nbsp;|&nbsp;</li>
333-<a href="http://doc.bazaar-vcs.org/en/">Documentation</a>&nbsp;|&nbsp;</li>
334+<a href="http://doc.bazaar.canonical.com/en/">Documentation</a>&nbsp;|&nbsp;</li>
335 {{ super() }}
336 {% endblock %}
337
338
339=== modified file 'doc/es/_static/es/bzr-es-quick-reference.svg'
340--- doc/es/_static/es/bzr-es-quick-reference.svg 2009-09-09 00:49:50 +0000
341+++ doc/es/_static/es/bzr-es-quick-reference.svg 2010-01-29 14:12:18 +0000
342@@ -1672,7 +1672,7 @@
343 <a
344 id="a6316"
345 style="fill:#333333;fill-opacity:1"
346- xlink:href="http://bazaar-vcs.org">
347+ xlink:href="http://bazaar.canonical.com">
348 <text
349 sodipodi:linespacing="100%"
350 id="text6302"
351@@ -1683,7 +1683,7 @@
352 y="97.901367"
353 x="787.79535"
354 id="tspan6304"
355- sodipodi:role="line">http://bazaar-vcs.org</tspan></text>
356+ sodipodi:role="line">http://bazaar.canonical.com</tspan></text>
357 </a>
358 </g>
359 </g>
360
361=== modified file 'doc/es/_templates/layout.html'
362--- doc/es/_templates/layout.html 2009-10-30 07:51:16 +0000
363+++ doc/es/_templates/layout.html 2010-01-29 14:12:18 +0000
364@@ -1,9 +1,9 @@
365 {% extends "!layout.html" %}
366
367 {% block rootrellink %}
368-<li><a href="http://bazaar-vcs.org/">
369+<li><a href="http://bazaar.canonical.com/">
370 <img src="{{ pathto("_static/bzr icon 16.png", 1) }}" /> Inicio</a>&nbsp;|&nbsp;</li>
371-<a href="http://doc.bazaar-vcs.org/en/">Documentación</a>&nbsp;|&nbsp;</li>
372+<a href="http://doc.bazaar.canonical.com/">Documentación</a>&nbsp;|&nbsp;</li>
373 {{ super() }}
374 {% endblock %}
375
376
377=== modified file 'doc/ru/_static/ru/bzr-ru-quick-reference.svg'
378--- doc/ru/_static/ru/bzr-ru-quick-reference.svg 2009-09-09 00:49:50 +0000
379+++ doc/ru/_static/ru/bzr-ru-quick-reference.svg 2010-01-29 14:12:18 +0000
380@@ -1582,7 +1582,7 @@
381 <a
382 id="a6316"
383 style="fill:#333333;fill-opacity:1"
384- xlink:href="http://bazaar-vcs.org">
385+ xlink:href="http://bazaar.canonical.com">
386 <text
387 sodipodi:linespacing="100%"
388 id="text6302"
389@@ -1593,7 +1593,7 @@
390 y="97.901367"
391 x="787.79535"
392 id="tspan6304"
393- sodipodi:role="line">http://bazaar-vcs.org</tspan></text>
394+ sodipodi:role="line">http://bazaar.canonical.com</tspan></text>
395 </a>
396 </g>
397 </g>
398
399=== modified file 'doc/ru/_templates/layout.html'
400--- doc/ru/_templates/layout.html 2009-10-30 07:51:16 +0000
401+++ doc/ru/_templates/layout.html 2010-01-29 14:12:18 +0000
402@@ -1,9 +1,9 @@
403 {% extends "!layout.html" %}
404
405 {% block rootrellink %}
406-<li><a href="http://bazaar-vcs.org/">
407+<li><a href="http://bazaar.canonical.com/">
408 <img src="{{ pathto("_static/bzr icon 16.png", 1) }}" /> Главная</a>&nbsp;|&nbsp;</li>
409-<a href="http://doc.bazaar-vcs.org/ru/">Документация</a>&nbsp;|&nbsp;</li>
410+<a href="http://doc.bazaar.canonical.com/ru/">Документация</a>&nbsp;|&nbsp;</li>
411 {{ super() }}
412 {% endblock %}
413
414
415=== modified file 'setup.py'
416--- setup.py 2010-01-12 06:30:41 +0000
417+++ setup.py 2010-01-29 14:12:18 +0000
418@@ -37,7 +37,7 @@
419 'version': bzrlib.__version__,
420 'author': 'Canonical Ltd',
421 'author_email': 'bazaar@lists.canonical.com',
422- 'url': 'http://www.bazaar-vcs.org/',
423+ 'url': 'http://www.bazaar.canonical.com/',
424 'description': 'Friendly distributed version control system',
425 'license': 'GNU GPL v2',
426 'download_url': 'https://launchpad.net/bzr/+download',
427
428=== modified file 'tools/win32/bzr_postinstall.py'
429--- tools/win32/bzr_postinstall.py 2009-03-23 14:59:43 +0000
430+++ tools/win32/bzr_postinstall.py 2010-01-29 14:12:18 +0000
431@@ -341,7 +341,7 @@
432 "this library manually and put it to directory\n"
433 "where Bzr installed.\n"
434 "For detailed instructions see:\n"
435- "http://bazaar-vcs.org/BzrOnPureWindows"
436+ "http://wiki.bazaar.canonical.com/BzrOnPureWindows"
437 ),
438 "Warning",
439 MB_OK | MB_ICONEXCLAMATION)