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

[Matthew Revell]

[Matthew Revell (matthew.revell)]

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

[Brad Crittenden (bac)]

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)

[lp:~matthew.revell/launchpad/tour-commercial-tweak-bug-393348]

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)]

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

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.

=== modified file 'lib/canonical/launchpad/tour/join-launchpad'
--- lib/canonical/launchpad/tour/join-launchpad	2010-01-08 20:39:15 +0000
+++ lib/canonical/launchpad/tour/join-launchpad	2010-01-21 15:10:33 +0000
@@ -65,7 +65,7 @@
                         <p class="screen-holder">
                             <img src="images/join/1.png" alt="Commercial subscriptions" />                        </p>
                         <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 />
-                        <p> At the same time, get an exclusive preview of our new privacy features, including:</p><br />
+                        <p>At the same time, try out our privacy features, including:</p><br />
 			<ul>
 				<li>private code branches</li>
 				<li>private bugs by default</li>
@@ -74,7 +74,7 @@
 			</ul><br />
 			<p>To get going, register your project and select <em>Other/Proprietary</em> as its licence.</p><br />
 			<p>Want to know more? <a href="mailto:[e-mail]">Get in touch</a>!</p><br />
-			<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>
+			<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>
 			<p style="float: right;"><a href="https://launchpad.net/projects/+new">Register your project &gt;</a></p><br />
 
                         </p>