Merge lp:~matthew.revell/launchpad/10.04-tour-updates into lp:launchpad/db-devel

[Matthew Revell]

This makes text updates to the tour to account for new features.

It also changes the screen shots on the front page so that they have a Lucid theme, rather than Human.

[Brad Crittenden (bac)]

Hi Matthew thanks for the change. The new screenshots look good. You're quite ahead of the game by thinking to do that.

One thing I notice about the page templates are you're lack of line wrapping. Our page templates are supposed to wrap at 78 columns unless there is a formatting reason, which I don't see.

Wikipedia capitalizes 'Git' so I think we should too, which I see you fixed in all but one place.

s/community of over 47,000 working/community of over 47,000 people working/

review: Approve (code)

[Matthew Revell (matthew.revell)]

Thanks Brad.

I've made each of the changes you requested *apart from* the line wrapping. None of the page templates have ever wrapped at 78 chars as that's how they were delivered by the designer and originally accepted into the LP tree.

As the wrapping issue isn't something I've introduced in this branch, would you mind if I change this another time?

[Brad Crittenden (bac)]

Thanks for making the changes. Your rationale about the state of the line-wrapping makes sense.

=== modified file 'lib/canonical/launchpad/tour/branch-hosting-tracking'
--- lib/canonical/launchpad/tour/branch-hosting-tracking	2010-01-08 20:39:15 +0000
+++ lib/canonical/launchpad/tour/branch-hosting-tracking	2010-04-21 09:51:44 +0000
@@ -37,13 +37,14 @@
                 <img src="images/hosting/main-image.jpg" alt="Collaborate with free software communities." />
             </p>
             <p class="intro-text">
-                <strong>You want to ensure that anybody who is interested can contribute code to your project, in a simple way, with full version control.</strong> And of course, you also want to maintain strict control of who can actually land code in your development trunk.
-            </p>
-            <p class="intro-text">
-                With Launchpad and Bazaar, anyone can create their own line of development, with full version control, to be published alongside your official branches. From experimental lines of development by entirely new contributors, to work on the the next major release, all code related to your project - whether hosted on Launchpad or elsewhere - is catalogued and can be downloaded with just a few key strokes.
-            </p>
-            <p class="intro-text">
-               If your code's not in Bazaar, Launchpad will even run a continuous import of Subversion and CVS repositories directly into a Bazaar branch.
+                <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>
+            </p>
+
+            <p class="intro-text">
+                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.
+            </p>
+            <p class="intro-text">
+                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.
             </p>
             <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>
         </div>

=== modified file 'lib/canonical/launchpad/tour/bugs'
--- lib/canonical/launchpad/tour/bugs	2010-02-19 12:05:10 +0000
+++ lib/canonical/launchpad/tour/bugs	2010-04-21 09:51:44 +0000
@@ -66,19 +66,21 @@
                         In Launchpad, you can share a bug report and its comment history with other communities interested in finding a fix.
                         Each project &mdash; or even different releases within a project &mdash; can track its own status, importance and assignee for that same bug report.
                         <br /><br />
-                        Even if the bug is tracked elsewhere &mdash; such as in Trac, Sourceforge or Bugzilla &mdash; Launchpad can pull in it status. Using our <a href="https://help.launchpad.net/Bugs/PluginAPISpec">bug tracker plugins</a> for Bugzilla and Trac you can share a comment history for the same bug tracked both in Launchpad and an external tracker.<br /><br />
+                        Even if the bug is tracked elsewhere &mdash; such as in Trac, Sourceforge or Bugzilla &mdash; Launchpad can monitor its status. Using our <a href="https://help.launchpad.net/Bugs/PluginAPISpec">bug tracker plugins</a> for Bugzilla and Trac you can share a comment history for the same bug tracked both in Launchpad and an external tracker.<br /><br />
 And to help find low-hanging fruit, there&rsquo;s a &ldquo;Bugs fixed elsewhere&rdquo; report that shows which of your bugs are marked fixed in other communities.
 
                         </p>
                     </div>
                     <div class="block odd">
-                        <h3>Found a fix? Publish a branch!</h3>
-                        <h4>Don't swap static patches in bug comments. Instead, share evolving fixes by linking bug reports directly to Bazaar branches.</h4>
+                        <h3>Turn patches into fixes</h3>
+                        <h4>Direct links from bug reports to the patches and branches that contain the fix.</h4>
                         <p class="screen-holder">
                             <img src="images/bugs/5.png" alt="Found a fix? Publish a branch!" />                        </p>
                         <p>
