Wesley Stout has proposed merging lp:~wesleystout/openlp/documentation into lp:openlp.
Requested reviews: OpenLP Core (openlp-core) Updated the dual monitor documentation to include Nvidia on linux. Fixed some formatting in the glossary and fixed the file paths for the screenshots. -- https://code.launchpad.net/~wesleystout/openlp/documentation/+merge/38669 Your team OpenLP Core is requested to review the proposed merge of lp:~wesleystout/openlp/documentation into lp:openlp.
=== modified file 'documentation/manual/source/glossary.rst' --- documentation/manual/source/glossary.rst 2010-10-15 15:25:39 +0000 +++ documentation/manual/source/glossary.rst 2010-10-17 21:29:41 +0000 @@ -9,11 +9,18 @@ Main Window ----------- +<<<<<<< TREE The Main Window is what you will see when you first open OpenLP .. image:: pics/mainwindow.png The Main Window contains all the tools and plugins that make OpenLP function +======= +The Main Window is what you will see when you first open OpenLP. +The Main Window contains all the tools and plugins that make OpenLP function. + +.. image:: pics/mainwindow.png +>>>>>>> MERGE-SOURCE Media Manager ------------- @@ -21,10 +28,15 @@ The Media Manager contains a number of tabs that plugins supply to OpenLP. Each tab in the Media Manager is called a **Media Item** +<<<<<<< TREE .. image:: pics/mediamanager.png +======= +>>>>>>> MERGE-SOURCE From the Media Manager you can send Media Items to the Preview or Live screens. +.. image:: pics/mediamanager.png + Preview ------- === added file 'documentation/manual/source/pics/nvlinux1.png' Binary files documentation/manual/source/pics/nvlinux1.png 1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/nvlinux1.png 2010-10-17 21:29:41 +0000 differ === added file 'documentation/manual/source/pics/twinview.png' Binary files documentation/manual/source/pics/twinview.png 1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/twinview.png 2010-10-17 21:29:41 +0000 differ === added file 'documentation/manual/source/pics/xorgwrite.png' Binary files documentation/manual/source/pics/xorgwrite.png 1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/xorgwrite.png 2010-10-17 21:29:41 +0000 differ
_______________________________________________ Mailing list: https://launchpad.net/~openlp-core Post to : [email protected] Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
