- Update the macOS installation instructions

- Change Mac OS X -> macOS
- Update the FAQ a bit

Thanks to "froggles" on https://forums.openlp.org/discussion/2816/feedback-on-mac-os-x-content-in-openlp-2-2-manual for the updated install instructions.

bzr-revno: 133

manual/source/bibles.rst

@@ -73,7 +73,7 @@ You can use the commands below convert Bibles from that software to OSIS format.
 
 The following commands are used in all platforms and the commands are case
 sensitive across all platforms. To convert a Bible using the command prompt in
-Windows or a terminal in Linux or Mac OS X you would type::
+Windows or a terminal in Linux or macOS you would type::
 
     mod2osis biblename > biblename.osis
 

manual/source/configure.rst

@@ -36,7 +36,7 @@ This setting often comes in useful when you only have a single display, and you
 want to be able to make the display smaller so that it does not cover your
 entire screen.
 
-Display if a single screen
+Display if a Single Screen
 ^^^^^^^^^^^^^^^^^^^^^^^^^^ 
 
 Checking this checkbox will show the display output in a separate window when
@@ -316,7 +316,7 @@ players control the following:
    reputation of being able to handle almost any video or audio format.
 
 **Note:** You must have `VLC`_ installed for the VLC option to be available. On
-Windows you must install the 32-bit version of VLC. On Mac OS X you must install
+Windows you must install the 32-bit version of VLC. On macOS you must install
 the 64-bit version of VLC.
 
 Player Order
@@ -489,7 +489,7 @@ feature you will need to have one of the above-mentioned applications installed,
 due to the fact that OpenLP uses these application to open and run the
 presentation.
 
-Support of PDF is bundled with OpenLP on Mac OS X and Windows. On Linux you will
+Support of PDF is bundled with OpenLP on macOS and Windows. On Linux you will
 need to install :file:`mupdf` (recommended) or :file:`ghostscript`.
 
 Advanced
@@ -692,7 +692,7 @@ Generating and Installing a Certificate
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 To make the Remote access run in a secure manner ssl certificates need to be
 provided to OpenLP. This is completely optional. On Linux you will need the
-"openssl" package installed. On Mac OS X openssl should be installed by default.
+"openssl" package installed. On macOS openssl should be installed by default.
 On Windows you will need to download OpenSSL for Windows.
 
 First create a configuration file for OpenSSL named openlp.cnf::

manual/source/dualmonitors.rst

@@ -330,21 +330,22 @@ connect your projector and enter::
 want to connect your projector until your desktop is running. 
 
 
-Mac OS X
+macOS
---------
+-----
 
-This short guide will tell users of Mac OS X how to setup dual displays.
+This short guide will tell users of macOS how to setup dual displays.
-
-.. image:: pics/mac-os-x-system-menu.png
 
 Open :guilabel:`System Preferences` in the Apple menu.
 
-.. image:: pics/mac-os-x-settings.png
+.. image:: pics/dual-monitors-macos-01-system-menu.png
 
 Choose the :guilabel:`Displays` option.
 
-.. image:: pics/mac-os-x-display-settings.png
+.. image:: pics/dual-monitors-macos-02-settings.png
 
 Click :guilabel:`Arrangement` in the top of the window. Make sure that
 :guilabel:`Mirror Displays` is unchecked. You can now arrange the displays as
 you wish.
+
+.. image:: pics/dual-monitors-macos-03-display-settings.png
+

manual/source/faq.rst

@@ -8,207 +8,194 @@ General Questions
 Can I help with OpenLP?
 -----------------------
 
-OpenLP is possible because of the commitment of individuals. If you would like 
+OpenLP is possible because of the commitment of individuals. If you would like to help there are several things that
-to help there are several things that you can get involved with. Please see: 
+you can get involved with. Please see our `Contribute`_ page for more information.
-`Contributing <http://wiki.openlp.org/Development:Getting_Started>`_ 
-for more information.
 
 I use and like OpenLP and would like to tell others online. Where can I do this?
 --------------------------------------------------------------------------------
 
 A variety of places!
 
