Merge pull request #1008 from mwalls/Mike's-branch

Mike's branch

doc/user_guide/install.rst

@@ -28,10 +28,10 @@ Bundle. This is a customised `WinPython <http://winpython.github.io/>`_
 distribution that includes HyperSpy, all its dependencies and many other
 scientific Python packages. HyperSpy Bundle does not interact with any other
 Python installation in your system, so it can be safely installed alongside
-other Python distributions. Moreover it is portable, so it can be installed in
-an USB key. When intalling it with administator rights for all users it adds
-context menu entries to start the `Jupyter Notebook <http://jupyter.org>`_ and
-`Juypter QtConsole <http://jupyter.org/qtconsole/stable/>`_. See
+other Python distributions. Moreover it is portable, so it can be installed from
+a USB key. When installing it with administator rights for all users it adds
+context (right-click) menu  entries to start the `Jupyter Notebook <http://jupyter.org>`_ and
+`Juypter QtConsole <http://jupyter.org/qtconsole/stable/>`_ inside the folder being clicked. See
 `start_jupyter_cm <https://github.com/hyperspy/start_jupyter_cm>`_ for details.
 
 
@@ -42,9 +42,9 @@ Quick instructions to install HyperSpy using Anaconda (Linux, MacOs, Windows)
 
 #. Download and install
    `Anaconda. <https://store.continuum.io/cshop/anaconda/>`_
-   Anaconda is recommended for the best performance (it is compiled
+   For MacOS, be sure to choose the graphical installer, not the command-line version. Anaconda is recommended for the best performance (it is compiled
    using Intel MKL libraries) and the easiest intallation (all the required
-   libraries are included). The academic license is free.
+   libraries are included). The academic license is free. Then install Hyperspy via the 'pip' command (in the Mac Terminal,  usually to be found in "Applications>Utilities" or in a Unix terminal):
 
    .. code-block:: bash
 
@@ -58,8 +58,8 @@ Quick instructions to install HyperSpy using Anaconda (Linux, MacOs, Windows)
 
         $ pip install --upgrade hyperspy==0.8.3-1
 
-For convenience you may also consider installing `start_jupyter_cm
-<https://github.com/hyperspy/start_jupyter_cm>`_.
+To enable context-menu (right-click) startup in a chosen folder, install `start_jupyter_cm
+<https://github.com/hyperspy/start_jupyter_cm>`_. (currently only available for Gnome and Windows, not MacOS)
 
 
 For more options and details read the rest of the documentation.
@@ -260,17 +260,17 @@ Windows
   and the entries in the context menu and the Start Menu are not installed
   properly. In most cases the problem can be solved by restarting the computer
   and reinstalling HyperSpy.
-* Due to a `Python bug <http://bugs.python.org/issue13276>`_ sometimes uninstalling
-  HyperSpy does not uninstall the "HyperSpy Here" entries in the context menu.
-  Please run the following code in a Windows Terminal with administrator rights
+* Concerning older installations with the "Hyperspy here" context menus: Due to a `Python bug <http://bugs.python.org/issue13276>`_ sometimes uninstalling
+  HyperSpy does not uninstall the "Hyperspy here" entries in the context menu.
+  Please run the following code in a Windows Terminal (command line prompt) with administrator rights
   to remove the entries manually:
 
   .. code-block:: bash
 
-    $ uninstall_hyperspy_here
-* If HyperSpy raise a MemoryError exceptions:
+    > uninstall_hyperspy_here
+* If HyperSpy raises a MemoryError exception:
 
-  * Install the 64bit if you're using the 32bit one and you are running
+  * Install the 64bit version if you're using the 32bit one and you are running
     HyperSpy in a 64bit system.
-  * Increase the available RAM but closing other applications or physically
+  * Increase the available RAM by closing other applications or physically
     adding more RAM to your computer.