You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ns...@apache.org on 2012/10/01 23:22:27 UTC

git commit: initial work towards html build

Updated Branches:
  refs/heads/docs 83d84259f -> 36a82023f


initial work towards html build


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/36a82023
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/36a82023
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/36a82023

Branch: refs/heads/docs
Commit: 36a82023ff77ffe4a5016f5716f1864245801d1d
Parents: 83d8425
Author: Noah Slater <ns...@apache.org>
Authored: Mon Oct 1 22:22:22 2012 +0100
Committer: Noah Slater <ns...@apache.org>
Committed: Mon Oct 1 22:22:22 2012 +0100

----------------------------------------------------------------------
 configure.ac                |    1 +
 share/doc/Makefile.am       |    3 +
 share/doc/build/Makefile.am |   97 ++++++++++++++++++++++++++++++++++++++
 share/doc/src/conf.py       |    8 ++--
 4 files changed, 105 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/36a82023/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 2e79a93..504eef7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -560,6 +560,7 @@ AC_CONFIG_FILES([etc/windows/Makefile])
 AC_CONFIG_FILES([etc/Makefile])
 AC_CONFIG_FILES([share/Makefile])
 AC_CONFIG_FILES([share/doc/Makefile])
+AC_CONFIG_FILES([share/doc/build/Makefile])
 AC_CONFIG_FILES([src/Makefile])
 AC_CONFIG_FILES([src/couch_index/Makefile])
 AC_CONFIG_FILES([src/couch_mrview/Makefile])

http://git-wip-us.apache.org/repos/asf/couchdb/blob/36a82023/share/doc/Makefile.am
----------------------------------------------------------------------
diff --git a/share/doc/Makefile.am b/share/doc/Makefile.am
index c0271d4..8782b8b 100644
--- a/share/doc/Makefile.am
+++ b/share/doc/Makefile.am
@@ -10,6 +10,8 @@
 ## License for the specific language governing permissions and limitations under
 ## the License.
 
+SUBDIRS = build
+
 # @@ can we remove _static?
 
 # @@ what is the license for conf.py?
@@ -24,6 +26,7 @@ EXTRA_DIST = \
 	images/futon-replform.png \
 	make.bat \
 	Makefile.am \
+	src/_static \
 	src/api/authn.rst \
 	src/api/configuration.rst \
 	src/api/database.rst \

http://git-wip-us.apache.org/repos/asf/couchdb/blob/36a82023/share/doc/build/Makefile.am
----------------------------------------------------------------------
diff --git a/share/doc/build/Makefile.am b/share/doc/build/Makefile.am
new file mode 100644
index 0000000..20b7b41
--- /dev/null
+++ b/share/doc/build/Makefile.am
@@ -0,0 +1,97 @@
+## Licensed under the Apache License, Version 2.0 (the "License"); you may not
+## use this file except in compliance with the License. You may obtain a copy of
+## the License at
+##
+##   http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+## WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+## License for the specific language governing permissions and limitations under
+## the License.
+
+EXTRA_DIST = \
+    html/.buildinfo
+
+nobase_dist_localdocdir_DATA = \
+    html/_images \
+    html/_images/futon-createdb.png \
+    html/_images/futon-editdoc.png \
+    html/_images/futon-editeddoc.png \
+    html/_images/futon-overview.png \
+    html/_images/futon-replform.png \
+    html/_sources/api/authn.txt \
+    html/_sources/api/configuration.txt \
+    html/_sources/api/database.txt \
+    html/_sources/api/dbmaint.txt \
+    html/_sources/api/design.txt \
+    html/_sources/api/documents.txt \
+    html/_sources/api/local.txt \
+    html/_sources/api/misc.txt \
+    html/_sources/api/reference.txt \
+    html/_sources/api-basics.txt \
+    html/_sources/changes.txt \
+    html/_sources/commonjs.txt \
+    html/_sources/config_reference.txt \
+    html/_sources/configuring.txt \
+    html/_sources/ddocs.txt \
+    html/_sources/errors.txt \
+    html/_sources/http-proxying.txt \
+    html/_sources/index.txt \
+    html/_sources/intro.txt \
+    html/_sources/json-structure.txt \
+    html/_sources/os-daemons.txt \
+    html/_sources/range.txt \
+    html/_sources/release.txt \
+    html/_sources/replication.txt \
+    html/_sources/ssl.txt \
+    html/_static/ajax-loader.gif \
+    html/_static/basic.css \
+    html/_static/comment-bright.png \
+    html/_static/comment-close.png \
+    html/_static/comment.png \
+    html/_static/default.css \
+    html/_static/doctools.js \
+    html/_static/down-pressed.png \
+    html/_static/down.png \
+    html/_static/file.png \
+    html/_static/jquery.js \
+    html/_static/minus.png \
+    html/_static/opensearch.xml \
+    html/_static/plus.png \
+    html/_static/pygments.css \
+    html/_static/searchtools.js \
+    html/_static/sidebar.js \
+    html/_static/underscore.js \
+    html/_static/up-pressed.png \
+    html/_static/up.png \
+    html/_static/websupport.js \
+    html/api/authn.html \
+    html/api/configuration.html \
+    html/api/database.html \
+    html/api/dbmaint.html \
+    html/api/design.html \
+    html/api/documents.html \
+    html/api/local.html \
+    html/api/misc.html \
+    html/api/reference.html \
+    html/api-basics.html \
+    html/changes.html \
+    html/commonjs.html \
+    html/config_reference.html \
+    html/configuring.html \
+    html/ddocs.html \
+    html/errors.html \
+    html/genindex.html \
+    html/http-proxying.html \
+    html/index.html \
+    html/intro.html \
+    html/json-structure.html \
+    html/objects.inv \
+    html/os-daemons.html \
+    html/range.html \
+    html/release.html \
+    html/replication.html \
+    html/search.html \
+    html/searchindex.js \
+    html/ssl.html

http://git-wip-us.apache.org/repos/asf/couchdb/blob/36a82023/share/doc/src/conf.py
----------------------------------------------------------------------
diff --git a/share/doc/src/conf.py b/share/doc/src/conf.py
index 5c3b087..d738428 100644
--- a/share/doc/src/conf.py
+++ b/share/doc/src/conf.py
@@ -33,7 +33,7 @@ release = "@@"
 highlight_language = "json"
 
 pygments_style = "sphinx"
- 
+
 # @@ design CouchDB theme
 
 # @@ check out http://sphinx.pocoo.org/theming.html
@@ -42,8 +42,8 @@ html_theme = "default"
 
 html_short_title = "@@"
 
-html_logo = "@@"
+html_logo = ""
 
-html_favicon = "@@"
+html_favicon = ""
 
-html_use_opensearch = "@@"
+html_use_opensearch = ""