diff --git a/api/source/index.rst b/api/source/index.rst index d6cc936..dc42497 100644 --- a/api/source/index.rst +++ b/api/source/index.rst @@ -6,7 +6,7 @@ Welcome ======= -Welcome to the OpenLP 2.2 API Documentation! In here you will find all +Welcome to the OpenLP 2.4 API Documentation! In here you will find all information relating to OpenLP's core classes, core plugins, and anything else deemed necessary or interesting by the developers. diff --git a/manual/source/conf.py b/manual/source/conf.py index e66d7e6..88654cb 100644 --- a/manual/source/conf.py +++ b/manual/source/conf.py @@ -49,9 +49,9 @@ copyright = u'2004 - 2015, Raoul Snyman' # built documents. # # The short X.Y version. -version = '2.2' +version = '2.4' # The full version, including alpha/beta/rc tags. -release = '2.2' +release = '2.4' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. @@ -110,7 +110,7 @@ html_theme_path = [os.path.abspath(os.path.join('..', '..', 'common', 'themes')) # The name for this set of Sphinx documents. If None, it defaults to # " v documentation". -html_title = u'OpenLP 2.2 Reference Manual' +html_title = u'OpenLP 2.4 Reference Manual' # A shorter title for the navigation bar. Default is the same as html_title. #html_short_title = None diff --git a/manual/source/faq.rst b/manual/source/faq.rst index ce79367..822dd30 100644 --- a/manual/source/faq.rst +++ b/manual/source/faq.rst @@ -30,20 +30,20 @@ A variety of places! * 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.2 support? +What operating systems will OpenLP 2.4 support? ----------------------------------------------- -OpenLP 2.2 is designed to be cross platform. Currently it has been known to run +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 `_ if you have successfully run it on something else. -Which programming language is 2.2 developed in? +Which programming language is 2.4 developed in? ----------------------------------------------- -OpenLP 2.2 is written in `Python3 `_ and uses the -`Qt4 toolkit `_. Both are cross-platform which allows the +OpenLP 2.4 is written in `Python3 `_ and uses the +`Qt5 toolkit `_. 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 `_ @@ -60,31 +60,31 @@ into your language then see the `Getting started page `_. -Can I upgrade directly from 1.2 to 2.2? +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.2. See the 2.0 documentation for how to upgrade from 1.2 to +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 `_. -Does 2.2 replace 2.0, or can they be run side by side? ------------------------------------------------------- +Does 2.4 replace older 2.x versions, or can they be run side by side? +--------------------------------------------------------------------- -OpenLP 2.2 and 2.0 cannot run side by side. When running 2.2 for first time -any existing 2.0 data will automatically be converted to the 2.2 format. -Note that OpenLP 2.2 is not backwards compatible with 2.0. Once you have -upgraded from 2.0, version 2.0 cannot read the upgraded files. OpenLP 2.2 will +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 to 2.0 again. +to downgrade again. -OpenLP 2.2 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 OpenLP 2.0.5. Using OpenLP @@ -242,7 +242,7 @@ 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.2 would not +we were to try and include everything we wanted to implement, then 2.4 would not likely ever get released. I have a great idea for a new feature, where should I suggest it? diff --git a/manual/source/index.rst b/manual/source/index.rst index c08beb2..c294d83 100644 --- a/manual/source/index.rst +++ b/manual/source/index.rst @@ -1,4 +1,4 @@ -Welcome to the OpenLP 2.2 User Manual +Welcome to the OpenLP 2.4 User Manual ===================================== Getting Started With OpenLP diff --git a/manual/source/install_linux.rst b/manual/source/install_linux.rst index 52de413..8a0f538 100644 --- a/manual/source/install_linux.rst +++ b/manual/source/install_linux.rst @@ -13,9 +13,9 @@ Installation of OpenLP on Ubuntu can either be done through the Software Center or the command line. Command line instructions will be included at the end of this section on Ubuntu and its variants. -OpenLP 2.2 supports Ubuntu 14.04 or later versions. There is currently an older +OpenLP 2.4 supports Ubuntu 15.10 or later versions. There is currently an older version of OpenLP available in the official Ubuntu repositories, which can be -found using the Software Center, but to get OpenLP 2.2 it is necessary to add +found using the Software Center, but to get OpenLP 2.4 it is necessary to add the OpenLP Personal Package Archive (PPA) to your system. Ubuntu, Ubuntu GNOME, Xubuntu diff --git a/manual/source/songs.rst b/manual/source/songs.rst index ed670c5..d0a8d2b 100644 --- a/manual/source/songs.rst +++ b/manual/source/songs.rst @@ -13,8 +13,8 @@ Song Importer ============= If you are using an earlier version of OpenLP or, come from another software -package, you may be able to convert your existing database to work in OpenLP -2.0. To access the Song Importer click :menuselection:`File --> Import --> Song`. +package, you may be able to convert your existing database to work in OpenLP. +To access the Song Importer click :menuselection:`File --> Import --> Song`. You will see the Song Importer window, then click :guilabel:`Next`. .. image:: pics/songimporter.png diff --git a/manual/source/troubleshooting.rst b/manual/source/troubleshooting.rst index a9816da..7d5e4bd 100644 --- a/manual/source/troubleshooting.rst +++ b/manual/source/troubleshooting.rst @@ -80,7 +80,7 @@ the link to the page that is created. Windows ^^^^^^^ -Find the OpenLP 2.2 folder in your Start menu. Choose the "OpenLP (Debug)" option. +Find the OpenLP 2.4 folder in your Start menu. Choose the "OpenLP (Debug)" option. OpenLP will start up. Go to the :menuselection:`Tools --> Open Data Folder` menu option, and an Explorer window will appear containing folders such as alerts, @@ -404,15 +404,9 @@ 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.2 on Windows & Mac OS X +Why do live backgrounds not work in OpenLP 2.4 on Windows & Mac OS X -------------------------------------------------------------------- -Due to changes in one of the underlying frameworks that OpenLP uses (Qt4), -live backgrounds do not work in OpenLP 2.2. This will be fixed in OpenLP 2.4. +Due to bugs in one of the underlying frameworks that OpenLP uses (Qt5), +live backgrounds do not work in OpenLP 2.4. This will be fixed in OpenLP 2.6. -Why do playback of linked audio not work in OpenLP 2.2 on Mac OS X ------------------------------------------------------------------- - -Due to changes in one of the underlying frameworks that OpenLP uses (Qt4), -playback of linked audio does not work in OpenLP 2.2. This will be fixed in -OpenLP 2.4.