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 2015/03/20 00:16:58 UTC
[1/3] documentation commit: updated refs/heads/master to 3096413
Repository: couchdb-documentation
Updated Branches:
refs/heads/master 5a81acee8 -> 30964137d
Fix github repo name
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/206d6319
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/206d6319
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/206d6319
Branch: refs/heads/master
Commit: 206d63196ef1a1c5ee75ff7098eb82911d1457c7
Parents: 5a81ace
Author: Alexander Shorin <kx...@apache.org>
Authored: Wed Mar 11 16:35:53 2015 +0300
Committer: Alexander Shorin <kx...@apache.org>
Committed: Wed Mar 11 16:35:53 2015 +0300
----------------------------------------------------------------------
src/conf.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/206d6319/src/conf.py
----------------------------------------------------------------------
diff --git a/src/conf.py b/src/conf.py
index 9930c64..ab93ea4 100644
--- a/src/conf.py
+++ b/src/conf.py
@@ -115,7 +115,7 @@ extlinks = {
'commit': ('https://git-wip-us.apache.org/repos/asf?p=couchdb.git;a=commit;h=%s', '#')
}
-github_project = 'apache/couchdb'
+github_project = 'apache/couchdb-documentation'
html_context['git_branch'] = github_branch = 'master'
[2/3] documentation commit: updated refs/heads/master to 3096413
Posted by kx...@apache.org.
Don't guess version from git
This doesn't works when you need to provide documentation for
non-released versions. It'll try to use last-know-tag for that and
cause people confusion.
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/ab4fc456
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/ab4fc456
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/ab4fc456
Branch: refs/heads/master
Commit: ab4fc456631fe6d63555c8b491df31b1284a842c
Parents: 206d631
Author: Alexander Shorin <kx...@apache.org>
Authored: Wed Mar 11 16:48:23 2015 +0300
Committer: Alexander Shorin <kx...@apache.org>
Committed: Wed Mar 11 16:48:23 2015 +0300
----------------------------------------------------------------------
Makefile | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/ab4fc456/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index 85b9b10..e0c00e8 100644
--- a/Makefile
+++ b/Makefile
@@ -12,13 +12,10 @@
SPHINXBUILD := sphinx-build
BUILDDIR := build
-COUCHVERSION := $(shell git describe --tags --abbrev=0 2>/dev/null || echo unknown)
-COUCHDOCSHA := $(shell git rev-parse --verify --short HEAD 2>/dev/null || echo src)
-COUCHRELEASE := $(COUCHVERSION)-git-$(COUCHDOCSHA)
SOURCE := src/
PAPERSIZE := -D latex_paper_size=a4
SPHINXFLAGS := -a -E -W -n -A local=1 $(PAPERSIZE) -d $(BUILDDIR)/doctree
-SPHINXOPTS := $(SPHINXFLAGS) -D version=$(COUCHVERSION) -D release=$(COUCHRELEASE) $(SOURCE)
+SPHINXOPTS := $(SPHINXFLAGS) $(SOURCE)
all: distclean html pdf info man install clean
[3/3] documentation commit: updated refs/heads/master to 3096413
Posted by kx...@apache.org.
Add license header
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/30964137
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/30964137
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/30964137
Branch: refs/heads/master
Commit: 30964137d396df170a227a8c7f443828841c3d8b
Parents: ab4fc45
Author: Alexander Shorin <kx...@apache.org>
Authored: Sat Mar 14 14:23:46 2015 +0300
Committer: Alexander Shorin <kx...@apache.org>
Committed: Sat Mar 14 14:23:46 2015 +0300
----------------------------------------------------------------------
src/docs.app.src | 12 ++++++++++++
1 file changed, 12 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/30964137/src/docs.app.src
----------------------------------------------------------------------
diff --git a/src/docs.app.src b/src/docs.app.src
index 27a0156..35e262a 100644
--- a/src/docs.app.src
+++ b/src/docs.app.src
@@ -1,3 +1,15 @@
+% 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.
+
{application, docs, [
{description, "CouchDB Documentation"},
{vsn, git},