Merge pull request #3 from mu-editor/master

Bring up to date

Author: Martin O'Hanlon

en/download.md

@@ -6,17 +6,6 @@ i18n: en
 
 # Download Mu
 
-<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 and you may encounter bugs (<a href="/en/howto/bugs">please report them!</a>).
-    Please read the instructions for your installer for more information.</p>
-    </div>
-</div>
-
-
 There are many ways to install Mu. The simplest is to download the official
 installer for Windows or Mac OSX. If you're a more advanced user you can use
 Python's built-in `pip` tool. Some Linux distributions come with Mu packaged
@@ -33,8 +22,8 @@ Each option is outlined below:
       <img src="/img/windows_logo.png" alt="Windows Logo">
       <div class="caption">
         <h3>Windows Installer</h3>
-        <p><a href="https://github.com/mu-editor/mu/releases/download/v1.0.0.beta.16/mu-editor_beta16_win32.exe" class="btn btn-primary" role="button">32-bit</a>
-        <a href="https://github.com/mu-editor/mu/releases/download/v1.0.0.beta.16/mu-editor_beta16_win64.exe" class="btn btn-primary" role="button">64-bit</a>
+        <p><a href="https://github.com/mu-editor/mu/releases/download/v1.0.0/mu-editor_1.0_win32.exe" class="btn btn-primary" role="button">32-bit</a>
+        <a href="https://github.com/mu-editor/mu/releases/download/v1.0.0/mu-editor_1.0_win64.exe" class="btn btn-primary" role="button">64-bit</a>
         <a href="/en/howto/install_windows" class="btn btn-default" role="button">Instructions</a></p>
       </div>
     </div>
@@ -44,7 +33,7 @@ Each option is outlined below:
       <img src="/img/apple_logo.png" alt="Apple Logo">
       <div class="caption">
         <h3>Mac OSX Installer</h3>
-        <p><a href="https://github.com/mu-editor/mu/releases/download/v1.0.0.beta.16/mu-editor_beta16_osx.dmg" class="btn btn-primary" role="button">Download</a>
+        <p><a href="https://github.com/mu-editor/mu/releases/download/v1.0.0/mu-editor_1.0_osx.dmg" class="btn btn-primary" role="button">Download</a>
         <a href="/en/howto/install_macos" class="btn btn-default" role="button">Instructions</a></p>
       </div>
     </div>

en/help/1.0.md

@@ -5,21 +5,54 @@ title: Help for Mu 1.0.*
 
 # Help for Mu 1.0
 
-You have three options for finding help about this version of Mu:
+<div class="row">
+  <div class="col-sm-4 col-md-4">
+    <div class="thumbnail">
+      <a href="/en/tutorials">
+      <img src="/img/en/tutorials/start.gif" alt="Tutorials"
+        class="img-responsive center-block img-rounded movie-light">
+      </a>
+      <div class="caption">
+        <h3>1. Tutorials</h3>
+        <p>All the basics you need to know to get started and help with first
+        steps in using Mu. <strong>If you only read one thing, make it
+        this!</strong></p>
+        <p><a href="/en/tutorials" class="btn btn-primary"
+           role="button">Go</a> Level: <strong>SUPER EASY</strong></p>
+      </div>
+    </div>
+  </div>
+  <div class="col-sm-4 col-md-4">
+    <div class="thumbnail">
+      <a href="/en/howto">
+      <img src="/img/en/help/howto.png" alt="Howto"
+        class="img-responsive center-block img-rounded movie-light">
+      </a>
+      <div class="caption">
+        <h3>2. How-to Guides</h3>
+        <p>These deal with common tasks or problems in a simple
+        step-by-step manner. If you're looking for something specific,
+        look here.</p>
+        <p><a href="/en/howto" class="btn btn-primary"
+           role="button">Go</a> Level: <strong>INTERMEDIATE</strong></p>
+      </div>
+    </div>
+  </div>
+  <div class="col-sm-4 col-md-4">
+    <div class="thumbnail">
+      <a href="/en/discuss">
+      <img src="/img/en/help/chat.png" alt="Chat"
+        class="img-responsive center-block img-rounded movie-light">
+      </a>
+      <div class="caption">
+        <h3>3. Discussion Channel</h3>
+        <p>Our web-based chat-room is where you can ask questions or discuss
+        My with both other users and the developers of Mu.</p>
+        <p><a href="/en/discuss" class="btn btn-primary"
+           role="button">Go</a> Level: <strong>ADVANCED-ish</strong></p>
+      </div>
+    </div>
+  </div>
+</div>
 
-1. The [tutorials](/en/tutorials) introduce you to using Mu. 
-  They are the best place to start. The tutorial entitled
-  "[Start Here!](/en/tutorials/1.0/start)" gives you the basics needed to get
-  going. If you follow the tutorials, one after the other, you'll very quickly
-  become an expert in using Mu (the tutorials themselves are *very easy* to
-  follow).
-2. The [how-to guides](/en/howto/) deal with common tasks or problems in a
-  simple step-by-step manner. If you're looking for something specific then
-  look here.
-3. The [discussion channel](/en/discuss) is a web based chat-room for members
-  of the Mu community. We expect participants to follow the Python Software
-  foundation's [Code of Conduct](https://www.python.org/psf/codeofconduct/).
-  The discussion channel is where you can ask questions or discuss Mu with
-  both other users and the developers of Mu.
-
-Finally, if you think you've found a bug in Mu then [follow the steps outlined here](/en/howto/bugs).
+**If you think you've found a bug in Mu, congratulations! Please [follow the steps outlined here](/en/howto/bugs).**

en/howto/install_macos.md

@@ -1,72 +1,76 @@
 ---
 layout: default
-title: How to install Mu on Mac OSX with the Official Installer
+title: How to install Mu on macOS with the Official Installer
 i18n: en
 ---
 
-# How to install Mu on Mac OSX with the Official Installer 
+# How to install Mu on macOS with the Official Installer 
 
-Since most of our users will be beginners we've made it extraordinarily easy to
-install Mu on Apple's Macintosh line of computers that run OSX. Mu should run
-on any machine running OSX version 10.10 Yosemite or later.
+Installing Mu on macOS is super easy.
 
