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 2017/01/10 19:36:22 UTC
[1/2] documentation commit: updated refs/heads/master to fb552b8
Repository: couchdb-documentation
Updated Branches:
refs/heads/master 59a887a97 -> fb552b869
Update python versions to 2.7/3.4, Replace latex_paper_size
Sphinx requires python 2.7/3.4 or higher.
Latex_paper_size property is deprecated, replace with latex_elements.papersize
According to the latest failed builds, sphinx needs at least Python 2.7 or 3.4 to build.
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/78ad53d7
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/78ad53d7
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/78ad53d7
Branch: refs/heads/master
Commit: 78ad53d7cc5760e09f90b5b1e3f2ba2d8d11bc3e
Parents: 59a887a
Author: Patrick B�nziger <pa...@bsi-software.com>
Authored: Tue Jan 10 09:51:55 2017 +0100
Committer: Patrick B�nziger <pa...@bsi-software.com>
Committed: Tue Jan 10 09:51:55 2017 +0100
----------------------------------------------------------------------
.travis.yml | 4 ++--
Makefile | 2 +-
make.bat | 6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/78ad53d7/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 75ac54b..603769d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
language: python
python:
- - 2.6
- - 3.3
+ - 2.7
+ - 3.4
before_install:
- sudo apt-get update -qq
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/78ad53d7/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index 9c071f5..b1314e1 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@ MAKEINFO := makeinfo
BUILDDIR := build
SOURCE := src/
-PAPERSIZE := -D latex_paper_size=a4
+PAPERSIZE := -D latex_elements.papersize=a4
SPHINXFLAGS := -a -W -n -A local=1 $(PAPERSIZE) -d $(BUILDDIR)/doctree
SPHINXOPTS := $(SPHINXFLAGS) $(SOURCE)
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/78ad53d7/make.bat
----------------------------------------------------------------------
diff --git a/make.bat b/make.bat
index 1cfba34..ff4a3f4 100644
--- a/make.bat
+++ b/make.bat
@@ -7,14 +7,14 @@ if "%SPHINXBUILD%" == "" (
)
set BUILDDIR=build
set SOURCE=src/
-set PAPERSIZE=-D latex_paper_size=a4
+set PAPERSIZE=-D latex_elements.papersize=a4
set SPHINXFLAGS=-a -n -A local=1 %PAPERSIZE%
set SPHINXOPTS=%SPHINXFLAGS% %SOURCE%
set ALLSPHINXOPTS=-d %BUILDDIR%/doctrees %SPHINXOPTS%
set I18NSPHINXOPTS=%SPHINXOPTS%
if NOT "%PAPER%" == "" (
- set ALLSPHINXOPTS=-D latex_paper_size=%PAPER% %ALLSPHINXOPTS%
- set I18NSPHINXOPTS=-D latex_paper_size=%PAPER% %I18NSPHINXOPTS%
+ set ALLSPHINXOPTS=-D latex_elements.papersize=%PAPER% %ALLSPHINXOPTS%
+ set I18NSPHINXOPTS=-D latex_elements.papersize=%PAPER% %I18NSPHINXOPTS%
)
if "%1" == "" goto help
[2/2] documentation commit: updated refs/heads/master to fb552b8
Posted by kx...@apache.org.
Merge remote-tracking branch 'github/pr/97'
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/fb552b86
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/fb552b86
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/fb552b86
Branch: refs/heads/master
Commit: fb552b8697e32bee896ce08fd08c700b0ee8241b
Parents: 59a887a 78ad53d
Author: Alexander Shorin <kx...@apache.org>
Authored: Tue Jan 10 22:35:43 2017 +0300
Committer: Alexander Shorin <kx...@apache.org>
Committed: Tue Jan 10 22:35:43 2017 +0300
----------------------------------------------------------------------
.travis.yml | 4 ++--
Makefile | 2 +-
make.bat | 6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------