Merge lp:~jelmer/brz/upload-instructions into lp:brz

Proposed by Jelmer Vernooij
Status: Merged
Approved by: Vincent Ladeuil
Approved revision: no longer in the source branch.
Merge reported by: The Breezy Bot
Merged at revision: not available
Proposed branch: lp:~jelmer/brz/upload-instructions
Merge into: lp:brz
Diff against target: 50 lines (+5/-18)
2 files modified
breezy/plugins/upload/README (+5/-8)
breezy/plugins/upload/__init__.py (+0/-10)
To merge this branch: bzr merge lp:~jelmer/brz/upload-instructions
Reviewer Review Type Date Requested Status
Vincent Ladeuil Approve
Review via email: mp+352337@code.launchpad.net

Description of the change

Fix instructions for upload plugin; no longer point at original upstream branch/bugtracker.

To post a comment you must log in.
Revision history for this message
Vincent Ladeuil (vila) wrote :

Trivial.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'breezy/plugins/upload/README'
2--- breezy/plugins/upload/README 2017-06-02 00:04:01 +0000
3+++ breezy/plugins/upload/README 2018-08-04 18:00:42 +0000
4@@ -1,21 +1,18 @@
5-Bazaar Upload
6+Breezy Upload
7 =============
8
9 Overview
10 --------
11
12-bzr-upload is a plugin for Bazaar which lets you upload your working tree to
13+upload is a plugin for Breezy which lets you upload your working tree to
14 a remote location using ftp/sftp.
15
16 The main target audience is web developers who keep their web pages version
17-controlled with bzr.
18-
19-Please report any bugs to: http://bugs.launchpad.net/bzr-upload/
20-
21-Our home page is located at: https://launchpad.net/bzr-upload/
22+controlled with breezy.
23+
24 The original authors are:
25
26 Vincent Ladeuil <v.ladeuil+lp@free.fr>
27 Martin Albisetti <argentina@gmail.com>
28
29-Use bzr help plugins/upload to get more info.
30+Use brz help plugins/upload to get more info.
31
32=== modified file 'breezy/plugins/upload/__init__.py'
33--- breezy/plugins/upload/__init__.py 2018-04-02 22:07:12 +0000
34+++ breezy/plugins/upload/__init__.py 2018-08-04 18:00:42 +0000
35@@ -123,16 +123,6 @@
36 but only applies to bzr-upload.
37
38
39-Collaborating
40--------------
41-
42-While we don't have any platform setup, you can branch from trunk:
43-
44- brz branch lp:bzr-upload
45-
46-And change anything you'd like, and file a merge proposal on Launchpad.
47-
48-
49 Known Issues
50 ------------
51

Subscribers

People subscribed via source and target branches