-* Are you on facebook? Then `become a fan <http://www.facebook.com/openlp>`_
+* Are you on Facebook? Then `become a fan`_.
-* Are you on twitter? Then `follow openlp <http://twitter.com/openlp>`_, and
+* Are you on Twitter? Then `follow OpenLP`_, and retweet the announcements.
-  retweet the announcements.
+* If you have a website or blog, then link to `our web site`_ with a few words saying what OpenLP is and why you like it.
-* Give us a thumbs up on the
+* Add a placemark on our `Worldwide Usage map`_, so others in your locality can see someone close by is using it.
-  `SourceForge project page <http://www.sourceforge.net/projects/openlp>`_ 
+* If you are a member of any Christian forums or websites, and their rules allow it, then perhaps review OpenLP or ask
-* If you have a website or blog, then link to our site http://www.openlp.org
+  others to review it.
-  with a few words saying what the software is and why you like it.
-* Add a placemark on our `Worldwide Usage map <http://maps.google.com/maps/ms?ie=UTF8&source=embed&msa=0&msid=113314234297482809599.00047e88b1985e07ad495&ll=13.923404,0&spn=155.179835,316.054688&z=2>`_,
-  so others in your locality can see someone close by is using it.
-* If you are a member of any Christian Forums or websites, and their rules allow
-  it, then perhaps review the software or ask others to review it.
 
-What operating systems will OpenLP 2.4 support?
+What operating systems does OpenLP support?
------------------------------------------------
+-------------------------------------------
 
-OpenLP 2.4 is designed to be cross platform. Currently it has been known to run 
+OpenLP is designed to be cross platform. Currently it has been known to run on Windows (Vista, 7, 8, 10), Linux (Ubuntu
-on Windows (Vista, 7, 8, 10), Linux (Ubuntu and its variants, Fedora, Debian,
+and its variants, Fedora, Debian, ArchLinux, Mint, OpenSUSE and many others), FreeBSD and macOS. `Please let us know`_
-ArchLinux, Mint, OpenSUSE and many many others), FreeBSD & Mac OS X.
+if you have successfully run it on something else.
-`Please let us know <http://wiki.openlp.org/Help:Contents>`_ if you have 
-successfully run it on something else.
 
-Which programming language is 2.4 developed in?
+Which programming language is OpenLP developed in?
------------------------------------------------
+--------------------------------------------------
 
-OpenLP 2.4 is written in `Python3 <http://www.python.org>`_ and uses the 
+OpenLP is written in `Python 3`_ and uses the `Qt5 toolkit`_ via the `PyQt5 library`. Both are cross-platform which
-`Qt5 toolkit <http://www.qt.io>`_. Both are cross-platform which allows the 
+allows the software to run on different types of machine and so allow more people access to free worship software.
-software to run on different types of machine and so allow more people access to 
+Python is one of the easier programming languages to learn, so this helps us develop and `find bugs`_ faster, and also
-free worship software. Python is one of the easier programming languages to 
+allows more developers to contribute with the project.
-learn, so this helps us develop and `find bugs <http://wiki.openlp.org/Bug#Something_has_gone_wrong.2C_what_should_I_do_to_help_get_it_fixed.3F>`_ 
-quicker, and also allows more developers to contribute with the project.
 
 Which written languages does OpenLP support?
 --------------------------------------------
                             
-OpenLP has support for multiple languages which can be seen on the 
+OpenLP has support for multiple languages which can be seen on the :menuselection:`Settings -->Translate` menu. However
-:menuselection:`Settings -->Translate` menu. However some of these translations 
+some of these translations are incomplete. If you would like to help complete or start to translate OpenLP into your
-are incomplete. If you would like to help complete or start to translate OpenLP 
+own language then see the `Getting started page`_ for translations. 
-into your language then see the `Getting started page <http://wiki.openlp.org/Translation:Getting_Started>`_. 
 
 Upgrading
 =========
 
