couchdb commit: updated refs/heads/1.x.x to b1f5333

[kx...@apache.org]

Repository: couchdb
Updated Branches:
  refs/heads/1.x.x f30f3dd2a -> b1f5333b9


docs: add version tag for f30f3dd feature


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

Branch: refs/heads/1.x.x
Commit: b1f5333b9057a3b784704022d999e9a969935b26
Parents: f30f3dd
Author: Alexander Shorin <kx...@apache.org>
Authored: Fri Oct 31 05:40:44 2014 +0300
Committer: Alexander Shorin <kx...@apache.org>
Committed: Fri Oct 31 05:40:44 2014 +0300

----------------------------------------------------------------------
 share/doc/src/config/http.rst | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/b1f5333b/share/doc/src/config/http.rst
----------------------------------------------------------------------
diff --git a/share/doc/src/config/http.rst b/share/doc/src/config/http.rst
index 3b808e9..6ab09f0 100644
--- a/share/doc/src/config/http.rst
+++ b/share/doc/src/config/http.rst
@@ -401,11 +401,13 @@ Secure Socket Level Options
 
     Set to the cipher suites that should be supported which can be
     specified in erlang format "{ecdhe_ecdsa,aes_128_cbc,sha256}" or
-    in OpenSSL format "ECDHE-ECDSA-AES128-SHA256".
+    in OpenSSL format "ECDHE-ECDSA-AES128-SHA256"::
 
       [ssl]
       ciphers = ["ECDHE-ECDSA-AES128-SHA256", "ECDHE-ECDSA-AES128-SHA"]
 
+    .. versionadded:: 1.7
+
   .. config:option:: tls_versions :: Specify permitted server SSL/TLS
                      protocol versions
 
@@ -414,6 +416,8 @@ Secure Socket Level Options
       [ssl]
       tls_versions = [sslv3 | tlsv1 | 'tlsv1.1' | 'tlsv1.2']
 
+    .. versionadded:: 1.7
+
 
 .. _cors:
 .. _config/cors: