[7/44] git commit: better documentation in .ini file

[ja...@apache.org]

better documentation in .ini file


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

Branch: refs/heads/1368-fix-multipart-header-parts
Commit: 16421456725c115d24f123a89eb025bac1f8f447
Parents: 2d6fdb8
Author: Jan Lehnardt <ja...@apache.org>
Authored: Mon Nov 12 18:50:54 2012 +0100
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Mon Nov 12 18:54:35 2012 +0100

----------------------------------------------------------------------
 etc/couchdb/default.ini.tpl.in |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/16421456/etc/couchdb/default.ini.tpl.in
----------------------------------------------------------------------
diff --git a/etc/couchdb/default.ini.tpl.in b/etc/couchdb/default.ini.tpl.in
index d534753..be92fcf 100644
--- a/etc/couchdb/default.ini.tpl.in
+++ b/etc/couchdb/default.ini.tpl.in
@@ -71,6 +71,8 @@ iterations = 10000 ; iterations for password hashing
 [cors]
 credentials = false
 ; List of origins separated by a comma, * means accept all
+; Origins must include the scheme: http://example.com
+; You can’t set origins: * and credentials = true at the same time.
 ;origins = *
 ; List of accepted headers separated by a comma
 ; headers =
@@ -79,9 +81,11 @@ credentials = false
 
 
 ; Configuration for a vhost
-;[cors:example.com]
+;[cors:http://example.com]
 ; credentials = false
 ; List of origins separated by a comma
+; Origins must include the scheme: http://example.com
+; You can’t set origins: * and credentials = true at the same time.
 ;origins =
 ; List of accepted headers separated by a comma
 ; headers =