git commit: updated refs/heads/master to 1c685c4

[kx...@apache.org]

Updated Branches:
  refs/heads/master cd9270f48 -> 1c685c406


Docs: add 1.6 release notes for current changes


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/1c685c40
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/1c685c40
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/1c685c40

Branch: refs/heads/master
Commit: 1c685c406f2896fee732f8ad93375dd8b8d49bf2
Parents: cd9270f
Author: Alexander Shorin <kx...@apache.org>
Authored: Fri Nov 8 14:47:33 2013 +0400
Committer: Alexander Shorin <kx...@apache.org>
Committed: Fri Nov 8 14:47:33 2013 +0400

----------------------------------------------------------------------
 share/doc/src/whatsnew/1.6.rst   | 48 +++++++++++++++++++++++++++++++++++
 share/doc/src/whatsnew/index.rst |  1 +
 2 files changed, 49 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/1c685c40/share/doc/src/whatsnew/1.6.rst
----------------------------------------------------------------------
diff --git a/share/doc/src/whatsnew/1.6.rst b/share/doc/src/whatsnew/1.6.rst
new file mode 100644
index 0000000..df57320
--- /dev/null
+++ b/share/doc/src/whatsnew/1.6.rst
@@ -0,0 +1,48 @@
+.. 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.6.x:
+
+============
+1.6.x Branch
+============
+
+.. contents::
+   :depth: 1
+   :local:
+
+.. _release/1.6.x/upgrade:
+
+Upgrade Notes
+=============
+
+The :ref:`Proxy Authentication <api/auth/proxy>` handler was renamed to
+``proxy_authentication_handler`` to follow the ``*_authentication_handler`` form
+of all other handlers. The old ``proxy_authentification_handler`` name is marked
+as deprecated and will be removed in future releases. It's strongly recommended
+to update :config:option:`httpd/authentication_handlers` option with new value
+in case if you had used such handler.
+
+
+.. _release/1.6.0:
+
+Version 1.6.0
+=============
+
+.. warning::
+
+   This version is not released yet.
+
+* :issue:`1922`: Fix CORS exposed headers :commit:`4f619833`
+* Rename ``proxy_authentification_handler`` to ``proxy_authentication_handler``
+  :commit:`c66ac4a8`

http://git-wip-us.apache.org/repos/asf/couchdb/blob/1c685c40/share/doc/src/whatsnew/index.rst
----------------------------------------------------------------------
diff --git a/share/doc/src/whatsnew/index.rst b/share/doc/src/whatsnew/index.rst
index 50cc9ec..800b9ee 100644
--- a/share/doc/src/whatsnew/index.rst
+++ b/share/doc/src/whatsnew/index.rst
@@ -19,6 +19,7 @@ Release History
 .. toctree::
    :glob:
 
+   1.6
    1.5
    1.4
    1.3