From 710cfc54c77fbcaf3f2a9b5499ed812d9fbc4064 Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Mon, 6 Jan 2014 17:40:56 +0100 Subject: [PATCH] Various fixes --- admin_manual/Makefile | 8 +++++++- admin_manual/conf.py | 2 +- developer_manual/Makefile | 8 +++++++- developer_manual/conf.py | 6 +++--- user_manual/Makefile | 8 +++++++- user_manual/conf.py | 2 +- 6 files changed, 26 insertions(+), 8 deletions(-) diff --git a/admin_manual/Makefile b/admin_manual/Makefile index bc7312e9a..74c47b133 100644 --- a/admin_manual/Makefile +++ b/admin_manual/Makefile @@ -29,6 +29,7 @@ help: @echo " epub to make an epub" @echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter" @echo " latexpdf to make LaTeX files and run them through pdflatex" + @echo " pdf to make PDF files" @echo " text to make text files" @echo " man to make manual pages" @echo " texinfo to make Texinfo files" @@ -122,10 +123,15 @@ latexpdf: $(MAKE) -C $(BUILDDIR)/latex all-pdf @echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex." +pdf: + $(SPHINXBUILD) -b pdf $(ALLSPHINXOPTS) $(BUILDDIR)/pdf + @echo + @echo "build finished. the text files are in $(BUILDDIR)/pdf." + text: $(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text @echo - @echo "Build finished. The text files are in $(BUILDDIR)/text." + @echo "build finished. the text files are in $(BUILDDIR)/text." man: $(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man diff --git a/admin_manual/conf.py b/admin_manual/conf.py index 7b279b8f7..7a4eed82f 100644 --- a/admin_manual/conf.py +++ b/admin_manual/conf.py @@ -212,7 +212,7 @@ latex_logo = '../_shared_assets/static/logo-blue.pdf' # -- Options for pdf page output ----------------------------------------------- -pdf_documents = [('index', u'owncloudAdminManual', u'ownCloud Admin Manual', +pdf_documents = [('contents', u'owncloudAdminManual', u'ownCloud Admin Manual', u'The ownCloud developers'),] # -- Options for manual page output -------------------------------------------- diff --git a/developer_manual/Makefile b/developer_manual/Makefile index bc7312e9a..74c47b133 100644 --- a/developer_manual/Makefile +++ b/developer_manual/Makefile @@ -29,6 +29,7 @@ help: @echo " epub to make an epub" @echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter" @echo " latexpdf to make LaTeX files and run them through pdflatex" + @echo " pdf to make PDF files" @echo " text to make text files" @echo " man to make manual pages" @echo " texinfo to make Texinfo files" @@ -122,10 +123,15 @@ latexpdf: $(MAKE) -C $(BUILDDIR)/latex all-pdf @echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex." +pdf: + $(SPHINXBUILD) -b pdf $(ALLSPHINXOPTS) $(BUILDDIR)/pdf + @echo + @echo "build finished. the text files are in $(BUILDDIR)/pdf." + text: $(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text @echo - @echo "Build finished. The text files are in $(BUILDDIR)/text." + @echo "build finished. the text files are in $(BUILDDIR)/text." man: $(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man diff --git a/developer_manual/conf.py b/developer_manual/conf.py index 50f51128f..555068632 100644 --- a/developer_manual/conf.py +++ b/developer_manual/conf.py @@ -166,7 +166,7 @@ html_show_sphinx = False #html_file_suffix = None # Output file base name for HTML help builder. -htmlhelp_basename = '2012-2014' +htmlhelp_basename = 'owncloudDeveloperManual' # -- Options for LaTeX output -------------------------------------------------- @@ -211,7 +211,7 @@ latex_logo = '../_shared_assets/static/logo-blue.pdf' # -- Options for pdf page output ----------------------------------------------- -pdf_documents = [('index', u'2012-2014', u'ownCloud Developer Manual', +pdf_documents = [('contents', u'owncloudDeveloperManual', u'ownCloud Developer Manual', u'The ownCloud developers'),] # -- Options for manual page output -------------------------------------------- @@ -219,7 +219,7 @@ pdf_documents = [('index', u'2012-2014', u'ownCloud Developer Manual', # One entry per manual page. List of tuples # (source start file, name, description, authors, manual section). man_pages = [ - ('contents', 'owncloudadminmanual', u'ownCloud Developer Manual', + ('contents', 'owncloudDeveloperManual', u'ownCloud Developer Manual', [u'The ownCloud developers'], 1) ] diff --git a/user_manual/Makefile b/user_manual/Makefile index bc7312e9a..74c47b133 100644 --- a/user_manual/Makefile +++ b/user_manual/Makefile @@ -29,6 +29,7 @@ help: @echo " epub to make an epub" @echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter" @echo " latexpdf to make LaTeX files and run them through pdflatex" + @echo " pdf to make PDF files" @echo " text to make text files" @echo " man to make manual pages" @echo " texinfo to make Texinfo files" @@ -122,10 +123,15 @@ latexpdf: $(MAKE) -C $(BUILDDIR)/latex all-pdf @echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex." +pdf: + $(SPHINXBUILD) -b pdf $(ALLSPHINXOPTS) $(BUILDDIR)/pdf + @echo + @echo "build finished. the text files are in $(BUILDDIR)/pdf." + text: $(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text @echo - @echo "Build finished. The text files are in $(BUILDDIR)/text." + @echo "build finished. the text files are in $(BUILDDIR)/text." man: $(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man diff --git a/user_manual/conf.py b/user_manual/conf.py index 35f64f6b5..fdd216673 100644 --- a/user_manual/conf.py +++ b/user_manual/conf.py @@ -211,7 +211,7 @@ latex_logo = '../_shared_assets/static/logo-blue.pdf' # -- Options for pdf page output ----------------------------------------------- -pdf_documents = [('index', u'owncloudUserManual', u'ownCloud User Manual', u'The ownCloud developers'),] +pdf_documents = [('contents', u'owncloudUserManual', u'ownCloud User Manual', u'The ownCloud developers'),] # -- Options for manual page output --------------------------------------------