Merge lp:~jelmer/brz/homepage into lp:brz

Proposed by Jelmer Vernooij
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: no longer in the source branch.
Merge reported by: The Breezy Bot
Merged at revision: not available
Proposed branch: lp:~jelmer/brz/homepage
Merge into: lp:brz
Diff against target: 207 lines (+19/-22)
14 files modified
README (+1/-1)
breezy/doc_generate/autodoc_man.py (+2/-2)
breezy/doc_generate/autodoc_rstx.py (+1/-1)
breezy/help_topics/__init__.py (+1/-1)
breezy/plugins/bash_completion/README.txt (+2/-5)
breezy/version.py (+1/-1)
doc/developers/HACKING.txt (+1/-1)
doc/developers/_templates/layout.html (+1/-1)
doc/en/_static/en/brz-en-quick-reference.svg (+2/-2)
doc/en/_templates/layout.html (+1/-1)
doc/en/tutorials/centralized_workflow.txt (+1/-1)
setup.py (+2/-2)
tools/win32/breezy.url (+1/-1)
tools/win32/brz.iss.cog (+2/-2)
To merge this branch: bzr merge lp:~jelmer/brz/homepage
Reviewer Review Type Date Requested Status
Martin Packman Approve
Review via email: mp+325025@code.launchpad.net

Commit message

Update homepage to point at www.breezy-vcs.org

Description of the change

Update homepage to point at www.breezy-vcs.org

To post a comment you must log in.
Revision history for this message
Martin Packman (gz) wrote :

One inline note, otherwise looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'README'
2--- README 2017-05-21 12:38:31 +0000
3+++ README 2017-06-02 21:40:50 +0000
4@@ -10,7 +10,7 @@
5
6 To learn how to use Breezy, see the official documentation in the `doc`
7 directory or refer to the Bazaar documentation at
8-<http://doc.bazaar.canonical.com/en/>.
9+<https://doc.bazaar.canonical.com/en/>.
10
11 For additional training materials including screencasts and slides,
12 visit the Bazaar community wiki documentation page at:
13
14=== modified file 'breezy/doc_generate/autodoc_man.py'
15--- breezy/doc_generate/autodoc_man.py 2017-05-30 21:42:49 +0000
16+++ breezy/doc_generate/autodoc_man.py 2017-06-02 21:40:50 +0000
17@@ -247,7 +247,7 @@
18 .br
19 log10 = log --short -r -10..-1
20 .SH "SEE ALSO"
21-.UR http://bazaar.canonical.com/
22-.BR http://bazaar.canonical.com/
23+.UR https://www.breezy-vcs.org/
24+.BR https://www.breezy-vcs.org/
25 """
26
27
28=== modified file 'breezy/doc_generate/autodoc_rstx.py'
29--- breezy/doc_generate/autodoc_rstx.py 2017-05-21 18:39:42 +0000
30+++ breezy/doc_generate/autodoc_rstx.py 2017-06-02 21:40:50 +0000
31@@ -176,7 +176,7 @@
32
33 The following web sites provide further information on Bazaar:
34
35-:Home page: http://bazaar.canonical.com/
36+:Home page: http://www.breezy-vcs.org/
37 :Bazaar docs: http://doc.bazaar.canonical.com/
38 :Launchpad: https://launchpad.net/brz/
39 """
40
41=== modified file 'breezy/help_topics/__init__.py'
42--- breezy/help_topics/__init__.py 2017-05-21 18:10:28 +0000
43+++ breezy/help_topics/__init__.py 2017-06-02 21:40:50 +0000
44@@ -281,7 +281,7 @@
45
46 _basic_help = \
47 """Breezy %s -- a free distributed version-control tool
48-http://bazaar.canonical.com/
49+https://www.breezy-vcs.org/
50
51 Basic commands:
52 brz init makes this directory a versioned branch
53
54=== modified file 'breezy/plugins/bash_completion/README.txt'
55--- breezy/plugins/bash_completion/README.txt 2010-05-22 11:16:04 +0000
56+++ breezy/plugins/bash_completion/README.txt 2017-06-02 21:40:50 +0000
57@@ -127,11 +127,8 @@
58 References
59 ----------
60
61-Bazaar homepage
62- | http://bazaar.canonical.com/
63-Standalone plugin homepages
64- | https://launchpad.net/bzr-bash-completion
65- | http://pypi.python.org/pypi/bzr-bash-completion
66+Breezy homepage
67+ | https://www.breezy-vcs.org/
68
69
70
71
72=== modified file 'breezy/version.py'
73--- breezy/version.py 2017-05-22 00:56:52 +0000
74+++ breezy/version.py 2017-06-02 21:40:50 +0000
75@@ -84,7 +84,7 @@
76 if show_copyright:
77 to_file.write('\n')
78 to_file.write(breezy.__copyright__ + '\n')
79- to_file.write("http://bazaar.canonical.com/\n")
80+ to_file.write("https://www.breezy-vcs.org/\n")
81 to_file.write('\n')
82 to_file.write("brz comes with ABSOLUTELY NO WARRANTY. brz is free software, and\n")
83 to_file.write("you may use, modify and redistribute it under the terms of the GNU\n")
84
85=== modified file 'doc/developers/HACKING.txt'
86--- doc/developers/HACKING.txt 2012-02-29 13:55:25 +0000
87+++ doc/developers/HACKING.txt 2017-06-02 21:40:50 +0000
88@@ -201,7 +201,7 @@
89
90 * Launchpad - https://launchpad.net/
91
92-* Bazaar - http://bazaar.canonical.com/
93+* Breezy - https://www.breezy-vcs.org/
94
95 * Patch Queue Manager - https://launchpad.net/pqm/
96
97
98=== modified file 'doc/developers/_templates/layout.html'
99--- doc/developers/_templates/layout.html 2017-05-21 12:59:37 +0000
100+++ doc/developers/_templates/layout.html 2017-06-02 21:40:50 +0000
101@@ -6,7 +6,7 @@
102 {% endblock %}
103
104 {% block rootrellink %}
105-<li><a href="http://bazaar.canonical.com/">
106+<li><a href="https://www.breezy-vcs.org/">
107 <!--TODO(jelmer): Add a brz logo <img src="{{ pathto("_static/brz icon 16.png", 1) }}" />-->
108 Home</a>&nbsp;|&nbsp;</li>
109 <a href="http://doc.bazaar.canonical.com/en/">Documentation</a>&nbsp;|&nbsp;</li>
110
111=== modified file 'doc/en/_static/en/brz-en-quick-reference.svg'
112--- doc/en/_static/en/brz-en-quick-reference.svg 2017-05-21 13:35:49 +0000
113+++ doc/en/_static/en/brz-en-quick-reference.svg 2017-06-02 21:40:50 +0000
114@@ -1579,7 +1579,7 @@
115 <a
116 id="a6316"
117 style="fill:#333333;fill-opacity:1"
118- xlink:href="http://bazaar.canonical.com">
119+ xlink:href="https://www.breezy-vcs.org/">
120 <text
121 sodipodi:linespacing="100%"
122 id="text6302"
123@@ -1590,7 +1590,7 @@
124 y="97.901367"
125 x="787.79535"
126 id="tspan6304"
127- sodipodi:role="line">http://bazaar.canonical.com</tspan></text>
128+ sodipodi:role="line">https://www.breezy-vcs.org/</tspan></text>
129 </a>
130 </g>
131 </g>
132
133=== modified file 'doc/en/_templates/layout.html'
134--- doc/en/_templates/layout.html 2017-05-21 12:51:58 +0000
135+++ doc/en/_templates/layout.html 2017-06-02 21:40:50 +0000
136@@ -1,7 +1,7 @@
137 {% extends "!layout.html" %}
138
139 {% block rootrellink %}
140-<li><a href="http://bazaar.canonical.com/">
141+<li><a href="https://www.breezy-vcs.org/">
142 <!--TODO(jelmer): Add a brz icon<img src="{{ pathto("_static/brz icon 16.png", 1) }}" /> -->
143 Home</a>&nbsp;|&nbsp;</li>
144 <a href="http://doc.bazaar.canonical.com/en/">Documentation</a>&nbsp;|&nbsp;</li>
145
146=== modified file 'doc/en/tutorials/centralized_workflow.txt'
147--- doc/en/tutorials/centralized_workflow.txt 2017-05-21 13:35:49 +0000
148+++ doc/en/tutorials/centralized_workflow.txt 2017-06-02 21:40:50 +0000
149@@ -21,7 +21,7 @@
150 in sync. This workflow is also applicable to a single developer working
151 on several different machines.
152
153-.. _Breezy: http://bazaar.canonical.com
154+.. _Breezy: https://www.breezy-vcs.org/
155
156
157 Initial Setup
158
159=== modified file 'setup.py'
160--- setup.py 2017-05-22 00:56:52 +0000
161+++ setup.py 2017-06-02 21:40:50 +0000
162@@ -40,10 +40,10 @@
163 'author': 'Canonical Ltd',
164 'author_email': 'bazaar@lists.canonical.com',
165 'maintainer': 'Breezy Developers',
166- 'url': 'http://bazaar.canonical.com/',
167+ 'url': 'https://www.breezy-vcs.org/',
168 'description': 'Friendly distributed version control system',
169 'license': 'GNU GPL v2',
170- 'download_url': 'https://launchpad.net/bzr/+download',
171+ 'download_url': 'https://launchpad.net/brz/+download',
172 'long_description': get_long_description(),
173 'classifiers': [
174 'Development Status :: 6 - Mature',
175
176=== renamed file 'tools/win32/bazaar.url' => 'tools/win32/breezy.url'
177--- tools/win32/bazaar.url 2010-12-07 09:06:39 +0000
178+++ tools/win32/breezy.url 2017-06-02 21:40:50 +0000
179@@ -1,5 +1,5 @@
180 [InternetShortcut]
181-URL=http://bazaar.canonical.com
182+URL=https://www.breezy-vcs.org/
183 Hotkey=0
184 IconIndex=0
185 IconFile=
186
187=== modified file 'tools/win32/brz.iss.cog'
188--- tools/win32/brz.iss.cog 2017-05-21 18:10:28 +0000
189+++ tools/win32/brz.iss.cog 2017-06-02 21:40:50 +0000
190@@ -72,7 +72,7 @@
191
192 AppComments="Breezy: Friendly distributed version control system"
193 AppPublisher="Breezy Developers"
194-AppPublisherURL="http://bazaar.canonical.com"
195+AppPublisherURL="https://www.breezy-vcs.org/"
196 AppSupportURL="http://wiki.bazaar.canonical.com/BzrSupport"
197 AppUpdatesURL="http://wiki.bazaar.canonical.com/WindowsDownloads"
198 ; [[[cog cog.outl('AppVersion=%s' % VERSION) ]]]
199@@ -178,7 +178,7 @@
200
201 [Icons]
202 Name: "{group}\Documentation index"; Filename: "{app}\doc\index.html"; WorkingDir: "{app}\doc";
203-Name: "{group}\Bazaar Home Page"; Filename: "{app}\bazaar.url"; Comment: "http://bazaar.canonical.com";
204+Name: "{group}\Breezy Home Page"; Filename: "{app}\breezy.url"; Comment: "https://www.breezy-vcs.org/";
205 Name: "{group}\Start Bzr in cmd shell"; Filename: "{cmd}"; Parameters: "/K start_bzr.bat"; WorkingDir: "{app}"; IconFilename: "{app}\bzr.exe"; Comment: "Open new Bzr session";
206 ; NOTE: Intent is to change the log file location - the line below will need to change to reflect that.
207 Name: "{group}\Open Bzr log file"; Filename: "notepad.exe"; Parameters: "{userdocs}\.bzr.log"; Comment: "Launch notepad to view the bzr log file";

Subscribers

People subscribed via source and target branches