Updated windows-install screenshots, added info about dual monitor conf for win8/10.

manual/source/dualmonitors.rst

@@ -51,8 +51,37 @@ Microsoft Windows
 -----------------
 
 Dual monitor setup is similar among all the currently supported Windows
-releases (:ref:`win7monitor`, :ref:`winvistamonitor`, :ref:`winxpmonitor`), but 
-does vary slightly from one release to the next.
+releases (:ref:`win10monitor`, :ref:`win7monitor`,
+:ref:`winvistamonitor`), but does vary slightly from one release to the next.
+
+.. _win10monitor:
+
+Windows 8 & 10
+^^^^^^^^^^^^^^
+
+When using Windows 8 and 10 enabling your projector is easy. Simply connect your
+projector and press :kbd:`Windows+P`.
+
+The more traditional way is also fairly straight forward. Go to
+:guilabel:`Control Panel` and click on :guilabel:`Adjust screen resolution`
+under :guilabel:`Appearance and Personalization`.
+
+.. image:: pics/controlpanel-win10.png
+
+This will open up a window for configuring your screens. Enable your projector
+and make sure that the selected value for :guilabel:`Multiple displays` is 
+:guilabel:`Extend these displays`.
+
+.. image:: pics/screen-res-win10.png
+
+On Windows 10 there is also a different way of configuring your screens. By
+right-clicking on the desktop an choosing :guilabel:`Display settings` a
+different configuration window will appear.
+
+.. image:: pics/new-display-settings-win10.png
+
+To change the resolution of the screens you will have to click 
+:guilabel:`Advanced display settings`.
 
 .. _win7monitor:
 
@@ -91,19 +120,6 @@ you have checked :guilabel:`Extend the desktop onto this monitor`.
 
 .. image:: pics/vistadisplaysettings.png
 
-.. _winxpmonitor:
-
-Windows XP
-^^^^^^^^^^
-
-From :guilabel:`Control Panel` select :guilabel:`Display`, or right click on a
-blank area of the desktop and select :guilabel:`Properties`. From the
-:guilabel:`Display Properties` window click on the :guilabel:`Settings` tab.
-Click on the monitor that represents your projector and make sure you have
-checked :guilabel:`Extend my Windows desktop onto this monitor`.
-
-.. image:: pics/xpdisplaysettings.png
-
 Linux
 -----
 

manual/source/install_windows_mac.rst

@@ -5,63 +5,55 @@ Installing OpenLP is identical over all supported versions of Windows. After
 downloading the file from the `download page <http://www.openlp.org/en/download.html>`_ 
 open the file by double clicking when the download is complete. After opening 
 the downloaded file agree to open the unverified file if you are prompted.
+On Windows 8 you might have to click :guilabel:`More info` before you can
+verify by clicking :guilabel:`Run anyway`.
 
 Next select your language and click :guilabel:`OK`
 
-.. image:: pics/selectlanguage.png
+.. image:: pics/win10-selectlanguage.png
 
 After reading the welcome message click :guilabel:`Next` to continue the
 installation.
 
-.. image:: pics/welcome.png
+.. image:: pics/win10-welcome.png
 
 Agree to the license agreement. Click :guilabel:`Next` to continue.
 
-.. image:: pics/license.png
+.. image:: pics/win10-license.png
 
 Select the install location for OpenLP. Choosing the default location is
 generally the best choice. Click :guilabel:`Next` to continue.
 
-.. image:: pics/installlocation.png
+.. image:: pics/win10-installlocation.png
 
 Select a start menu folder for OpenLP to be visible in. The default location
 here is generally the best choice. Click :guilabel:`Next` to continue.
 
-.. image:: pics/startmenufolder.png
+.. image:: pics/win10-startmenufolder.png
 
 Select if you want to create a desktop or Quick Launch icon. Click :guilabel:`Next`
 to continue.
 
-.. image:: pics/additionaltask.png
+.. image:: pics/win10-additionaltask.png
 
 Review your previous choices. If you need to make any changes click the
 :guilabel:`Back button` to get to the previous choices, or click :guilabel:`Install`
 
-.. image:: pics/readytoinstall.png
+.. image:: pics/win10-readytoinstall.png
 
 The progress bar will update you on how far along the installation has gone.
 
-.. image:: pics/progress.png
+.. image:: pics/win10-progress.png
 
-When the install is complete you will have the option to launch OpenLP. After
-making your selection click :guilabel:`Finish`
+When the install is complete you will have the option to launch OpenLP.
+
+.. image:: pics/win10-launch.png
+
+After making your selection click :guilabel:`Finish`
 
 Installing OpenLP on Mac OS X
 =============================
 
-.. _macinstall:
-
-Version 10.6 (Snow Leopard) to 10.7 (Lion)
-------------------------------------------
-
-Installing OpenLP on OS X is very simple. After downloading the correct file
-from the OpenLP `download page <http://www.openlp.org/en/download.html>`_ 
-double click on the .dmg file. Drag the OpenLP icon over to the Applications
-folder and you will be ready to use OpenLP. OpenLP will be available in your
-Applications folder.
-
-.. image:: pics/osxinstall.png
-
 Version 10.8 (Mountain Lion) and Newer
 --------------------------------------
 
@@ -83,5 +75,10 @@ enable editing.
 
 .. image:: pics/gatekeeper3.png
 
-Now you can install OpenLP with the instructions for Mac :ref:`macinstall`.
+I you have not already downloaded the correct file from the OpenLP
+`download page <http://www.openlp.org/en/download.html>`_, download it now.
+Then double click on the .dmg file. Drag the OpenLP icon over to the Applications
+folder and you will be ready to use OpenLP. OpenLP will be available in your
+Applications folder.
 
+.. image:: pics/osxinstall.png