doc: fixed rtd build

diff --git a/doc/conf.py b/doc/conf.py
index 63332cb20498d55412527840a9325ed5ecd4172e..4efd14e5b9ec1a700154ce3ceded62604aee901f 100644 (file)
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -24,8 +24,6 @@ project = u'Knot DNS Resolver'
 copyright = u'2014-2015 CZ.NIC labs'
 version = { k[0][0]: k[0][1] for k in filter(None, [re.findall(r'(MAJOR|MINOR|PATCH) := ([0-9]+)',line) for line in open('../config.mk')])}
 version = '%s.%s.%s' % (version['MAJOR'], version['MINOR'], version['PATCH'])
-
-# The full version, including alpha/beta/rc tags.
 release = version
 
 # List of patterns, relative to source directory, that match files and
@@ -39,26 +37,6 @@ primary_domain = 'c'
 
 # -- Options for HTML output ---------------------------------------------------
 
-# The theme to use for HTML and HTML Help pages.  See the documentation for
-# a list of builtin themes.
-html_theme = 'alabaster'
-
-# The name for this set of Sphinx documents.  If None, it defaults to
-# "<project> v<release> documentation".
-#html_title = None
-
-# 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".
@@ -68,56 +46,12 @@ html_static_path = ['_static']
 # 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_domain_indices = 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, "Created using Sphinx" is shown in the HTML footer. Default is True.
-#html_show_sphinx = True
-
-# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
-#html_show_copyright = True
-
-# If true, an OpenSearch description file will be output, and all pages will
-# contain a <link> tag referring to it.  The value of this option must be the
-# base URL from which the finished HTML is served.
-#html_use_opensearch = ''
-
-# This is the file name suffix for HTML files (e.g. ".xhtml").
-#html_file_suffix = None
-
 # Output file base name for HTML help builder.
 htmlhelp_basename = 'apidoc'
 
 
 # -- Options for LaTeX output --------------------------------------------------
 
-latex_elements = {
-# The paper size ('letterpaper' or 'a4paper').
-#'papersize': 'letterpaper',
-
-# The font size ('10pt', '11pt' or '12pt').
-#'pointsize': '10pt',
-
-# Additional stuff for the LaTeX preamble.
-#'preamble': '',
-}
-
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
@@ -125,27 +59,6 @@ latex_documents = [
    u'CZ.NIC Labs', '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
-
-# If true, show page references after internal links.
-#latex_show_pagerefs = False
-
-# If true, show URL addresses after external links.
-#latex_show_urls = False
-
-# Documents to append as an appendix to all manuals.
-#latex_appendices = []
-
-# If false, no module index is generated.
-#latex_domain_indices = True
-
-
 # -- Options for manual page output --------------------------------------------
 
 # One entry per manual page. List of tuples
@@ -155,6 +68,3 @@ man_pages = [
      [u'CZ.NIC Labs'], 1)
 ]
 
-# If true, show URL addresses after external links.
-#man_show_urls = False
-

diff --git a/doc/doc.mk b/doc/doc.mk
index dad588c81e071f23743195d7db312f23a166ecab..04cfc5dcadc9b48addca74fcc790feaadf817102 100644 (file)
--- a/doc/doc.mk
+++ b/doc/doc.mk
@@ -3,7 +3,7 @@ doc-doxygen:
 doc-html: doc-doxygen
        @cd doc && $(sphinx-build_BIN) -b html . html
 doc-clean:
-       @rm -rf doc/doxyxml doc/*.db doc/html
+       rm -rf doc/doxyxml doc/*.db doc/html
 
 .PHONY: doc-doxygen doc-html doc-clean