-                        Other community members can use Bazaar to download your fix, make their own changes and then upload them back to Launchpad for everyone to see.<br /><br />
-                        Thanks to Bazaar, it&rsquo;s easy to merge the branch containing your bug fix into your project&rsquo;s trunk. Bazaar branches are like "living patches" &mdash; a single URL points to the latest version of the fix and a single command merges it into your trunk branch.
+                          Launchpad helps you bring bugs and fixes together. You can easily see any patches attached to a bug report and you can jump straight to a list of all the bug reports, associated with your project, that have patches.
+                        <br /><br />
+                          For fixes that require more than a simple patch, you can link directly to the Bazaar branch (including imports from Git, Subversion and CVS) you're working in, allowing everyone interested in the bug to watch your solution evolve or even download your branch, make their own changes and then upload them back to Launchpad for everyone to see.<br /><br />
+                          A single URL points to the latest version of the fix and a single command merges it into the project's trunk branch.
                         </p>
                     </div>
                     <div class="clear"></div>
@@ -94,9 +96,9 @@
                         <p class="screen-holder">
                             <img src="images/bugs/3.png" alt="Bug tracker email interface"  />                        </p>
                         <p>
-                        Manage bug reports entirely through your mail client, using the Launchpad Bugs email interface.
+                        Manage bug reports entirely through your email client.
 <br /><br />
-						Report, subscribe, comment on, assign, prioritize and make just about any other update to bugs tracked in Launchpad using email. Launchpad will also mail you with updates on any bug you're interested in, whether an individual bug or all the bugs associated with a particular project or package. Read more about <a href="https://help.launchpad.net/Bugs/EmailInterface">the bug tracker's e-mail interface &gt;</a><br /><br />
+						You can use email to report, subscribe, comment on, assign, prioritise and make just about any other update to bugs tracked in Launchpad. Launchpad will also mail you with updates on any bug you're interested in, whether an individual bug or all the bugs associated with a particular project or package. Read more about <a href="https://help.launchpad.net/Bugs/EmailInterface">the bug tracker's e-mail interface &gt;</a><br /><br />
 						And, if you prefer, you can also subscribe to bug information in your feed reader with our Atom feeds. <img src="https://edge.launchpad.net/@@/rss" alt="Feed logo" />
                         </p>
                     </div>

=== modified file 'lib/canonical/launchpad/tour/images/answers-screenshot.png'
Binary files lib/canonical/launchpad/tour/images/answers-screenshot.png	2009-09-21 17:07:26 +0000 and lib/canonical/launchpad/tour/images/answers-screenshot.png	2010-04-21 09:51:44 +0000 differ
=== modified file 'lib/canonical/launchpad/tour/images/blueprint-screenshot.png'
Binary files lib/canonical/launchpad/tour/images/blueprint-screenshot.png	2009-09-21 17:07:26 +0000 and lib/canonical/launchpad/tour/images/blueprint-screenshot.png	2010-04-21 09:51:44 +0000 differ
=== modified file 'lib/canonical/launchpad/tour/images/bugs-screenshot.png'
Binary files lib/canonical/launchpad/tour/images/bugs-screenshot.png	2009-09-21 17:07:26 +0000 and lib/canonical/launchpad/tour/images/bugs-screenshot.png	2010-04-21 09:51:44 +0000 differ
=== modified file 'lib/canonical/launchpad/tour/images/code-screenshot.png'
Binary files lib/canonical/launchpad/tour/images/code-screenshot.png	2009-09-21 17:07:26 +0000 and lib/canonical/launchpad/tour/images/code-screenshot.png	2010-04-21 09:51:44 +0000 differ
=== modified file 'lib/canonical/launchpad/tour/images/ppa-screenshot.png'
Binary files lib/canonical/launchpad/tour/images/ppa-screenshot.png	2009-09-21 17:07:26 +0000 and lib/canonical/launchpad/tour/images/ppa-screenshot.png	2010-04-21 09:51:44 +0000 differ
=== modified file 'lib/canonical/launchpad/tour/images/trans-screenshot.png'
Binary files lib/canonical/launchpad/tour/images/trans-screenshot.png	2009-09-21 17:07:26 +0000 and lib/canonical/launchpad/tour/images/trans-screenshot.png	2010-04-21 09:51:44 +0000 differ
=== modified file 'lib/canonical/launchpad/tour/index'
--- lib/canonical/launchpad/tour/index	2010-01-08 20:39:15 +0000
+++ lib/canonical/launchpad/tour/index	2010-04-21 09:51:44 +0000
@@ -90,7 +90,7 @@
 
                          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 />
 
