Merge lp:~raoul-snyman/openlp/user-guide into lp:~openlp-documentation/openlp/trunk

Proposed by Raoul Snyman
Status: Merged
Approved by: Wesley Stout
Approved revision: 115
Merged at revision: 115
Proposed branch: lp:~raoul-snyman/openlp/user-guide
Merge into: lp:~openlp-documentation/openlp/trunk
Diff against target: 26 lines (+12/-4)
1 file modified
user-guide/source/index.rst (+12/-4)
To merge this branch: bzr merge lp:~raoul-snyman/openlp/user-guide
Reviewer Review Type Date Requested Status
John Cegalis Approve
Wesley Stout Approve
Review via email: mp+137653@code.launchpad.net

Description of the change

Added an introductory section on the front page with a link to the reference manual.

To post a comment you must log in.
Revision history for this message
Wesley Stout (wesleystout) :
review: Approve
Revision history for this message
John Cegalis (jseagull1) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'user-guide/source/index.rst'
2--- user-guide/source/index.rst 2012-11-20 10:54:21 +0000
3+++ user-guide/source/index.rst 2012-12-03 18:38:28 +0000
4@@ -3,10 +3,18 @@
5 You can adapt this file completely to your liking, but it should at least
6 contain the root `toctree` directive.
7
8-Welcome to the OpenLP 2.0 User Guide
9-====================================
10-
11-Contents:
12+OpenLP 2.0 User Guide
13+=====================
14+
15+Welcome to the OpenLP 2.0 user guide. This will provide you with an overview of
16+how to use OpenLP in your church.
17+
18+Please note that this user guide is still a work in progress currently, and will
19+be updated as content is added. For more information on how to use each of the
20+features in OpenLP, see the `Reference Manual <http://manual.openlp.org/>`_.
21+
22+Contents
23+--------
24
25 .. toctree::
26 :maxdepth: 2

Subscribers

People subscribed via source and target branches