+.. warning::
+
+   Newer versions of OpenLP are not backwards compatible with earlier versions. Once you have upgraded to a newer
+   version, the older version of OpenLP will not be able to read the upgraded files.
+   
+.. note::
+   
+   It is always a good idea to make a backup when prompted by OpenLP.
+
 Can I upgrade from any 1.9.x or 2.0.x release to 2.4?
 -----------------------------------------------------
 
-No, you should first upgrade to the last stable release in the 2.0-series
+No, you should first upgrade to the last stable release in the 2.0-series (2.0.5) and then upgrade to 2.4 to ensure
-(2.0.5) and then upgrade to 2.4 to ensure that data is correctly converted.
+that data is correctly converted.  You can download OpenLP 2.0.5 from `<https://get.openlp.org/2.0.5/>`_. 
-You can download OpenLP 2.0.5 from <http://sourceforge.net/projects/openlp/files/openlp/2.0.5/>`_. 
 
 Can I upgrade directly from 1.2 to 2.4?
 ---------------------------------------
 
-No, you will have to install 2.0.5 first, then import the 1.2 data and then
+No, you will have to install 2.0.5 first, then import the 1.2 data and then upgrade to 2.4. See the 2.0 documentation
-upgrade to 2.4. See the 2.0 documentation for how to upgrade from 1.2 to
+for how to upgrade from 1.2 to 2.0. You can download OpenLP 2.0.5 from `<https://get.openlp.org/2.0.5/>`_. 
-2.0. You can download OpenLP 2.0.5 from <http://sourceforge.net/projects/openlp/files/openlp/2.0.5/>`_. 
 
 Does 2.4 replace older 2.x versions, or can they be run side by side?
 ---------------------------------------------------------------------
 
-OpenLP 2.4 and earlier 2.x versions cannot run side by side. When running 2.4 for first time
+OpenLP 2.4 and earlier 2.x versions cannot run side by side. When running 2.4 for first time any existing 2.x data will
-any existing 2.x data will automatically be converted to the 2.4 format.
+automatically be converted to the 2.4 format. OpenLP 2.4 will ask if it should make a backup on startup, which can be
-Note that OpenLP 2.4 is not backwards compatible with earlier 2.x versions. Once you have
+used in case you want to downgrade again.
-upgraded from the older OpenLP versions cannot read the upgraded files. OpenLP 2.4 will
-ask if it should make a backup on startup, which can be used in case you want
-to downgrade again.
 
-OpenLP 2.4 cannot read service files created by OpenLP 2.0.4 and earlier, it can only
+OpenLP 2.4 cannot read service files created by OpenLP 2.0.4 and earlier, it can only read service files created by
-read service files created by OpenLP 2.0.5.
+OpenLP 2.0.5 and higher.
+
+Where can I download an older version of OpenLP?
+------------------------------------------------
+
+.. warning::
+
+   Only the most current version of OpenLP is supported. If you submit a bug report for an older version, you will be
+   told to upgrade first.
+
+Sometimes you might need to download an older version of OpenLP. You can always find previous versions of OpenLP on our
+download server: `<https://get.openlp.org/>`_
 
 Using OpenLP
 ============
 
-I have started OpenLP, but I cannot see the songs or bibles section in the Media Manager
+I have started OpenLP, but I cannot see the songs or bibles section in the Library
-----------------------------------------------------------------------------------------
+----------------------------------------------------------------------------------
 
-When you installed OpenLP, the first time wizard would have asked which plugins 
+When you installed OpenLP, the first time wizard would have asked which plugins you wanted, and songs and bibles should
-you wanted, and songs and bibles should have been selected. If for some reason 
+have been selected. If for some reason they were not, then you will need to activate them yourself. See below for
-they were not, then you will need to activate them yourself. See below
+instructions.
-for instructions.
 
 How do I activate / deactivate a plugin?
 ----------------------------------------
 
-Plugins can be turned on and off from the Plugin List Screen. Select the plugin 
+Plugins can be turned on and off from the Plugin List Screen. Select the plugin you wish to start/stop and change its
-you wish to start/stop and change its status. You should not need to restart 
+status. You should not need to restart OpenLP.
-OpenLP.
 
 What are these plugins that I keep seeing mentioned?
 ----------------------------------------------------
 
