Merge remote branch 'origin/stable45'

_shared_assets/themes/owncloud/layout.html

@@ -151,7 +151,7 @@
 <div class="container">
   <div class="content">
     <div class="page-header">
-      <h1><a href="{{ pathto(master_doc) }}">Documentation Centre</a></h1>
+      <h1><a href="{{ pathto(master_doc) }}">{{ project|e }}</a></h1>
 
       <form class="headersearch" style="margin-bottom:-3px;" action="{{ pathto('search') }}" method="get">
         <input type="text" value="" name="q" id="q" /> <input type="submit" id=

admin_manual/conf.py

@@ -185,13 +185,13 @@ latex_elements = {
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
-  ('index', 'ownCloudAdminManual.tex', u'ownCloud Admin Manual',
+  ('index', 'ownCloudAdminManual.tex', u'ownCloud Administrators Manual',
    u'The ownCloud developers', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
 # the title page.
-#latex_logo = None
+latex_logo = '../_shared_assets/static/logo-blue.pdf'
 
 # For "manual" documents, if this is true, then toplevel headings are parts,
 # not chapters.

admin_manual/index.rst

@@ -1,7 +1,4 @@
-ownCloud Administrators Manual 
-******************************
-
-Short synopsis of the manual goes here.
+.. _contents:
 
 Contents
 ========

developer_manual/conf.py

@@ -191,7 +191,7 @@ latex_documents = [
 
 # The name of an image file (relative to this directory) to place at the top of
 # the title page.
-#latex_logo = None
+latex_logo = '../_shared_assets/static/logo-blue.pdf'
 
 # For "manual" documents, if this is true, then toplevel headings are parts,
 # not chapters.

developer_manual/index.rst

@@ -1,7 +1,4 @@
-ownCloud Developers Manual
-**************************
-
-This is the ownCloud documentation. More information and source code is at the `Git repository <https://github.com/owncloud/documentation>`_.
+.. _contents:
 
 Contents
 ========

user_manual/conf.py

@@ -191,7 +191,7 @@ latex_documents = [
 
 # The name of an image file (relative to this directory) to place at the top of
 # the title page.
-#latex_logo = None
+latex_logo = '../_shared_assets/static/logo-blue.pdf'
 
 # For "manual" documents, if this is true, then toplevel headings are parts,
 # not chapters.

user_manual/index.rst

@@ -1,7 +1,4 @@
-ownCloud User Manual 
-********************
-
-Short synopsis of the manual goes here.
+.. _contents:
 
 Contents
 ========