couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nsla...@apache.org
Subject git commit: Serve up docs through Futon and enable search
Date Sat, 01 Dec 2012 21:17:54 GMT
Updated Branches:
  refs/heads/docs 487183c30 -> c2569c639


Serve up docs through Futon and enable search


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

Branch: refs/heads/docs
Commit: c2569c6396877989842c2223c65f099ee3f39980
Parents: 487183c
Author: Noah Slater <nslater@apache.org>
Authored: Sat Dec 1 21:17:51 2012 +0000
Committer: Noah Slater <nslater@apache.org>
Committed: Sat Dec 1 21:17:51 2012 +0000

----------------------------------------------------------------------
 share/doc/build/Makefile.am |   44 +++++++++++++++++++++++++++++++------
 share/doc/src/conf.py       |    1 +
 share/www/_sidebar.html     |    3 ++
 3 files changed, 41 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/c2569c63/share/doc/build/Makefile.am
----------------------------------------------------------------------
diff --git a/share/doc/build/Makefile.am b/share/doc/build/Makefile.am
index 29cc938..0ce4eb0 100644
--- a/share/doc/build/Makefile.am
+++ b/share/doc/build/Makefile.am
@@ -41,6 +41,33 @@ html_files = \
     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/pretty_urls.txt \
+    html/_sources/query-servers.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 \
@@ -229,10 +256,12 @@ install-data-local:
 	    $(INSTALL_DATA) \
 	        $(pdf_file_dist).gz $(DESTDIR)$(localdocdir)/$(pdf_file_inst); \
 	fi
-	for file in $(html_files); do \
-	    if test -s $$file; then \
-	        $(INSTALL) -d `dirname $(DESTDIR)$(localdocdir)/$$file`; \
-	        $(INSTALL_DATA) $$file $(DESTDIR)$(localdocdir)/$$file; \
+	for dist_file in $(html_files); do \
+	    if test -s $$dist_file; then \
+	        inst_file=`echo $$dist_file | sed s,^html,docs,`; \
+	        $(INSTALL) -d `dirname $(DESTDIR)$(localdatadir)/www/$$inst_file`; \
+	        $(INSTALL_DATA) \
+	            $$dist_file $(DESTDIR)$(localdatadir)/www/$$inst_file; \
 	    fi \
 	done
 
@@ -249,9 +278,10 @@ uninstall-local:
 	    fi \
 	fi
 	rm -f $(DESTDIR)$(localdocdir)/$(pdf_file_inst)
-	for file in $(html_files); do \
-	    if test -s $$file; then \
-	        rm -f $(DESTDIR)$(localdocdir)/$$file; \
+	for dist_file in $(html_files); do \
+	    if test -s $$dist_file; then \
+	        inst_file=`echo $$dist_file | sed s,^html,docs,`; \
+	        rm -f $(DESTDIR)$(localdatadir)/$$inst_file; \
 	    fi \
 	done
 

http://git-wip-us.apache.org/repos/asf/couchdb/blob/c2569c63/share/doc/src/conf.py
----------------------------------------------------------------------
diff --git a/share/doc/src/conf.py b/share/doc/src/conf.py
index 56d9dc2..d06df28 100644
--- a/share/doc/src/conf.py
+++ b/share/doc/src/conf.py
@@ -46,6 +46,7 @@ html_favicon = "../images/favicon.ico"
 
 html_sidebars= {
     "**": [
+        'searchbox.html',
         "localtoc.html",
         "relations.html",
         "sidebar.html",

http://git-wip-us.apache.org/repos/asf/couchdb/blob/c2569c63/share/www/_sidebar.html
----------------------------------------------------------------------
diff --git a/share/www/_sidebar.html b/share/www/_sidebar.html
index efa66f4..e3dc93c 100644
--- a/share/www/_sidebar.html
+++ b/share/www/_sidebar.html
@@ -24,6 +24,9 @@ specific language governing permissions and limitations under the License.
       <li><a href="replicator.html">Replicator</a></li>
       <li><a href="status.html">Status</a></li>
     </ul></li>
+    <li><span>Documentation</span><ul>
+      <li><a href="docs/index.html">Manual</a></li>
+    </ul></li>
     <li><span>Diagnostics</span><ul>
       <li><a href="verify_install.html">Verify Installation</a></li>
       <li><a href="couch_tests.html?script/couch_tests.js">Test Suite</a></li>


Mime
View raw message