-The plugins allow OpenLP to be extend easily.  A number have been written 
+The plugins allow OpenLP to be extend easily. A number have been written (Songs, Bibles, Presentations) etc but it is
-(Songs, Bibles, Presentations) etc but it is possible for the application to be 
+possible for the application to be extended with functionality only you require. If this is the case then go for it but
-extended with functionality only you require.  If this is the case then go for 
+let us know as we can help and it may be something someone else wants.
-it but lets us know as we can help and it may be something someone else wants.
 
 How do I enable PowerPoint/Impress/PowerPoint Viewer?
 -----------------------------------------------------
 
-First of all ensure that the presentation plugin is enabled (see above).
+.. note::
-Then to enable a presentation application, go to the `Settings` dialog, switch 
-to the `Presentations` tab and check one of the enabled checkboxes. OpenLP will 
-automatically detect which of the three you have installed, and enable the 
-appropriate checkbox(es). Check the applications you require, and then restart 
-OpenLP for the change to be detected. 
-Note, PowerPoint Viewer 2010 is not yet supported, use 2003 or 2007.
 
-Why can LibreOffice Impress not be used on Mac OS X?
+   PowerPoint, Keynote and LibreOffice are not supported on macOS due to limitations within the platform. This is
-----------------------------------------------------
+   outside of our control.
 
-Currently the presentations plugin does not support Impress on OS X. The 
+.. note::
-reason for that is that the interoperability component (pyuno) in LibreOffice on
-Mac OS X cannot be used by OpenLP due to incompatibilities between the version
-of Python used by LibreOffice and the Python version used by OpenLP.
 
-Why can MS PowerPoint not be used on Mac OS X?
+   PowerPoint Viewer 2010 is not supported, use 2003 or 2007.
-----------------------------------------------
 
-Currently the presentations plugin does not support PowerPoint on OS X. The 
+First of all ensure that the presentation plugin is enabled (see above). Then to enable a presentation application, go
-reason for that is that so far we have found that the available method to
+to the `Settings` dialog, switch to the `Presentations` tab and check one of the enabled checkboxes. OpenLP will 
-control PowerPoint on OS X is not good enough for integration with OpenLP.
+automatically detect which of the three you have installed, and enable the appropriate checkbox(es). Check the
-If this changes we will look at including this feature.
+applications you require, and then restart OpenLP for the change to be detected. 
 
 I am on Windows and PowerPoint is installed, but it does not appear as an option
 --------------------------------------------------------------------------------
 
-Try installing the `Visual C++ Runtime Redistributable <http://www.microsoft.com/downloads/details.aspx?FamilyID=9b2da534-3e03-4391-8a4d-074b9f2bc1bf&displaylang=en>`_.
+Try installing the `Visual C++ Runtime Redistributable`_.
 
-Why does PowerPoint presentations not advance automatically
+Why don't PowerPoint presentations advance automatically?
------------------------------------------------------------
+---------------------------------------------------------
 
-The reason that PowerPoint does not advance automatically is that it can only do
+The reason that PowerPoint does not advance automatically is that it can only do so when it has the focus. But when
-so when it has the focus. But when using OpenLP for controlling presentation,
+using OpenLP for controlling presentation, OpenLP has the focus. So in order to make PowerPoint advance automatically
-OpenLP has the focus. So in order to make PowerPoint advance automatically the
+the focus must be switched to PowerPoint, which can be done by clicking the Powerpoint-icon in the taskbar once the
-focus must be switched to PowerPoint, which can be done by clicking the
+PowerPoint presentation has opened.
-Powerpoint-icon in the taskbar once the PowerPoint presentation has opened.
 
-Is it possible to get Bible x? How?
+Is it possible to get a particular translation of the Bible? How?
------------------------------------
+-----------------------------------------------------------------
 
