You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by kx...@apache.org on 2013/10/15 19:08:12 UTC
[1/3] git commit: updated refs/heads/1.5.x to 90cecc2
Updated Branches:
refs/heads/1.5.x 976916d44 -> 90cecc20e
Fix httpdomain compatibility issue with Python 2.6
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/c9698b41
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/c9698b41
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/c9698b41
Branch: refs/heads/1.5.x
Commit: c9698b414497121803d51af6098cecad7044147c
Parents: 976916d
Author: Alexander Shorin <kx...@apache.org>
Authored: Tue Oct 15 02:54:47 2013 +0400
Committer: Alexander Shorin <kx...@apache.org>
Committed: Tue Oct 15 21:06:50 2013 +0400
----------------------------------------------------------------------
share/doc/ext/httpdomain.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/c9698b41/share/doc/ext/httpdomain.py
----------------------------------------------------------------------
diff --git a/share/doc/ext/httpdomain.py b/share/doc/ext/httpdomain.py
index afc81b5..d5d5652 100644
--- a/share/doc/ext/httpdomain.py
+++ b/share/doc/ext/httpdomain.py
@@ -46,7 +46,7 @@ class DocRef(object):
location of the RFC which defines some HTTP method.
"""
- return '{}#{}{}'.format(self.base_url, self.anchor, self.section)
+ return '{0}#{1}{2}'.format(self.base_url, self.anchor, self.section)
class RFC2616Ref(DocRef):
@@ -62,7 +62,7 @@ class IETFRef(DocRef):
def __init__(self, rfc, section):
url = 'http://tools.ietf.org/html/rfc{0:d}'.format(rfc)
super(IETFRef, self).__init__(url, 'section-', section)
-
+
class EventSourceRef(DocRef):
[2/3] git commit: updated refs/heads/1.5.x to 90cecc2
Posted by kx...@apache.org.
Fix release version generation for docs.
The logic:
- If you didn't run ./bootstrap the version will be X.Y.Z-dev
- If you did: X.Y.Z+build.hash
- For CouchDB releases - just X.Y.Z (because we remove STAGE/RELEASE
info from acinclude.m4.in)
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/99423c51
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/99423c51
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/99423c51
Branch: refs/heads/1.5.x
Commit: 99423c5141fd77f63e5637ec15ada9d2d709d990
Parents: c9698b4
Author: Alexander Shorin <kx...@apache.org>
Authored: Tue Oct 15 19:18:08 2013 +0400
Committer: Alexander Shorin <kx...@apache.org>
Committed: Tue Oct 15 21:07:06 2013 +0400
----------------------------------------------------------------------
share/doc/src/conf.py | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/99423c51/share/doc/src/conf.py
----------------------------------------------------------------------
diff --git a/share/doc/src/conf.py b/share/doc/src/conf.py
index 0c649b8..3d2536e 100644
--- a/share/doc/src/conf.py
+++ b/share/doc/src/conf.py
@@ -24,10 +24,10 @@ _info = {}
_regex = re.compile('m4_define\(\[(.+)\],\s+\[(.+)\]\)')
_acinclude_m4 = '../../../acinclude.m4'
_acinclude_m4_in = '../../../acinclude.m4.in'
-if os.path.exists(_acinclude_m4_in):
- _source = _acinclude_m4_in
-elif os.path.exists(_acinclude_m4):
+if os.path.exists(_acinclude_m4):
_source = _acinclude_m4
+elif os.path.exists(_acinclude_m4_in):
+ _source = _acinclude_m4_in
else:
_source = None
if _source is not None:
@@ -50,11 +50,12 @@ release = '.'.join([
_info['LOCAL_VERSION_MAJOR'],
_info['LOCAL_VERSION_MINOR'],
_info['LOCAL_VERSION_REVISION']
-]) + (
- _info['LOCAL_VERSION_STAGE'] + '' + _info['LOCAL_VERSION_RELEASE']
- if _info.get('LOCAL_VERSION_RELEASE') == '%revision%'
- else '-dev'
-)
+])
+
+if _info.get('LOCAL_VERSION_RELEASE') == '.%revision%':
+ release += '-dev'
+elif _info.get('LOCAL_VERSION_RELEASE'):
+ release += _info['LOCAL_VERSION_STAGE'] + _info['LOCAL_VERSION_RELEASE']
project = _info['LOCAL_PACKAGE_NAME']
[3/3] git commit: updated refs/heads/1.5.x to 90cecc2
Posted by kx...@apache.org.
Add missed docs files for `make html` output.
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/90cecc20
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/90cecc20
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/90cecc20
Branch: refs/heads/1.5.x
Commit: 90cecc20e34380ba6c7ea6d5f95a2ae855b33f24
Parents: 99423c5
Author: Alexander Shorin <kx...@apache.org>
Authored: Tue Oct 15 20:20:57 2013 +0400
Committer: Alexander Shorin <kx...@apache.org>
Committed: Tue Oct 15 21:07:22 2013 +0400
----------------------------------------------------------------------
share/doc/build/Makefile.am | 28 ++++++++++++++++++++++++++--
1 file changed, 26 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/90cecc20/share/doc/build/Makefile.am
----------------------------------------------------------------------
diff --git a/share/doc/build/Makefile.am b/share/doc/build/Makefile.am
index 30b933e..c4298d3 100644
--- a/share/doc/build/Makefile.am
+++ b/share/doc/build/Makefile.am
@@ -45,6 +45,26 @@ html_files = \
html/_images/futon-editeddoc.png \
html/_images/futon-overview.png \
html/_images/futon-replform.png \
+ html/_images/intro-consistency-01.png \
+ html/_images/intro-consistency-02.png \
+ html/_images/intro-consistency-03.png \
+ html/_images/intro-consistency-04.png \
+ html/_images/intro-consistency-05.png \
+ html/_images/intro-consistency-06.png \
+ html/_images/intro-consistency-07.png \
+ html/_images/intro-tour-01.png \
+ html/_images/intro-tour-02.png \
+ html/_images/intro-tour-03.png \
+ html/_images/intro-tour-04.png \
+ html/_images/intro-tour-05.png \
+ html/_images/intro-tour-06.png \
+ html/_images/intro-tour-07.png \
+ html/_images/intro-tour-08.png \
+ html/_images/intro-tour-09.png \
+ html/_images/intro-tour-10.png \
+ html/_images/intro-why-01.png \
+ html/_images/intro-why-02.png \
+ html/_images/intro-why-03.png \
html/_images/views-intro-01.png \
html/_images/views-intro-02.png \
html/_images/views-intro-03.png \
@@ -93,6 +113,7 @@ html_files = \
html/_sources/couchapp/views/intro.txt \
html/_sources/couchapp/views/joins.txt \
html/_sources/couchapp/views/nosql.txt \
+ html/_sources/couchapp/views/pagination.txt \
html/_sources/cve/2010-0009.txt \
html/_sources/cve/2010-2234.txt \
html/_sources/cve/2010-3854.txt \
@@ -264,11 +285,14 @@ html_files = \
html/about.html \
html/config-ref.html \
html/contents.html \
- html/externals.html \
+ html/contributing.html \
+ html/download.html \
html/experimental.html \
+ html/externals.html \
+ html/http-api.html \
+ html/index.html \
html/json-structure.html \
html/objects.inv \
- html/http-api.html \
html/search.html \
html/searchindex.js