-First, follow the
-[advice on Apple's website](https://support.apple.com/en-us/HT201260) to check
-you're using a version of OSX that'll work with Mu (remember, it needs to be
-a version later than 10.10).
+Mu will run on any machine running macOS version 10.11 El Capitan or later. There is [advice on Apple's website](https://support.apple.com/en-us/HT201260) on how to check your macOS version.
 
-Next, [download the installer for Mac OSX](/en/download). 
-The installer itself is a disk image (a file that ends in .dmg) that you open
-by double clicking it. When you open the disk image your computer will check
-it is uncorrupted (this may take a couple of minutes).
+## Step 1 - Download Mu Installer
 
-Once the disk image is open, follow the steps illustrated below to install Mu.
++ [Download](/en/download) the installer for macOS.
+
+## Step 2 - Open the Installer
+
++ Open your Downloads folder - click "Go", then "Downloads" on the Finder menu. 
+
+<div class="row">
+  <img src="/img/en/howto/macos_go_downloads.png" alt="Mac OS open downloads" class="img-responsive center-block img-rounded"/>
+  <br/>
+</div>
+
++ Double click the Mu installer disk image (a .dmg file).
+
+<div class="row">
+  <img src="/img/en/howto/macos_downloads.png" alt="Mac OS downloads" class="img-responsive center-block img-rounded"/>
+  <br/>
+</div>
+
+When you open the installer you'll be asked to accept the software license
+agreement and then your computer will verify the package is not corrupted (this
+may take a couple of minutes).
+
+## Step 3 - Install Mu
+
++ Click, hold and drag the "Mu" icon into the "Applications" folder.
 
 <div class="row">
-  <h2>Step 1</h2>
-  <p>Click, hold and drag the "Mu" icon into the "Applications" folder.</p>
   <img src="/img/en/howto/macos1.png" alt="Mac OSX installer step 1" class="img-responsive center-block img-rounded"/>
+  <br/>
 </div>
+
+## Step 4 - Installing
+
+Mu will install into the Applications folder on your Mac.
+
 <div class="row">
-  <h2>Step 2</h2>
-  <p>Mu will install into the Applications folder on your Mac.</p>
   <img src="/img/en/howto/macos2.png" alt="Mac OSX installer step 2" class="img-responsive center-block img-rounded"/>
 </div>
+
+## Step 5 - Start Mu
+
++ Open your Applications folder - click "Go", "Applications" on the Finder menu. 
+
 <div class="row">
-  <h2>Step 3</h2>
-  <p>Open the Applications folder on your Mac (where all your other
-  applications are found) and double click the Mu icon to launch the
-  editor.</p>
-  <img src="/img/en/howto/macos3.png" alt="Mac OSX installer step 3" class="img-responsive center-block img-rounded"/>
+  <img src="/img/en/howto/macos_go_applications.png" alt="Mac OS open downloads" class="img-responsive center-block img-rounded"/>
+  <br/>
 </div>
 
-<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
-    OSX complains about Mu coming from an unknown publisher. When the Mu
-    1.0 is finally we won't have this issue.</p>
-
-    <p>We've outlined the extra steps needed to help OSX start Mu for the first
-    time (you'll never have to repeat this step unless you re-install another
-    beta version of Mu).</p>
-
-    <p>Once Mu is installed, as per the steps above, open the "Applications"
-    folder, find the "mu-editor" icon then <strong>while holding down the
-    "ctrl" key, click the icon</strong> to display the menu shown below:</p>
-    <img src="/img/en/howto/beta/osx_beta1.png" alt="CTRL-click" class="img-responsive center-block img-rounded movie"/><br/>
-
-    <p>Click the "open" item on the menu.</p>
-
-    <p>At this point, OSX will "verify" Mu, as shown below:</p>
-    <img src="/img/en/howto/beta/osx_beta2.png" alt="Verify Mu" class="img-responsive center-block img-rounded movie"/><br/>
-
-    <p>Finally, an alert (shown below) will appear. To actually launch Mu click
-    on the "Open" button.</p>
-    <img src="/img/en/howto/beta/osx_beta3.png" alt="Click Open" class="img-responsive center-block img-rounded movie"/><br/>
-    <p><strong>These steps can take some time as OSX checks the Mu package, but
-    you'll only ever have to do them once.</strong></p>
-    </div>
+Double-click on the Mu icon. You'll see a dialog to check you want to open
+Mu. Click "Open":
+
+<div class="row">
+  <img src="/img/en/howto/open_mu_osx.png" alt="Click to Open" class="img-responsive center-block img-rounded"/><br/>
+</div>
+
+**This can take some time as OSX checks the Mu package, but you'll only ever have to do it once.**
+
++ Next time you launch Mu you will be able to just double click the Mu icon.
+
+<div class="row">
+  <img src="/img/en/howto/macos3.png" alt="Mac OSX installer step 3" class="img-responsive center-block img-rounded"/>
 </div>

en/howto/install_raspberry_pi.md

@@ -11,18 +11,26 @@ If you're using the Raspberry Pi Foundation's official
 operating system you should use your preferred package management application
 and install `mu-editor`.
 
-## Step 1
+## Step 1 - Open a Terminal
 
-Open a terminal by selecting Accessories and Terminal from the menu
++ Open a terminal by selecting Accessories and Terminal from the menu
 
 <div class="row">
   <img src="/img/en/howto/pi_open_terminal.png" alt="pi open terminal" class="img-responsive center-block img-rounded movie"/>
   <br/>
 </div>
 
-## Step 2
+## Step 2 - Install Mu
 
-Enter the following command to download and install Mu.
+Enter the following commands to:
+
++ Update the repositories.
+
+```bash
+sudo apt-get update
+```
+
++ Download and install Mu.
 
 ```bash
 sudo apt-get install mu
@@ -33,4 +41,11 @@ sudo apt-get install mu
   <br/>
 </div>
 
-Open Mu from by selecting it from the Programming menu.
+## Step 3 - Start Mu
+
++ Open Mu by selecting it from the Programming menu.
+
+<div class="row">
+  <img src="/img/en/howto/pi_open_mu.png" alt="pi open mu" class="img-responsive center-block img-rounded movie"/>
+  <br/>
+</div>

en/howto/install_windows.md

@@ -6,7 +6,8 @@ i18n: en
 
 # How to install Mu on Windows with the Official Installer 
 
-Installing Mu in Windows is super easy.
+Installing Mu in Windows is super easy (if you are a network administrator we
+recommend you [read the instructions at the bottom of the page](#admins)).
 
 <div class="row">
   <img src="/img/en/howto/windows_mu_installer.gif" alt="mu windows installer" class="img-responsive center-block img-rounded movie"/>
@@ -55,18 +56,12 @@ There is also [advice on Microsoft's website](https://support.microsoft.com/en-u
 
 + 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.</p>
+<div class="alert alert-warning" role="alert">
+    <h3>THIS IS SOFTWARE FROM THE INTERNET!</h3>
 
-    <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>
+    <p>Windows complains about Mu coming from the internet.</p>
 
-    <p>In any case, we've outlined the extra steps needed to help Windows
+    <p>As a result, we've outlined the extra steps needed to help Windows
     install Mu for both Windows 7 and Windows 10 (other versions of Windows
     will be similar).</p>
 
@@ -80,7 +75,6 @@ There is also [advice on Microsoft's website](https://support.microsoft.com/en-u
     <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
@@ -107,6 +101,9 @@ Review the license and click "Agree".
 
 Select if you want to install Mu for all users, or just yourself and click "Next".
 
+Please note, if your user account does not have administrative rights this step might not appear on your installation process.
+If it does, the installer might only work if you select the "Install just for me" option.
+
 <div class="row">
   <img src="/img/en/howto/winstall3.png" alt="Windows installer step 3" class="img-responsive center-block img-rounded movie"/>
   <br/>
@@ -147,3 +144,48 @@ You can start Mu by clicking on the icon in the Start menu.
   <img src="/img/en/howto/windows_start_mu.png" alt="Windows start mu" class="img-responsive center-block img-rounded movie"/>
   <br/>
 </div>
+
+<div id="admins" class="panel panel-warning">
+    <div class="panel-heading"><h3 class="panel-title"><strong>ATTENTION NETWORK ADMINISTRATORS</strong></h3></div>
+    <div class="panel-body">
+    <p>If you are a network administrator who needs to install Mu on
+    many machines we'd like to answer a couple of common queries and provide
+    some technical context and information:</p>
+
+    <dl>
+        <dt>Why is the installer a <code>.exe</code> rather than an MSI?</dt>
+        <dd>In 2015 Microsoft announced that, while MSI won't go away any time
+        soon, they want developers to move onto other, more modern, packaging
+        solutions. We use a simple and easy to use
+        <a href="https://pynsist.readthedocs.io/en/latest/">packaging
+        system</a> which allows us to automatically and reliably create 
+        installers with zero manual intervention.</dd>
+        <dt>Why is the default install per-user rather than system wide?</dt>
+        <dd>Engineers at Microsoft have
+        <a href="https://twitter.com/zooba/status/1013445957290061824">advised
+        us</a> that per-user is the preferred for the following reasons:
+            <ul>
+                <li>Non-admin users can use the installer.</li>
+                <li>Such installations keep users isolated from each other.</li>
+                <li>Per-user installation means security and reliability
+                problems encountered by running as admin are avoided.</li>
+            </ul>
+        For more information about installation contexts, please see
+        <a href="https://msdn.microsoft.com/en-us/library/windows/desktop/dd765197(v=vs.85).aspx">this article on Microsoft's website</a>.
+        </dd>
+
+    </dl>
+    <p><strong>We understand that, as a system administrator, you know what
+    you're doing and simply want to install Mu, system wide, on all the
+    machines under your control.</strong> In this case, you need
+    to run the installer with the following flags:
+    <code>mu-editor_win64.exe /S /AllUsers</code></p>
+
+    <p>The <code>/S</code> flag tells the installer to work in "silent" mode
+    (i.e. you won't see the windows shown in the screenshots above) and the
+    <code>/AllUsers</code> flag makes Mu available to all users of the system 
+    (i.e. it's installed "system wide").</p>
+    <p>If you encounter problems or wish to give feedback, please
+    <a href="/en/discuss">get in touch</a>.</p>
+    </div>
+</div>

en/howto/install_with_python.md

@@ -8,6 +8,8 @@ i18n: en
 If you already have [Python3](https://python.org/) installed on your Windows,
 OSX or Linux machine then it is easy to install Mu with Python's
 built-in package manager, [`pip`](https://pip.pypa.io/en/stable/installing/).
+**Please note: this method does not currently work on Raspberry Pi** (use
+[these instructions instead](/en/howto/install_raspberry_pi)).
 If you're on Windows and would rather not type commands you should use the
 [Windows installer for Mu](install_windows) instead. If you're using OSX on a
 Mac and want to use the simple drag-and-drop installer instead, you should use