summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Shorin <kxepal@apache.org>2013-09-28 10:45:05 +0400
committerAlexander Shorin <kxepal@apache.org>2013-09-28 10:45:05 +0400
commit5fe58936ae6bf4e72e43380d517c057f7cabd1c8 (patch)
tree4cfc6d580fbee77a0f8ce03db9123c9833fa4be5
parent6b50511d88d29d50e0b9b927d239e337087f4e4b (diff)
downloadcouchdb-5fe58936ae6bf4e72e43380d517c057f7cabd1c8.tar.gz
Prepare for 1.5.0 release.
-rw-r--r--share/doc/build/Makefile.am3
-rw-r--r--share/doc/src/whatsnew/1.5.rst31
-rw-r--r--share/doc/src/whatsnew/index.rst2
3 files changed, 35 insertions, 1 deletions
diff --git a/share/doc/build/Makefile.am b/share/doc/build/Makefile.am
index c83e39279..870976a15 100644
--- a/share/doc/build/Makefile.am
+++ b/share/doc/build/Makefile.am
@@ -138,6 +138,7 @@ html_files = \
html/_sources/whatsnew/1.2.txt \
html/_sources/whatsnew/1.3.txt \
html/_sources/whatsnew/1.4.txt \
+ html/_sources/whatsnew/1.5.txt \
html/_sources/whatsnew/index.txt \
html/_sources/about.txt \
html/_sources/contents.txt \
@@ -256,6 +257,7 @@ html_files = \
html/whatsnew/1.2.html \
html/whatsnew/1.3.html \
html/whatsnew/1.4.html \
+ html/whatsnew/1.5.html \
html/whatsnew/index.html \
html/about.html \
html/contents.html \
@@ -396,6 +398,7 @@ src_files = \
../src/whatsnew/1.2.rst \
../src/whatsnew/1.3.rst \
../src/whatsnew/1.4.rst \
+ ../src/whatsnew/1.5.rst \
../src/whatsnew/index.rst \
../src/about.rst \
../src/contents.rst \
diff --git a/share/doc/src/whatsnew/1.5.rst b/share/doc/src/whatsnew/1.5.rst
new file mode 100644
index 000000000..f2ce86a07
--- /dev/null
+++ b/share/doc/src/whatsnew/1.5.rst
@@ -0,0 +1,31 @@
+.. 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.
+
+
+.. _release/1.5.x:
+
+============
+1.5.x Branch
+============
+
+.. contents::
+ :depth: 1
+ :local:
+
+.. _release/1.5.0:
+
+Version 1.5.0
+=============
+
+.. warning::
+
+ This version is not released yet.
diff --git a/share/doc/src/whatsnew/index.rst b/share/doc/src/whatsnew/index.rst
index a69a75e71..50cc9ecfa 100644
--- a/share/doc/src/whatsnew/index.rst
+++ b/share/doc/src/whatsnew/index.rst
@@ -19,7 +19,7 @@ Release History
.. toctree::
:glob:
- ../cve/index
+ 1.5
1.4
1.3
1.2