Wesley Stout has proposed merging lp:~wesleystout/openlp/documentation into lp:openlp.
Requested reviews: OpenLP Core (openlp-core) added Nvidia section to dual monitors for linux, cleaned up the glossary some, and fixed the file paths -- https://code.launchpad.net/~wesleystout/openlp/documentation/+merge/38670 Your team OpenLP Core is requested to review the proposed merge of lp:~wesleystout/openlp/documentation into lp:openlp.
=== modified file 'documentation/manual/source/dualmonitors.rst' --- documentation/manual/source/dualmonitors.rst 2010-10-15 15:25:39 +0000 +++ documentation/manual/source/dualmonitors.rst 2010-10-17 21:35:55 +0000 @@ -118,6 +118,62 @@ resolution, and position. OpenLP works best projecting to the monitor on the right. +Linux Systems Using Nvida Drivers +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +This guide is for users of the proprietary Nvidia driver on Linux Distributions. +It is assumed that you have properly setup your drivers according to your +distribution's documentation, and you have a working xorg.conf file in place. + +If you wish to make the changes permanent in setting up your system for dual +monitors it will be necessary to modify your xorg.conf file. It is always a good +idea to make a backup of any cirtical file before making changes. + + u...@linux:~ $ sudo cp /etc/X11/xorg.conf /etc/X11/xorg.conf.old + +or for those using systems that use the root user instead of sudo, change to +root and enter + + r...@linux: # cp /etc/X11/xorg.conf /etc/X11/xorg.conf.old + +The exact location of the xorg.conf file can vary so check your distribution's +documentation. + +If you want to make your changes permanent run Nvidia settings from the terminal + + u...@linux:~ $ sudo nvidia-settings + +or + + r...@linux: # nividia-settings + +If you do not want to write the changes to your xorg.conf file simply run the +Nvidia Settings program from your desktops menu, usually in an administration +or system menu, or from the terminal as a normal user run + + u...@linux:~ $ nvidia-settings + +Once you have opened Nvidia Settings, click on **X Server Display Confiuration** +Then select the monitor you are wanting to use as your second monitor and click +configure. + +.. image:: pics/nvlinux1.png + +After clicking configure, select twinview. Then click ok. + +.. image:: pics/twinview.png + +Then click **apply** and if you are happy with the way things look click to keep +your new settings. Don't worry if all goes wrong the settings will return back +to the previous settings in 15 seconds without any action. Nvidia Settings +should take care of selecting your optimum resolution etc, but that can be +changed as needed. When you are happy with everything click on **Save to X Configuration File** + +.. image:: pics/xorgwrite.png + +Then click **Save** and you should be set. You may want to restart X or your +machine just to make sure all the settings carry over the next time you log in. + === 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:35:55 +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:35:55 +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:35:55 +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:35:55 +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
