From 2b86e5d463edca7cded7cd5af88122d9a9bf02ad Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Fri, 15 Oct 2010 22:09:57 +0200 Subject: [PATCH] Rearranged the documentation into two separate parts, the API for developers, and the manual for users. --- documentation/{ => api}/Makefile | 0 documentation/{ => api}/make.bat | 0 documentation/{ => api}/source/conf.py | 12 +- documentation/{ => api}/source/core/index.rst | 0 documentation/{ => api}/source/core/lib.rst | 0 documentation/{ => api}/source/core/theme.rst | 0 documentation/{ => api}/source/index.rst | 0 documentation/{ => api}/source/openlp.rst | 0 .../{ => api}/source/plugins/bibles.rst | 0 .../{ => api}/source/plugins/images.rst | 0 .../{ => api}/source/plugins/index.rst | 0 .../{ => api}/source/plugins/media.rst | 0 .../source/plugins/presentations.rst | 0 .../{ => api}/source/plugins/songs.rst | 0 documentation/manual/Makefile | 88 ++++++++ documentation/manual/make.bat | 112 ++++++++++ documentation/manual/source/conf.py | 202 ++++++++++++++++++ .../manual => manual/source}/dualmonitors.rst | 0 .../manual => manual/source}/glossary.rst | 0 .../manual => manual/source}/index.rst | 4 +- .../manual => manual/source}/introduction.rst | 0 .../manual => manual/source}/pics/dvi.png | Bin .../manual => manual/source}/pics/gnome.png | Bin .../source}/pics/kdedisplay.png | Bin .../source}/pics/kdesystemsettings.png | Bin .../source}/pics/mainwindow.png | Bin .../source}/pics/mediamanager.png | Bin .../manual => manual/source}/pics/preview.png | Bin .../source}/pics/servicemanager.png | Bin .../source}/pics/slidecontroller.png | Bin .../source}/pics/thememanager.png | Bin .../manual => manual/source}/pics/vga.png | Bin .../source}/pics/vistadisplaysettings.png | Bin .../source}/pics/vistapersonalize.png | Bin .../source}/pics/winsevendisplay.png | Bin .../source}/pics/winsevenresolution.png | Bin .../source}/pics/xpdisplaysettings.png | Bin 37 files changed, 410 insertions(+), 8 deletions(-) rename documentation/{ => api}/Makefile (100%) rename documentation/{ => api}/make.bat (100%) rename documentation/{ => api}/source/conf.py (96%) rename documentation/{ => api}/source/core/index.rst (100%) rename documentation/{ => api}/source/core/lib.rst (100%) rename documentation/{ => api}/source/core/theme.rst (100%) rename documentation/{ => api}/source/index.rst (100%) rename documentation/{ => api}/source/openlp.rst (100%) rename documentation/{ => api}/source/plugins/bibles.rst (100%) rename documentation/{ => api}/source/plugins/images.rst (100%) rename documentation/{ => api}/source/plugins/index.rst (100%) rename documentation/{ => api}/source/plugins/media.rst (100%) rename documentation/{ => api}/source/plugins/presentations.rst (100%) rename documentation/{ => api}/source/plugins/songs.rst (100%) create mode 100644 documentation/manual/Makefile create mode 100644 documentation/manual/make.bat create mode 100644 documentation/manual/source/conf.py rename documentation/{source/manual => manual/source}/dualmonitors.rst (100%) rename documentation/{source/manual => manual/source}/glossary.rst (100%) rename documentation/{source/manual => manual/source}/index.rst (83%) rename documentation/{source/manual => manual/source}/introduction.rst (100%) rename documentation/{source/manual => manual/source}/pics/dvi.png (100%) rename documentation/{source/manual => manual/source}/pics/gnome.png (100%) rename documentation/{source/manual => manual/source}/pics/kdedisplay.png (100%) rename documentation/{source/manual => manual/source}/pics/kdesystemsettings.png (100%) rename documentation/{source/manual => manual/source}/pics/mainwindow.png (100%) rename documentation/{source/manual => manual/source}/pics/mediamanager.png (100%) rename documentation/{source/manual => manual/source}/pics/preview.png (100%) rename documentation/{source/manual => manual/source}/pics/servicemanager.png (100%) rename documentation/{source/manual => manual/source}/pics/slidecontroller.png (100%) rename documentation/{source/manual => manual/source}/pics/thememanager.png (100%) rename documentation/{source/manual => manual/source}/pics/vga.png (100%) rename documentation/{source/manual => manual/source}/pics/vistadisplaysettings.png (100%) rename documentation/{source/manual => manual/source}/pics/vistapersonalize.png (100%) rename documentation/{source/manual => manual/source}/pics/winsevendisplay.png (100%) rename documentation/{source/manual => manual/source}/pics/winsevenresolution.png (100%) rename documentation/{source/manual => manual/source}/pics/xpdisplaysettings.png (100%) diff --git a/documentation/Makefile b/documentation/api/Makefile similarity index 100% rename from documentation/Makefile rename to documentation/api/Makefile diff --git a/documentation/make.bat b/documentation/api/make.bat similarity index 100% rename from documentation/make.bat rename to documentation/api/make.bat diff --git a/documentation/source/conf.py b/documentation/api/source/conf.py similarity index 96% rename from documentation/source/conf.py rename to documentation/api/source/conf.py index 248c83e56..51ecfee0c 100644 --- a/documentation/source/conf.py +++ b/documentation/api/source/conf.py @@ -17,7 +17,7 @@ import sys # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the # documentation root, use os.path.abspath to make it absolute, like shown here. -sys.path.insert(0, os.path.abspath(os.path.join('..', '..'))) +sys.path.insert(0, os.path.abspath(os.path.join('..', '..', '..'))) # -- General configuration ----------------------------------------------------- @@ -39,7 +39,7 @@ master_doc = 'index' # General information about the project. project = u'OpenLP' -copyright = u'2009, Raoul Snyman' +copyright = u'2004-2010, Raoul Snyman' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the @@ -48,7 +48,7 @@ copyright = u'2009, Raoul Snyman' # The short X.Y version. version = '2.0' # The full version, including alpha/beta/rc tags. -release = '2.0.pre' +release = '1.9.3' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. @@ -111,7 +111,7 @@ html_theme_options = { # The name for this set of Sphinx documents. If None, it defaults to # " v documentation". -#html_title = None +html_title = 'OpenLP 2.0 Developer API' # A shorter title for the navigation bar. Default is the same as html_title. #html_short_title = None @@ -166,7 +166,7 @@ html_static_path = ['_static'] #html_file_suffix = '' # Output file base name for HTML help builder. -htmlhelp_basename = 'OpenLPdoc' +htmlhelp_basename = 'OpenLP-2.0-api' # -- Options for LaTeX output -------------------------------------------------- @@ -180,7 +180,7 @@ htmlhelp_basename = 'OpenLPdoc' # Grouping the document tree into LaTeX files. List of tuples # (source start file, target name, title, author, documentclass [howto/manual]). latex_documents = [ - ('index', 'OpenLP.tex', u'OpenLP Documentation', + ('index', 'OpenLP.tex', u'OpenLP 2.0 Developer API', u'Raoul Snyman', 'manual'), ] diff --git a/documentation/source/core/index.rst b/documentation/api/source/core/index.rst similarity index 100% rename from documentation/source/core/index.rst rename to documentation/api/source/core/index.rst diff --git a/documentation/source/core/lib.rst b/documentation/api/source/core/lib.rst similarity index 100% rename from documentation/source/core/lib.rst rename to documentation/api/source/core/lib.rst diff --git a/documentation/source/core/theme.rst b/documentation/api/source/core/theme.rst similarity index 100% rename from documentation/source/core/theme.rst rename to documentation/api/source/core/theme.rst diff --git a/documentation/source/index.rst b/documentation/api/source/index.rst similarity index 100% rename from documentation/source/index.rst rename to documentation/api/source/index.rst diff --git a/documentation/source/openlp.rst b/documentation/api/source/openlp.rst similarity index 100% rename from documentation/source/openlp.rst rename to documentation/api/source/openlp.rst diff --git a/documentation/source/plugins/bibles.rst b/documentation/api/source/plugins/bibles.rst similarity index 100% rename from documentation/source/plugins/bibles.rst rename to documentation/api/source/plugins/bibles.rst diff --git a/documentation/source/plugins/images.rst b/documentation/api/source/plugins/images.rst similarity index 100% rename from documentation/source/plugins/images.rst rename to documentation/api/source/plugins/images.rst diff --git a/documentation/source/plugins/index.rst b/documentation/api/source/plugins/index.rst similarity index 100% rename from documentation/source/plugins/index.rst rename to documentation/api/source/plugins/index.rst diff --git a/documentation/source/plugins/media.rst b/documentation/api/source/plugins/media.rst similarity index 100% rename from documentation/source/plugins/media.rst rename to documentation/api/source/plugins/media.rst diff --git a/documentation/source/plugins/presentations.rst b/documentation/api/source/plugins/presentations.rst similarity index 100% rename from documentation/source/plugins/presentations.rst rename to documentation/api/source/plugins/presentations.rst diff --git a/documentation/source/plugins/songs.rst b/documentation/api/source/plugins/songs.rst similarity index 100% rename from documentation/source/plugins/songs.rst rename to documentation/api/source/plugins/songs.rst diff --git a/documentation/manual/Makefile b/documentation/manual/Makefile new file mode 100644 index 000000000..70c821142 --- /dev/null +++ b/documentation/manual/Makefile @@ -0,0 +1,88 @@ +# Makefile for Sphinx documentation +# + +# You can set these variables from the command line. +SPHINXOPTS = +SPHINXBUILD = sphinx-build +PAPER = + +# Internal variables. +PAPEROPT_a4 = -D latex_paper_size=a4 +PAPEROPT_letter = -D latex_paper_size=letter +ALLSPHINXOPTS = -d build/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source + +.PHONY: help clean html dirhtml pickle json htmlhelp qthelp latex changes linkcheck doctest + +help: + @echo "Please use \`make ' where is one of" + @echo " html to make standalone HTML files" + @echo " dirhtml to make HTML files named index.html in directories" + @echo " pickle to make pickle files" + @echo " json to make JSON files" + @echo " htmlhelp to make HTML files and a HTML help project" + @echo " qthelp to make HTML files and a qthelp project" + @echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter" + @echo " changes to make an overview of all changed/added/deprecated items" + @echo " linkcheck to check all external links for integrity" + @echo " doctest to run all doctests embedded in the documentation (if enabled)" + +clean: + -rm -rf build/* + +html: + $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) build/html + @echo + @echo "Build finished. The HTML pages are in build/html." + +dirhtml: + $(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) build/dirhtml + @echo + @echo "Build finished. The HTML pages are in build/dirhtml." + +pickle: + $(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) build/pickle + @echo + @echo "Build finished; now you can process the pickle files." + +json: + $(SPHINXBUILD) -b json $(ALLSPHINXOPTS) build/json + @echo + @echo "Build finished; now you can process the JSON files." + +htmlhelp: + $(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) build/htmlhelp + @echo + @echo "Build finished; now you can run HTML Help Workshop with the" \ + ".hhp project file in build/htmlhelp." + +qthelp: + $(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) build/qthelp + @echo + @echo "Build finished; now you can run "qcollectiongenerator" with the" \ + ".qhcp project file in build/qthelp, like this:" + @echo "# qcollectiongenerator build/qthelp/OpenLP.qhcp" + @echo "To view the help file:" + @echo "# assistant -collectionFile build/qthelp/OpenLP.qhc" + +latex: + $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) build/latex + @echo + @echo "Build finished; the LaTeX files are in build/latex." + @echo "Run \`make all-pdf' or \`make all-ps' in that directory to" \ + "run these through (pdf)latex." + +changes: + $(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) build/changes + @echo + @echo "The overview file is in build/changes." + +linkcheck: + $(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) build/linkcheck + @echo + @echo "Link check complete; look for any errors in the above output " \ + "or in build/linkcheck/output.txt." + +doctest: + $(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) build/doctest + @echo "Testing of doctests in the sources finished, look at the " \ + "results in build/doctest/output.txt." diff --git a/documentation/manual/make.bat b/documentation/manual/make.bat new file mode 100644 index 000000000..8d21b45ce --- /dev/null +++ b/documentation/manual/make.bat @@ -0,0 +1,112 @@ +@ECHO OFF + +REM Command file for Sphinx documentation + +set SPHINXBUILD=sphinx-build +set ALLSPHINXOPTS=-d build/doctrees %SPHINXOPTS% source +if NOT "%PAPER%" == "" ( + set ALLSPHINXOPTS=-D latex_paper_size=%PAPER% %ALLSPHINXOPTS% +) + +if "%1" == "" goto help + +if "%1" == "help" ( + :help + echo.Please use `make ^` where ^ is one of + echo. html to make standalone HTML files + echo. dirhtml to make HTML files named index.html in directories + echo. pickle to make pickle files + echo. json to make JSON files + echo. htmlhelp to make HTML files and a HTML help project + echo. qthelp to make HTML files and a qthelp project + echo. latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter + echo. changes to make an overview over all changed/added/deprecated items + echo. linkcheck to check all external links for integrity + echo. doctest to run all doctests embedded in the documentation if enabled + goto end +) + +if "%1" == "clean" ( + for /d %%i in (build\*) do rmdir /q /s %%i + del /q /s build\* + goto end +) + +if "%1" == "html" ( + %SPHINXBUILD% -b html %ALLSPHINXOPTS% build/html + echo. + echo.Build finished. The HTML pages are in build/html. + goto end +) + +if "%1" == "dirhtml" ( + %SPHINXBUILD% -b dirhtml %ALLSPHINXOPTS% build/dirhtml + echo. + echo.Build finished. The HTML pages are in build/dirhtml. + goto end +) + +if "%1" == "pickle" ( + %SPHINXBUILD% -b pickle %ALLSPHINXOPTS% build/pickle + echo. + echo.Build finished; now you can process the pickle files. + goto end +) + +if "%1" == "json" ( + %SPHINXBUILD% -b json %ALLSPHINXOPTS% build/json + echo. + echo.Build finished; now you can process the JSON files. + goto end +) + +if "%1" == "htmlhelp" ( + %SPHINXBUILD% -b htmlhelp %ALLSPHINXOPTS% build/htmlhelp + echo. + echo.Build finished; now you can run HTML Help Workshop with the ^ +.hhp project file in build/htmlhelp. + goto end +) + +if "%1" == "qthelp" ( + %SPHINXBUILD% -b qthelp %ALLSPHINXOPTS% build/qthelp + echo. + echo.Build finished; now you can run "qcollectiongenerator" with the ^ +.qhcp project file in build/qthelp, like this: + echo.^> qcollectiongenerator build\qthelp\OpenLP.qhcp + echo.To view the help file: + echo.^> assistant -collectionFile build\qthelp\OpenLP.ghc + goto end +) + +if "%1" == "latex" ( + %SPHINXBUILD% -b latex %ALLSPHINXOPTS% build/latex + echo. + echo.Build finished; the LaTeX files are in build/latex. + goto end +) + +if "%1" == "changes" ( + %SPHINXBUILD% -b changes %ALLSPHINXOPTS% build/changes + echo. + echo.The overview file is in build/changes. + goto end +) + +if "%1" == "linkcheck" ( + %SPHINXBUILD% -b linkcheck %ALLSPHINXOPTS% build/linkcheck + echo. + echo.Link check complete; look for any errors in the above output ^ +or in build/linkcheck/output.txt. + goto end +) + +if "%1" == "doctest" ( + %SPHINXBUILD% -b doctest %ALLSPHINXOPTS% build/doctest + echo. + echo.Testing of doctests in the sources finished, look at the ^ +results in build/doctest/output.txt. + goto end +) + +:end diff --git a/documentation/manual/source/conf.py b/documentation/manual/source/conf.py new file mode 100644 index 000000000..7b8a12e8b --- /dev/null +++ b/documentation/manual/source/conf.py @@ -0,0 +1,202 @@ +# -*- coding: utf-8 -*- +# +# OpenLP documentation build configuration file, created by +# sphinx-quickstart on Fri Jul 10 17:20:40 2009. +# +# This file is execfile()d with the current directory set to its containing dir. +# +# Note that not all possible configuration values are present in this +# autogenerated file. +# +# All configuration values have a default; values that are commented out +# serve to show the default. + +import os +import sys + +# If extensions (or modules to document with autodoc) are in another directory, +# add these directories to sys.path here. If the directory is relative to the +# documentation root, use os.path.abspath to make it absolute, like shown here. +#sys.path.insert(0, os.path.abspath(os.path.join('..', '..'))) + +# -- General configuration ----------------------------------------------------- + +# Add any Sphinx extension module names here, as strings. They can be extensions +# coming with Sphinx (named 'sphinx.ext.*') or your custom ones. +#extensions = ['sphinx.ext.autodoc'] + +# Add any paths that contain templates here, relative to this directory. +templates_path = ['_templates'] + +# The suffix of source filenames. +source_suffix = '.rst' + +# The encoding of source files. +source_encoding = 'utf-8' + +# The master toctree document. +master_doc = 'index' + +# General information about the project. +project = u'OpenLP' +copyright = u'2004-2010 Raoul Snyman' + +# The version info for the project you're documenting, acts as replacement for +# |version| and |release|, also used in various other places throughout the +# built documents. +# +# The short X.Y version. +version = '2.0' +# The full version, including alpha/beta/rc tags. +release = '1.9.3' + +# The language for content autogenerated by Sphinx. Refer to documentation +# for a list of supported languages. +#language = None + +# There are two options for replacing |today|: either, you set today to some +# non-false value, then it is used: +#today = '' +# Else, today_fmt is used as the format for a strftime call. +#today_fmt = '%B %d, %Y' + +# List of documents that shouldn't be included in the build. +#unused_docs = [] + +# List of directories, relative to source directory, that shouldn't be searched +# for source files. +exclude_trees = [] + +# The reST default role (used for this markup: `text`) to use for all documents. +#default_role = None + +# If true, '()' will be appended to :func: etc. cross-reference text. +#add_function_parentheses = True + +# If true, the current module name will be prepended to all description +# unit titles (such as .. function::). +add_module_names = False + +# If true, sectionauthor and moduleauthor directives will be shown in the +# output. They are ignored by default. +#show_authors = False + +# The name of the Pygments (syntax highlighting) style to use. +pygments_style = 'sphinx' + +# A list of ignored prefixes for module index sorting. +#modindex_common_prefix = [] + + +# -- Options for HTML output --------------------------------------------------- + +# The theme to use for HTML and HTML Help pages. Major themes that come with +# Sphinx are currently 'default' and 'sphinxdoc'. +html_theme = 'default' + +# Theme options are theme-specific and customize the look and feel of a theme +# further. For a list of options available for each theme, see the +# documentation. +html_theme_options = { + 'sidebarbgcolor': '#3a60a9', + 'relbarbgcolor': '#203b6f', + 'footerbgcolor': '#26437c', + 'headtextcolor': '#203b6f', + 'linkcolor': '#26437c', + 'sidebarlinkcolor': '#ceceff' +} + +# Add any paths that contain custom themes here, relative to this directory. +#html_theme_path = [] + +# The name for this set of Sphinx documents. If None, it defaults to +# " v documentation". +html_title = u'OpenLP 2.0 User Manual' + +# A shorter title for the navigation bar. Default is the same as html_title. +#html_short_title = None + +# The name of an image file (relative to this directory) to place at the top +# of the sidebar. +#html_logo = None + +# The name of an image file (within the static path) to use as favicon of the +# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32 +# pixels large. +#html_favicon = None + +# Add any paths that contain custom static files (such as style sheets) here, +# relative to this directory. They are copied after the builtin static files, +# so a file named "default.css" will overwrite the builtin "default.css". +html_static_path = ['_static'] + +# If not '', a 'Last updated on:' timestamp is inserted at every page bottom, +# using the given strftime format. +#html_last_updated_fmt = '%b %d, %Y' + +# If true, SmartyPants will be used to convert quotes and dashes to +# typographically correct entities. +#html_use_smartypants = True + +# Custom sidebar templates, maps document names to template names. +#html_sidebars = {} + +# Additional templates that should be rendered to pages, maps page names to +# template names. +#html_additional_pages = {} + +# If false, no module index is generated. +#html_use_modindex = True + +# If false, no index is generated. +#html_use_index = True + +# If true, the index is split into individual pages for each letter. +#html_split_index = False + +# If true, links to the reST sources are added to the pages. +#html_show_sourcelink = True + +# If true, an OpenSearch description file will be output, and all pages will +# contain a tag referring to it. The value of this option must be the +# base URL from which the finished HTML is served. +#html_use_opensearch = '' + +# If nonempty, this is the file name suffix for HTML files (e.g. ".xhtml"). +#html_file_suffix = '' + +# Output file base name for HTML help builder. +htmlhelp_basename = 'OpenLP-2.0-manual' + + +# -- Options for LaTeX output -------------------------------------------------- + +# The paper size ('letter' or 'a4'). +#latex_paper_size = 'letter' + +# The font size ('10pt', '11pt' or '12pt'). +#latex_font_size = '10pt' + +# Grouping the document tree into LaTeX files. List of tuples +# (source start file, target name, title, author, documentclass [howto/manual]). +latex_documents = [ + ('index', 'OpenLP.tex', u'OpenLP 2.0 User Manual', + u'Raoul Snyman', 'manual'), +] + +# The name of an image file (relative to this directory) to place at the top of +# the title page. +#latex_logo = None + +# For "manual" documents, if this is true, then toplevel headings are parts, +# not chapters. +#latex_use_parts = False + +# Additional stuff for the LaTeX preamble. +#latex_preamble = '' + +# Documents to append as an appendix to all manuals. +#latex_appendices = [] + +# If false, no module index is generated. +#latex_use_modindex = True diff --git a/documentation/source/manual/dualmonitors.rst b/documentation/manual/source/dualmonitors.rst similarity index 100% rename from documentation/source/manual/dualmonitors.rst rename to documentation/manual/source/dualmonitors.rst diff --git a/documentation/source/manual/glossary.rst b/documentation/manual/source/glossary.rst similarity index 100% rename from documentation/source/manual/glossary.rst rename to documentation/manual/source/glossary.rst diff --git a/documentation/source/manual/index.rst b/documentation/manual/source/index.rst similarity index 83% rename from documentation/source/manual/index.rst rename to documentation/manual/source/index.rst index 180555cbb..ac29c4360 100644 --- a/documentation/source/manual/index.rst +++ b/documentation/manual/source/index.rst @@ -3,8 +3,8 @@ You can adapt this file completely to your liking, but it should at least contain the root `toctree` directive. -Welcome to OpenLP's documentation -================================== +Welcome to the OpenLP 2.0 User Manual +===================================== Contents: diff --git a/documentation/source/manual/introduction.rst b/documentation/manual/source/introduction.rst similarity index 100% rename from documentation/source/manual/introduction.rst rename to documentation/manual/source/introduction.rst diff --git a/documentation/source/manual/pics/dvi.png b/documentation/manual/source/pics/dvi.png similarity index 100% rename from documentation/source/manual/pics/dvi.png rename to documentation/manual/source/pics/dvi.png diff --git a/documentation/source/manual/pics/gnome.png b/documentation/manual/source/pics/gnome.png similarity index 100% rename from documentation/source/manual/pics/gnome.png rename to documentation/manual/source/pics/gnome.png diff --git a/documentation/source/manual/pics/kdedisplay.png b/documentation/manual/source/pics/kdedisplay.png similarity index 100% rename from documentation/source/manual/pics/kdedisplay.png rename to documentation/manual/source/pics/kdedisplay.png diff --git a/documentation/source/manual/pics/kdesystemsettings.png b/documentation/manual/source/pics/kdesystemsettings.png similarity index 100% rename from documentation/source/manual/pics/kdesystemsettings.png rename to documentation/manual/source/pics/kdesystemsettings.png diff --git a/documentation/source/manual/pics/mainwindow.png b/documentation/manual/source/pics/mainwindow.png similarity index 100% rename from documentation/source/manual/pics/mainwindow.png rename to documentation/manual/source/pics/mainwindow.png diff --git a/documentation/source/manual/pics/mediamanager.png b/documentation/manual/source/pics/mediamanager.png similarity index 100% rename from documentation/source/manual/pics/mediamanager.png rename to documentation/manual/source/pics/mediamanager.png diff --git a/documentation/source/manual/pics/preview.png b/documentation/manual/source/pics/preview.png similarity index 100% rename from documentation/source/manual/pics/preview.png rename to documentation/manual/source/pics/preview.png diff --git a/documentation/source/manual/pics/servicemanager.png b/documentation/manual/source/pics/servicemanager.png similarity index 100% rename from documentation/source/manual/pics/servicemanager.png rename to documentation/manual/source/pics/servicemanager.png diff --git a/documentation/source/manual/pics/slidecontroller.png b/documentation/manual/source/pics/slidecontroller.png similarity index 100% rename from documentation/source/manual/pics/slidecontroller.png rename to documentation/manual/source/pics/slidecontroller.png diff --git a/documentation/source/manual/pics/thememanager.png b/documentation/manual/source/pics/thememanager.png similarity index 100% rename from documentation/source/manual/pics/thememanager.png rename to documentation/manual/source/pics/thememanager.png diff --git a/documentation/source/manual/pics/vga.png b/documentation/manual/source/pics/vga.png similarity index 100% rename from documentation/source/manual/pics/vga.png rename to documentation/manual/source/pics/vga.png diff --git a/documentation/source/manual/pics/vistadisplaysettings.png b/documentation/manual/source/pics/vistadisplaysettings.png similarity index 100% rename from documentation/source/manual/pics/vistadisplaysettings.png rename to documentation/manual/source/pics/vistadisplaysettings.png diff --git a/documentation/source/manual/pics/vistapersonalize.png b/documentation/manual/source/pics/vistapersonalize.png similarity index 100% rename from documentation/source/manual/pics/vistapersonalize.png rename to documentation/manual/source/pics/vistapersonalize.png diff --git a/documentation/source/manual/pics/winsevendisplay.png b/documentation/manual/source/pics/winsevendisplay.png similarity index 100% rename from documentation/source/manual/pics/winsevendisplay.png rename to documentation/manual/source/pics/winsevendisplay.png diff --git a/documentation/source/manual/pics/winsevenresolution.png b/documentation/manual/source/pics/winsevenresolution.png similarity index 100% rename from documentation/source/manual/pics/winsevenresolution.png rename to documentation/manual/source/pics/winsevenresolution.png diff --git a/documentation/source/manual/pics/xpdisplaysettings.png b/documentation/manual/source/pics/xpdisplaysettings.png similarity index 100% rename from documentation/source/manual/pics/xpdisplaysettings.png rename to documentation/manual/source/pics/xpdisplaysettings.png