Merge pull request #2 from mu-editor/master

bring fork up to date

Author: Martin O'Hanlon

en/howto/install_windows.md

@@ -6,28 +6,63 @@ i18n: en
 
 # How to install Mu on Windows with the Official Installer 
 
-Since most of our users will be using Mu on Windows in an educational setting
-we've made it extraordinarily easy to install Mu on Windows. We've checked
-Mu works on Windows 7 (32bit) and Windows 10 (64bit) - so it should work on
-all the versions of Windows in between. We assume you have an up-to-date
-system (i.e. ensure you have installed all updates).
+Installing Mu in Windows is super easy.
 
-First, follow the
-[advice on Microsoft's website](https://support.microsoft.com/en-us/help/15056/windows-7-32-64-bit-faq) to work out if you're using 32 or 64 bit Windows.
+<div class="row">
+  <img src="/img/en/howto/windows_mu_installer.gif" alt="mu windows installer" class="img-responsive center-block img-rounded movie"/>
+  <br/>
+</div>
+
+Mu works on Window 7, 8 and 10 in 32 bit and 64 bit. Its a good idea to make sure your system to up-to-date with all Windows updates.
+
+If you in an educational setting you may need to get your system administrator to run the installer for you.
+
+## Step 1 - Download Mu Installer
+
+[Download](/en/download) the correct 32 bit or 64 bit installer for your operating system.
+
+To find out whether you need a 32 bit or 64 bit installer:
+
++ Opening Explorer, right click "This PC" and select properties.
+
+<div class="row">
+  <img src="/img/en/howto/windows_open_pc_properties_annotated.png" alt="open pc properties" class="img-responsive center-block img-rounded movie"/>
+  <br/>
+</div>
+
++ The operating system type will be shown under System, System Type.
 
-Next, [download the correct installer](/en/download) for your version of
-Windows (either 32 or 64 bit for Windows 7 or above). The installer itself is
-an executable so you need to run it to make it work.
+<div class="row">
+  <img src="/img/en/howto/windows_system_properties_annotated.png" alt="system type" class="img-responsive center-block img-rounded movie"/>
+  <br/>
+</div>
+
+There is also [advice on Microsoft's website](https://support.microsoft.com/en-us/help/15056/windows-7-32-64-bit-faq) for finding whether you are using 32 or 64 bit Windows.
+
+# Step 2 - Run the installer
+
++ Find the installer you just downloaded (it's probably in your Downloads folder)
+
+<div class="row">
+  <img src="/img/en/howto/beta/win7.1.png" alt="Windows 7 - Find the installer" class="img-responsive center-block img-rounded movie"/>
+  <br/>
+</div>
+
+<div class="row">
+  <img src="/img/en/howto/beta/win10.1.png" alt="Windows 10 -Find the installer" class="img-responsive center-block img-rounded movie"/>
+  <br/>
+</div>
 
-Follow the steps illustrated below and, once installation has finished, you'll
-find Mu in your start menu.
++ Double-click the installer to run it.
 
 <div class="panel panel-warning">
     <div class="panel-heading"><h3 class="panel-title">THIS IS BETA SOFTWARE!</h3></div>
     <div class="panel-body">
     <p>Mu is in the closing stages of a final 1.0 release. As a result it is
     still considered BETA software and this reflects how the installer
-    currently works. Put simply, we currently don't sign the installer so
+    currently works.</p>
+    
+    <p>Put simply, we currently don't sign the installer so
     Windows complains about Mu coming from an unknown publisher. When the Mu
     1.0 is finally released the installer won't have this issue.</p>
 
@@ -36,53 +71,79 @@ find Mu in your start menu.
     will be similar).</p>
 
     <h3>Windows 7</h3>
-    <p>Find the installer (it's probably in your "Downloads" folder):</p>
-    <img src="/img/en/howto/beta/win7.1.png" alt="Find the installer" class="img-responsive center-block img-rounded movie"/><br/>
-    <p>Double-click the installer and the message shown below will appear.
-    Click on the "Yes" button and follow the remaining instructions below.</p>
+    <p>"User Account Control" will ask you if you want to allow this program to make changes to your computer.
+    Click "Yes"</p>
     <img src="/img/en/howto/beta/win7.2.png" alt="Click Yes" class="img-responsive center-block img-rounded movie"/><br/>
     <h3>Windows 10</h3>
-    <p>Find the installer (it's probably in your "Downloads" folder):</p>
-    <img src="/img/en/howto/beta/win10.1.png" alt="Find the installer" class="img-responsive center-block img-rounded movie"/><br/>
-    <p>When you double-click the installer Windows Defender will pop up with a
-    warning message. You should click on the "More info" link.</p>
-    <img src="/img/en/howto/beta/win10.2.png" alt="Click More Info" class="img-responsive center-block img-rounded movie"/><br/>
-    <p>The message will change to something similar to that shown below
-    (although the "App" name may be slightly different). Click on the new
-    "Run anyway" button and follow the remaining instructions below.</p>
+    <p>Windows Defender will pop up with a warning message. You should click on the "More info" link.</p>
+    <img src="/img/en/howto/beta/win10.2_annotated.png" alt="Click More Info" class="img-responsive center-block img-rounded movie"/><br/>
+    <p>The message will change giving you more information about the installer and display a "Run anyway" button. Click
+    "Run anyway".</p>
     <img src="/img/en/howto/beta/win10.3.png" alt="Click Run Anyway" class="img-responsive center-block img-rounded movie"/><br/>
     </div>
 </div>
 
+## Step 3 - Start the install
+
+Confirm the version of Mu you'll be installing and click "Next".
+
 <div class="row">
-  <h2>Step 1</h2>
-  <p>Confirmation of the version of Mu you'll be installing. The version
-  number will likely be different from the one shown below.</p>
   <img src="/img/en/howto/winstall1.png" alt="Windows installer step 1" class="img-responsive center-block img-rounded movie"/>
+  <br/>
 </div>
+
+The version number will likely be different from the one shown.
+
+## Step 4 - License Agreement
+
+Review the license and click "Agree".
+
 <div class="row">
-  <h2>Step 2</h2>
-  <p>You need to agree to <a href="https://github.com/mu-editor/mu/blob/master/LICENSE">Mu's license</a> before installing the software.</p>
   <img src="/img/en/howto/winstall2.png" alt="Windows installer step 2" class="img-responsive center-block img-rounded movie"/>
+  <br/>
 </div>
+
+## Step 5 - Choose Users
+
+Select if you want to install Mu for all users, or just yourself and click "Next".
+
 <div class="row">
-  <h2>Step 3</h2>
-  <p>Select if you want to install Mu for all users, or just yourself.</p>
   <img src="/img/en/howto/winstall3.png" alt="Windows installer step 3" class="img-responsive center-block img-rounded movie"/>
+  <br/>
 </div>
+
+## Step 6 - Choose Install Location
+
+Select the installation destination (you can usually leave this as the default) and click "Install".
+
 <div class="row">
-  <h2>Step 4</h2>
-  <p>Select the installation destination (you can usually safely ignore this
-  step).</p>
   <img src="/img/en/howto/winstall4.png" alt="Windows installer step 4" class="img-responsive center-block img-rounded movie"/>
+  <br/>
 </div>
+
+## Step 7 - Installing
+
+Go make a cup of coffee as Mu installs on your computer.
+
 <div class="row">
-  <h2>Step 5</h2>
-  <p>Go make a cup of coffee as Mu installs on your machine.</p>
   <img src="/img/en/howto/winstall5.png" alt="Windows installer step 5" class="img-responsive center-block img-rounded movie"/>
+  <br/>
 </div>
+
+## Step 8 - Complete
+
+The installation has completed successfully, click "Finish" to close the installer.
+
 <div class="row">
-  <h2>Step 6</h2>
-  <p>Confirmation that Mu has installed properly.</p>
   <img src="/img/en/howto/winstall6.png" alt="Windows installer step 6" class="img-responsive center-block img-rounded movie"/>
+  <br/>
+</div>
+
+## Step 9 - Start Mu
+
+You can start Mu by clicking on the icon in the Start menu.
+
+<div class="row">
+  <img src="/img/en/howto/windows_start_mu.png" alt="Windows start mu" class="img-responsive center-block img-rounded movie"/>
+  <br/>
 </div>

en/howto/install_with_python.md

@@ -91,5 +91,5 @@ Simply use `pip` to install `shortcut` and then use `shortcut` on Mu:
 
 ```
 pip3 install shortcut
-shortcut mu
+shortcut mu-editor
 ```