-                         You can even use Launchpad to import git, CVS and Subversion repositories into Bazaar branches.
+                         You can even use Launchpad to import Git, CVS and Subversion repositories into Bazaar branches.
                         </p>
                         <p style="float: right;"><a href="branch-hosting-tracking" accesskey="f" tabindex="4">More about code hosting and review &gt;</a></p>
                         </ul>
@@ -109,7 +109,7 @@
                             <img src="images/trans-screenshot.png" alt="Translations" />
                         </p>
                         <p>
-                            See your software translated by a community of over 35,000 working in 272 languages.<br /><br />
+                            See your software translated by a community of over 47,000 people working in 293 languages.<br /><br />
 
                             Launchpad makes translation easy for everyone. Translators get a simple web interface, with automatic suggestions from a library of more than 16 million strings.<br /><br />
                             You, as project owner, decide the balance between openness and quality. And you get standard GNU GetText files for integration with your software.<br /><br />

=== 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-04-21 09:51:44 +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>

=== modified file 'lib/canonical/launchpad/tour/ppa'
--- lib/canonical/launchpad/tour/ppa	2010-01-08 20:39:15 +0000
+++ lib/canonical/launchpad/tour/ppa	2010-04-21 09:51:44 +0000
@@ -24,11 +24,11 @@
             <li><a href="translation" accesskey="5">Web-based translation</a></li>
             <li><a href="community" accesskey="6">Mailing lists and teams</a></li>
             <li class="current"><a href="ppa" accesskey="7">Software distribution</a></li>
-            <li><a href="community-support" accesskey="8">Community support</a></li>
+            <li><a href="community-support" accesskey="8">Community support</a></li>
             <li><a href="api" accesskey="9">Beta: web services API</a></li>
             <li><a href="feature-tracking" accesskey="a">Lightweight specifications</a></li>
-            <li><a href="release-management" accesskey="b">Release management</a></li>
-            <li><a href="join-launchpad" accesskey="c">Join Launchpad!</a></li>                        
+            <li><a href="release-management" accesskey="b">Release management</a></li>
+            <li><a href="join-launchpad" accesskey="c">Join Launchpad!</a></li>
         </ul>
         <div id="page-intro-top"></div>
         <div id="page-intro">
@@ -37,19 +37,19 @@
                 <img src="images/ppa/main-image.jpg" alt="Collaborate with free software communities." />
             </p>
             <p class="intro-text">
-                <strong>Publishing your software is simple with Launchpad's Personal Package Archives.</strong><br /><br />
-                
-                Launchpad builds installable Ubuntu packages for multiple architectures and hosts them in your own software repository.
-                <br /><br />
+                <strong>Publishing your software is simple with Launchpad's Personal Package Archives.</strong><br /><br />
+
+                Launchpad builds installable Ubuntu packages for multiple architectures and hosts them in your own software repository.
+                <br /><br />
                 Installing applications from a PPA is just as easy as standard Ubuntu software, with updates automatically pushed to your users.
-            </p>
+            </p>
             <div id="left-link-holder"><strong>Need a private PPA with restricted access?</strong><br /><a href="join-launchpad#commercial">Read about our beta for commercial subscribers &gt;</a></div>
             <div id="link-holder"><a href="https://launchpad.net/ubuntu/+ppas"><img src="images/see-it-action-button.png" alt="See it in action" title="Click to browse PPAs" /></a><br /><a href="https://help.launchpad.net/PPA">Read our PPA user guide &gt;</a></div>
         </div>
         <div id="page-intro-bottom"></div>
-        <ul id="secondary-navigation">
-            <li class="button-prev">
-                <a href="community" accesskey="d" tabindex="2" title="Back to the mailing lists and teams page">Back</a>
+        <ul id="secondary-navigation">
+            <li class="button-prev">
+                <a href="community" accesskey="d" tabindex="2" title="Back to the mailing lists and teams page">Back</a>
             </li>
             <li class="button-next">
                 <a href="community-support" accesskey="e" tabindex="3" title="Read about user support tracking in Launchpad">Next</a>
@@ -65,12 +65,11 @@
                         <p class="screen-holder">
                             <img src="images/ppa/1.png" alt="Automatic software distribution - with updates!" />                        </p>
                         <p>
