Raoul Snyman has proposed merging lp:~raoul-snyman/openlp/update-macos-install
into lp:openlp/documentation.
Requested reviews:
OpenLP Core (openlp-core)
For more details, see:
https://code.launchpad.net/~raoul-snyman/openlp/update-macos-install/+merge/322811
Update the macOS installation instructions, thanks to "froggles" on
https://forums.openlp.org/discussion/2816/feedback-on-mac-os-x-content-in-openlp-2-2-manual
--
Your team OpenLP Core is requested to review the proposed merge of
lp:~raoul-snyman/openlp/update-macos-install into lp:openlp/documentation.
=== modified file 'manual/source/bibles.rst'
--- manual/source/bibles.rst 2015-10-16 11:14:02 +0000
+++ manual/source/bibles.rst 2017-04-20 06:15:33 +0000
@@ -73,7 +73,7 @@
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
=== modified file 'manual/source/configure.rst'
--- manual/source/configure.rst 2017-02-14 06:40:26 +0000
+++ manual/source/configure.rst 2017-04-20 06:15:33 +0000
@@ -36,7 +36,7 @@
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 @@
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 @@
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 @@
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
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::
=== modified file 'manual/source/dualmonitors.rst'
--- manual/source/dualmonitors.rst 2015-10-16 10:02:10 +0000
+++ manual/source/dualmonitors.rst 2017-04-20 06:15:33 +0000
@@ -330,21 +330,22 @@
want to connect your projector until your desktop is running.
-Mac OS X
---------
-
-This short guide will tell users of Mac OS X how to setup dual displays.
-
-.. image:: pics/mac-os-x-system-menu.png
+macOS
+-----
+
+This short guide will tell users of macOS how to setup dual displays.
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
+
=== modified file 'manual/source/faq.rst'
--- manual/source/faq.rst 2016-02-20 22:40:13 +0000
+++ manual/source/faq.rst 2017-04-20 06:15:33 +0000
@@ -8,207 +8,194 @@
Can I help with OpenLP?
-----------------------
-OpenLP is possible because of the commitment of individuals. If you would like
-to help there are several things that you can get involved with. Please see:
-`Contributing <http://wiki.openlp.org/Development:Getting_Started>`_
-for more information.
+OpenLP is possible because of the commitment of individuals. If you would like to help there are several things that
+you can get involved with. Please see our `Contribute`_ page 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 twitter? Then `follow openlp <http://twitter.com/openlp>`_, and
- retweet the announcements.
-* Give us a thumbs up on the
- `SourceForge project page <http://www.sourceforge.net/projects/openlp>`_
-* If you have a website or blog, then link to our site http://www.openlp.org
- 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?
------------------------------------------------
-
-OpenLP 2.4 is designed to be cross platform. Currently it has been known to run
-on Windows (Vista, 7, 8, 10), Linux (Ubuntu and its variants, Fedora, Debian,
-ArchLinux, Mint, OpenSUSE and many many others), FreeBSD & Mac OS X.
-`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?
------------------------------------------------
-
-OpenLP 2.4 is written in `Python3 <http://www.python.org>`_ and uses the
-`Qt5 toolkit <http://www.qt.io>`_. Both are cross-platform which allows the
-software to run on different types of machine and so allow more people access to
-free worship software. Python is one of the easier programming languages to
-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.
+* Are you on Facebook? Then `become a fan`_.
+* Are you on Twitter? Then `follow OpenLP`_, and 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.
+* Add a placemark on our `Worldwide Usage map`_, 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 OpenLP or ask
+ others to review it.
+
+What operating systems does OpenLP support?
+-------------------------------------------
+
+OpenLP is designed to be cross platform. Currently it has been known to run on Windows (Vista, 7, 8, 10), Linux (Ubuntu
+and its variants, Fedora, Debian, ArchLinux, Mint, OpenSUSE and many others), FreeBSD and macOS. `Please let us know`_
+if you have successfully run it on something else.
+
+Which programming language is OpenLP developed in?
+--------------------------------------------------
+
+OpenLP is written in `Python 3`_ and uses the `Qt5 toolkit`_ via the `PyQt5 library`. Both are cross-platform which
+allows the software to run on different types of machine and so allow more people access to free worship software.
+Python is one of the easier programming languages to learn, so this helps us develop and `find bugs`_ faster, 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
-:menuselection:`Settings -->Translate` menu. However some of these translations
-are incomplete. If you would like to help complete or start to translate OpenLP
-into your language then see the `Getting started page <http://wiki.openlp.org/Translation:Getting_Started>`_.
+OpenLP has support for multiple languages which can be seen on the :menuselection:`Settings -->Translate` menu. However
+some of these translations are incomplete. If you would like to help complete or start to translate OpenLP into your
+own language then see the `Getting started page`_ for translations.
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
-(2.0.5) and then upgrade to 2.4 to ensure that data is correctly converted.
-You can download OpenLP 2.0.5 from <http://sourceforge.net/projects/openlp/files/openlp/2.0.5/>`_.
+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
+that data is correctly converted. You can download OpenLP 2.0.5 from `<https://get.openlp.org/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
-upgrade to 2.4. See the 2.0 documentation for how to upgrade from 1.2 to
-2.0. You can download OpenLP 2.0.5 from <http://sourceforge.net/projects/openlp/files/openlp/2.0.5/>`_.
+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
+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/>`_.
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
-any existing 2.x data will automatically be converted to the 2.4 format.
-Note that OpenLP 2.4 is not backwards compatible with earlier 2.x versions. Once you have
-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
-read service files created by OpenLP 2.0.5.
+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
+automatically be converted to the 2.4 format. 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 read service files created by
+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
-you wanted, and songs and bibles should have been selected. If for some reason
-they were not, then you will need to activate them yourself. See below
-for instructions.
+When you installed OpenLP, the first time wizard would have asked which plugins you wanted, and songs and bibles should
+have been selected. If for some reason they were not, then you will need to activate them yourself. See below for
+instructions.
How do I activate / deactivate a plugin?
----------------------------------------
-Plugins can be turned on and off from the Plugin List Screen. Select the plugin
-you wish to start/stop and change its status. You should not need to restart
-OpenLP.
+Plugins can be turned on and off from the Plugin List Screen. Select the plugin you wish to start/stop and change its
+status. You should not need to restart OpenLP.
What are these plugins that I keep seeing mentioned?
----------------------------------------------------
-The plugins allow OpenLP to be extend easily. A number have been written
-(Songs, Bibles, Presentations) etc but it is possible for the application to be
-extended with functionality only you require. If this is the case then go for
-it but lets us know as we can help and it may be something someone else wants.
+The plugins allow OpenLP to be extend easily. A number have been written (Songs, Bibles, Presentations) etc but it is
+possible for the application to be extended with functionality only you require. If this is the case then go for it but
+let 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).
-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?
-----------------------------------------------------
-
-Currently the presentations plugin does not support Impress on OS X. The
-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?
-----------------------------------------------
-
-Currently the presentations plugin does not support PowerPoint on OS X. The
-reason for that is that so far we have found that the available method to
-control PowerPoint on OS X is not good enough for integration with OpenLP.
-If this changes we will look at including this feature.
+.. note::
+
+ PowerPoint, Keynote and LibreOffice are not supported on macOS due to limitations within the platform. This is
+ outside of our control.
+
+.. note::
+
+ PowerPoint Viewer 2010 is not supported, use 2003 or 2007.
+
+First of all ensure that the presentation plugin is enabled (see above). 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.
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>`_.
-
-Why does PowerPoint presentations not advance automatically
------------------------------------------------------------
-
-The reason that PowerPoint does not advance automatically is that it can only do
-so when it has the focus. But when using OpenLP for controlling presentation,
-OpenLP has the focus. So in order to make PowerPoint advance automatically the
-focus must be switched to PowerPoint, which can be done by clicking the
-Powerpoint-icon in the taskbar once the PowerPoint presentation has opened.
-
-Is it possible to get Bible x? How?
------------------------------------
-
-The Bible plugin has a `Import Wizard` which can import Bibles
-from a variety of sources. The following sources are supported:
+Try installing the `Visual C++ Runtime Redistributable`_.
+
+Why don't PowerPoint presentations advance automatically?
+---------------------------------------------------------
+
+The reason that PowerPoint does not advance automatically is that it can only do so when it has the focus. But when
+using OpenLP for controlling presentation, OpenLP has the focus. So in order to make PowerPoint advance automatically
+the focus must be switched to PowerPoint, which can be done by clicking the Powerpoint-icon in the taskbar once the
+PowerPoint presentation has opened.
+
+Is it possible to get a particular translation of the Bible? How?
+-----------------------------------------------------------------
+
+.. note::
+
+ 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/>`_
- into OSIS using the ``mod2osis`` tool. After using the Sword software Media
- 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)::
-
- mod2osis <name> > <name>.osis
-
- The ``<name>`` parameter is the name of your Bible, as you see it in Sword.
- Note that the ``<name>`` is case sensitive on all environments. Once you
- have exported your Bible to OSIS, the Bible import wizard will the read
- ``<name>.osis`` file and import your Bible.
+ An XML format for Bible. You can export Bibles from the `Sword Project`_ into OSIS using the ``mod2osis`` tool.
+ After using the Sword software Media 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)::
+
+ mod2osis NAME > NAME.osis
+
+ The ``NAME`` parameter is the name of your Bible, as you see it in Sword. Note that the ``NAME`` is case sensitive
+ on all environments. Once you have exported your Bible to OSIS, the Bible import wizard will the read ``NAME.osis``
+ file and import your Bible.
OpenSong
- OpenSong has a good selection of Bibles on their
- `download page <http://www.opensong.org/d/downloads#bible_translations>`_.
+ OpenSong has a good selection of Bibles on their `download page`_.
Web Download
OpenLP can download Bibles on demand from the following 3 sites:
- * `Crosswalk <http://biblestudy.crosswalk.com/bibles/>`_
- * `BibleGateway <http://www.biblegateway.com/versions/>`_
- * `BibleServer <http://www.bibleserver.com>`_
+ * `Crosswalk`_
+ * `BibleGateway`_
+ * `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
-downloaded when you import them, but on the fly as you search for them. As a
-result, the search takes a little longer if you need to download those
-particular verses. Having said that, the Web Download Bibles cache downloaded
-verses so that you do not need to download them again.
+In order to better conform to copyright law, the Web Download Bibles are not downloaded when you import them, but on
+the fly as you search for them. As a result, the search takes a little longer if you need to download those particular
+verses. Having said that, the Web Download Bibles cache downloaded 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
-it. That means any images, presentations, songs and media items are saved. This
-is also true for bibles. What this means is you can create the service on your
-home computer, insert a Bible passage from the web, save it and then open the
-service using your church computer and voila, the Bible passage should be there!
-Note this can also be done with songs, etc!
+When you create and save a service, all the items in the service are saved with it. That means any images,
+presentations, songs and media items are saved. This is also true for bibles. What this means is you can create the
+service on your home computer, insert a Bible passage from the web, save it and then open the 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 @@
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
-configuration file in::
+If your distribution supports the XDG standard, you will find OpenLP's configuration file in::
/home/<user>/.config/OpenLP/OpenLP.conf
@@ -231,8 +217,8 @@
``<user>`` is your username.
-Mac OS X
-^^^^^^^^
+macOS
+^^^^^
You will find your configuration file here::
@@ -243,8 +229,7 @@
Windows
^^^^^^^
-On Windows, OpenLP does not use a configuration file, it uses the Windows
-registry. You can find the settings here::
+On Windows, OpenLP does not use a configuration file, it uses the Windows registry. You can find the settings here::
HKEY_CURRENT_USER\Software\OpenLP\OpenLP
@@ -253,27 +238,26 @@
Where do I find the data folder?
--------------------------------
-Normally you can open the data folder by using the menu :menuselection:`Tools --> Open Data Folder`
-and a fileexplorer window will appear with the data folder. In some cases due to
-bugs or other issues this is not an option, and the folder must be found
-manually.
+Normally you can open the data folder by using the menu :menuselection:`Tools --> Open Data Folder` and a file manager
+window will appear with the data folder. In some cases due to bugs or other issues this is not an option, and the
+folder must be found 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
-time. This will open a the :menuselection:`Run dialog`. Enter ``%appdata%\OpenLP``
-and press <Enter>. This will open a fileexplorer with in the data folder.
+To get to the data folder on Windows, pres the Windows Key and "R" at the same time. This will open a the
+:menuselection:`Run dialog`. Enter ``%appdata%\OpenLP`` and press <Enter>. This will open a file manager within the
+data folder.
Features
========
@@ -281,14 +265,34 @@
Why has popular feature request X not been implemented?
-------------------------------------------------------
-There are only a handful of developers working in their spare time. If
-we were to try and include everything we wanted to implement, then 2.4 would not
-likely ever get released.
+There are only a handful of developers working in their spare time. If we were to try and include everything we wanted
+to implement, then we would never be able to release any new versions of OpenLP.
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>`_
-page. If it is, then you need to say no more, it has already been suggested! If it
-is not on the list, then head to the `forum <http://forums.openlp.org>`_
-and post the idea there.
+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
+already been suggested! If it is not on the list, then head to the `forums`_ 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/
=== modified file 'manual/source/index.rst'
--- manual/source/index.rst 2017-02-16 18:36:16 +0000
+++ manual/source/index.rst 2017-04-20 06:15:33 +0000
@@ -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 @@
faq
troubleshooting
+
+.. _help us add it: https://openlp.org/contribute
=== modified file 'manual/source/install_mac.rst'
--- manual/source/install_mac.rst 2017-02-16 18:36:16 +0000
+++ manual/source/install_mac.rst 2017-04-20 06:15:33 +0000
@@ -1,30 +1,46 @@
-Installing OpenLP on Mac OS X
-=============================
-
-If you have not already downloaded the correct file from the `OpenLP website`_,
-download it now. Then double click on the .dmg file. This will open a window with two
-icons: An OpenLP icon and an Applications Folder icon. To install OpenLP, simply drag
-the OpenLP icon over to the Applications folder icon and you will be ready to use
-OpenLP. OpenLP will be available in your Applications folder.
-
-.. image:: pics/mac-os-x-dnd-install.png
-
-With the release of Mac OS X 10.8 applications not downloaded throught the Mac
-App Store will not run by default. A setting must be changed in the Security &
-Privacy Settings to run OpenLP.
-
-Click the Apple icon and open System Preferences
-
-.. image:: pics/mac-os-x-system-menu.png
-
-Open the Security & Privacy settings
-
-.. image:: pics/mac-os-x-settings.png
-
-Change the setting from Mac App Store to Anywhere. If the settings are grayed
-out click on the lock in the lower lefthand corner of the settings window to
-enable editing.
-
-.. image:: pics/mac-os-x-security-and-privacy.png
+Installing OpenLP on macOS
+==========================
+
+If you have not already downloaded the correct file from the `OpenLP website`_, download it now. Then double click on
+the .dmg file. This will open a window with two icons: An OpenLP icon and an Applications Folder icon. To install
+OpenLP, simply drag the OpenLP icon over to the Applications folder icon and you will be ready to use OpenLP. OpenLP
+will be available in your Applications folder.
+
+.. image:: pics/install-macos-01-dnd-install.png
+
+With the release of Mac OS X 10.7.5, applications that are not signed by a developer registered with Apple will not run
+by default. In order to run OpenLP the first time after installation, you will need to "teach" your computer to trust
+the OpenLP application.
+
+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/install-macos-02-open.png
+ :width: 40%
+ :align: center
+
+Your computer may then verify the application, which will take a few seconds.
+
+.. image:: pics/install-macos-03-verifying.png
+
+You will see a prompt asking whether you are sure you want to open "OpenLP", noting that it is from an unidentified
+developer. It will look very similar to the pictured dialog.
+
+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/
=== added file 'manual/source/pics/dual-monitors-macos-01-system-menu.png'
Binary files manual/source/pics/dual-monitors-macos-01-system-menu.png 1970-01-01 00:00:00 +0000 and manual/source/pics/dual-monitors-macos-01-system-menu.png 2017-04-20 06:15:33 +0000 differ
=== added file 'manual/source/pics/dual-monitors-macos-02-settings.png'
Binary files manual/source/pics/dual-monitors-macos-02-settings.png 1970-01-01 00:00:00 +0000 and manual/source/pics/dual-monitors-macos-02-settings.png 2017-04-20 06:15:33 +0000 differ
=== added file 'manual/source/pics/dual-monitors-macos-03-display-settings.png'
Binary files manual/source/pics/dual-monitors-macos-03-display-settings.png 1970-01-01 00:00:00 +0000 and manual/source/pics/dual-monitors-macos-03-display-settings.png 2017-04-20 06:15:33 +0000 differ
=== added file 'manual/source/pics/install-macos-01-dnd-install.png'
Binary files manual/source/pics/install-macos-01-dnd-install.png 1970-01-01 00:00:00 +0000 and manual/source/pics/install-macos-01-dnd-install.png 2017-04-20 06:15:33 +0000 differ
=== added file 'manual/source/pics/install-macos-02-open.png'
Binary files manual/source/pics/install-macos-02-open.png 1970-01-01 00:00:00 +0000 and manual/source/pics/install-macos-02-open.png 2017-04-20 06:15:33 +0000 differ
=== added file 'manual/source/pics/install-macos-03-verifying.png'
Binary files manual/source/pics/install-macos-03-verifying.png 1970-01-01 00:00:00 +0000 and manual/source/pics/install-macos-03-verifying.png 2017-04-20 06:15:33 +0000 differ
=== added file 'manual/source/pics/install-macos-04-unidentified-developer.png'
Binary files manual/source/pics/install-macos-04-unidentified-developer.png 1970-01-01 00:00:00 +0000 and manual/source/pics/install-macos-04-unidentified-developer.png 2017-04-20 06:15:33 +0000 differ
=== added file 'manual/source/pics/install-macos-05-system-menu.png'
Binary files manual/source/pics/install-macos-05-system-menu.png 1970-01-01 00:00:00 +0000 and manual/source/pics/install-macos-05-system-menu.png 2017-04-20 06:15:33 +0000 differ
=== added file 'manual/source/pics/install-macos-06-settings.png'
Binary files manual/source/pics/install-macos-06-settings.png 1970-01-01 00:00:00 +0000 and manual/source/pics/install-macos-06-settings.png 2017-04-20 06:15:33 +0000 differ
=== added file 'manual/source/pics/install-macos-07-security-and-privacy.png'
Binary files manual/source/pics/install-macos-07-security-and-privacy.png 1970-01-01 00:00:00 +0000 and manual/source/pics/install-macos-07-security-and-privacy.png 2017-04-20 06:15:33 +0000 differ
=== removed file 'manual/source/pics/mac-os-x-display-settings.png'
Binary files manual/source/pics/mac-os-x-display-settings.png 2015-09-21 12:46:53 +0000 and manual/source/pics/mac-os-x-display-settings.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'manual/source/pics/mac-os-x-dnd-install.png'
Binary files manual/source/pics/mac-os-x-dnd-install.png 2015-10-16 10:04:13 +0000 and manual/source/pics/mac-os-x-dnd-install.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'manual/source/pics/mac-os-x-security-and-privacy.png'
Binary files manual/source/pics/mac-os-x-security-and-privacy.png 2015-10-16 10:04:13 +0000 and manual/source/pics/mac-os-x-security-and-privacy.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'manual/source/pics/mac-os-x-settings.png'
Binary files manual/source/pics/mac-os-x-settings.png 2015-09-21 12:46:53 +0000 and manual/source/pics/mac-os-x-settings.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'manual/source/pics/mac-os-x-system-menu.png'
Binary files manual/source/pics/mac-os-x-system-menu.png 2015-09-21 12:46:53 +0000 and manual/source/pics/mac-os-x-system-menu.png 1970-01-01 00:00:00 +0000 differ
=== modified file 'manual/source/system_requirements.rst'
--- manual/source/system_requirements.rst 2015-09-28 16:21:35 +0000
+++ manual/source/system_requirements.rst 2017-04-20 06:15:33 +0000
@@ -9,13 +9,13 @@
* 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
=== modified file 'manual/source/troubleshooting.rst'
--- manual/source/troubleshooting.rst 2016-02-22 19:27:30 +0000
+++ manual/source/troubleshooting.rst 2017-04-20 06:15:33 +0000
@@ -167,12 +167,10 @@
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
-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>`_.
+Most modern Macs should already support most popular formats out of the box.
Ubuntu Linux (and variants)
^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -365,8 +363,8 @@
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.
_______________________________________________
Mailing list: https://launchpad.net/~openlp-core
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openlp-core
More help : https://help.launchpad.net/ListHelp
