Merge ~cjwatson/launchpad:tour-git into launchpad:master

Proposed by Colin Watson on 2020-02-10
Status: Merged
Approved by: Colin Watson on 2020-02-21
Approved revision: 6b1d5d0495ee011d72b722f55f2d246b920ea25d
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/launchpad:tour-git
Merge into: launchpad:master
Diff against target: 95 lines (+10/-10)
3 files modified
lib/lp/app/tour/branch-hosting-tracking (+6/-6)
lib/lp/app/tour/index (+3/-3)
lib/lp/app/tour/join-launchpad (+1/-1)
Reviewer Review Type Date Requested Status
Tom Wardill 2020-02-10 Approve on 2020-02-21
Review via email: mp+378828@code.launchpad.net

Commit message

Mention Git hosting in the tour

Description of the change

Launchpad has had Git hosting for some years now, so we really should at least mention it in a few appropriate places in the tour.

To post a comment you must log in.
Tom Wardill (twom) :
Colin Watson (cjwatson) :
Tom Wardill (twom) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/lib/lp/app/tour/branch-hosting-tracking b/lib/lp/app/tour/branch-hosting-tracking
2index f67faea..6709c7f 100644
3--- a/lib/lp/app/tour/branch-hosting-tracking
4+++ b/lib/lp/app/tour/branch-hosting-tracking
5@@ -2,7 +2,7 @@
6 <html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
7 <head>
8 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
9- <meta content="Canonical Launchpad Tour - You want to ensure that anybody who is interested can contribute code to your project, in a simple way, with full version control. And of course, you also want to maintain strict control of the people who can actually land code in your development trunk. Launchpad, together with Bazaar, give you infinite hosting for contributions while still preserving tight control over your core codebase." name="description"/>
10+ <meta content="Canonical Launchpad Tour - You want to ensure that anybody who is interested can contribute code to your project, in a simple way, with full version control. And of course, you also want to maintain strict control of the people who can actually land code in your development trunk. Launchpad, together with Git or Bazaar, give you infinite hosting for contributions while still preserving tight control over your core codebase." name="description"/>
11 <meta content="canonical, launchpad, tour" name="keywords"/>
12 <meta content="en-US" name="language"/>
13 <title>Launchpad tour</title>
14@@ -37,14 +37,14 @@
15 <img src="images/hosting/main-image.jpg" alt="Collaborate with free software communities." />
16 </p>
17 <p class="intro-text">
18- <strong>Launchpad and Bazaar make it easy for anyone to get your project's code, make their own changes with full version control, and then propose their work for merging back into your trunk.</strong>
19+ <strong>Launchpad makes it easy for anyone to get your project's code using Git or Bazaar, make their own changes with full version control, and then propose their work for merging back into your trunk.</strong>
20 </p>
21
22 <p class="intro-text">
23 Full control of who can land code in your project's trunk remains with you. And thanks to public code reviews, you can share the work of vetting proposed changes.
24 </p>
25 <p class="intro-text">
26- From experimental lines of development by entirely new contributors, to your official trunk, all code related to your project &mdash; whether hosted on Launchpad or elsewhere, even in Git, Subversion or CVS &mdash; is catalogued and can be downloaded with just a few key strokes.
27+ From experimental lines of development by entirely new contributors, to your official trunk, all code related to your project &mdash; whether hosted on Launchpad or elsewhere, even in Subversion or CVS &mdash; is catalogued and can be downloaded with just a few key strokes.
28 </p>
29 <div id="link-holder"><a href="https://code.launchpad.net/">Visit Launchpad Code &gt;</a><br /><a href="https://launchpad.net/projects/+new">Add your project to Launchpad &gt;</a></div>
30 </div>
31@@ -67,7 +67,7 @@
32 <p class="screen-holder">
33 <img src="images/hosting/1.png" alt="Drive-by contributions" /> </p>
34 <p>
35- With Launchpad and Bazaar, contributors can create their own branch of your code, make their changes and then push it all back up to Launchpad to be listed right alongside your official branches.</p><br />
36+ With Launchpad, contributors can create their own branch of your code using Git or Bazaar, make their changes and then push it all back up to Launchpad to be listed right alongside your official branches.</p><br />
37 <p> And because they never touch your trunk they don&rsquo;t need to ask for commit access.</p><br />
38 <p>So, with no extra effort on your part new contributors can submit code to your project and propose it for merging into your trunk.</p>
39 </div>
40@@ -98,7 +98,7 @@
41 <img src="images/hosting/3.png" alt="Working on a fix for a bug tracked in Launchpad?" />
42 </p>
43 <p>
44- Develop your fix in a Bazaar branch and link it to the bug report. Anyone interested in the bug can track your progress and get access to your fix with a single command.
45+ Develop your fix in a Git or Bazaar branch and link it to the bug report. Anyone interested in the bug can track your progress and get access to your fix with a single command.
46 </p><p>
47 In effect, your branch becomes a living patch: the very latest version of your code is always available as direct link from the bug report.
48 </p>
49@@ -109,7 +109,7 @@ In effect, your branch becomes a living patch: the very latest version of your c
50 <p class="screen-holder">
51 <img src="images/hosting/4.png" alt="Team branches" /> </p>
52 <p>
53-Thanks to Bazaar&rsquo;s workflow flexibility, all team members can commit to a centrally hosted branch, while anyone can still create their own separate line of development with full version control.
54+All team members can commit to a centrally hosted branch, while anyone can still create their own separate line of development with full version control.
55
56
57 </p>
58diff --git a/lib/lp/app/tour/index b/lib/lp/app/tour/index
59index d9786ec..22fbd24 100644
60--- a/lib/lp/app/tour/index
61+++ b/lib/lp/app/tour/index
62@@ -80,17 +80,17 @@
63 </div>
64 <div class="block odd">
65 <h3><a href="branch-hosting-tracking">Code hosting and review</a></h3>
66- <h4>Democratise your code using Bazaar with Launchpad.</h4>
67+ <h4>Democratise your code using version control with Launchpad.</h4>
68 <p class="screen-holder">
69 <img src="images/code-screenshot.png" alt="Code hosting and tracking" />
70 </p>
71 <p>
72
73- Launchpad and <a href="http://bazaar-vcs.org/">Bazaar</a> distributed versional control strip away the barriers to contributing to your project. In just a few key strokes anyone can create their own local branch of your trunk with full version control.<br /><br />
74+ Launchpad and <a href="https://git-scm.com/">Git</a> or <a href="http://bazaar.canonical.com/">Bazaar</a> distributed version control strip away the barriers to contributing to your project. In just a few key strokes anyone can create their own local branch of your trunk with full version control.<br /><br />
75
76 When they're ready, they can upload their branch to Launchpad and propose it for merging back into your trunk. Code review &mdash; by web and email &mdash; gives you a public forum to discuss and approve or reject the merge.<br /><br />
77
78- You can even use Launchpad to import Git, CVS and Subversion repositories into Bazaar branches.
79+ You can even use Launchpad to mirror Git repositories, or to import Git, CVS and Subversion repositories into Bazaar branches.
80 </p>
81 <p style="float: right;"><a href="branch-hosting-tracking" accesskey="f" tabindex="4">More about code hosting and review &gt;</a></p>
82 </ul>
83diff --git a/lib/lp/app/tour/join-launchpad b/lib/lp/app/tour/join-launchpad
84index dfb91c3..147f187 100644
85--- a/lib/lp/app/tour/join-launchpad
86+++ b/lib/lp/app/tour/join-launchpad
87@@ -83,7 +83,7 @@ Launchpad is free to use for <a href="https://help.launchpad.net/Legal/ProjectLi
88 Your project can use any or all of Launchpad's applications:</p><br />
89 <ul>
90 <li><strong><a href="bugs">Bug tracking</a>:</strong> across project and tool boundaries</li>
91- <li><strong><a href="branch-hosting-tracking">Code hosting and review</a>:</strong> open up to drive-by contributions with Bazaar branch hosting/mirroring and imports from git, Subversion and CVS.</li>
92+ <li><strong><a href="branch-hosting-tracking">Code hosting and review</a>:</strong> open up to drive-by contributions with Git or Bazaar hosting and imports from Git, Subversion and CVS.</li>
93 <li><strong><a href="translation">Web-based translation</a>:</strong> make your software available to a global audience with help from Launchpad's 35,000 translators.</li>
94 <li><strong><a href="ppa">Ubuntu package building and hosting</a>:</strong> use your Personal Package Archives to distribute software, with updates, to Ubuntu users.</li>
95 <li><strong><a href="community">Mailing lists and teams</a>:</strong> hassle-free mailing list hosting and easy role delegation through teams.</li>

Subscribers

People subscribed via source and target branches