Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 901B5DD72 for ; Sun, 18 Nov 2012 19:19:40 +0000 (UTC) Received: (qmail 29003 invoked by uid 500); 18 Nov 2012 19:19:40 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 28958 invoked by uid 500); 18 Nov 2012 19:19:40 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 28656 invoked by uid 99); 18 Nov 2012 19:19:40 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 18 Nov 2012 19:19:40 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id A2F8D314741; Sun, 18 Nov 2012 19:19:39 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dch@apache.org To: commits@couchdb.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [6/6] git commit: fixing readthedocs.org auto-generation Message-Id: <20121118191939.A2F8D314741@tyr.zones.apache.org> Date: Sun, 18 Nov 2012 19:19:39 +0000 (UTC) fixing readthedocs.org auto-generation Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/d1d0016d Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/d1d0016d Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/d1d0016d Branch: refs/heads/docs Commit: d1d0016d02deccb840cea769f76b93d802770b5a Parents: 7723efc Author: Dave Cottlehuber Authored: Fri Nov 2 21:50:38 2012 +0100 Committer: Dave Cottlehuber Committed: Sun Nov 18 20:15:20 2012 +0100 ---------------------------------------------------------------------- share/doc/conf.py | 78 +++++++++++++++++++++++++++-------------------- 1 files changed, 45 insertions(+), 33 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/d1d0016d/share/doc/conf.py ---------------------------------------------------------------------- diff --git a/share/doc/conf.py b/share/doc/conf.py index 8602ab9..4787c6c 100644 --- a/share/doc/conf.py +++ b/share/doc/conf.py @@ -18,29 +18,38 @@ extensions = ["sphinx.ext.todo"] source_suffix = ".rst" -master_doc = "index" +master_doc = "src/index" nitpicky = True -project = "@@" +# CouchDB ############################################################## +# These will be over-ridden during make dist but are listed here +# to ensure that the readthedocs.org build has version numbers present +# The short X.Y version. +#version = "@@" +version = "latest" +# The full version, including alpha/beta/rc tags. +# release = None +#release = "@@" +release = "latest" -copyright = "@@" +#project = "@@" +project = u'Apache CouchDB' -version = "@@" - -release = "@@" +#copyright = "@@" +copyright = u'2012, Apache Software Foundation' highlight_language = "json" pygments_style = "sphinx" # @@ design CouchDB theme - -# @@ check out http://sphinx.pocoo.org/theming.html +# @@ http://jinja.pocoo.org/docs/ looks nice html_theme = "default" -html_short_title = "@@" +# inherit from project title +#html_short_title = "@@" html_logo = "" @@ -50,27 +59,30 @@ html_use_opensearch = "" text_newlines = "native" -latex_documents = [( - "index", - "CouchDB.tex", - "", - "", - "manual", - True -)] - -#latex_elements[( -# "a4paper" # @@ do we want this? -#)] - -texinfo_documents = [( - "index", - "CouchDB", - "", - "", - "dir_entry", - "description", - "category", - "manual", - True -)] +# use this for excluding docs from final build +# unused_docs = ["src/tmp/*.rst"] + +# latex_documents = [( +# "index", +# "CouchDB.tex", +# "", +# "", +# "manual", +# True +# )] + +# #latex_elements[( +# # "a4paper" # @@ do we want this? +# #)] + +# texinfo_documents = [( +# "index", +# "CouchDB", +# "", +# "", +# "dir_entry", +# "description", +# "category", +# "manual", +# True +# )]