summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDirkjan Ochtman <djc@apache.org>2013-05-21 21:52:22 +0200
committerDirkjan Ochtman <djc@apache.org>2013-05-21 22:00:11 +0200
commitff769a0613232e54f0218d3b6525832d54f5844a (patch)
tree27a531d5af3008b8d54b3552371d9648d1a82f52
parent6c7bfa77c9ce06eba62f4f1a6488adfe20e5e69a (diff)
downloadcouchdb-ff769a0613232e54f0218d3b6525832d54f5844a.tar.gz
docs: move upgrade notes into changelog chapter
-rw-r--r--share/doc/src/changelog.rst19
-rw-r--r--share/doc/src/index.rst1
-rw-r--r--share/doc/src/release.rst47
3 files changed, 19 insertions, 48 deletions
diff --git a/share/doc/src/changelog.rst b/share/doc/src/changelog.rst
index 9b5bec6fd..80fbd4e59 100644
--- a/share/doc/src/changelog.rst
+++ b/share/doc/src/changelog.rst
@@ -16,6 +16,25 @@ Apache CouchDB CHANGES
Version 1.3.0
-------------
+Upgrade notes
+^^^^^^^^^^^^^
+
+You can upgrade your existing CouchDB 1.0.x installation to 1.3.0
+without any specific steps or migration. When you run CouchDB, the
+existing data and index files will be opened and used as normal.
+
+The first time you run a compaction routine on your database within 1.3.0,
+the data structure and indexes will be updated to the new version of the
+CouchDB database format that can only be read by CouchDB 1.3.0 and later.
+This step is not reversible. Once the data files have been updated and
+migrated to the new version the data files will no longer work with a
+CouchDB 1.0.x release.
+
+.. warning::
+ If you want to retain support for opening the data files in
+ CouchDB 1.0.x you must back up your data files before performing the
+ upgrade and compaction process.
+
Database core
^^^^^^^^^^^^^
diff --git a/share/doc/src/index.rst b/share/doc/src/index.rst
index 91c4e1666..112e64c4b 100644
--- a/share/doc/src/index.rst
+++ b/share/doc/src/index.rst
@@ -35,7 +35,6 @@ Contents
ddocs
query-servers
changes
- release
api/reference
json-structure
contributing
diff --git a/share/doc/src/release.rst b/share/doc/src/release.rst
deleted file mode 100644
index c61d8ad6a..000000000
--- a/share/doc/src/release.rst
+++ /dev/null
@@ -1,47 +0,0 @@
-.. 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.
-
-=======================================
-CouchDB Release |version| Feature Guide
-=======================================
-
-Upgrading to CouchDB |version|
-==============================
-
-You can upgrade your existing CouchDB 1.0.x installation to CouchDB |version|
-without any specific steps or migration. When you run CouchDB |version| the
-existing data and index files will be opened and used as normal.
-
-The first time you run a compaction routine on your database within
-CouchDB |version|, the data structure and indexes will be updated to the new
-version of the CouchDB database format that can only be read by CouchDB
-|version| and later. This step is not reversible. Once the data files have
-been updated and migrated to the new version the data files will no
-longer work with a CouchDB 1.0.x release.
-
-.. warning::
- If you want to retain support for opening the data files in
- CouchDB 1.0.x you must back up your data files before performing the
- upgrade and compaction process.
-
-New features in CouchDB |version|
-=================================
-
-.. toctree::
-.. :maxdepth: 2
-..
-.. replicator
-.. ssl
-.. range
-.. proxy
-.. commonjs
-.. other