-                            PPAs are the easiest and quickest way to get your software directly to Ubuntu users. Once they've added your archive to their Ubuntu system,
-                            all of your PPA's packages are just a few clicks away.
-                            <br /><br />
-                            Ubuntu and your PPA take care of any dependencies, either from the primary Ubuntu repositories or from other PPAs that you specify.
-                            <br /><br />
-                            And when you publish a new version of one of your packages, Ubuntu notifies all of your users of the update. It can even automatically install
+                            PPAs are the easiest and quickest way to get your software directly to Ubuntu users. Adding your PPA to an Ubuntu system takes just a few keystrokes &mdash; <code>add-apt-repository ppa:your-ppa</code> &mdash; and then all of your PPA's packages are just a few clicks away.
+                            <br /><br />
+                            Ubuntu and your PPA take care of any dependencies, either from the primary Ubuntu repositories or from other PPAs that you specify.
+                            <br /><br />
+                            And when you publish a new version of one of your packages, Ubuntu notifies all of your users of the update. It can even automatically install
                             the updates if they prefer.
                         </p>
                     </div>
@@ -80,9 +79,8 @@
                         <p class="screen-holder">
                             <img src="images/ppa/2.png" alt="Team PPAs" />                        </p>
                         <p>
-                            Want to distribute nightly builds to your developer community, beta versions to your test team and backports to another group? No problem, you can create a PPA to serve each group. That way, there's no confusion over who gets which version.
-                            <br /><br />
-                            You can also create PPAs for the teams you run. Any member of a team can upload new packages to its PPAs, making it a great way for groups of people to publish software collectively. The Kubuntu project did just that to distribute their first builds of the KDE 4 environment.<br /><br />
+                            Want to distribute nightly builds to your developer community, beta versions to your test team and backports to another group? No problem. Create separate PPAs to serve each group.<br /><br />
+                            Teams can also have one or many PPAs. With team PPAs, any member of that team can upload new packages, making it a great way for groups of people to publish software collectively.<br /><br />
                             If you have a team of developers working on a set of related packages, consider setting up a team PPA as a way to simplify coordination across each of those pieces of software.
                         </p>
                     </div>
@@ -99,23 +97,23 @@
                         <p class="screen-holder">
                             <img src="images/ppa/3.png" alt="Multiple architectures"  />                        </p>
                         <p>
-                            Even if you don&rsquo;t have the hardware yourself, Launchpad will create binaries for x86, AMD64 and LPIA architectures, with more coming in the future.
+                            Even if you don&rsquo;t have the hardware yourself, Launchpad will create binaries for x86 and AMD64 architectures.
                         </p>
                     </div>
                     <div class="clear"></div>
                 <div class="furthur-information-block-bot"></div>
             </div>
-        </div>
-        </div>
-        <ul id="footer-navigation">
-            <li class="button-prev">
-                <a href="community" title="Back to the mailing lists and teams page" accesskey="f" tabindex="4">Back</a>
-            </li>        
+        </div>
+        </div>
+        <ul id="footer-navigation">
+            <li class="button-prev">
+                <a href="community" title="Back to the mailing lists and teams page" accesskey="f" tabindex="4">Back</a>
+            </li>
             <li class="button-next" title="Read about user support tracking in Launchpad">
                 <a href="community-support" accesskey="g" tabindex="5">Next</a>
-            </li>
-            <li class="copyright">
-                &copy; 2004-2010 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a>
+            </li>
+            <li class="copyright">
+                &copy; 2004-2010 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a>
             </li>
         </ul>
     </div>

=== modified file 'lib/canonical/launchpad/tour/translation'
--- lib/canonical/launchpad/tour/translation	2010-01-08 20:39:15 +0000
+++ lib/canonical/launchpad/tour/translation	2010-04-21 09:51:44 +0000
@@ -28,11 +28,11 @@
             <li><a href="api" accesskey="9">Beta: web services API</a></li>
             <li><a href="feature-tracking" accesskey="a">Lightweight specifications</a></li>
             <li><a href="release-management" accesskey="b">Release management</a></li>
-            <li><a href="join-launchpad" accesskey="c">Join Launchpad!</a></li>                        
+            <li><a href="join-launchpad" accesskey="c">Join Launchpad!</a></li>
         </ul>
         <div id="page-intro-top"></div>
         <div id="page-intro">
-            <h1>Take freedom global<br /> with web-based translation</h1>
+            <h1>Crowd-sourced translation<br /> for your software</h1>
             <p>
                 <img src="images/translation/main-image.jpg" alt="Collaborate with free software communities." />
             </p>