Repository: couchdb-documentation
Updated Branches:
  refs/heads/master a135f2fe8 -> da5852440


Document users_db_suffix


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

Branch: refs/heads/master
Commit: 5a5ad3985604f5f413de098cff65421d23f6c5f0
Parents: a135f2f
Author: ILYA Khlopotov <iil...@ca.ibm.com>
Authored: Mon Sep 19 11:07:11 2016 -0700
Committer: ILYA Khlopotov <iil...@ca.ibm.com>
Committed: Mon Sep 19 11:07:11 2016 -0700

----------------------------------------------------------------------
 src/api/server/configuration.rst |  2 +-
 src/config/auth.rst              | 12 ------------
 src/config/couchdb.rst           | 13 +++++++++++++
 3 files changed, 14 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/5a5ad398/src/api/server/configuration.rst
----------------------------------------------------------------------
diff --git a/src/api/server/configuration.rst b/src/api/server/configuration.rst
index ffa9cf7..610207b 100644
--- a/src/api/server/configuration.rst
+++ b/src/api/server/configuration.rst
@@ -62,12 +62,12 @@ the various configuration values within a running CouchDB 
instance.
             },
             "couch_httpd_auth": {
                 "auth_cache_size": "50",
-                "authentication_db": "_users",
                 "authentication_redirect": "/_utils/session.html",
                 "require_valid_user": "false",
                 "timeout": "600"
             },
             "couchdb": {
+                "users_db_suffix": "_users",
                 "database_dir": "/var/lib/couchdb",
                 "delayed_commits": "true",
                 "max_attachment_chunk_size": "4294967296",

http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/5a5ad398/src/config/auth.rst
----------------------------------------------------------------------
diff --git a/src/config/auth.rst b/src/config/auth.rst
index c9af7a8..1b6bde3 100644
--- a/src/config/auth.rst
+++ b/src/config/auth.rst
@@ -123,18 +123,6 @@ Authentication Configuration
             [couch_httpd_auth]
             auth_cache_size = 50
 
-    .. config:option:: authentication_db :: Users database
-
-        Specifies the name of the system database for storing CouchDB users. ::
-
-            [couch_httpd_auth]
-            authentication_db = _users
-
-        .. warning::
-            If you change the database name, do not forget to remove or clean
-            up the old database, since it will no longer be protected by
-            CouchDB.
-
     .. config:option:: authentication_redirect :: Default redirect for 
authentication requests
 
         Specifies the location for redirection on successful authentication if

http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/5a5ad398/src/config/couchdb.rst
----------------------------------------------------------------------
diff --git a/src/config/couchdb.rst b/src/config/couchdb.rst
index cceacad..2eb9cac 100644
--- a/src/config/couchdb.rst
+++ b/src/config/couchdb.rst
@@ -142,6 +142,19 @@ Base CouchDB Options
 
         .. _URI: http://en.wikipedia.org/wiki/URI
 
+   .. config:option:: users_db_suffix :: Users database suffix
+
+        Specifies the suffix (last component of a name) of the system database
+        for storing CouchDB users. ::
+
+            [couchdb]
+            users_db_suffix = _users
+
+        .. warning::
+            If you change the database name, do not forget to remove or clean
+            up the old database, since it will no longer be protected by
+            CouchDB.
+
     .. config:option:: util_driver_dir :: CouchDB binary utility drivers
 
         Specifies location of binary drivers (`icu`, `ejson`, etc.). This

Reply via email to