-The Bible plugin has a `Import Wizard` which can import Bibles 
+.. note::
-from a variety of sources. The following sources are supported:
+
+   OpenLP does not have distrubution rights for most popular translations of the Bible. Bible societies require
+   exhorbitant licensing costs which OpenLP could never afford. We cannot help you find those Bibles.
+
+The Bible plugin has a `Import Wizard` which can import Bibles from a variety of sources. The following sources are
+supported:
 
 CSV
-    The format is documented in the `OpenLP API documentation <http://api.openlp.io/api/openlp/plugins/bibles/lib/csvbible.html#module-openlp.plugins.bibles.lib.csvbible>`_.
+    The format is documented in the `OpenLP API documentation`_.
 
 OSIS
-    An XML format for Bible. You can export Bibles from the `Sword Project <http://www.crosswire.org/sword/software/>`_
+    An XML format for Bible. You can export Bibles from the `Sword Project`_ into OSIS using the ``mod2osis`` tool.
-    into OSIS using the ``mod2osis`` tool. After using the Sword software Media
+    After using the Sword software Media Manager (or other Sword frontend, like BibleTime or Xiphos) to download the
-    Manager (or other Sword frontend, like BibleTime or Xiphos) to download the
+    required Bible, run the following command from the command line (works on Windows and Linux)::
-    required Bible, run the following command from the command line (works on
-    Windows and Linux)::
 
-        mod2osis <name> > <name>.osis
+        mod2osis NAME > NAME.osis
 
-    The ``<name>`` parameter is the name of your Bible, as you see it in Sword.
+    The ``NAME`` parameter is the name of your Bible, as you see it in Sword. Note that the ``NAME`` is case sensitive
-    Note that the ``<name>`` is case sensitive on all environments. Once you
+    on all environments. Once you have exported your Bible to OSIS, the Bible import wizard will the read ``NAME.osis``
-    have exported your Bible to OSIS, the Bible import wizard will the read
+    file and import your Bible.
-    ``<name>.osis`` file and import your Bible.
 
 OpenSong
-    OpenSong has a good selection of Bibles on their
+    OpenSong has a good selection of Bibles on their `download page`_.
-    `download page <http://www.opensong.org/d/downloads#bible_translations>`_.
 
 Web Download
     OpenLP can download Bibles on demand from the following 3 sites:
 
-    * `Crosswalk <http://biblestudy.crosswalk.com/bibles/>`_
+    * `Crosswalk`_
-    * `BibleGateway <http://www.biblegateway.com/versions/>`_
+    * `BibleGateway`_
-    * `BibleServer <http://www.bibleserver.com>`_
+    * `BibleServer`_
 
 Zefania
-   The Zefania project has many bibles available from `their website <http://sourceforge.net/projects/zefania-sharp/files/Bibles/>`_
+   The Zefania project has many bibles available from `their website`_.
 
 Why do my Bible verses take a long time to load?
 ------------------------------------------------
 
-In order to better conform to copyright law, the Web Download Bibles are not 
+In order to better conform to copyright law, the Web Download Bibles are not downloaded when you import them, but on
-downloaded when you import them, but on the fly as you search for them. As a 
+the fly as you search for them. As a result, the search takes a little longer if you need to download those particular
-result, the search takes a little longer if you need to download those 
+verses. Having said that, the Web Download Bibles cache downloaded verses so that you do not need to download them
-particular verses. Having said that, the Web Download Bibles cache downloaded 
+again.
-verses so that you do not need to download them again.
 
 My Bible is on the Web Download sites, but my Church is not on the internet. What options do I have?
 ----------------------------------------------------------------------------------------------------
 
-When you create and save a service, all the items in the service are saved with 
+When you create and save a service, all the items in the service are saved with it. That means any images,
-it. That means any images, presentations, songs and media items are saved. This 
+presentations, songs and media items are saved. This is also true for bibles. What this means is you can create the
-is also true for bibles. What this means is you can create the service on your 
+service on your home computer, insert a Bible passage from the web, save it and then open the service using your church
-home computer, insert a Bible passage from the web, save it and then open the 
+computer and voila, the Bible passage should be there! Note this can also be done with songs, etc!
-service using your church computer and voila, the Bible passage should be there! 
-Note this can also be done with songs, etc!
 
 
 Location of OpenLP files
