Merge branch 'develop' into thumbnailOOM

[pub/Android/ownCloud.git] / user_manual / conf.py

diff --git a/user_manual/conf.py b/user_manual/conf.py
index b9c5711..20e5bda 100644 (file)
--- a/user_manual/conf.py
+++ b/user_manual/conf.py
@@ -51,9 +51,9 @@ copyright = u'2013-2015, The ownCloud developers'
 # built documents.
 #
 # The short X.Y version.
-version = '@VERSION_MAJOR@.@VERSION_MINOR@'
+version = '1.6.2'
 # The full version, including alpha/beta/rc tags.
-release = '@VERSION@'
+release = version
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -67,7 +67,7 @@ release = '@VERSION@'
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
-exclude_patterns = ['_build','scripts/*']
+exclude_patterns = ['_build','scripts/*', 'ocdoc/*']
 
 # The reST default role (used for this markup: `text`) to use for all documents.
 #default_role = None
@@ -216,8 +216,7 @@ latex_documents = [
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    ('owncloud.1', 'owncloud', u'Android synchronisation and file management 
-utility.',
+    ('owncloud.1', 'owncloud', u'Android synchronisation and file management utility.',
      [u'The ownCloud developers'], 1),
     ('owncloudcmd.1', 'owncloudcmd', u'ownCloud Android app.',
      [u'The ownCloud developers'], 1),