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
=== modified file 'INSTALL'
--- INSTALL 2007-08-16 00:54:00 +0000
+++ INSTALL 2010-01-29 14:12:18 +0000
@@ -43,5 +43,6 @@
43 python setup.py install43 python setup.py install
4444
45For more information on installation, see45For more information on installation, see
46http://bazaar-vcs.org/InstallationFaq46<http://wiki.bazaar.canonical.com/InstallationFaq>
47or write to bazaar@lists.canonical.com.47or write to bazaar@lists.canonical.com, or ask a question at
48<https://answers.launchpad.net/bzr/>.
4849
=== modified file 'Makefile'
--- Makefile 2010-01-07 06:44:05 +0000
+++ Makefile 2010-01-29 14:12:18 +0000
@@ -406,7 +406,7 @@
406406
407### Packaging Targets ###407### Packaging Targets ###
408408
409.PHONY: dist dist-upload-escudero check-dist-tarball409.PHONY: dist check-dist-tarball
410410
411# build a distribution source tarball411# build a distribution source tarball
412#412#
@@ -434,18 +434,3 @@
434 tar Cxz $$tmpdir -f $$tarball && \434 tar Cxz $$tmpdir -f $$tarball && \
435 $(MAKE) -C $$tmpdir/bzr-$$version check && \435 $(MAKE) -C $$tmpdir/bzr-$$version check && \
436 rm -rf $$tmpdir436 rm -rf $$tmpdir
437
438
439# upload previously built tarball to the download directory on bazaar-vcs.org,
440# and verify that it can be downloaded ok.
441dist-upload-escudero:
442 version=`./bzr version --short` && \
443 tarball=../bzr-$$version.tar.gz && \
444 scp $$tarball $$tarball.sig \
445 escudero.ubuntu.com:/srv/bazaar.canonical.com/www/releases/src \
446 && \
447 echo verifying over http... && \
448 curl http://bazaar-vcs.org/releases/src/bzr-$$version.tar.gz \
449 | diff -s - $$tarball && \
450 curl http://bazaar-vcs.org/releases/src/bzr-$$version.tar.gz.sig \
451 | diff -s - $$tarball.sig
452437
=== modified file 'README'
--- README 2009-10-06 07:41:02 +0000
+++ README 2010-01-29 14:12:18 +0000
@@ -3,25 +3,24 @@
3=================3=================
44
5Bazaar (``bzr``) is a decentralized revision control system, designed to be5Bazaar (``bzr``) is a decentralized revision control system, designed to be
6easy for developers and end users alike. Bazaar is part of the GNU project6easy for developers and end users alike. Bazaar is part of the GNU project to
7to develop a complete free operating system.7develop a complete free operating system <http://www.gnu.org/>, and a project
88of Canonical <http://www.canonical.com/>.
9To install Bazaar, follow the instructions given at9
10http://bazaar-vcs.org/Download. Ready-to-install packages are available10Ready-to-install packages are available for most popular operating systems from
11for most popular operating systems or you can install from source.11<http://wiki.bazaar.canonical.com/Download/> or you can install from source by
1212following the instructions in the INSTALL file.
13To learn how to use Bazaar, see the official documentation at:13
1414To learn how to use Bazaar, see the official documentation in the `doc`
15 http://doc.bazaar-vcs.org/en/15directory or at <http://doc.bazaar.canonical.com/en/>.
1616
17For additional training materials including screencasts and slides,17For additional training materials including screencasts and slides,
18visit our community wiki documentation page at:18visit our community wiki documentation page at:
1919
20 http://bazaar-vcs.org/Documentation/20 http://wiki.bazaar.canonical.com/Documentation/
2121
22Bazaar is written in Python, and is sponsored by Canonical Limited, the22Bazaar is Free Software, and is released under the GNU General Public License,
23founders of Ubuntu and Launchpad. Bazaar is Free Software, and is released23version 2 or later.
24under the GNU General Public License.
2524
26Bazaar highlights25Bazaar highlights
27=================26=================
2827
=== modified file 'bzrlib/builtins.py'
--- bzrlib/builtins.py 2010-01-22 14:32:37 +0000
+++ bzrlib/builtins.py 2010-01-29 14:12:18 +0000
@@ -2191,13 +2191,10 @@
2191 :Tips & tricks:2191 :Tips & tricks:
21922192
2193 GUI tools and IDEs are often better at exploring history than command2193 GUI tools and IDEs are often better at exploring history than command
2194 line tools. You may prefer qlog or viz from the QBzr and Bzr-Gtk packages2194 line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the
2195 respectively for example. (TortoiseBzr uses qlog for displaying logs.) See2195 bzr-explorer shell, or the Loggerhead web interface. See the Plugin
2196 http://bazaar-vcs.org/BzrPlugins and http://bazaar-vcs.org/IDEIntegration.2196 Guide <http://doc.bazaar.canonical.com/plugins/en/> and
21972197 <http://wiki.bazaar.canonical.com/IDEIntegration>.
2198 Web interfaces are often better at exploring history than command line
2199 tools, particularly for branches on servers. You may prefer Loggerhead
2200 or one of its alternatives. See http://bazaar-vcs.org/WebInterface.
22012198
2202 You may find it useful to add the aliases below to ``bazaar.conf``::2199 You may find it useful to add the aliases below to ``bazaar.conf``::
22032200
@@ -4408,10 +4405,10 @@
4408 adding new commands, providing additional network transports and4405 adding new commands, providing additional network transports and
4409 customizing log output.4406 customizing log output.
44104407
4411 See the Bazaar web site, http://bazaar-vcs.org, for further4408 See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>
4412 information on plugins including where to find them and how to4409 for further information on plugins including where to find them and how to
4413 install them. Instructions are also provided there on how to4410 install them. Instructions are also provided there on how to write new
4414 write new plugins using the Python programming language.4411 plugins using the Python programming language.
4415 """4412 """
4416 takes_options = ['verbose']4413 takes_options = ['verbose']
44174414
44184415
=== modified file 'bzrlib/bzrdir.py'
--- bzrlib/bzrdir.py 2010-01-20 23:28:35 +0000
+++ bzrlib/bzrdir.py 2010-01-29 14:12:18 +0000
@@ -3772,9 +3772,7 @@
3772 help='New in 0.92: Pack-based format with data compatible with '3772 help='New in 0.92: Pack-based format with data compatible with '
3773 'dirstate-tags format repositories. Interoperates with '3773 'dirstate-tags format repositories. Interoperates with '
3774 'bzr repositories before 0.92 but cannot be read by bzr < 0.92. '3774 'bzr repositories before 0.92 but cannot be read by bzr < 0.92. '
3775 'Previously called knitpack-experimental. '3775 ,
3776 'For more information, see '
3777 'http://doc.bazaar-vcs.org/latest/developers/packrepo.html.',
3778 branch_format='bzrlib.branch.BzrBranchFormat6',3776 branch_format='bzrlib.branch.BzrBranchFormat6',
3779 tree_format='bzrlib.workingtree.WorkingTreeFormat4',3777 tree_format='bzrlib.workingtree.WorkingTreeFormat4',
3780 )3778 )
@@ -3783,9 +3781,7 @@
3783 help='New in 0.92: Pack-based format with data compatible with '3781 help='New in 0.92: Pack-based format with data compatible with '
3784 'dirstate-with-subtree format repositories. Interoperates with '3782 'dirstate-with-subtree format repositories. Interoperates with '
3785 'bzr repositories before 0.92 but cannot be read by bzr < 0.92. '3783 'bzr repositories before 0.92 but cannot be read by bzr < 0.92. '
3786 'Previously called knitpack-experimental. '3784 ,
3787 'For more information, see '
3788 'http://doc.bazaar-vcs.org/latest/developers/packrepo.html.',
3789 branch_format='bzrlib.branch.BzrBranchFormat6',3785 branch_format='bzrlib.branch.BzrBranchFormat6',
3790 tree_format='bzrlib.workingtree.WorkingTreeFormat4',3786 tree_format='bzrlib.workingtree.WorkingTreeFormat4',
3791 hidden=True,3787 hidden=True,
@@ -3853,7 +3849,7 @@
3853 'to and from rich-root-pack (and anything compatible with '3849 'to and from rich-root-pack (and anything compatible with '
3854 'rich-root-pack) format repositories. Repositories and branches in '3850 'rich-root-pack) format repositories. Repositories and branches in '
3855 'this format can only be read by bzr.dev. Please read '3851 'this format can only be read by bzr.dev. Please read '
3856 'http://doc.bazaar-vcs.org/latest/developers/development-repo.html '3852 'http://doc.bazaar.canonical.com/latest/developers/development-repo.html '
3857 'before use.',3853 'before use.',
3858 branch_format='bzrlib.branch.BzrBranchFormat7',3854 branch_format='bzrlib.branch.BzrBranchFormat7',
3859 tree_format='bzrlib.workingtree.WorkingTreeFormat6',3855 tree_format='bzrlib.workingtree.WorkingTreeFormat6',
@@ -3867,7 +3863,7 @@
3867 'from pack-0.92-subtree (and anything compatible with '3863 'from pack-0.92-subtree (and anything compatible with '
3868 'pack-0.92-subtree) format repositories. Repositories and branches in '3864 'pack-0.92-subtree) format repositories. Repositories and branches in '
3869 'this format can only be read by bzr.dev. Please read '3865 'this format can only be read by bzr.dev. Please read '
3870 'http://doc.bazaar-vcs.org/latest/developers/development-repo.html '3866 'http://doc.bazaar.canonical.com/latest/developers/development-repo.html '
3871 'before use.',3867 'before use.',
3872 branch_format='bzrlib.branch.BzrBranchFormat7',3868 branch_format='bzrlib.branch.BzrBranchFormat7',
3873 tree_format='bzrlib.workingtree.WorkingTreeFormat6',3869 tree_format='bzrlib.workingtree.WorkingTreeFormat6',
@@ -3883,7 +3879,7 @@
3883 'bzrlib.repofmt.groupcompress_repo.RepositoryFormatCHK1',3879 'bzrlib.repofmt.groupcompress_repo.RepositoryFormatCHK1',
3884 help='pack-1.9 with 255-way hashed CHK inv, group compress, rich roots '3880 help='pack-1.9 with 255-way hashed CHK inv, group compress, rich roots '
3885 'Please read '3881 'Please read '
3886 'http://doc.bazaar-vcs.org/latest/developers/development-repo.html '3882 'http://doc.bazaar.canonical.com/latest/developers/development-repo.html '
3887 'before use.',3883 'before use.',
3888 branch_format='bzrlib.branch.BzrBranchFormat7',3884 branch_format='bzrlib.branch.BzrBranchFormat7',
3889 tree_format='bzrlib.workingtree.WorkingTreeFormat6',3885 tree_format='bzrlib.workingtree.WorkingTreeFormat6',
@@ -3895,7 +3891,7 @@
3895 'bzrlib.repofmt.groupcompress_repo.RepositoryFormatCHK2',3891 'bzrlib.repofmt.groupcompress_repo.RepositoryFormatCHK2',
3896 help='pack-1.9 with 255-way hashed CHK inv, bencode revision, group compress, '3892 help='pack-1.9 with 255-way hashed CHK inv, bencode revision, group compress, '
3897 'rich roots. Please read '3893 'rich roots. Please read '
3898 'http://doc.bazaar-vcs.org/latest/developers/development-repo.html '3894 'http://doc.bazaar.canonical.com/latest/developers/development-repo.html '
3899 'before use.',3895 'before use.',
3900 branch_format='bzrlib.branch.BzrBranchFormat7',3896 branch_format='bzrlib.branch.BzrBranchFormat7',
3901 tree_format='bzrlib.workingtree.WorkingTreeFormat6',3897 tree_format='bzrlib.workingtree.WorkingTreeFormat6',
39023898
=== modified file 'bzrlib/doc_generate/autodoc_man.py'
--- bzrlib/doc_generate/autodoc_man.py 2009-11-04 12:25:49 +0000
+++ bzrlib/doc_generate/autodoc_man.py 2010-01-29 14:12:18 +0000
@@ -241,7 +241,7 @@
241.br241.br
242log10 = log --short -r -10..-1242log10 = log --short -r -10..-1
243.SH "SEE ALSO"243.SH "SEE ALSO"
244.UR http://www.bazaar-vcs.org/244.UR http://www.bazaar.canonical.com/
245.BR http://www.bazaar-vcs.org/245.BR http://www.bazaar.canonical.com/
246"""246"""
247247
248248
=== modified file 'bzrlib/help_topics/__init__.py'
--- bzrlib/help_topics/__init__.py 2010-01-20 14:53:08 +0000
+++ bzrlib/help_topics/__init__.py 2010-01-29 14:12:18 +0000
@@ -276,7 +276,7 @@
276276
277_basic_help = \277_basic_help = \
278"""Bazaar -- a free distributed version-control tool278"""Bazaar -- a free distributed version-control tool
279http://bazaar-vcs.org/279http://www.bazaar.canonical.com/
280280
281Basic commands:281Basic commands:
282 bzr init makes this directory a versioned branch282 bzr init makes this directory a versioned branch
283283
=== modified file 'bzrlib/plugins/launchpad/lp_registration.py'
--- bzrlib/plugins/launchpad/lp_registration.py 2009-12-09 09:20:42 +0000
+++ bzrlib/plugins/launchpad/lp_registration.py 2010-01-29 14:12:18 +0000
@@ -81,7 +81,7 @@
81class LaunchpadService(object):81class LaunchpadService(object):
82 """A service to talk to Launchpad via XMLRPC.82 """A service to talk to Launchpad via XMLRPC.
8383
84 See http://bazaar-vcs.org/Specs/LaunchpadRpc for the methods we can call.84 See http://wiki.bazaar.canonical.com/Specs/LaunchpadRpc for the methods we can call.
85 """85 """
8686
87 LAUNCHPAD_DOMAINS = {87 LAUNCHPAD_DOMAINS = {
8888
=== modified file 'bzrlib/tests/test_http.py'
--- bzrlib/tests/test_http.py 2010-01-25 17:48:22 +0000
+++ bzrlib/tests/test_http.py 2010-01-29 14:12:18 +0000
@@ -391,10 +391,10 @@
391 self.assertEqual('http://example.com', url)391 self.assertEqual('http://example.com', url)
392 self.assertEqual(0, len(f.credentials))392 self.assertEqual(0, len(f.credentials))
393 url = http.extract_auth(393 url = http.extract_auth(
394 'http://user:pass@www.bazaar-vcs.org/bzr/bzr.dev', f)394 'http://user:pass@example.com/bzr/bzr.dev', f)
395 self.assertEqual('http://www.bazaar-vcs.org/bzr/bzr.dev', url)395 self.assertEqual('http://example.com/bzr/bzr.dev', url)
396 self.assertEqual(1, len(f.credentials))396 self.assertEqual(1, len(f.credentials))
397 self.assertEqual([None, 'www.bazaar-vcs.org', 'user', 'pass'],397 self.assertEqual([None, 'example.com', 'user', 'pass'],
398 f.credentials[0])398 f.credentials[0])
399399
400400
401401
=== modified file 'bzrlib/version.py'
--- bzrlib/version.py 2009-12-10 00:13:16 +0000
+++ bzrlib/version.py 2010-01-29 14:12:18 +0000
@@ -83,7 +83,7 @@
83 if show_copyright:83 if show_copyright:
84 to_file.write('\n')84 to_file.write('\n')
85 to_file.write(bzrlib.__copyright__ + '\n')85 to_file.write(bzrlib.__copyright__ + '\n')
86 to_file.write("http://bazaar-vcs.org/\n")86 to_file.write("http://bazaar.canonical.com/\n")
87 to_file.write('\n')87 to_file.write('\n')
88 to_file.write("bzr comes with ABSOLUTELY NO WARRANTY. bzr is free software, and\n")88 to_file.write("bzr comes with ABSOLUTELY NO WARRANTY. bzr is free software, and\n")
89 to_file.write("you may use, modify and redistribute it under the terms of the GNU\n")89 to_file.write("you may use, modify and redistribute it under the terms of the GNU\n")
9090
=== modified file 'doc/developers/_templates/layout.html'
--- doc/developers/_templates/layout.html 2009-11-18 02:08:40 +0000
+++ doc/developers/_templates/layout.html 2010-01-29 14:12:18 +0000
@@ -6,9 +6,9 @@
6{% endblock %}6{% endblock %}
77
8{% block rootrellink %}8{% block rootrellink %}
9<li><a href="http://bazaar-vcs.org/">9<li><a href="http://bazaar.canonical.com/">
10 <img src="{{ pathto("_static/bzr icon 16.png", 1) }}" /> Home</a>&nbsp;|&nbsp;</li>10 <img src="{{ pathto("_static/bzr icon 16.png", 1) }}" /> Home</a>&nbsp;|&nbsp;</li>
11<a href="http://doc.bazaar-vcs.org/en/">Documentation</a>&nbsp;|&nbsp;</li>11<a href="http://doc.bazaar.canonical.com/en/">Documentation</a>&nbsp;|&nbsp;</li>
12{{ super() }}12{{ super() }}
13{% endblock %}13{% endblock %}
1414
1515
=== modified file 'doc/en/_static/en/bzr-en-quick-reference.svg'
--- doc/en/_static/en/bzr-en-quick-reference.svg 2009-09-09 00:49:50 +0000
+++ doc/en/_static/en/bzr-en-quick-reference.svg 2010-01-29 14:12:18 +0000
@@ -1579,7 +1579,7 @@
1579 <a1579 <a
1580 id="a6316"1580 id="a6316"
1581 style="fill:#333333;fill-opacity:1"1581 style="fill:#333333;fill-opacity:1"
1582 xlink:href="http://bazaar-vcs.org">1582 xlink:href="http://bazaar.canonical.com">
1583 <text1583 <text
1584 sodipodi:linespacing="100%"1584 sodipodi:linespacing="100%"
1585 id="text6302"1585 id="text6302"
@@ -1590,7 +1590,7 @@
1590 y="97.901367"1590 y="97.901367"
1591 x="787.79535"1591 x="787.79535"
1592 id="tspan6304"1592 id="tspan6304"
1593 sodipodi:role="line">http://bazaar-vcs.org</tspan></text>1593 sodipodi:role="line">http://bazaar.canonical.com</tspan></text>
1594 </a>1594 </a>
1595 </g>1595 </g>
1596 </g>1596 </g>
15971597
=== modified file 'doc/en/_templates/index.html'
--- doc/en/_templates/index.html 2010-01-08 00:27:40 +0000
+++ doc/en/_templates/index.html 2010-01-29 14:12:18 +0000
@@ -39,7 +39,7 @@
39 <p class="biglink"><a class="biglink" href="https://answers.launchpad.net/bzr/+faqs">FAQ</a><br/>39 <p class="biglink"><a class="biglink" href="https://answers.launchpad.net/bzr/+faqs">FAQ</a><br/>
40 <span class="linkdescr">frequently asked questions</span>40 <span class="linkdescr">frequently asked questions</span>
41 </p>41 </p>
42 <p class="biglink"><a class="biglink" href="http://bazaar-vcs.org/BzrGlossary/">Glossary</a><br/>42 <p class="biglink"><a class="biglink" href="http://bazaar.canonical.com/BzrGlossary/">Glossary</a><br/>
43 <span class="linkdescr">help with terminology</span>43 <span class="linkdescr">help with terminology</span>
44 </p>44 </p>
45 <p class="biglink"><a class="biglink" href="../developers/">Developer Docs</a><br/>45 <p class="biglink"><a class="biglink" href="../developers/">Developer Docs</a><br/>
@@ -47,10 +47,10 @@
47 </p>47 </p>
48 </td>48 </td>
49 <td width="50%">49 <td width="50%">
50 <p class="biglink"><a class="biglink" href="http://doc.bazaar-vcs.org/migration/en/">Migration Docs</a><br/>50 <p class="biglink"><a class="biglink" href="http://doc.bazaar.canonical.com/migration/en/">Migration Docs</a><br/>
51 <span class="linkdescr">for refugees of other tools</span>51 <span class="linkdescr">for refugees of other tools</span>
52 </p>52 </p>
53 <p class="biglink"><a class="biglink" href="http://doc.bazaar-vcs.org/plugins/en/">Plugins Guide</a><br/>53 <p class="biglink"><a class="biglink" href="http://doc.bazaar.canonical.com/plugins/en/">Plugins Guide</a><br/>
54 <span class="linkdescr">help on popular plugins</span>54 <span class="linkdescr">help on popular plugins</span>
55 </p>55 </p>
56 </td></tr>56 </td></tr>
5757
=== modified file 'doc/en/_templates/layout.html'
--- doc/en/_templates/layout.html 2009-10-30 07:51:16 +0000
+++ doc/en/_templates/layout.html 2010-01-29 14:12:18 +0000
@@ -1,9 +1,9 @@
1{% extends "!layout.html" %}1{% extends "!layout.html" %}
22
3{% block rootrellink %}3{% block rootrellink %}
4<li><a href="http://bazaar-vcs.org/">4<li><a href="http://bazaar.canonical.com/">
5 <img src="{{ pathto("_static/bzr icon 16.png", 1) }}" /> Home</a>&nbsp;|&nbsp;</li>5 <img src="{{ pathto("_static/bzr icon 16.png", 1) }}" /> Home</a>&nbsp;|&nbsp;</li>
6<a href="http://doc.bazaar-vcs.org/en/">Documentation</a>&nbsp;|&nbsp;</li>6<a href="http://doc.bazaar.canonical.com/en/">Documentation</a>&nbsp;|&nbsp;</li>
7{{ super() }}7{{ super() }}
8{% endblock %}8{% endblock %}
99
1010
=== modified file 'doc/es/_static/es/bzr-es-quick-reference.svg'
--- doc/es/_static/es/bzr-es-quick-reference.svg 2009-09-09 00:49:50 +0000
+++ doc/es/_static/es/bzr-es-quick-reference.svg 2010-01-29 14:12:18 +0000
@@ -1672,7 +1672,7 @@
1672 <a1672 <a
1673 id="a6316"1673 id="a6316"
1674 style="fill:#333333;fill-opacity:1"1674 style="fill:#333333;fill-opacity:1"
1675 xlink:href="http://bazaar-vcs.org">1675 xlink:href="http://bazaar.canonical.com">
1676 <text1676 <text
1677 sodipodi:linespacing="100%"1677 sodipodi:linespacing="100%"
1678 id="text6302"1678 id="text6302"
@@ -1683,7 +1683,7 @@
1683 y="97.901367"1683 y="97.901367"
1684 x="787.79535"1684 x="787.79535"
1685 id="tspan6304"1685 id="tspan6304"
1686 sodipodi:role="line">http://bazaar-vcs.org</tspan></text>1686 sodipodi:role="line">http://bazaar.canonical.com</tspan></text>
1687 </a>1687 </a>
1688 </g>1688 </g>
1689 </g>1689 </g>
16901690
=== 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 14:12:18 +0000
@@ -1,9 +1,9 @@
1{% extends "!layout.html" %}1{% extends "!layout.html" %}
22
3{% block rootrellink %}3{% block rootrellink %}
4<li><a href="http://bazaar-vcs.org/">4<li><a href="http://bazaar.canonical.com/">
5 <img src="{{ pathto("_static/bzr icon 16.png", 1) }}" /> Inicio</a>&nbsp;|&nbsp;</li>5 <img src="{{ pathto("_static/bzr icon 16.png", 1) }}" /> Inicio</a>&nbsp;|&nbsp;</li>
6<a href="http://doc.bazaar-vcs.org/en/">Documentación</a>&nbsp;|&nbsp;</li>6<a href="http://doc.bazaar.canonical.com/">Documentación</a>&nbsp;|&nbsp;</li>
7{{ super() }}7{{ super() }}
8{% endblock %}8{% endblock %}
99
1010
=== modified file 'doc/ru/_static/ru/bzr-ru-quick-reference.svg'
--- doc/ru/_static/ru/bzr-ru-quick-reference.svg 2009-09-09 00:49:50 +0000
+++ doc/ru/_static/ru/bzr-ru-quick-reference.svg 2010-01-29 14:12:18 +0000
@@ -1582,7 +1582,7 @@
1582 <a1582 <a
1583 id="a6316"1583 id="a6316"
1584 style="fill:#333333;fill-opacity:1"1584 style="fill:#333333;fill-opacity:1"
1585 xlink:href="http://bazaar-vcs.org">1585 xlink:href="http://bazaar.canonical.com">
1586 <text1586 <text
1587 sodipodi:linespacing="100%"1587 sodipodi:linespacing="100%"
1588 id="text6302"1588 id="text6302"
@@ -1593,7 +1593,7 @@
1593 y="97.901367"1593 y="97.901367"
1594 x="787.79535"1594 x="787.79535"
1595 id="tspan6304"1595 id="tspan6304"
1596 sodipodi:role="line">http://bazaar-vcs.org</tspan></text>1596 sodipodi:role="line">http://bazaar.canonical.com</tspan></text>
1597 </a>1597 </a>
1598 </g>1598 </g>
1599 </g>1599 </g>
16001600
=== modified file 'doc/ru/_templates/layout.html'
--- doc/ru/_templates/layout.html 2009-10-30 07:51:16 +0000
+++ doc/ru/_templates/layout.html 2010-01-29 14:12:18 +0000
@@ -1,9 +1,9 @@
1{% extends "!layout.html" %}1{% extends "!layout.html" %}
22
3{% block rootrellink %}3{% block rootrellink %}
4<li><a href="http://bazaar-vcs.org/">4<li><a href="http://bazaar.canonical.com/">
5 <img src="{{ pathto("_static/bzr icon 16.png", 1) }}" /> Главная</a>&nbsp;|&nbsp;</li>5 <img src="{{ pathto("_static/bzr icon 16.png", 1) }}" /> Главная</a>&nbsp;|&nbsp;</li>
6<a href="http://doc.bazaar-vcs.org/ru/">Документация</a>&nbsp;|&nbsp;</li>6<a href="http://doc.bazaar.canonical.com/ru/">Документация</a>&nbsp;|&nbsp;</li>
7{{ super() }}7{{ super() }}
8{% endblock %}8{% endblock %}
99
1010
=== modified file 'setup.py'
--- setup.py 2010-01-12 06:30:41 +0000
+++ setup.py 2010-01-29 14:12:18 +0000
@@ -37,7 +37,7 @@
37 'version': bzrlib.__version__,37 'version': bzrlib.__version__,
38 'author': 'Canonical Ltd',38 'author': 'Canonical Ltd',
39 'author_email': 'bazaar@lists.canonical.com',39 'author_email': 'bazaar@lists.canonical.com',
40 'url': 'http://www.bazaar-vcs.org/',40 'url': 'http://www.bazaar.canonical.com/',
41 'description': 'Friendly distributed version control system',41 'description': 'Friendly distributed version control system',
42 'license': 'GNU GPL v2',42 'license': 'GNU GPL v2',
43 'download_url': 'https://launchpad.net/bzr/+download',43 'download_url': 'https://launchpad.net/bzr/+download',
4444
=== modified file 'tools/win32/bzr_postinstall.py'
--- tools/win32/bzr_postinstall.py 2009-03-23 14:59:43 +0000
+++ tools/win32/bzr_postinstall.py 2010-01-29 14:12:18 +0000
@@ -341,7 +341,7 @@
341 "this library manually and put it to directory\n"341 "this library manually and put it to directory\n"
342 "where Bzr installed.\n"342 "where Bzr installed.\n"
343 "For detailed instructions see:\n"343 "For detailed instructions see:\n"
344 "http://bazaar-vcs.org/BzrOnPureWindows"344 "http://wiki.bazaar.canonical.com/BzrOnPureWindows"
345 ),345 ),
346 "Warning",346 "Warning",
347 MB_OK | MB_ICONEXCLAMATION)347 MB_OK | MB_ICONEXCLAMATION)