Launchpad itself

Merge lp:~matthew.revell/launchpad/tour-commercial-tweak-bug-393348 into lp:launchpad/db-devel

  1. tour-commercial-tweak-bug-393348
  2. Merge into db-devel
Proposed by Matthew Revell on 2010-01-21
Status: Work in progress
Proposed branch: lp:~matthew.revell/launchpad/tour-commercial-tweak-bug-393348
Merge into: lp:launchpad/db-devel
Diff against target: 21 lines (+2/-2)
1 file modified
lib/canonical/launchpad/tour/join-launchpad (+2/-2)
To merge this branch: bzr merge lp:~matthew.revell/launchpad/tour-commercial-tweak-bug-393348
Reviewer Review Type Date Requested Status
Brad Crittenden (community) code 2010-01-21 Approve on 2010-01-21
Review via email: mp+17808@code.launchpad.net
To post a comment you must log in.
Matthew Revell (matthew.revell) wrote :

Fixes the VAT rate and clarifies some wording on the join-launchpad page of the tour.

Reply
Brad Crittenden (bac) wrote :

As we discussed on IRC I think you should strike the word 'new' at line 9 of the diff. Otherwise it's great. Thanks for the corrections.

review: Approve (code)
Reply
lp:~matthew.revell/launchpad/tour-commercial-tweak-bug-393348 updated on 2010-01-21
10196. By Matthew Revell on 2010-01-21

Changes following bac's review

10197. By Matthew Revell on 2010-01-21

Changes following bac's review.

Aaron Bentley (abentley) wrote :

It seems unlikely that a branch this old will merge cleanly, therefore, I am marking it work-in-progress.

Reply

Unmerged revisions

10197. By Matthew Revell on 2010-01-21

Changes following bac's review.

10196. By Matthew Revell on 2010-01-21

Changes following bac's review

10195. By Matthew Revell on 2010-01-20

Merge from RF

10194. By Matthew Revell on 2010-01-19

Changes VAT to 17.5% and clarifies the privacy features texts. Fixes bugs 393348 and 509720.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/canonical/launchpad/tour/join-launchpad'
2--- lib/canonical/launchpad/tour/join-launchpad 2010-01-08 20:39:15 +0000
3+++ lib/canonical/launchpad/tour/join-launchpad 2010-01-21 15:10:33 +0000
4@@ -65,7 +65,7 @@
5 <p class="screen-holder">
6 <img src="images/join/1.png" alt="Commercial subscriptions" /> </p>
7 <p>Get all the benefits of hosting your closed-source project on Launchpad for just $250* a year. Easily share bug reports, code and more across your development community and, optionally, plug into the open source projects you rely on.</p><br />
8- <p> At the same time, get an exclusive preview of our new privacy features, including:</p><br />
9+ <p>At the same time, try out our privacy features, including:</p><br />
10 <ul>
11 <li>private code branches</li>
12 <li>private bugs by default</li>
13@@ -74,7 +74,7 @@
14 </ul><br />
15 <p>To get going, register your project and select <em>Other/Proprietary</em> as its licence.</p><br />
16 <p>Want to know more? <a href="mailto:commercial@launchpad.net">Get in touch</a>!</p><br />
17- <p><small>* US Dollars. Add VAT at 15% if you're in the European Union. Subscription is per project. Privacy features may incur additional charges after the beta.</small></p>
18+ <p><small>* US Dollars. Add VAT at 17.5% if you're in the European Union. Subscription is per project. Prices may change in the future.</small></p>
19 <p style="float: right;"><a href="https://launchpad.net/projects/+new">Register your project &gt;</a></p><br />
20
21 </p>

Subscribers

People subscribed via source and target branches

to status/vote changes: