Fix some posts and import images from the old site.

bzr-revno: 12

blog/a-christian-response-to-microsoft.rst

@@ -37,6 +37,6 @@ My question is this: Is Microsoft a company you want to associate with
 as a Christian, as a member of the Church? Are they "true, noble, right,
 pure lovely or admirable"?
 
-| I would recommend that you show print out this document and show it to
+I would recommend that you show print out this document and show it to
 your pastors and those involved in the leadership of your church. Ask
 them to think about what I've said.

blog/advertisement-flyer.rst

@@ -1,8 +1,8 @@
 .. title: Advertisement Flyer
 .. slug: 2008/01/03/advertisement-flyer
 .. date: 2008-01-03 17:01:29 UTC
-.. tags: 
+.. tags:
-.. description: 
+.. description:
 
 I've busy with a few things marketing-related for openlp.org lately,
 including creating a flyer for people to print out and hand out, or put
@@ -21,18 +21,6 @@ it fits well inside the physical bounds of the pieceof paper. It's 3
 columns, so that you have 3 flyers per sheet of paper. Don't forget to
 flip the paper over and print the second page on the back!
 
-+--------------------------------------+--------------------------------------+
+* `openlp.org-flyer-a4.pdf </files/openlp.org-flyer-a4.pdf>`_
-| Attachment                           |
+* `openlp.org-flyer.zip </files/openlp.org-flyer.zip>`_
-| Size                                 |
-+======================================+======================================+
-| |image2|                             | |image3|                             |
-| `openlp.org-flyer-a4.pdf <http://ope | `openlp.org-flyer.zip <http://openlp |
-| nlp.org/files/openlp.org-flyer-a4.pd | .org/files/openlp.org-flyer.zip>`__  |
-| f>`__                                | 355.42 KB                            |
-| 303.07 KB                            |                                      |
-+--------------------------------------+--------------------------------------+
 
-.. |image0| image:: http://openlp.org/modules/file/icons/application-pdf.png
-.. |image1| image:: http://openlp.org/modules/file/icons/package-x-generic.png
-.. |image2| image:: http://openlp.org/modules/file/icons/application-pdf.png
-.. |image3| image:: http://openlp.org/modules/file/icons/package-x-generic.png

blog/android-10-release.rst

@@ -1,8 +1,8 @@
 .. title: Android 1.0 release
 .. slug: 2013/03/26/android-10-release
 .. date: 2013-03-26 08:03:48 UTC
-.. tags: 
+.. tags:
-.. description: 
+.. description:
 
 |OpenLP Android Remote|
 
@@ -18,4 +18,4 @@ out, you can get it from the Google Play store, just search for "OpenLP"
 
  
 
-.. |OpenLP Android Remote| image:: http://openlp.org/files/u2/Screenshot_2013-03-26-11-45-13.png
+.. |OpenLP Android Remote| image:: /pictures/Screenshot_2013-03-26-11-45-13.png

blog/android-release-05-has-escaped.rst

@@ -1,8 +1,8 @@
 .. title: Android Release : 0.5 has escaped
 .. slug: 2012/07/02/android-release-05-has-escaped
 .. date: 2012-07-02 17:07:12 UTC
-.. tags: 
+.. tags:
-.. description: 
+.. description:
 
 |OpenLP for Android|
 
@@ -28,4 +28,4 @@ The new features added since 0.4 are:
 -  To aid usability, the displayed verse is now highlighted on the live
    tab so it is obvious which slide is selected.
 
-.. |OpenLP for Android| image:: http://openlp.org/files/u2/Google-Android-128.png
+.. |OpenLP for Android| image:: /pictures/Google-Android-128.png

blog/announcing-end-support-older-versions-ubuntu.rst

@@ -25,4 +25,4 @@ there is some reason why you cannot upgrade to a later version of
 Ubuntu, you can come into our IRC channel and chat with us about getting
 OpenLP running on your computer.
 
-.. |Ubuntu 12.04| image:: http://openlp.org/files/u2/precise-pangolin.png
+.. |Ubuntu 12.04| image:: /pictures/precise-pangolin.png

blog/announcing-openlp-202-debugged-deborah.rst

@@ -15,41 +15,40 @@ error reports we have recieved from you guys. They really do help!
 
 Some of the bugs fixed in this release:
 
--  OpenLP does not start due to mimetypes bug
+* OpenLP does not start due to mimetypes bug
--  Theme in Song Editor is never reset
+* Theme in Song Editor is never reset
--  We should not warn when verse order is empty
+* We should not warn when verse order is empty
--  Inconvenient focus in Song Editor when adding authors
+* Inconvenient focus in Song Editor when adding authors
--  Macro enabled presentations are not shown in OpenLP
+* Macro enabled presentations are not shown in OpenLP
--  Images always get black background when loaded from saved service
+* Images always get black background when loaded from saved service
    file
--  "Display verses on live tool bar" ignored
+* "Display verses on live tool bar" ignored
--  Typing a path for a theme background causes a key error
+* Typing a path for a theme background causes a key error
--  Typing a path for a theme background does not set background
+* Typing a path for a theme background does not set background
--  Adjust Line Spacing does not work
+* Adjust Line Spacing does not work
--  Configure shortcuts has two items called settings
+* Configure shortcuts has two items called settings
--  Attach button on exception form does not work
+* Attach button on exception form does not work
--  Transtion + fast slide changes + ESC causes screen to open again
+* Transtion + fast slide changes + ESC causes screen to open again
--  Delete button in Configure Formatting Tags gets focus
+* Delete button in Configure Formatting Tags gets focus
--  Importing an OSIS bible always results in English book names
+* Importing an OSIS bible always results in English book names
--  Traceback in czech bible download Webbible import fails
+* Traceback in czech bible download Webbible import fails
--  Traceback when importing bible with disabled bible plugin in FTW
+* Traceback when importing bible with disabled bible plugin in FTW
--  Non existing chapters result in traceback when searching webbibles
+* Non existing chapters result in traceback when searching webbibles
--  getFileNames corrupts file names that use "special chars"
+* getFileNames corrupts file names that use "special chars"
--  Opensong Import - some lines missing
+* Opensong Import \*some lines missing
--  Foil Presenter Importer fails if no verses
+* Foil Presenter Importer fails if no verses
--  SongShowPlus traceback
+* SongShowPlus traceback
--  SongShowPlus importer does not handle verse labels such as 1A
+* SongShowPlus importer does not handle verse labels such as 1A
--  Issues importing Sunday Plus Files
+* Issues importing Sunday Plus Files
--  OpenLP 1 database importer crashes when encountering control chars
+* OpenLP 1 database importer crashes when encountering control chars
--  Easy Worship importer progress bar is out
+* Easy Worship importer progress bar is out
--  Cancelling character table dialogue in importer causes OpenLP to
+* Cancelling character table dialogue in importer causes OpenLP to crash
-   crash
 
 For the full list of the changes we've made see:
 https://launchpad.net/openlp/+milestone/2.0.2
 
 As usual, you can grab this release from the `download
-page <http://openlp.org/download>`__. The Mac OS X version, torrents,
+page </#download>`_. The Mac OS X version, torrents,
 portable versions and various Linux packages will be updated over the
 next week or so.
 
@@ -61,4 +60,4 @@ community, for your bug reports, giving support and helping others.
 
     1 Thessalonians 5:16-18 (New International Version)
 
-.. |Deborah the Prophetess and Judge| image:: http://openlp.org/files/u2/deborahandbarak2.jpg
+.. |Deborah the Prophetess and Judge| image:: /pictures/deborahandbarak2.jpg

blog/development-status-report.rst

@@ -14,15 +14,13 @@ area's that needed enhancing prior to a major distribution release. You
 can look forward to the following enhancements coming in the next few
 release candidates:
 
-| - Enhanced Bible Verse handing where you can display multiple verses
+* Enhanced Bible Verse handing where you can display multiple verses on one slide
-on one slide
+* Some keyboard navigation (actually I think it's in RC2 already)
-| - Some keyboard navigation (actually I think it's in RC2 already)
+* Enhanced slide auto-scrolling
-| - Enhanced slide auto-scrolling
+* Import/Export of themes
-| - Import/Export of themes
+* Storage of theme data exclusively in the 'theme' directory in XML format
-| - Storage of theme data exclusively in the 'theme' directory in XML
-format
 
-| There may be 1 or 2 other things, but these are the main ones as we
+There may be 1 or 2 other things, but these are the main ones as we
 didn't want to impact our timeline too much.
 
 God Bless,

blog/exposong-project-shut-down.rst

@@ -5,8 +5,8 @@
 .. description: 
 
 A few days ago another open source church worship project called
-`ExpoSong <http://exposong.org/>`__ had to `shut
+`ExpoSong <http://exposong.org/>`_ had to `shut
-down <http://exposong.org/2014/01/08/eol-announcement/>`__. It seems to
+down <http://exposong.org/2014/01/08/eol-announcement/>`_. It seems to
 me that they had a very small development team and were unable to
 continue developing their software. ExpoSong's last release was over 2
 years ago, in December 2011, and I can only presume they took a rain
@@ -21,8 +21,7 @@ to continue at a later stage.
 
 For those of you who have come from ExpoSong, I have put together a
 step-by-step guide below to show you how to easily export all your songs
-from ExpoSong and import them all into OpenLP. Click the **Read more**
+from ExpoSong and import them all into OpenLP.
-link below if you can't see the guide.
 
 Exporting Songs from ExpoSong and Importing Into OpenLP
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -49,7 +48,7 @@ Now you should have a "tarball" in your directory.
 |Tarball|
 
 Using an archive program (Windows users can use
-`7-zip <http://www.7-zip.org/>`__, unzipping should be built in on Linux
+`7-zip <http://www.7-zip.org/>`_, unzipping should be built in on Linux
 and OS X), extract the contents of the "tarball".
 
 |Extracted Archive|
@@ -69,11 +68,12 @@ to be imported.
 Follow the rest of the prompts in the wizard to finish importing your
 files.
 
-.. |Export songs from ExpoSong| image:: http://openlp.org/files/u2/exposong_01_export_whole_library.png
+.. |Export songs from ExpoSong| image:: /pictures/exposong_01_export_whole_library.png
-.. |Select Location| image:: http://openlp.org/files/u2/exposong_02_export_whole_library.png
+.. |Select Location| image:: /pictures/exposong_02_export_whole_library.png
-.. |Find exported file| image:: http://openlp.org/files/u2/exposong_03_export_whole_library.png
+.. |Find exported file| image:: /pictures/exposong_03_export_whole_library.png
-.. |Change File Extension| image:: http://openlp.org/files/u2/exposong_04_export_whole_library.png
+.. |Change File Extension| image:: /pictures/exposong_04_export_whole_library.png
-.. |Tarball| image:: http://openlp.org/files/u2/exposong_05_export_whole_library.png
+.. |Tarball| image:: /pictures/exposong_05_export_whole_library.png
-.. |Extracted Archive| image:: http://openlp.org/files/u2/exposong_06_export_whole_library.png
+.. |Extracted Archive| image:: /pictures/exposong_06_export_whole_library.png
-.. |Song Files| image:: http://openlp.org/files/u2/exposong_07_export_whole_library.png
+.. |Song Files| image:: /pictures/exposong_07_export_whole_library.png
-.. |Import into OpenLP| image:: http://openlp.org/files/u2/exposong_08_export_whole_library.png
+.. |Import into OpenLP| image:: /pictures/exposong_08_export_whole_library.png
+

blog/feature-survey-results.rst

@@ -95,7 +95,7 @@ Android app.
 We also noticed that some folk thought that OpenLP is donateware. It is
 not, we haven't publically accepted donations for a few reasons, mostly
 that we don't see the need. If you *would* like to donate, please
-`e-mail us (contact form) <http://openlp.org/support/email-us>`__.
+`e-mail us (contact form) <http://openlp.org/support/email-us>`_.
 
 What do you dislike about OpenLP?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -124,14 +124,15 @@ Helping with development
 We couldn't help but notice that a few of the respondents indicated a
 willingness to help develop OpenLP in some way. If you're keen to take a
 look at helping out, please see our `getting
-started <http://wiki.openlp.org/#Development>`__ page on the developer
+started <http://wiki.openlp.org/#Development>`_ page on the developer
-wiki and `join us in IRC <http://openlp.org/support/live-chat-irc>`__ so
+wiki and `join us in IRC <http://openlp.org/support/live-chat-irc>`_ so
 that we can help you get up and running.
 
 As always, God bless, and happy projecting!
 
-.. |How did you originally hear about OpenLP?| image:: http://openlp.org/files/u2/heard_about_openlp.png
+.. |How did you originally hear about OpenLP?| image:: /pictures/heard_about_openlp.png
-.. |Which services do you use OpenLP in?| image:: http://openlp.org/files/u2/services_used_in.png
+.. |Which services do you use OpenLP in?| image:: /pictures/services_used_in.png
-.. |What do you currently use OpenLP for?| image:: http://openlp.org/files/u2/how_openlp_used.png
+.. |What do you currently use OpenLP for?| image:: /pictures/how_openlp_used.png
-.. |What operating system do you use OpenLP on?| image:: http://openlp.org/files/u2/operating_system.png
+.. |What operating system do you use OpenLP on?| image:: /pictures/operating_system.png
-.. |What other software do you use in addition to OpenLP?| image:: http://openlp.org/files/u2/other_software.png
+.. |What other software do you use in addition to OpenLP?| image:: /pictures/other_software.png
+

blog/forward-thinking.rst

@@ -26,4 +26,4 @@ We thank you for your patience in this matter and apoligise for this
 bug. Steps are being taken including automated testing in 2.2 to reduce
 the chances of bugs like these slipping in the future.
 
-.. |The Future| image:: http://openlp.org/files/u2/the-future-sign.jpg
+.. |The Future| image:: /pictures/the-future-sign.jpg

blog/gearing-final-release.rst

@@ -63,7 +63,7 @@ Markdown or wiki formatting.
 
 If you'd like to help out, please contact us at that same e-mail
 address, or via the `contact
-page <http://openlp.org/en/contact-us/support>`__, and we'll get you up
+page <http://openlp.org/en/contact-us/support>`_, and we'll get you up
 and running in no time at all.
 
 Fixing Bugs
@@ -138,10 +138,10 @@ Lastly, we need to generate buzz! If you have a blog, please blog about
 us. If your church has a web site, see if you can link back to our site.
 If you have a podcast or a vodcast, please feature us - we welcome
 interviews! Of course you can also find us on all the big social
-networks, like `Facebook <https://www.facebook.com/openlp>`__,
+networks, like `Facebook <https://www.facebook.com/openlp>`_,
-`Twitter <http://twitter.com/openlp>`__,
+`Twitter <http://twitter.com/openlp>`_,
-`YouTube <http://www.youtube.com/openlpvideos>`__ and
+`YouTube <http://www.youtube.com/openlpvideos>`_ and
-`Google+ <https://plus.google.com/b/117120749304988900189/117120749304988900189>`__.
+`Google+ <https://plus.google.com/b/117120749304988900189/117120749304988900189>`_.
 
 We'll be releasing a press kit in a few days with helpful information
 and useful buttons and icons for people to use on their web sites and in
@@ -153,8 +153,9 @@ Any Other Help
 If you think you can help us in another way not listed here, please
 contact us and let us know your ideas - we're always open to more ideas.
 
-.. |Gearing Up For OpenLP 2.0| image:: http://openlp.org/files/u2/gears.jpg
+.. |Gearing Up For OpenLP 2.0| image:: /pictures/gears.jpg
-.. |OpenLP User Guide| image:: http://openlp.org/files/u2/kword.png
+.. |OpenLP User Guide| image:: /pictures/kword.png
-.. |Bug Fixing| image:: http://openlp.org/files/u2/kbugbuster.png
+.. |Bug Fixing| image:: /pictures/kbugbuster.png
-.. |OpenLP Tutorials| image:: http://openlp.org/files/u2/kbruch.png
+.. |OpenLP Tutorials| image:: /pictures/kbruch.png
-.. |Blog About It| image:: http://openlp.org/files/u2/kblogger.png
+.. |Blog About It| image:: /pictures/kblogger.png
+

blog/getting-videos-work-correctly-openlp-using-vlc.rst

@@ -12,7 +12,7 @@ service, showing videos to help set a “mood” of worship before a service
 starts or through a multitude of other creative ways, videos can be
 effective tools for worship. OpenLP has the ability to play videos as
 part of the service using the
-`Media <http://manual.openlp.org/mediamanager.html#media>`__ tab. You
+`Media <http://manual.openlp.org/mediamanager.html#media>`_ tab. You
 simply add your video, or audio to OpenLP then use it as you do a song
 or Bible verses in your service. Easy.
 
@@ -31,31 +31,31 @@ but as with many this theory fails many times in practice. In the past
 the solution was to install codec packs and do a variety of other rather
 hackish things with hopes that videos would work. This is no longer the
 case, thanks to another open source project
-`VLC <http://www.videolan.org/vlc/index.html>`__ paired with OpenLP 2.0.
+`VLC <http://www.videolan.org/vlc/index.html>`_ paired with OpenLP 2.0.
 
 If you have not heard of
-`VLC <http://www.videolan.org/vlc/index.html>`__\ lets just put it this
+`VLC <http://www.videolan.org/vlc/index.html>`_ lets just put it this
 way it is the premier media player, regardless of operating system. If
-`VLC <http://www.videolan.org/vlc/index.html>`__\ won’t play your file,
+`VLC <http://www.videolan.org/vlc/index.html>`_ won’t play your file,
 stop, nothing will play your file. That may not be entirely the case,
 but chances are if
-`VLC <http://www.videolan.org/vlc/index.html>`__\ won’t play it nothing
+`VLC <http://www.videolan.org/vlc/index.html>`_ won’t play it nothing
 will. So what does this have to do with OpenLP you ask? Remember OpenLP
 uses resources on your computer to play videos and with
-`VLC <http://www.videolan.org/vlc/index.html>`__ installed OpenLP can
+`VLC <http://www.videolan.org/vlc/index.html>`_ installed OpenLP can
 use this most awesome media player to take care of all of your media
 problems.
 
 The first step is to download
-`VLC <http://www.videolan.org/vlc/index.html>`__ from
+`VLC <http://www.videolan.org/vlc/index.html>`_ from
-`HERE <http://www.videolan.org/vlc/index.html>`__. If you are running a
+`HERE <http://www.videolan.org/vlc/index.html>`_. If you are running a
 Linux distro it should be available using your distro’s package manager.
 You will need version 2.0.3 or above to work correctly. Once you have
-`VLC <http://www.videolan.org/vlc/index.html>`__ installed we are just
+`VLC <http://www.videolan.org/vlc/index.html>`_ installed we are just
 about finished.
 
 Now we need to tell OpenLP to use
-`VLC <http://www.videolan.org/vlc/index.html>`__ to play all media.
+`VLC <http://www.videolan.org/vlc/index.html>`_ to play all media.
 Don’t worry you won’t regret this and if you do you can always change
 this setting back. Go to Settings, then click on Configure OpenLP. You
 should now be greeted by a window that looks similar to this:
@@ -64,14 +64,14 @@ should now be greeted by a window that looks similar to this:
 
 Click on Media on the left hand panel to enter the media settings. You
 should see a list of available media players. Click on the check box to
-enable `VLC <http://www.videolan.org/vlc/index.html>`__. In the player
+enable `VLC <http://www.videolan.org/vlc/index.html>`_. In the player
 order box, click on VLC and use the up arrow to promote it to the top of
 the list. You can also disable all the other media players if you wish.
 If you check the “Allow media player to be overridden” check box you can
 change the player on the fly from the
-`Media <http://manual.openlp.org/mediamanager.html#media>`__ tab in the
+`Media <http://manual.openlp.org/mediamanager.html#media>`_ tab in the
 `Media
-Manager <http://manual.openlp.org/glossary.html#g-media-manager>`__.
+Manager <http://manual.openlp.org/glossary.html#g-media-manager>`_.
 This is a good option for some users, but really if you are using VLC
 you shouldn’t need to do this.
 
@@ -83,10 +83,11 @@ get your hands on.
  
 
 **Note:** If you install
-`VLC <http://www.videolan.org/vlc/index.html>`__ while OpenLP is running
+`VLC <http://www.videolan.org/vlc/index.html>`_ while OpenLP is running
 you will need to restart OpenLP after installing
-`VLC <http://www.videolan.org/vlc/index.html>`__.
+`VLC <http://www.videolan.org/vlc/index.html>`_.
+
+.. |VLC| image:: /pictures/VLMC-Icon.png
+.. |Configure OpenLP| image:: /pictures/configuregeneral.png
+.. |Media Configuration| image:: /pictures/configuremedia.png
 
-.. |VLC| image:: http://openlp.org/files/u1284/VLMC-Icon.png
-.. |Configure OpenLP| image:: http://openlp.org/files/u1284/configuregeneral.png
-.. |Media Configuration| image:: http://openlp.org/files/u1284/configuremedia.png

blog/have-your-say-survey-features.rst

@@ -9,21 +9,23 @@
 **Update:** The survey has been closed. We received 381 responses, and
 are busy processing the responses.
 
-| Before I kick off the main gist of this post, I'd just like to
+Before I kick off the main gist of this post, I'd just like to announce that OpenLP 2.0.3
-announce that OpenLP 2.0.3 has finally made it to our `Ubuntu
+has finally made it to our `Ubuntu PPA <http://launchpad.net/~openlp-core/+archive/release>`_.
-PPA <http://launchpad.net/~openlp-core/+archive/release>`__.
+
-| Unfortunately I was having computer hardware issues and I wasn't able
+Unfortunately I was having computer hardware issues and I wasn't able
 to get the build process set up until a few days ago. I've remedied this
 problem by setting up the build process on our Continuous Integration
 server such that anyone can build packages for the PPA by simply
 clicking a button.
-| As per the title of this post, we have set up a
+
-`survey <https://docs.google.com/forms/d/1tGoW26DU-zwIkyyNHFNm_f9a9zgsZH3YrwfGwFIkZN8/viewform>`__
+As per the title of this post, we have set up a
+`survey <https://docs.google.com/forms/d/1tGoW26DU-zwIkyyNHFNm_f9a9zgsZH3YrwfGwFIkZN8/viewform>`_
 to help us decide on what the most important features are that we need
 to work on. This survey is completely anonymous, but we do ask that you
 only fill it out once. We've also set maximum number of features to
 choose so that we are absolutely certain that these are the most
 important features. Have your say: `complete the
-survey <https://docs.google.com/forms/d/1tGoW26DU-zwIkyyNHFNm_f9a9zgsZH3YrwfGwFIkZN8/viewform>`__.
+survey <https://docs.google.com/forms/d/1tGoW26DU-zwIkyyNHFNm_f9a9zgsZH3YrwfGwFIkZN8/viewform>`_.
+
+.. |Survey| image:: /pictures/preferences-contact-list_0.png
 
-.. |Survey| image:: http://openlp.org/files/u2/preferences-contact-list_0.png

blog/he-risen.rst

@@ -57,5 +57,6 @@ We are also happy to see that the community is growing, with more people
 helping out on the forums. We are always grateful for every helping
 hand.
 
-.. |Image Groups| image:: http://openlp.org/files/u2/image_groups.png
+.. |Image Groups| image:: /pictures/image_groups.png
-.. |SSL and Password| image:: http://openlp.org/files/u2/ssl_password.png
+.. |SSL and Password| image:: /pictures/ssl_password.png
+

blog/hot-on-the-heels-of-beta-6.rst

@@ -4,7 +4,7 @@
 .. tags: 
 .. description: 
 
-| I am proud to announce the release of Release Candidate 1. This is the
+I am proud to announce the release of Release Candidate 1. This is the
 first in our release candidate series. Once we are satisfied that no
 more bugs exist in openlp.org, we will release the final version of 1.0.
 Remember to post your bug reports in the forum topic.

blog/keyboard-shortcuts-blank-screen.rst

@@ -14,7 +14,7 @@ Esc to hide the display. We also plan in the future to add shortcuts to
 allow the user to skip straight to a verse or chorus and the ability to
 customize the shortcuts.
 
-| However one shortcut we haven't yet implemented is blank screen, and
+However one shortcut we haven't yet implemented is blank screen, and
 we're trying to figure out what key to use as the default. The obvious
 is "B", but we want to reserve that in the future for "Bridge"...
 

blog/ladies-and-gents-i-present-beta4.rst

@@ -6,6 +6,6 @@
 
 Hi all!
 
-| Yes, I have just released openlp.org beta4. This beta includes things
+Yes, I have just released openlp.org beta4. This beta includes things
 like improved useability, working PowerPoint integeration and a revamped
 theme system. Please report bugs in the bug reporting forum.

blog/last-call-translators.rst

@@ -8,12 +8,12 @@
 
 **Update:** Instructions on how to test your translation out have been
 added to the `bottom of this blog
-post <http://openlp.org/en/blog/2012/11/15/last-call-translators#testing-translations>`__.
+post </blog/2012/11/15/last-call-translators#testing-translations>`_.
 
 This is the final call for all translators. If you wish to have OpenLP
 in your langauge you need to have completed the translation of
-`OpenLP <https://www.transifex.com/projects/p/openlp/>`__ on the
+`OpenLP <https://www.transifex.com/projects/p/openlp/>`_ on the
-`Transifex <https://www.transifex.com/>`__ site ***by midnight UTC (GMT)
+`Transifex <https://www.transifex.com/>`_ site ***by midnight UTC (GMT)
 on Friday the 23rd of November 2012***.
 
 Because we believe strongly in quality over quantity at OpenLP, we will
@@ -71,7 +71,7 @@ Testing Out Your Translation
 To test your translation out, do the following:
 
 #. Make sure you are running the `latest nightly
-   build <http://openlp.org/download#nightly-builds>`__
+   build <http://openlp.org/download#nightly-builds>`_
 #. Install Qt Linguist
    Windows and OS X users can download Qt Linguist from here:
    http://code.google.com/p/qtlinguistdownload/downloads/list
@@ -90,5 +90,6 @@ To test your translation out, do the following:
    \*BSD: /usr/local/share/openlp/i18n/
 #. (Re)start Openlp and select your language
 
-.. |Translate OpenLP| image:: http://openlp.org/files/u2/applications-development-translation.png
+.. |Translate OpenLP| image:: /pictures/applications-development-translation.png
-.. |Current Status of OpenLP Translations| image:: http://openlp.org/files/u2/openlp_translations_0.png
+.. |Current Status of OpenLP Translations| image:: /pictures/openlp_translations_0.png
+

blog/latest-position-for-version-2.rst

@@ -4,24 +4,14 @@
 .. tags: 
 .. description: 
 
-Let's start with a screen shot
+Let's start with a screen shot:
+
+.. image:: /pictures/trb01.png
 
 The Service Manager is nearing completion and it is now possible to save
 are restore orders of services.
 
 The screen shot also shows that individual verses are visible within
-songs.  These can be selected as the starting place for the times when
+songs. These can be selected as the starting place for the times when
 the worship leader decides to start in a different place to normal.
 
-+--------------------------------------+--------------------------------------+
-| Attachment                           |
-| Size                                 |
-+======================================+======================================+
-| |image1|                             |
-| `trb01.png <http://openlp.org/files/ |
-| trb01.png>`__                        |
-| 395.19 KB                            |
-+--------------------------------------+--------------------------------------+
-
-.. |image0| image:: http://openlp.org/modules/file/icons/image-x-generic.png
-.. |image1| image:: http://openlp.org/modules/file/icons/image-x-generic.png

blog/lets-get-translating.rst

@@ -25,8 +25,8 @@ Here's the break down of the different translations we currently have:
 |Current Status of OpenLP Translations|
 
 Helping out with these translations is easy! Just go to
-`Transifex <https://www.transifex.com/>`__ and register, then go to the
+`Transifex <https://www.transifex.com/>`_ and register, then go to the
-`OpenLP project page <https://www.transifex.com/projects/p/openlp/>`__,
+`OpenLP project page <https://www.transifex.com/projects/p/openlp/>`_,
 and then request to join a language team. Once you've been added to that
 team you will receive an e-mail notification, and all you need to do is
 login and start translating! It couldn't be simpler!
@@ -34,5 +34,5 @@ login and start translating! It couldn't be simpler!
 **Translations need to be completed by midnight Tuesday, 23rd October
 UTC.**
 
-.. |Translate OpenLP| image:: http://openlp.org/files/u2/translations.jpg
+.. |Translate OpenLP| image:: /pictures/translations.jpg
-.. |Current Status of OpenLP Translations| image:: http://openlp.org/files/u2/openlp_translations.png
+.. |Current Status of OpenLP Translations| image:: /pictures/openlp_translations.png

blog/media-kit-now-available.rst

@@ -27,10 +27,11 @@ As I gather more items, I'll add them to the media kit, so be on the
 look out for more updates, including more wallpapers and website badges.
 
 For Windows uers, and those who like zip files, you can download
-`OpenLP-MediaKit.zip <http://sourceforge.net/projects/openlp/files/mediakit/OpenLP-MediaKit.zip/download>`__,
+`OpenLP-MediaKit.zip <http://sourceforge.net/projects/openlp/files/mediakit/OpenLP-MediaKit.zip/download>`_,
 and those who prefer tarballs can download
-`OpenLP-MediaKit.tar.gz <http://sourceforge.net/projects/openlp/files/mediakit/OpenLP-MediaKit.tar.gz/download>`__.
+`OpenLP-MediaKit.tar.gz <http://sourceforge.net/projects/openlp/files/mediakit/OpenLP-MediaKit.tar.gz/download>`_.
 
 Now go forth and multiply!
 
-.. |OpenLP Media Kit| image:: http://openlp.org/files/u2/media_kit_newspapers.jpg
+.. |OpenLP Media Kit| image:: /pictures/media_kit_newspapers.jpg
+

blog/minor-faux-pas-and-some-web-site-down-time.rst

@@ -21,7 +21,6 @@ this weekend just before the release. So don't panic if see a "website
 under maintenance" page, the web site will be ready for the release on
 Sunday!
 
- 
+.. |Computer| image:: /pictures/computer-laptop.png
+.. |Site Maintenance| image:: /pictures/internet-web-browser.png
 
-.. |Computer| image:: http://openlp.org/files/u2/computer-laptop.png
-.. |Site Maintenance| image:: http://openlp.org/files/u2/internet-web-browser.png

blog/more-video-tutorials.rst

@@ -9,13 +9,14 @@
 Thanks to some hard work from one of our users, Joey Sour, we now have a
 whole bunch more video tutorials on how to use OpenLP! If you want to
 watch them, check out the `A/V Tools page on his church's web
-site <http://www.mcrbc.org/av-tools.html>`__, where he has uploaded
+site <http://www.mcrbc.org/av-tools.html>`_, where he has uploaded
 them.
 
 In addition to Joey's videos, we have a couple of tutorials we've done
-ourselves on our `YouTube channel <http://youtube.com/openlpvideos>`__.
+ourselves on our `YouTube channel <http://youtube.com/openlpvideos>`_.
 You can view those, plus Joey's and other videos from the community on
 our `channel
-page <http://www.youtube.com/playlist?list=PL5F75F986BB183DD9>`__.
+page <http://www.youtube.com/playlist?list=PL5F75F986BB183DD9>`_.
+
+.. |OpenLP Video Tutorials| image:: /pictures/video_tutorial.png
 
-.. |OpenLP Video Tutorials| image:: http://openlp.org/files/u2/video_tutorial.png

blog/new-20-forums.rst

@@ -18,7 +18,7 @@ to be able to hold back the tide once the alpha is released.
 Therefore new 2.0 specific forums have been created, to help separate
 v1.2 posts from v2.0 ones.
 
-| If you just want to discuss how great \*cough\* 2.0 is, need a bit of
+If you just want to discuss how great \*cough\* 2.0 is, need a bit of
 help getting it to do what you want or other general 2.0 chat, then you
 can use the General Discussion forum. Just don't ask us when the final
 version will be released, we don't know :)

blog/news-flash-jumping-jonah-out-the-fishs-mouth.rst

@@ -4,12 +4,13 @@
 .. tags: 
 .. description: 
 
-**\*\*\* IMPORTANT NOTE FOR WINDOWS USERS \*\*\*** Please note, if
+**IMPORTANT NOTE FOR WINDOWS USERS**
-you're using Windows, you need to ***uninstall the previous version of
+
-OpenLP***. We upgraded some of the components used in OpenLP and there
+Please note, if you're using Windows, you need to *uninstall the previous version of
+OpenLP*. We upgraded some of the components used in OpenLP and there
 seems to be a conflict on Windows, as reported by some users.
 
-****\ Yes folks, we've done it again! Here is another pre-release
+Yes folks, we've done it again! Here is another pre-release
 release of OpenLP 2.0. We're very excited to bring you OpenLP 1.9.4
 Alpha 4, codename "Jumping Jonah".
 
@@ -30,8 +31,7 @@ Some of the new features in this release are...
 -  A new shortcuts dialog, though it is not yet functional
 -  Bug report dialog now hooks into your e-mail client
 
-**PLEASE RUN THE NEW SEARCH RE-INDEX TOOL AFTER UPGRADING
+**PLEASE RUN THE NEW SEARCH RE-INDEX TOOL AFTER UPGRADING**
-**
 
 Not only do we have all these new features, but a couple of our testers
 have started writing a reference manual for OpenLP 2, which can be seen
@@ -52,54 +52,45 @@ Head on over to the download page to get it now!
 
 Here's a list of bugs fixed in Alpha 4:
 
-| 684901: Editing solid theme
+* 684901: Editing solid theme
-| 684905: Saving a theme name
+* 684905: Saving a theme name
-| 688647: Bible Import code requires SQLITE package to be avaliable
+* 688647: Bible Import code requires SQLITE package to be avaliable
-| 691952: To create a songs fails
+* 691952: To create a songs fails
-| 694148: importing theme produces errors
+* 694148: importing theme produces errors
-| 598356: Slide Controller preview screen does not resize when screen
+* 598356: Slide Controller preview screen does not resize when screen size changes.
-size changes.
+* 643506: Updating song in media manager doesn't update song in service manager
-| 643506: Updating song in media manager doesn't update song in service
+* 651076: Preview/Live issues with saved Song/Bible/Custom items loaded into Service Manager
-manager
+* 652380: OpenLP1.x database fails to import in 1.9.3 with character issues
-| 651076: Preview/Live issues with saved Song/Bible/Custom items loaded
+* 656177: saved ppt file to order of service
-into Service Manager
+* 660448: Activating a presentation while "blank" causes presentation to go live
-| 652380: OpenLP1.x database fails to import in 1.9.3 with character
+* 661965: Preview/Going Live of video fails in build 1093
-issues
+* 685331: Service Manager fails after 1 instance
-| 656177: saved ppt file to order of service
+* 686103: Labels in theme wizard out of alignment on Windows
-| 660448: Activating a presentation while "blank" causes presentation to
+* 690335: The slides of a customs item cannot be reduced to one
-go live
+* 696979: Open Service dialog shows no files
-| 661965: Preview/Going Live of video fails in build 1093
+* 697271: Songs maintain the list of songs topics authors
-| 685331: Service Manager fails after 1 instance
+* 594909: Editing theme name creates a theme
-| 686103: Labels in theme wizard out of alignment on Windows
+* 599146: Theme changes not getting saved
-| 690335: The slides of a customs item cannot be reduced to one
+* 647931: OSIS Bible importer imports "1Sam.x.yy" as "1 Samual" (misspelling)
-| 696979: Open Service dialog shows no files
+* 649999: Extra line is being added to end of Verses and Choruses
-| 697271: Songs maintain the list of songs topics authors
+* 655102: CCLI song importer brings in some text not needed
-| 594909: Editing theme name creates a theme
+* 657465: Media Types and File Types detection not complete
-| 599146: Theme changes not getting saved
+* 657712: image slides slow to open or mixed up
-| 647931: OSIS Bible importer imports "1Sam.x.yy" as "1 Samual"
+* 668630: Error when previewing a media file in the media manager
-(misspelling)
+* 686126: OpenLP 2 song import crashes with "alternate\_title" attribute error.
-| 649999: Extra line is being added to end of Verses and Choruses
+* 692684: Theme Wizard not updating
-| 655102: CCLI song importer brings in some text not needed
+* 693694: Web interface does not always send all necessary data
-| 657465: Media Types and File Types detection not complete
+* 696313: "Open Last Service" incorrectly opens the most recent service
-| 657712: image slides slow to open or mixed up
+* 598393: After adding a new image to a selected (image) item in the service manager it is not selected anymore
-| 668630: Error when previewing a media file in the media manager
+* 626070: GStreamer backend for Phonon has issues
-| 686126: OpenLP 2 song import crashes with "alternate\_title" attribute
+* 636835: songs.sqlite will not be downsized when deleting songs
-error.
+* 641661: Web Bible Import doesn't handle network problems
-| 692684: Theme Wizard not updating
+* 693150: Custom Slide Display footer option
-| 693694: Web interface does not always send all necessary data
+* 697405: Theme editor looses settings
-| 696313: "Open Last Service" incorrectly opens the most recent service
+* 656958: 'Blank to Theme' is not working for image backgrounds
-| 598393: After adding a new image to a selected (image) item in the
+* 661867: Invalid author added in song dialog
-service manager it is not selected anymore
+* 667837: Revision 1102 broke themes
-| 626070: GStreamer backend for Phonon has issues
+* 668789: Bible wont display any verses when clicking search
-| 636835: songs.sqlite will not be downsized when deleting songs
+* 674023: When adding media to the media plugin the file window does not show all supported video/audio file types.
-| 641661: Web Bible Import doesn't handle network problems
+* 693202: delete theme
-| 693150: Custom Slide Display footer option
+* 696362: Songbook number left from previously opened song edit dialog
-| 697405: Theme editor looses settings
-| 656958: 'Blank to Theme' is not working for image backgrounds
-| 661867: Invalid author added in song dialog
-| 667837: Revision 1102 broke themes
-| 668789: Bible wont display any verses when clicking search
-| 674023: When adding media to the media plugin the file window does not
-show all supported video/audio file types.
-| 693202: delete theme
-| 696362: Songbook number left from previously opened song edit dialog

blog/ooops-my-bad.rst

@@ -31,7 +31,7 @@ application as well.
 I'm very pleased with the progress we have made so far, and Derek is
 doing a fantastic job, so well done to him!
 
-| Oh, and as usual, we're always on the look out for helping hands. We
+Oh, and as usual, we're always on the look out for helping hands. We
 need documentation done and we need a few more people in our support
 team, and of course more developers are always welcome. Please use the
 Contact Us page to let us know.

blog/openlp-20-release-parties.rst

@@ -19,10 +19,10 @@ celebrate the release of OpenLP 2.0. A better solution would be for
 people in various areas to host regional release parties.
 
 There are a number of OpenLP `developers living in the
-UK <http://openlp.org/en/forums/general-support/general-discussion/uk-20-release-party>`__,
+UK <http://openlp.org/en/forums/general-support/general-discussion/uk-20-release-party>`_,
 and they are quite eager to get together for a release party. I live in
 `Cape Town, South
-Africa <http://openlp.org/en/forums/general-support/general-discussion/south-africa-20-release-party>`__,
+Africa <http://openlp.org/en/forums/general-support/general-discussion/south-africa-20-release-party>`_,
 and I'm keen to host a release party here in Cape Town too.
 
 If you are interested in attending a release party, or hosting a release
@@ -36,4 +36,5 @@ the day of OpenLP's release either, they can be a week or two or three
 later. If you have any ideas of how to celebrate OpenLP's release, feel
 free to post your ideas in the forums too.
 
-.. |Cape Town| image:: http://openlp.org/files/u2/Cape_Town.jpg
+.. |Cape Town| image:: /pictures/Cape_Town.jpg
+

blog/openlp-203-patched-petrus.rst

@@ -9,7 +9,7 @@
 We are happy to announce another bugfix release of OpenLP 2.0: version
 2.0.3 "Patched Petrus". This release fixes a regression in OpenLP 2.0.2
 where \ `services with notes could not be
-saved <https://bugs.launchpad.net/bugs/1216785>`__, and includes some
+saved <https://bugs.launchpad.net/bugs/1216785>`_, and includes some
 updates to the translations. Windows and Mac OS X builds are on the
 download page as usual, and OpenLP will filter down to the various Linux
 distributions over the next week or so.
@@ -19,7 +19,7 @@ make future bugfix releases of OpenLP 2.0 until OpenLP 2.2 is released.
 If you think you have found a bug, please check the list of bugs on our
 Launchpad.net project page to see if yours already exists in our bug
 tracker: \ `OpenLP at
-Launchpad.net <https://bugs.launchpad.net/openlp>`__
+Launchpad.net <https://bugs.launchpad.net/openlp>`_
 
 Speaking of OpenLP 2.2 (and on a more technical note), we have completed
 the migration of OpenLP from Python 2.7 to Python 3.3. This was a big
@@ -34,4 +34,5 @@ with OpenLP 2.0, you may lose some or even all of your data. As soon as
 the code is more stable, we will start our release cycles again with
 alpha and beta releases for folks to try out.
 
-.. |Petra| image:: http://openlp.org/files/u2/jordansyrPetra.png
+.. |Petra| image:: /pictures/jordansyrPetra.png
+

blog/openlp-204-correct-caleb-released.rst

@@ -1,10 +1,9 @@
 .. title: OpenLP 2.0.4 "Correct Caleb" Released
 .. slug: 2014/02/02/openlp-204-correct-caleb-released
 .. date: 2014-02-02 13:02:00 UTC
-.. tags: 
+.. tags:
-.. description: 
+.. description:
-
+.. previewimage: /cover-images/openlp-204-correct-caleb-released.jpg
-|OpenLP 2.0.4|
 
 Welcome to another bugfix release of OpenLP 2.0. This is a further
 release in the stable 2.0 series. While it might not look like much,
@@ -13,35 +12,27 @@ bit easier.
 
 Bugs fixed in this release:
 
--  #1117098: Transparent theme is white on Mac OSX
+* #1117098: Transparent theme is white on Mac OSX
--  #1154467: Web download bible db's getting locked
+* #1154467: Web download bible db's getting locked
--  #1173749: Songs with mismatching formatting tags still throw an
+* #1173749: Songs with mismatching formatting tags still throw an exception
-   exception
+* #1252477: Changing theme on bible settings tab causes an error when saving service
--  #1252477: Changing theme on bible settings tab causes an error when
+* #1012110: pptviewlib does not accept unicode filename
-   saving service
+* #1199639: Formatting tags opened and closed in different verses throw an exception
--  #1012110: pptviewlib does not accept unicode filename
+* #1206886: HTTP Server gets deleted
--  #1199639: Formatting tags opened and closed in different verses throw
+* #1222534: KeyError when "Allow presentation application to be overridden" and Spanish language is selected
-   an exception
+* #1223841: Transition does not work if texts are the same
--  #1206886: HTTP Server gets deleted
+* #1225763: Replacing background with video unblank screen even if  "Blanked to Theme"
--  #1222534: KeyError when "Allow presentation application to be
+* #1247661: Cannot restore OpenLP after minimising on OSX
-   overridden" and Spanish language is selected
+* #1251437: BibleGateway importer crashes on non unicode urls
--  #1223841: Transition does not work if texts are the same
+* #1258634: TypeError when saving service from previous versions with notes
--  #1225763: Replacing background with video unblank screen even if
+* #1259606: Clicking Verse Button doesn't alter live slide
-   "Blanked to Theme"
+* #1266271: Output display returns after pressing esc when looping slides
--  #1247661: Cannot restore OpenLP after minimising on OSX
+* #1157938: "Alt + Tab" = some pixelated icons and missing icons
--  #1251437: BibleGateway importer crashes on non unicode urls
+* #1211049: Can no long download bible verses
--  #1258634: TypeError when saving service from previous versions with
+* #1216234: Layout style has not effect when using a second bible
-   notes
+* #1240942: Troubleshooting guide is outdated
--  #1259606: Clicking Verse Button doesn't alter live slide
+* #1265368: [regression] Traceback in web remote
--  #1266271: Output display returns after pressing esc when looping
+* #1163874: Add Slovak bible to First Run Wizard. (SK *Katolický (Písmo Sväté)*)
-   slides
--  #1157938: "Alt + Tab" = some pixelated icons and missing icons
--  #1211049: Can no long download bible verses
--  #1216234: Layout style has not effect when using a second bible
--  #1240942: Troubleshooting guide is outdated
--  #1265368: [regression] Traceback in web remote
--  #1163874: Add Slovak bible to First Run Wizard. (SK - Katolický
-   (Písmo Sväté))
 
     Stay dressed for action and keep your lamps burning, and be like men
     who are waiting for their master to come home from the wedding
@@ -50,4 +41,8 @@ Bugs fixed in this release:
 
     Luke 12:35-36 (ESV)
 
-.. |OpenLP 2.0.4| image:: http://openlp.org/files/u2/fix_hammer_nails.png
+
+[ Image Credit: `B&W Hammer by Justin Baeder`_ ]
+
+.. _B&W Hammer by Justin Baeder: https://www.flickr.com/photos/justinbaeder/183930977/
+

blog/openlp-featured-amazing-people-podcast.rst

@@ -1,10 +1,9 @@
 .. title: OpenLP Featured on the Amazing People Podcast
 .. slug: 2014/04/19/openlp-featured-amazing-people-podcast
 .. date: 2014-04-19 20:04:09 UTC
-.. tags: 
+.. tags:
-.. description: 
+.. description:
-
+.. previewimage: /cover-images/chipdizardstudios.png
-|Chip Dizárd Studios|
 
 Recently, Raoul (the project leader) was interviewed by church media
 expert Chip Dizárd about OpenLP and open source software on his Amazing
@@ -13,5 +12,3 @@ open source and the church, then don't hesitate to listen to the
 podcast.
 
 `APP 024 :: Raoul Snyman of OpenLP <http://chip.photography/24/>`__
-
-.. |Chip Dizárd Studios| image:: http://openlp.org/files/u2/chipdizardstudios.png

blog/openlp-featured-libreoffice-41-release-notes.rst

@@ -7,7 +7,7 @@
 |LibreOffice Impress|
 
 As some of our users will have noted, `LibreOffice 4.1 was
-released <https://www.libreoffice.org/download/4-1-new-features-and-fixes>`__
+released <https://www.libreoffice.org/download/4-1-new-features-and-fixes>`_
 on the 25th of July. Included in this release are a whole lot of bug
 fixes and improvements, but one that stands out is an option that was
 added to Impress to aid in integration with OpenLP.
@@ -15,7 +15,7 @@ added to Impress to aid in integration with OpenLP.
 As of LibreOffice 4.0, the presenter console extension became part of
 the core of LibreOffice, and OpenLP was not able to turn this off. Tim,
 one of our core developers, `submitted a
-bug <https://bugs.freedesktop.org/show_bug.cgi?id=56995>`__ to the
+bug <https://bugs.freedesktop.org/show_bug.cgi?id=56995>`_ to the
 LibreOffice bug tracker, and an Indian student named Manik Malhotra
 picked it up for part of his Google Summer of Code submission to
 LibreOffice. Many thanks to Tim for his ongoing push to make folks aware
@@ -29,7 +29,7 @@ three of those days beat the usual Sunday traffic.
 
 |OpenLP Website Traffic|
 
-Never heard of `LibreOffice <https://www.libreoffice.org/>`__?
+Never heard of `LibreOffice <https://www.libreoffice.org/>`_?
 LibreOffice is an open source office suite, a free alternative to
 Microsoft Office. LibreOffice runs on Windows, Linux and Mac OS X, and
 can read and write most MS Office files. OpenLP supports displaying
@@ -41,5 +41,6 @@ Bug report: https://bugs.freedesktop.org/show_bug.cgi?id=56995
 LibreOffice release notes:
 https://www.libreoffice.org/download/4-1-new-features-and-fixes
 
-.. |LibreOffice Impress| image:: http://openlp.org/files/u2/libreoffice-impress.png
+.. |LibreOffice Impress| image:: /pictures/libreoffice-impress.png
-.. |OpenLP Website Traffic| image:: http://openlp.org/files/u2/openlp-libreoffice-release.png
+.. |OpenLP Website Traffic| image:: /pictures/openlp-libreoffice-release.png
+

blog/openlp-libreoffice-41-and-ubuntu-ppa.rst

@@ -13,7 +13,7 @@ seems to be due to a bug in the way LibreOffice is packaged in the PPA,
 as other Linux users on distributions such as Fedora and Arch are not
 encountering the problem.
 
-Please ***do not install*** LibreOffice from the PPA, it ***WILL***
+Please **do not install** LibreOffice from the PPA, it **WILL**
 break OpenLP.
 
 Folks, please note that ***OpenLP is currently not compatible with
@@ -22,4 +22,4 @@ and LibreOffice uses Python 3.2 which are incompatible. The next version
 of OpenLP, version 2.2, will be compatible with LibreOffice 4.x but
 unfortunately there is no way to backport this compatibility.
 
-.. |Package| image:: http://openlp.org/files/u2/utilities-file-archiver.png
+.. |Package| image:: /pictures/utilities-file-archiver.png

blog/openlp-officially-debian-repositories.rst

@@ -7,7 +7,7 @@
 |Debian - The Universal Operating System|
 
 Ladies and gentlemen, I am extremely happy to announce that as from
-today you can install OpenLP in `Debian Linux <http://debian.org/>`__
+today you can install OpenLP in `Debian Linux <http://debian.org/>`_
 (unstable) by simply typing in ``apt-get install openlp`` - yes, that's
 right, OpenLP is in the Debian repositories.
 
@@ -17,5 +17,5 @@ will filter down into distributions like Ubuntu, Kubuntu and Linux Mint
 in the near future. For instance, you should find OpenLP in Ubuntu 12.10
 when it comes out in October this year.
 
-.. |Debian - The Universal Operating System| image:: http://openlp.org/files/u2/debian_logo.png
+.. |Debian - The Universal Operating System| image:: /pictures/debian_logo.png
    :target: http://debian.org/

blog/openlp-officially-part-opensuse.rst

@@ -20,4 +20,4 @@ months. He had to fix bugs in other packages and prod people to compile
 their packages properly, just so that he could get OpenLP into openSUSE.
 It really was quite a mission, but he did so anyways.
 
-.. |openSUSE| image:: http://openlp.org/files/u2/120px-Geeko-button-bling3.png
+.. |openSUSE| image:: /pictures/120px-Geeko-button-bling3.png

blog/openlp-officially-part-ubuntu-1210.rst

@@ -22,4 +22,4 @@ Pangolin.
 
 Don't forget that you can find OpenLP in openSUSE and Fedora too.
 
-.. |Ubuntu Linux| image:: http://openlp.org/files/u2/ubuntu_orange_hex1.png
+.. |Ubuntu Linux| image:: /pictures/ubuntu_orange_hex1.png

blog/openlp-snow-leopard-now-officially-fully-supported.rst

@@ -4,7 +4,7 @@
 .. tags: 
 .. description: 
 
-| To give a little bit of history: a big item for our OpenLP 1.9.6 (Beta
+To give a little bit of history: a big item for our OpenLP 1.9.6 (Beta
 2) release was to fix the JPEG support on Snow Leopard (OS X 10.6), not
 just on Leopard (OS X 10.5) - see this ticket. But it turns out that was
 not that easy to fix, as during packaging OpenLP it somehow get left
@@ -13,15 +13,20 @@ for OS X, but in this particular case the libraries were not being
 packaged correctly. Because of this bug in PyInstaller, fixing this
 issue was delayed until after the official release date of Beta 2. Kudos
 goes to Martin for fixing that issue:
+
 http://www.pyinstaller.org/ticket/373
-| Now that the official fix is available, we have repacakged OpenLP for
+
+Now that the official fix is available, we have repacakged OpenLP for
 OS X, and made it available as OpenLP 1.9.6.1, a special release for
 Snow Leopard (OS X 10.6) with JPEG support. This now enables users of
 Snow Leopard to use the JPEG format in images and theme backgrounds.
 Here's a direct download link:
+
 http://sourceforge.net/projects/openlp/files/openlp/1.9.6/OpenLP-1.9.6.1.dmg/download
+
 Enjoy!
-| To answer a recent question about OS X 10.7, aka Lion: unfortunately
+
+To answer a recent question about OS X 10.7, aka Lion: unfortunately
 at this point in time we cannot estimate when OpenLP will be officially
 supported on Lion (OS X 10.7). Currently the GUI toolkit we use (Qt) has
 some glitches on that new version of OS X that need to be fixed before

blog/openlp-version-2-bible-plugin.rst

@@ -4,43 +4,29 @@
 .. tags: 
 .. description: 
 
-| The developement of the Bible plugin is nearing completion and we have
+The developement of the Bible plugin is nearing completion and we have
 mananaged to add some new features, as well as port the current
 functionality.
-| **Bible Imports**
-| Two new import methods have been added.
 
--  Ability to import bibles from Sword bible reader.  This functionality
+Bible Imports
-   will create a bible from a bible downloaded by the sword software.
+-------------
-   The quality of the import is only as good as the source material but
+Two new import methods have been added.
-   it opens up access  to a wide range of bibles in many languages.
--  Ability to access bibles directly from the Internet.  These bibles
-   will be downloaded on demand and cached on the local machine so they
-   can be used whist not connected to the internet.
 
-| **
+* Ability to import bibles from Sword bible reader. This functionality will create a bible from a bible downloaded by the sword software. The quality of the import is only as good as the source material but it opens up access to a wide range of bibles in many languages.
-Bible Presentations.**
+* Ability to access bibles directly from the Internet. These bibles will be downloaded on demand and cached on the local machine so they can be used whist not connected to the internet.
-| It is now possible to mix verses and/or versions on the same slide.
-| For example
 
--  A slide could have Matthew 1:1 and Matthew 1:3 on the same slide.
+Bible Presentations
--  Also a slide could have Matthew 1:1 from the NIV and The Message on
+-------------------
-   the same slide.
+It is now possible to mix verses and/or versions on the same slide.
+For example
+
+* A slide could have Matthew 1:1 and Matthew 1:3 on the same slide.
+* Also a slide could have Matthew 1:1 from the NIV and The Message on the same slide.
 
 Hopefully this will give you an idea of some of the improvements coming
 up.
 
 The image below shows search results using the new Bible Plugin.
 
-+--------------------------------------+--------------------------------------+
+.. image:: /pictures/bibles1.png
-| Attachment                           |
-| Size                                 |
-+======================================+======================================+
-| |image1|                             |
-| `bibles1.png <http://openlp.org/file |
-| s/bibles1.png>`__                    |
-| 42.86 KB                             |
-+--------------------------------------+--------------------------------------+
 
-.. |image0| image:: http://openlp.org/modules/file/icons/image-x-generic.png
-.. |image1| image:: http://openlp.org/modules/file/icons/image-x-generic.png

blog/over-40000-downloads-openlp-201.rst

@@ -32,7 +32,7 @@ lot higher, thanks to the downloads we can't track, but this still gives
 us a rough idea of the impact of OpenLP.
 
 If you haven't downloaded OpenLP yet, `DO IT
-NOW <http://openlp.org/download>`__!
+NOW <http://openlp.org/download>`_!
 
-.. |Download OpenLP Open Source Free Worship Projection Presentation Software| image:: http://openlp.org/files/u2/download.png
+.. |Download OpenLP Open Source Free Worship Projection Presentation Software| image:: /pictures/download.png
    :target: http://openlp.org/download

blog/quick-video-tutorial.rst

@@ -12,8 +12,5 @@ can't see it, you can download it and watch it in VLC using the link
 below, or you'll have to wait a little until I've uploaded it to our
 YouTube channel.
 
-| 
-|  Your browser does not support the video tag or WebM videos.
-
 `Download OpenLP Service Tutorial
-Video <http://openlp.org/files/openlp-service-tutorial.webm>`__
+Video </files/openlp-service-tutorial.webm>`_

blog/rc1-progress.rst

@@ -1,15 +1,15 @@
 .. title: RC1 progress
 .. slug: 2006/04/23/rc1-progress
 .. date: 2006-04-23 22:04:01 UTC
-.. tags: 
+.. tags:
-.. description: 
+.. description:
 
 As you might have noticed, openlp.org has stagnated again. My profuse
 apologies, this was due to an error with PowerPoint that I was not sure
 how to solve. I didn't have PowerPoint installed, so I could not figure
 what the problem was.
 
-Well, this evening I eventually \*did\* install PowerPoint, and
+Well, this evening I eventually **did** install PowerPoint, and
 recompiled openlp.org, and it seems to have solved the problem. I also
 added the CCLI license number to the slides, and fixed up a bit of the
 positioning of the informational text at the bottom of the slides.
@@ -19,7 +19,7 @@ displaying properly, and focussing problems. I'll be meeting with Tim on
 Tuesday evening to see if we can get past those last few hurdles, and
 then RC1 should be good to go.
 
-| On a side note, please could you keep both Tim and myself in your
+On a side note, please could you keep both Tim and myself in your
 prayers.
 
 -  Tim is due to get married in July, he's got his studies, and then he

blog/release-candidate-1-openlp-1910-admirable-anna.rst

@@ -17,30 +17,25 @@ version of OpenLP.
 Minor features and enhancements in OpenLP 1.9.10
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
--  OpenLP now has a portable version in PortableApps.com form
+* OpenLP now has a portable version in PortableApps.com form
--  Users can now set a custom location for their data files
+* Users can now set a custom location for their data files
--  DreamBeam song importer
+* DreamBeam song importer
--  PowerSong importer
+* PowerSong importer
--  ZionWorx CSV song importer
+* ZionWorx CSV song importer
--  Improved rendering times
+* Improved rendering times
--  Keep/restore selected book, chapters and verses when changing the
+* Keep/restore selected book, chapters and verses when changing the bible translation in advanced search
-   bible translation in advanced search
+* Added a dialog to edit metadata of Bibles, and additional language options.
--  Added a dialog to edit metadata of Bibles, and additional language
+* UI and usability improvements to the web remote
-   options.
--  UI and usability improvements to the web remote
 
 Major bugs fixed in OpenLP 1.9.10:
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
--  The new BibleGateway web site was causing issues with the web Bible
+* The new BibleGateway web site was causing issues with the web Bible importer
-   importer
+* OpenLP did not exit properly on some Windows systems
--  OpenLP did not exit properly on some Windows systems
+* Disabled VLC integration on FreeBSD due to it not being supported by VLC
--  Disabled VLC integration on FreeBSD due to it not being supported by
+* Theme wizard now uses the current output display geometry when creating a thumbnail for a theme
-   VLC
+* Fixed a problem where newly imported Bibles would throw an error
--  Theme wizard now uses the current output display geometry when
+* Fixed most of the issues surrounding the progress bar for videos
-   creating a thumbnail for a theme
--  Fixed a problem where newly imported Bibles would throw an error
--  Fixed most of the issues surrounding the progress bar for videos
 
 Known issues:
 ^^^^^^^^^^^^^
@@ -94,4 +89,5 @@ OpenLP 2.0 in a few months.
 
     Luke 2:36-38 NIV
 
-.. |OpenLP 2.0 Release Candidate 1| image:: http://openlp.org/files/u2/rc1.png
+.. |OpenLP 2.0 Release Candidate 1| image:: /pictures/rc1.png
+

blog/release-candidate-2-ophthalmic-obadiah.rst

@@ -31,4 +31,5 @@ Minor features and enhancements in OpenLP 1.9.11
 -   - Various fixes to Song importers
 -   - Bug fixes for Formatting tag dialogues
 
-.. |OpenLP 2.0 Release Candidate 2| image:: http://openlp.org/files/u506/rc2.png
+.. |OpenLP 2.0 Release Candidate 2| image:: /pictures/rc2.png
+

blog/release-candidate-3-released.rst

@@ -15,6 +15,6 @@ slide. Also, if you look in the options window, you'll see that there's
 a "Verse slide layout" section where you can choose whether you want all
 the verses displayed together or each on a separate line on the slide.
 
-| So, a couple of new things in this release, a couple of things fixed.
+So, a couple of new things in this release, a couple of things fixed.
 If you encounter any bugs, use the bug reporting topic in the forums to
 file your bug report.

blog/release-candidate-5-released.rst

@@ -4,24 +4,26 @@
 .. tags: 
 .. description: 
 
-| Hi All. Release Candidate 5 has now been released. Due to the nature
+Hi All. Release Candidate 5 has now been released. Due to the nature
 of some of the issues/problems raised in RC4, we felt that we should add
 an additional RC version before going to a full V1.0. This was mainly
 due to a lot of rewriting of code to sort out some of the 'little
 quirks'.
-| The main issues corrected were:
-| - A theme import/export problem (involving the delete option)
-| - In the Bible verse 'Verse' layout mode, verses are not split across
-slides
-| - A Bible verse bug seen in imported Bibles was fixed
-| - A bug in the deleting of songs was fixed
-| - Auto Open Last OOS feature was fixed
-| - Missing last slide character bug was fixed
 
-| For all you Vista users out there, the missing DLL (d3drm.dll) that
+The main issues corrected were:
+
+* A theme import/export problem (involving the delete option)
+* In the Bible verse 'Verse' layout mode, verses are not split across slides
+* A Bible verse bug seen in imported Bibles was fixed
+* A bug in the deleting of songs was fixed
+* Auto Open Last OOS feature was fixed
+* Missing last slide character bug was fixed
+
+For all you Vista users out there, the missing DLL (d3drm.dll) that
 was causing issues, will now be installed if you are running on Vista.
 It has also been confirmed that Powerpoint in Office 2007 is compatible
 with OpenLP.org.
-| With any luck, this will now be the last release before V1.0.
+
-|  God bless,
+With any luck, this will now be the last release before V1.0.
-| Derek.
+
+God bless, Derek.

blog/reworking-the-bibles.rst

@@ -19,27 +19,29 @@ book from the abbreviation table (which has become a fully-fledged book
 table) and use that for the lookup.
 
 So, for those interested, here are the create statements (SQLite) for
-the tables in the new format Bible files.
+the tables in the new format Bible files:
 
-| **CREATE** **TABLE** testament (
+.. code:: SQL
-|   id **INTEGER** **PRIMARY** **KEY** **NOT** **NULL**,
-|   name **VARCHAR**\ (30) **NOT** **NULL
-**)
 
-| **CREATE** **TABLE** book (
+    CREATE TABLE testament (
-|   id **INTEGER** **PRIMARY** **KEY** **NOT** **NULL**,
+        id INTEGER PRIMARY KEY NOT NULL,
-|   testament\_id **INTEGER** **NOT** **NULL** **DEFAULT** 1,
+        name VARCHAR(30) NOT NULL
-|   name **VARCHAR**\ (30) **NOT** **NULL**,
+    )
-|   abbreviation **VARCHAR**\ (5)
-| )
 
-| **CREATE** **TABLE** verse (
+    CREATE TABLE book (
-|   id **INTEGER** **PRIMARY** **KEY** **NOT** **NULL**,
+       id INTEGER PRIMARY KEY NOT NULL,
-|   book\_id **INTEGER** **NOT** **NULL** **DEFAULT** 1,
+       testament_id INTEGER NOT NULL DEFAULT 1,
-|   chapter **INTEGER** **NOT** **NULL** **DEFAULT** 1,
+       name VARCHAR(30) NOT NULL,
-|   verse **INTEGER** **NOT** **NULL** **DEFAULT** 1,
+       abbreviation VARCHAR(5)
-|   text **BLOB
+    )
-**)
+
+    CREATE TABLE verse (
+       id INTEGER PRIMARY KEY NOT NULL,
+       book_id INTEGER NOT NULL DEFAULT 1,
+       chapter INTEGER NOT NULL DEFAULT 1,
+       verse INTEGER NOT NULL DEFAULT 1,
+       text BLOB
+    )
 
 What's great about this new format is that if you are Spanish, you can
 have all the names of the books in Spanish! So not only do you get

blog/server-migrations-and-support-e-mails.rst

@@ -1,10 +1,9 @@
 .. title: Server Migrations and Support E-mails
 .. slug: 2014/01/13/server-migrations-and-support-e-mails
 .. date: 2014-01-13 19:01:09 UTC
-.. tags: 
+.. tags:
-.. description: 
+.. description:
-
+.. previewimage: /cover-images/server-migrations-and-support-e-mails.jpg
-|pc-blue|
 
 If anyone has had problems e-mailing either our support e-mail address
 or our bug reporting e-mail address over the last couple of weeks, we
@@ -22,9 +21,11 @@ reply from us (apart from an automated reply, perhaps), then please
 e-mail us again and we should now get your e-mails and be able to
 respond to your queries. If we still don't seem to be getting your
 e-mails, please visit us in
-`IRC <http://openlp.org/support/live-chat-irc>`__ and let us know which
+`IRC <http://openlp.org/support/live-chat-irc>`_ and let us know which
 e-mail address you sent your query to, and when you sent it.
 
 Thanks for your patience, and your continued support!
 
-.. |pc-blue| image:: http://openclipart.org/image/100px/svg_to_png/77377/pc-blue.png
+[ Image Credit: `Server Room by Andy Rogers`_ ]
+
+.. _Server Room by Andy Rogers: https://www.flickr.com/photos/cobaltfish/7932122714/

blog/some-useful-utilities-for-openlp-org.rst

@@ -11,7 +11,7 @@ import Bibles from BibleGateway.com, which should be legal in terms of
 the "fair use" clause of copyright law. Please note, however, that I am
 not a lawyer, so I might be totally incorrect about this.
 
-| We've listed Jonathan's software on a new page in the documentation:
+We've listed Jonathan's software on a new page in the documentation:
 Useful Utilities. If you have written a utility for openlp.org and what
 it included on this page, please let me know (see the Contributing
 page).

blog/status-update-and-a-request-for-assistance-0.rst

@@ -11,7 +11,7 @@ theme level to song level, OOS level or global default. I few other
 small bugs have also been resolved. The internationalisation feature
 will be moved out to beta6.
 
-| The one outstanding issue that we wanted to include for beta 5 is the
+The one outstanding issue that we wanted to include for beta 5 is the
 correction of the CCLI bug. This is where we have a small problem that I
 hope someone out there can help me with. The South African CCLI website
 does not have the same functionality as the USA website and we can't use
@@ -23,6 +23,5 @@ That's it from me for now.
 
 God bless,
 
-| Derek.
+Derek.
-
  

blog/still-looking-for-documentation.rst

@@ -4,7 +4,7 @@
 .. tags: 
 .. description: 
 
-| We're still looking for people to help out with the documentation.
+We're still looking for people to help out with the documentation.
 That's the final part in the "release" of openlp.org. Unfortunately
 neither Derek nor myself have the time at the moment to do that, so we'd
 really appreciate the help.

blog/tips-android-app-setup-openlp.rst

@@ -12,9 +12,9 @@ on Sunday mornings. It is also useful for speakers that want to control
 what is being displayed and I'm sure many many other uses. We have
 recently had a few questions about the remote feature and the setup. You
 can find detailed instructions in the `OpenLP
-documentation <http://manual.openlp.org/configure.html#remote>`__ and
+documentation <http://manual.openlp.org/configure.html#remote>`_ and
 also info for the `Android
-app <http://manual.openlp.org/android.html#android>`__.
+app <http://manual.openlp.org/android.html#android>`_.
 
 **Networking Basics**
 
@@ -49,19 +49,19 @@ OpenLP machine is on.
 **Connect to the Correct IP Address **
 
 Most networks use
-`DHCP <http://en.wikipedia.org/wiki/Dynamic_Host_Configuration_Protocol>`__
+`DHCP <http://en.wikipedia.org/wiki/Dynamic_Host_Configuration_Protocol>`_
 to hand out IP addresses, this means your OpenLP machine may not have
 the same IP address every week so it may be necessary to check that if
 you cannot connect with your device. You can find the IP address from
 the `remote
-settings <http://manual.openlp.org/_images/configureremotes.png>`__\ screen
+settings <http://manual.openlp.org/_images/configureremotes.png>`_\ screen
 in OpenLP. You can also find the IP address by entering the command
 "ipconfig" in the command prompt in Windows, or by the commands "ip a"
 or "ifconfig" on most Mac, Linux, and BSD machines. You can also find
 your OpenLP computer if you know its
-`hostname  <http://en.wikipedia.org/wiki/Hostname>`__ on your Android
+`hostname  <http://en.wikipedia.org/wiki/Hostname>`_ on your Android
 device by using an app such as
-`eZNetScan <https://play.google.com/store/apps/details?id=com.vrsspl.eznetscan&hl=en>`__.
+`eZNetScan <https://play.google.com/store/apps/details?id=com.vrsspl.eznetscan&hl=en>`_.
 
 **Be Sure to Apply Your Settings**
 
@@ -74,8 +74,9 @@ A static IP address will help keep you from having a lot of these
 issues. This may not always be possible, another way to achieve
 something close to this is using a tool most routers have to reserve
 dhcp addresses usually bound to the `MAC
-address <http://en.wikipedia.org/wiki/MAC_address>`__ of a computer.
+address <http://en.wikipedia.org/wiki/MAC_address>`_ of a computer.
 Check your routers documentation but this is usually a pretty simple
 process.
 
-.. |Android| image:: http://openlp.org/files/u1284/android_logo.gif
+.. |Android| image:: /pictures/android_logo.gif
+

blog/transitions-and-verse-tagging.rst

@@ -7,22 +7,15 @@
 In the last few weeks a number of requested features have been added to
 the 2.x code base.
 
--  Transitions where a song slide will fade into the next slide
+* Transitions where a song slide will fade into the next slide automatically. This option still needs to be made configurable as it is expected some people will not wish to use it or find it distracting.
-   automatically. This option still needs to be made configurable as it
+* Verse tagging where each slide is given a tag  eg Verse, Chorus, Bridge , Intro.
-   is expected some people will not wish to use it or find it
+* Verses will also be given a number as there can be many of them in a song!
-   distracting.
--  | Verse tagging where each slide is given a tag  eg Verse, Chorus, 
-   Bridge , Intro.
-   | Verses will also be given a number as there can be many of them in
-   a song!
-   | It will then be possible to simply change the order of the verses,
-   if required.  One advantage of this is that each slide is only stored
-   once but can be used may times>
-   | For Example a ***verse list*** could look like:
 
-       V1 V2 C V3 C B V4 C V1
+It will then be possible to simply change the order of the verses, if required. One advantage of this is that each slide is only stored once but can be used may times.
 
-   A Verse (V1) can be one or many slides, all tagged the same and
+For example a *verse list* could look like::
-   treated as a block.
+
+    V1 V2 C V3 C B V4 C V1
+
+A Verse (V1) can be one or many slides, all tagged the same and treated as a block.
 
- 

blog/translators-and-documentators-needed.rst

@@ -11,7 +11,7 @@ pretty nicely. It's been a long time, and a long process (hectic
 personal schedules leave little time for pet projects like openlp.org),
 but we're finally nearing 1.0.
 
-| BUT in order for us to have a really nicely finished and polished
+BUT in order for us to have a really nicely finished and polished
 product, we need documentation. We're looking for people who are willing
 to put aside a couple of hours a week (say about 2 - 4) and, in a
 collaborative manner, put together a user guide second to none. If

blog/upcoming-releases-and-road-22.rst

@@ -1,44 +0,0 @@
-.. title: Upcoming Releases and the Road to 2.2
-.. slug: 2014/06/13/upcoming-releases-and-road-22
-.. date: 2014-06-13 20:06:12 UTC
-.. tags: 
-.. description: 
-
-|Road Ahead|
-
-OpenLP 2.0.4 has been out for 4 months now, and while there don't seem
-to be any major issues with it, that doesn't mean there are no more
-bugs. With this in mind we're going to be releasing version 2.0.5 at the
-end of this month, June. This will be the last release of OpenLP 2.0.
-
-Once 2.0.5 has be released, we will be gearing up for the release of
-2.2. As a part of this we will be starting up the nightly builds again
-and we will release a beta at the end of August with a view of releasing
-2.2 at the end of October.
-
-In order to reduce the time between (major) releases, the OpenLP team
-has decided to move to a release cycle more like Firefox and Chrome,
-with short cycles and a smaller number of features in each release. With
-fewer features in each release there should also be fewer bugs, and a
-faster cycle should mean that bugs are fixed sooner too.
-
-We have also started writing automated tests for OpenLP, which should
-help to curb some of the bugs before they make it into our main
-codebase. Each developer is required to run all the tests against their
-code before they can submit it, and they are required to write tests for
-their code. This way our test coverage increases and we are able to
-prevent regressions (when new code breaks some of the older code).
-
-So while you won't find all the features you want in OpenLP 2.2, we hope
-to be able to get the features you want out to you sooner in future
-because we're not spending forever getting all the features developed
-while you're waiting for a huge release to happen.
-
-| [Image credit: `The Garden Route, South
-Africa <https://www.flickr.com/photos/belsymington/4597668741/>`__ by
-`stringer\_bel <https://www.flickr.com/photos/belsymington/>`__ on
-`Flickr <https://www.flickr.com/>`__]
-| [See more `images of South African roads on
-Flickr <https://www.flickr.com/search/?q=road+south+africa&l=commderiv&ss=0&ct=0&mt=photos&w=all&adv=1>`__]
-
-.. |Road Ahead| image:: http://openlp.org/files/u2/road_ahead.png

blog/updated-how-help-mac-development.rst

@@ -1,10 +1,9 @@
 .. title: [Updated] How to help with Mac Development
 .. slug: 2014/03/27/updated-how-help-mac-development
 .. date: 2014-03-27 12:03:57 UTC
-.. tags: 
+.. tags:
-.. description: 
+.. description:
-
+.. previewimage: /cover-images/macmini_md388_3.png
-|Mac Mini|
 
 **Update:** We are pleased to announce that we've had another large
 donation, which will cover the cost of the Mac Mini completely. Thanks
@@ -26,4 +25,3 @@ contact us via support<at>openlp.org or `come visit us in
 IRC <http://openlp.org/support/live-chat-irc>`__ and ask for the PayPal
 details.
 
-.. |Mac Mini| image:: http://openlp.org/files/u2/macmini_md388_3.png

blog/using-images-slide-show.rst

@@ -40,7 +40,7 @@ the background playing as people come in. We have a very pro looking
 pre-service set of announcements that can be put together at the very
 last minute.
 
-.. |Image| image:: http://openlp.org/files/u1284/camera_256.png
+.. |Image| image:: /pictures/camera_256.png
-.. |Images| image:: http://openlp.org/files/u1284/slideshow1.png
+.. |Images| image:: /pictures/slideshow1.png
-.. |Service Manager| image:: http://openlp.org/files/u1284/slideshow2.png
+.. |Service Manager| image:: /pictures/slideshow2.png
-.. |image3| image:: http://openlp.org/files/u1284/slideshow3.png
+.. |image3| image:: /pictures/slideshow3.png

blog/v122-is-available-for-download.rst

@@ -9,15 +9,11 @@ Hi All
 This is a fairly minor update release, but I guess more minor to some
 the others :)
 
-| Changes in openlp.org 1.2.2.
+Changes in openlp.org 1.2.2.
-| - Correction for bug prevent song information display from being
+
-deactivated
+* Correction for bug prevent song information display from being deactivated
-| - Added option to ignore saving the unsaved OOS content when selecting
+* Added option to ignore saving the unsaved OOS content when selecting to open a new OOS
-to open a new OOS
+* Fixed bug preventing the theme export to use any folder outside of the "Documents and Settings" folder.  Themes can now be exported to any folder.
-| - Fixed bug preventing the theme export to use any folder outside of
-the "Documents and Settings" folder.  Themes can now be exported to any
-folder.
 
 Derek.
 
- 

blog/version-125-is-available-for-download.rst

@@ -6,8 +6,7 @@
 
 This is a fairly minor update release with the following changes:
 
-| - Prevent the creation of the ".lit" file in the openlp.exe directory
+* Prevent the creation of the ".lit" file in the openlp.exe directory which causes Windows 7 issues
-which causes Windows 7 issues
+* Correction made to the bundled PPT presentation
-| - Correction made to the bundled PPT presentation
+* Correction made to display configured Bible permission.
-| - Correction made to display configured Bible permission.
+* Audio component updated due to bugfixes
-| - Audio component updated due to bugfixes

blog/version-128-released.rst

@@ -4,15 +4,10 @@
 .. tags: 
 .. description: 
 
-| Here is the latest installment of the 1.2.x line sporting the
+Here is the latest installment of the 1.2.x line sporting the following corrections:
-following corrections:
-| - Correction for loading of OOS where the name of a song in the
-OOS existed multiple times in the song DB
 
-- Correction for corruption of OOS when no theme selected for storing in
+* Correction for loading of OOS where the name of a song in the OOS existed multiple times in the song DB
-the OOS
+* Correction for corruption of OOS when no theme selected for storing in the OOS
-
+* Correction for handling of embedded items in a PowerPoint slide in Office 2007 and above
-- Correction for handling of embedded items in a PowerPoint slide in
-Office 2007 and above
 
 Enjoy :)

blog/version-2-theme-manager.rst

@@ -21,17 +21,7 @@ Other changes include:
 
 Two examples are below.
 
-+--------------------------------------+--------------------------------------+
+.. image:: /files/render_circular.png
-| Attachment                           |
+
-| Size                                 |
+.. image:: /files/render_linear.png
-+======================================+======================================+
-| |image2|                             | |image3|                             |
-| `render\_circular.png <http://openlp | `render\_linear.png <http://openlp.o |
-| .org/files/render_circular.png>`__   | rg/files/render_linear.png>`__       |
-| 119 KB                               | 61.17 KB                             |
-+--------------------------------------+--------------------------------------+
 