@@ -217,11 +204,10 @@ Location of OpenLP files
 Where do I find the configuration file?
 ---------------------------------------
 
-Linux, FreeBSD & PC-BSD
+Linux, FreeBSD and PC-BSD
-^^^^^^^^^^^^^^^^^^^^^^^
+^^^^^^^^^^^^^^^^^^^^^^^^^
 
-If your distribution supports the XDG standard, you will find OpenLP's 
+If your distribution supports the XDG standard, you will find OpenLP's configuration file in::
-configuration file in::
 
     /home/<user>/.config/OpenLP/OpenLP.conf
 
@@ -231,8 +217,8 @@ If that file and/or directory does not exist, look for::
 
 ``<user>`` is your username.
 
-Mac OS X
+macOS
-^^^^^^^^
+^^^^^
 
 You will find your configuration file here::
 
@@ -243,8 +229,7 @@ You will find your configuration file here::
 Windows
 ^^^^^^^
 
-On Windows, OpenLP does not use a configuration file, it uses the Windows 
+On Windows, OpenLP does not use a configuration file, it uses the Windows registry. You can find the settings here::
-registry. You can find the settings here::
 
     HKEY_CURRENT_USER\Software\OpenLP\OpenLP
 
@@ -253,27 +238,26 @@ registry. You can find the settings here::
 Where do I find the data folder?
 --------------------------------
 
-Normally you can open the data folder by using the menu :menuselection:`Tools --> Open Data Folder`
+Normally you can open the data folder by using the menu :menuselection:`Tools --> Open Data Folder` and a file manager
-and a fileexplorer window will appear with the data folder. In some cases due to
+window will appear with the data folder. In some cases due to bugs or other issues this is not an option, and the
-bugs or other issues this is not an option, and the folder must be found
+folder must be found manually.
-manually.
 
-Linux, FreeBSD & PC-BSD
+Linux, FreeBSD and PC-BSD
-^^^^^^^^^^^^^^^^^^^^^^^
+^^^^^^^^^^^^^^^^^^^^^^^^^
 
 The data folder is located in ``/home/<user>/.local/share/openlp``.
 
-Mac OS X
+macOS
-^^^^^^^^
+^^^^^
 
-On Mac OS X the data folder is located in ``/Users/<username>/Library/Application Support/openlp``
+On macOS the data folder is located in ``/Users/<username>/Library/Application Support/openlp``
 
 Windows
 ^^^^^^^
 
-To get to the data folder on Windows, pres the Windows Key and "R" at the same
+To get to the data folder on Windows, pres the Windows Key and "R" at the same time. This will open a the
-time. This will open a the :menuselection:`Run dialog`. Enter ``%appdata%\OpenLP``
+:menuselection:`Run dialog`. Enter ``%appdata%\OpenLP`` and press <Enter>. This will open a file manager within the
-and press <Enter>. This will open a fileexplorer with in the data folder.
+data folder.
 
 Features
 ========
@@ -281,14 +265,34 @@ Features
 Why has popular feature request X not been implemented?
 -------------------------------------------------------
 
-There are only a handful of developers working in their spare time. If 
+There are only a handful of developers working in their spare time. If we were to try and include everything we wanted
-we were to try and include everything we wanted to implement, then 2.4 would not 
+to implement, then we would never be able to release any new versions of OpenLP.
-likely ever get released.
 
 I have a great idea for a new feature, where should I suggest it?
 -----------------------------------------------------------------
 
