couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject [42/42] git commit: updated refs/heads/master to a4d6cd4
Date Thu, 03 Oct 2013 14:13:55 GMT
[docs] re-add plugins dir config section


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

Branch: refs/heads/master
Commit: a4d6cd439919ccd38bce340339ee4c8363dc1f58
Parents: 95d6e35
Author: Jan Lehnardt <jan@apache.org>
Authored: Thu Oct 3 16:12:32 2013 +0200
Committer: Jan Lehnardt <jan@apache.org>
Committed: Thu Oct 3 16:12:32 2013 +0200

----------------------------------------------------------------------
 share/doc/src/config/intro.rst | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/a4d6cd43/share/doc/src/config/intro.rst
----------------------------------------------------------------------
diff --git a/share/doc/src/config/intro.rst b/share/doc/src/config/intro.rst
index 0198af2..f662b8f 100644
--- a/share/doc/src/config/intro.rst
+++ b/share/doc/src/config/intro.rst
@@ -28,11 +28,13 @@ in the following order:
 
 #. ``LOCALCONFDIR/default.ini``
 
-#. ``LOCALCONFDIR/default.d/*``
+#. ``LOCALCONFDIR/default.d/*.ini``
+
+#. ``PLUGINS_DIR/*/priv/default.d/*.ini``
 
 #. ``LOCALCONFDIR/local.ini``
 
-#. ``LOCALCONFDIR/local.d/*``
+#. ``LOCALCONFDIR/local.d/*.ini``
 
 The ``LOCALCONFDIR`` points to the directory that contains configuration files
 (``/usr/local/etc/couchdb`` by default). This variable may vary from the


Mime
View raw message