-.. |image0| image:: http://openlp.org/modules/file/icons/image-x-generic.png
-.. |image1| image:: http://openlp.org/modules/file/icons/image-x-generic.png
-.. |image2| image:: http://openlp.org/modules/file/icons/image-x-generic.png
-.. |image3| image:: http://openlp.org/modules/file/icons/image-x-generic.png

blog/version-20-release-postponed.rst

@@ -20,15 +20,16 @@ waited just a little bit longer.
 
 Don't forget that this gives everyone an extra couple of weeks to
 `translate
-OpenLP <http://openlp.org/en/blog/2012/10/12/lets-get-translating>`__,
+OpenLP <http://openlp.org/en/blog/2012/10/12/lets-get-translating>`_,
 `find more
-bugs <http://openlp.org/en/blog/2012/09/24/gearing-final-release>`__, or
+bugs <http://openlp.org/en/blog/2012/09/24/gearing-final-release>`_, or
 just `promote it in your Church
-circles <http://openlp.org/en/blog/2012/10/07/media-kit-now-available>`__.
+circles <http://openlp.org/en/blog/2012/10/07/media-kit-now-available>`_.
 
 See you at the end of November!
 
 **Update:** After some discussion the development team has decided to
 release OpenLP 2.0 on the 1\ :sup:`st` of December 2012.
 