-First of all check it is not on the `Feature Requests <http://wiki.openlp.org/Feature_Requests>`_ 
+First of all check it is not listed as a "wishlist" bug on `Launchpad`_. If it is, then you need to say no more, it has
-page. If it is, then you need to say no more, it has already been suggested! If it 
+already been suggested! If it is not on the list, then head to the `forums`_ and post the
-is not on the list, then head to the `forum <http://forums.openlp.org>`_ 
+idea there.
-and post the idea there.
+
+.. _Contribute: https://openlp.org/contribute
+.. _become a fan: https://www.facebook.com/openlp
+.. _follow OpenLP: https://twitter.com/openlp
+.. _our web site: https://openlp.org/
+.. _Worldwide Usage map: https://maps.google.com/maps/ms?ie=UTF8&source=embed&msa=0&msid=113314234297482809599.00047e88b1985e07ad495&ll=13.923404,0&spn=155.179835,316.054688&z=2
+.. _Please let us know: https://forums.openlp.org/
+.. _Python 3: http://www.python.org/
+.. _Qt5 toolkit: https://www.qt.io/
+.. _PyQt5 library: https://www.riverbankcomputing.com/software/pyqt/intro
+.. _find bugs: http://wiki.openlp.org/Bug#Something_has_gone_wrong.2C_what_should_I_do_to_help_get_it_fixed.3F
+.. _Getting started page: http://wiki.openlp.org/Translation:Getting_Started
+.. _Visual C++ Runtime Redistributable: http://www.microsoft.com/downloads/details.aspx?FamilyID=9b2da534-3e03-4391-8a4d-074b9f2bc1bf&displaylang=en
+.. _OpenLP API documentation: http://api.openlp.io/api/openlp/plugins/bibles/lib/csvbible.html#module-openlp.plugins.bibles.lib.csvbible
+.. _Sword Project: http://www.crosswire.org/sword/software/
+.. _download page: http://www.opensong.org/home/download#bibles
+.. _Crosswalk: http://biblestudy.crosswalk.com/bibles/
+.. _BibleGateway: http://www.biblegateway.com/versions/
+.. _BibleServer: http://www.bibleserver.com
+.. _their website: http://sourceforge.net/projects/zefania-sharp/files/Bibles/
+.. _Launchpad: https://bugs.launchpad.net/openlp
+.. _forums: https://forums.openlp.org/

manual/source/index.rst

@@ -1,5 +1,9 @@
-Welcome to the OpenLP 2.4 User Manual
+Welcome to the OpenLP User Manual
-=====================================
+=================================
+
+The OpenLP User Manual is here to help you learn how to use OpenLP. From installing, to setting up your monitors, to
+using OpenLP on a regular basis, all the information you need to know is in here. And if you see some of it is missing,
+please `help us add it`_.
 
 Getting Started With OpenLP
 ---------------------------
@@ -53,3 +57,5 @@ Questions and Troubleshooting
 
    faq
    troubleshooting
+
+.. _help us add it: https://openlp.org/contribute

manual/source/install_mac.rst

@@ -1,30 +1,46 @@
-Installing OpenLP on Mac OS X
+Installing OpenLP on macOS
-=============================
+==========================
 
-If you have not already downloaded the correct file from the `OpenLP website`_,
+If you have not already downloaded the correct file from the `OpenLP website`_, download it now. Then double click on
-download it now. Then double click on the .dmg file. This will open a window with two
+the .dmg file. This will open a window with two icons: An OpenLP icon and an Applications Folder icon. To install
-icons: An OpenLP icon and an Applications Folder icon. To install OpenLP, simply drag
+OpenLP, simply drag the OpenLP icon over to the Applications folder icon and you will be ready to use OpenLP. OpenLP
-the OpenLP icon over to the Applications folder icon and you will be ready to use
+will be available in your Applications folder.
-OpenLP. OpenLP will be available in your Applications folder.
 
-.. image:: pics/mac-os-x-dnd-install.png
+.. image:: pics/install-macos-01-dnd-install.png
 
-With the release of Mac OS X 10.8 applications not downloaded throught the Mac
+With the release of Mac OS X 10.7.5, applications that are not signed by a developer registered with Apple will not run
-App Store will not run by default. A setting must be changed in the Security &
+by default. In order to run OpenLP the first time after installation, you will need to "teach" your computer to trust
-Privacy Settings to run OpenLP.
+the OpenLP application.
 
