Merge pull request #335 from canonical/wd-12989

feat: Updates copy on /install

.github/pull_request_template.md

@@ -0,0 +1,24 @@
+## Done
+
+- [List of work items including drive-bys - remember to add the why and what of this work.]
+
+## QA
+
+- Check out this feature branch
+- Run the site using the command `./run serve` or `dotrun`
+- View the site locally in your web browser at: http://0.0.0.0:8026/
+    - Be sure to test on mobile, tablet and desktop screen sizes
+- [List additional steps to QA the new features or prove the bug has been resolved]
+
+## Issue / Card
+
+Fixes #
+
+## Screenshots
+
+[If relevant, please include a screenshot.]
+
+
+## Help
+
+[QA steps](https://discourse.canonical.com/t/qa-steps/152) - [Commit guidelines](https://discourse.canonical.com/t/commit-guidelines/148)

templates/install.html

@@ -20,7 +20,7 @@ <h1>Install Multipass</h1>
 
 <section class="p-strip">
   <div class="u-fixed-width u-sv3">
-    <h2>Select OS to get started</h2>
+    <h2>Select your OS to get started</h2>
   </div>
   <div class="row u-equal-height u-sv3">
     <a id="tab-one" href="#tab-one__content" class="col-small-2 col-medium-2 col-4 p-card p-tab u-align--center u-vertically-center js-tab active" role="tab" aria-selected="true">
@@ -56,7 +56,7 @@ <h2>Select OS to get started</h2>
 </section>
 <section class="p-strip">
   <div class="u-fixed-width">
-    <h2 class="u-sv2">Check out some of the things you can do with Multipass below</h2>
+    <h2 class="u-sv2">Check out some of the things you can do with Multipass</h2>
   </div>
   <div class="u-fixed-width u-align--center">
     <script id="asciicast-394119" src="https://asciinema.org/a/394119.js?" async data-t="08" data-autoplay="true" data-speed="1.5"></script>

templates/partial/_get-started-linux.html

@@ -4,5 +4,5 @@ <h2>Install Multipass on Linux</h2>
   <div class="p-code-snippet">
     <pre class="p-code-snippet__block--icon"><code>sudo snap install multipass</code></pre>
   </div>
-  <p>Don’t have the <code>snap</code> command? <a href="https://docs.snapcraft.io/installing-snapd" class="p-link--external">Get set up for snaps</a></p>
+  <p>Don't have the <code>snap</code> command? <a href="https://docs.snapcraft.io/installing-snapd" class="p-link--external">Get set up for snaps</a></p>
 </div>

templates/partial/_get-started-macos.html

@@ -3,7 +3,7 @@ <h2 class="u-sv3">Install Multipass on MacOS</h2>
   <li class="p-stepped-list__item">
     <h3 class="p-stepped-list__title"><a href="/download/macos">Download Multipass for MacOS</a></h3>
     <div class="p-stepped-list__content">
-      <p>Alternatively, see our <a href="/docs/installing-on-macos">documentation</a> for instructions to install with brew.</p>
+      <p>Alternatively, see our <a href="/docs/install-multipass">documentation</a> for instructions on how to install using brew.</p>
     </div>
   </li>
   <li class="p-stepped-list__item">

templates/partial/_get-started-windows.html

@@ -3,7 +3,7 @@ <h2 class="u-sv3">Install Multipass on Windows</h2>
   <li class="p-stepped-list__item">
     <h3 class="p-stepped-list__title"><a href="/download/windows">Download Multipass for Windows</a></h3>
     <div class="p-stepped-list__content">
-      <p><small><i>Note: You need Windows 10 Pro/Enterprise/Education v 1803 or later, or any Windows 10 with VirtualBox</i></small></p>
+      <p>You need Windows 10 Pro/Enterprise/Education v 1803 or later, <em>or</em> any Windows 10 with VirtualBox.</p>
     </div>
   </li>
   <li class="p-stepped-list__item">

templates/partial/_launch-lts-instances.html

@@ -1,26 +1,26 @@
 <h2>How to launch LTS instances</h2>
 <div class="p-stepped-list__content">
-<p>The first five minutes with Multipass let you know how easy it is to have a lightweight cloud handy. Let’s launch a few LTS instances, list them, exec a command, use cloud-init and clean up old instances to start.</p>
+<p>The first five minutes with Multipass let you know how easy it is to have a lightweight cloud handy. Let’s launch a few LTS instances, list them, run a command, use cloud-init and clean up old instances to start.</p>
 <div class="u-sv3">
-  <p>Launch an instance (by default you get the current Ubuntu LTS)</p>
+  <p>Launch an instance (by default you get the current Ubuntu LTS):</p>
   <div class="p-code-snippet">
     <pre class="p-code-snippet__block--icon"><code>multipass launch --name foo</code></pre>
   </div>
 </div>
 <div class="u-sv3">
-  <p>Run commands in that instance, try running bash (logout or ctrl-d to quit)</p>
+  <p>Run commands in that instance, try running bash (logout or ctrl-d to quit):</p>
   <div class="p-code-snippet">
     <pre class="p-code-snippet__block--icon"><code>multipass exec foo -- lsb_release -a</code></pre>
   </div>
 </div>
 <div class="u-sv3">
-  <p>See your instances</p>
+  <p>See your instances:</p>
   <div class="p-code-snippet">
     <pre class="p-code-snippet__block--icon"><code>multipass list</code></pre>
   </div>
 </div>
 <div class="u-sv3">
-  <p>Stop and start instances</p>
+  <p>Stop and start instances:</p>
   <div class="p-code-snippet">
     <pre class="p-code-snippet__block--icon"><code>multipass stop foo bar</code></pre>
   </div>
@@ -29,7 +29,7 @@ <h2>How to launch LTS instances</h2>
   </div>
 </div>
 <div class="u-sv3">
-  <p>Clean up what you don’t need</p>
+  <p>Clean up what you don't need:</p>
   <div class="p-code-snippet">
     <pre class="p-code-snippet__block--icon"><code>multipass delete bar</code></pre>
   </div>
@@ -38,32 +38,26 @@ <h2>How to launch LTS instances</h2>
   </div>
 </div>
 <div class="u-sv3">
-  <p>Find alternate images to launch</p>
+  <p>Find alternate images to launch:</p>
   <div class="p-code-snippet">
     <pre class="p-code-snippet__block--icon"><code>multipass find</code></pre>
   </div>
 </div>
 <div class="u-sv3">
-  <p>Pass a cloud-init metadata file to an instance on launch. See <a href="https://blog.ubuntu.com/2018/04/02/using-cloud-init-with-multipass">using cloud-init with multipass</a> for more details</p>
+  <p>Pass a cloud-init metadata file to an instance on launch (see <a href="https://blog.ubuntu.com/2018/04/02/using-cloud-init-with-multipass">Using cloud-init with Multipass</a> for more details):</p>
   <div class="p-code-snippet">
     <pre class="p-code-snippet__block--icon"><code>multipass launch -n bar --cloud-init cloud-config.yaml</code></pre>
   </div>
 </div>
 <div class="u-sv3">
-  <p>See your instances</p>
-  <div class="p-code-snippet">
-    <pre class="p-code-snippet__block--icon"><code>multipass list</code></pre>
-  </div>
-</div>
-<div class="u-sv3">
-  <p>Get help</p>
+  <p>Get help:</p>
   <div class="p-code-snippet">
     <pre class="p-code-snippet__block--icon"><code>multipass help</code></pre>
   </div>
   <div class="p-code-snippet">
     <pre class="p-code-snippet__block--icon"><code>multipass help &lt;command&gt;</code></pre>
   </div>
   <div class="u-sv3">
-    <p>Don’t forget you still have <code>'foo'</code> running. To learn more about Multipass keep reading, <a href="/docs">go to the docs</a>, or <a href="https://discourse.ubuntu.com/c/multipass/21">join the discussion and get involved.</a></p>
+    <p>Don't forget you still have the <code>"foo"</code> instance running! To learn more about Multipass, <a href="/docs">go to the docs</a>, or <a href="https://discourse.ubuntu.com/c/multipass/21">join the discussion and get involved.</a></p>
   </div>
 </div>