-.. |OpenLP version 2.0| image:: http://openlp.org/files/u2/applications-other.png
+.. |OpenLP version 2.0| image:: /pictures/applications-other.png
+

blog/very-special-christmas-present-everyone-openlp-20-beta-4.rst

@@ -27,7 +27,7 @@ previous versions of OpenLP with your most recent database.*
 This release is no different to the last one, chock-full of bug fixes,
 with a few features, or feature enhancements, thrown in. We are also
 constantly updating `the manual
-(http://manual.openlp.org/) <http://manual.openlp.org/>`__ to reflect
+(http://manual.openlp.org/) <http://manual.openlp.org/>`_ to reflect
 these new features and enhancements and a lot of changes have already
 been documented.
 
@@ -35,14 +35,14 @@ Some of the features you'll find in this release:
 
 -  A top toolbar in the web remote
 -  `Media has been
-   rewritten <http://www.openlp.org/en/blog/2011/12/02/media-rewrite-complete>`__
+   rewritten <http://www.openlp.org/en/blog/2011/12/02/media-rewrite-complete>`_
    to make integration of other media systems, like VLC, easier.
 -  Added "Justify" as a theme option (note: this makes themes not
    backward compatible if this option is used)
 -  Ability to edit songs loaded as part of a service which are not
    stored permanently in the songs database.
 -  `Special
-   shortcuts <http://www.openlp.org/en/blog/2011/11/06/shortcuts-live-controller-video>`__
+   shortcuts <http://www.openlp.org/en/blog/2011/11/06/shortcuts-live-controller-video>`_
    for the slide controller to go directly to any verse.
 
 Some of the bug fixes you'll find in this release:
@@ -86,6 +86,7 @@ take the time to refresh yourself with Jesus Christ, our Wonderful
 Counselor, Mighty God, Everlasting Father and Prince of Peace. Amen.
 
 `Go grab OpenLP 1.9.8 from the Download
-page! <http://openlp.org/en/download>`__
+page! <http://openlp.org/en/download>`_
+
+.. |Christmas Present| image:: /pictures/christmas_present.png
 
-.. |Christmas Present| image:: http://openlp.org/files/u2/christmas_present.png

blog/videos-wanted.rst

@@ -13,7 +13,7 @@ a YouTube channel. Many times a video is worth more than a thousand
 words when demonstrating a feature or helping out with a technical
 issue.
 
-| We would love for members of the OpenLP community to help out with
+We would love for members of the OpenLP community to help out with
 support. We can always use help with the manual or in chat, but
 specifically we would love to have your videos. Maybe you would like to
 document a feature that once found you couldn't live without. Maybe, you

blog/vista-problems.rst

@@ -12,7 +12,7 @@ openlp.org directory (on most systems it should be "C:\\Program
 Files\\openlp.org") and openlp.org should work fine. Let me know about
 this, I'm operating on hearsay.
 
-| On the other hand, I've moved to Linux full time now, Kubuntu 7.04
+On the other hand, I've moved to Linux full time now, Kubuntu 7.04
 (Feisty Fawn), as my main desktop, although I'll still have a Windows
 box around to develop openlp.org.  If you haven't looked at Linux yet, I
 would strongly recommend you do! Download a CD image from www.ubuntu.com

blog/windows-8-and-buggy-benjamin.rst

@@ -9,7 +9,7 @@
 We've had a number of reports recently of users with Windows 8 being
 unable to run OpenLP. Unfortunately from our side we have not had any
 problems with our tests on Windows 8. If you have Windows 8 `please
-contact us <http://openlp.org/en/support>`__ to let us know your
+contact us <http://openlp.org/en/support>`_ to let us know your
 experiences, both good and bad. Even if everything is working perfectly
 fine, we want to know that.
 
@@ -22,9 +22,9 @@ some of OpenLP's dependencies.
 Secondly, we have found two regressions in version 2.0, which have been
 fixed but are waiting for a release. The first is an issue with
 transparent themes which are `no longer
-transparent <https://bugs.launchpad.net/openlp/+bug/1085609>`__, and the
+transparent <https://bugs.launchpad.net/openlp/+bug/1085609>`_, and the
 second is a `bug in the export
-function <https://bugs.launchpad.net/openlp/+bug/1085921>`__.
+function <https://bugs.launchpad.net/openlp/+bug/1085921>`_.
 
 Interestingly, we never realised how much the export feature was used
 until it was broken. We've had quite a number of folks reporting the
@@ -33,7 +33,7 @@ issue.
 If you are experiencing either of these issues on Windows or Mac OS X
 then we recommend downgrading to version 1.9.12, `which can still be
 found on
-SourceForge <http://sourceforge.net/projects/openlp/files/openlp/1.9.12/>`__.
+SourceForge <http://sourceforge.net/projects/openlp/files/openlp/1.9.12/>`_.
 Users on Linux can either patch their version of OpenLP with help from
 us, or sit tight until we make a bugfix release.
 
@@ -45,4 +45,4 @@ We're hoping to make a release sometime in December.
 We're hoping to release version 2.0.1 on Sunday the 6th of January, the
 first release of the new year.
 
-.. |Windows 8| image:: http://openlp.org/files/u2/windows8.jpg
+.. |Windows 8| image:: /pictures/windows8.jpg

blog/workaround-dep-error-windows.rst

@@ -7,20 +7,20 @@
 |Windows|
 
 Recently we have had users `report issues with
-OpenLP <http://forums.openlp.org/discussion/1906/openlp-1-9-12-crashes-on-my-windows-vista-laptop/p1>`__
+OpenLP <http://forums.openlp.org/discussion/1906/openlp-1-9-12-crashes-on-my-windows-vista-laptop/p1>`_
 running on certain installs of Windows with an error about DEP. This
 seems to be mostly on Windows Vista but could possibly be an issue with
 more recent versions of Windows. DEP stands for Data Execution
 Prevention. In short this is to prevent malicious programs from using
 memory in a way that it shouldn't. That is a really poor description,
 but the `folks at Wikipedia have a detailed
-description <http://en.wikipedia.org/wiki/Data_Execution_Prevention>`__.
+description <http://en.wikipedia.org/wiki/Data_Execution_Prevention>`_.
 You can `find out more from Microsoft
-too <http://windows.microsoft.com/en-US/windows-vista/Data-Execution-Prevention-frequently-asked-questions>`__.
+too <http://windows.microsoft.com/en-US/windows-vista/Data-Execution-Prevention-frequently-asked-questions>`_.
 
 When a program you know you can trust experiences an issue with DEP you
 should be able to `disable DEP for that
-program <http://windows.microsoft.com/en-US/windows-vista/Change-Data-Execution-Prevention-settings>`__.
+program <http://windows.microsoft.com/en-US/windows-vista/Change-Data-Execution-Prevention-settings>`_.
 There is an issue, however, chances are if you try this method OpenLP
 will not be listed (manually selecting the exe will also not work from
 my experience). This will make it impossible to disable DEP for OpenLP
@@ -37,7 +37,7 @@ OpenLP running.
 First, you need to open an elevated command prompt or administrative
 command prompt. If you are unsure how to do that, Vista x64 has a great
 `guide on how to do
-it <http://www.vistax64.com/tutorials/181765-elevated-command-prompt.html>`__.
+it <http://www.vistax64.com/tutorials/181765-elevated-command-prompt.html>`_.
 
 Next enter this command into the elevated command prompt:
 
@@ -57,11 +57,12 @@ open an elevated command prompt and enter:
 Reboot and DEP is now enabled again.
 
 These instructions were taken from `instructions on the Vista x64
-site <http://www.vistax64.com/tutorials/120778-dep-enable-disable.html>`__
+site <http://www.vistax64.com/tutorials/120778-dep-enable-disable.html>`_
 I suggest you give it a look also.
 
 This may not be the best way to do this as we don't seem to have any
 real DEP/Windows experts here so if you have a better way let us know in
 the comments below and if it checks out we will update the blog entry.
 
-.. |Windows| image:: http://openlp.org/files/u1284/Windows-8-logo-300x300.jpg
+.. |Windows| image:: /pictures/Windows-8-logo-300x300.jpg
+