-Click the Apple icon and open System Preferences
+First, go to the :guilabel:`Applications` folder and right-click on OpenLP (two-finger click on touch pads, or
+:kbd:`Control+click` if you don't have a right mouse button). This will bring up a context menu as shown. Select "Open"
+from that menu.
 
-.. image:: pics/mac-os-x-system-menu.png
+.. image:: pics/install-macos-02-open.png
+   :width: 40%
+   :align: center
 
-Open the Security & Privacy settings
+Your computer may then verify the application, which will take a few seconds.
 
-.. image:: pics/mac-os-x-settings.png
+.. image:: pics/install-macos-03-verifying.png
 
-Change the setting from Mac App Store to Anywhere. If the settings are grayed
+You will see a prompt asking whether you are sure you want to open "OpenLP", noting that it is from an unidentified
-out click on the lock in the lower lefthand corner of the settings window to  
+developer. It will look very similar to the pictured dialog.
-enable editing.
 
-.. image:: pics/mac-os-x-security-and-privacy.png
+To run OpenLP you simply need to click "Open". In future, you can simply run OpenLP just like any other application
+(double-click in Applications, or keep it in the Dock for easy access) without going through these steps.
+
+.. image:: pics/install-macos-04-unidentified-developer.png
+
+You may need to repeat similar steps when you upgrade OpenLP (once per upgrade).
+
+If the steps above don't work, you may need to set your GateKeeper settings (under :guilabel:`Security && Privacy`) to
+"Mac App Store and identified developers", as seen below.
+
+.. image:: pics/install-macos-05-system-menu.png
+
+.. image:: pics/install-macos-06-settings.png
+
+.. image:: pics/install-macos-07-security-and-privacy.png
 
 .. _OpenLP website: https://openlp.org/

manual/source/system_requirements.rst

@@ -9,13 +9,13 @@ on less powerful hardware but you may not get the performance you desire.
 * 2Ghz CPU
 * 1GB RAM
 * 100MB free disk space
-* Windows Vista/7/8/10, Linux, Mac OS X (10.8 or later), FreeBSD
+* Windows Vista/7/8/10, Linux, macOS (10.8 or later), FreeBSD
 * Multiple Monitor Support is highly recommended (not required)
 * For Presentation support:
 
   * Windows: PowerPoint XP or later, PowerPoint Viewer 2003 or 2007 (not 2010)
     or LibreOffice Impress 4 or later (32 bit)
   * Linux: LibreOffice Impress 4 or later
-  * Mac: Not supported yet
+  * macOS: Not supported yet due to limitations in Keynote and PowerPoint
 * The Generic Document/Presentation and Songs of Fellowship song import options
   require LibreOffice 4 or later

manual/source/troubleshooting.rst

@@ -167,12 +167,10 @@ K-Lite Codec Pack. If you are having issues, results do seem to vary with the
 different options. What works for some may not for others, so some trial and
 error may be required.
 
-Mac
+macOS
-^^^
+^^^^^
 
-If you are using a Mac. You may wish to play Windows formats. flip4mac enables
+Most modern Macs should already support most popular formats out of the box.
-you to use popular Windows formats such as .wmv on your Mac. You can get it
-`from here <http://dynamic.telestream.net/downloads/download-flip4macwmv.htm>`_.
 
 Ubuntu Linux (and variants)
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -365,8 +363,8 @@ monitor resolution and avoiding shadows and outline text will help. We are
 hoping a future release of the toolkit we are using (QtWebKit) will help improve
 this, but there is no timeframe at present.
 
-Why do live backgrounds not work in OpenLP 2.4 on Windows & Mac OS X
+Why do live backgrounds not work in OpenLP 2.4 on Windows and macOS
---------------------------------------------------------------------
+-------------------------------------------------------------------
 
 Due to issues in one of the underlying frameworks that OpenLP uses (Qt5),
 live backgrounds do not work in OpenLP 2.4. We aim to fix this in OpenLP 2.6.