summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES4
-rw-r--r--NEWS1
-rw-r--r--bin/couchdb.tpl.in10
3 files changed, 15 insertions, 0 deletions
diff --git a/CHANGES b/CHANGES
index e7ff7633..47fbc9ce 100644
--- a/CHANGES
+++ b/CHANGES
@@ -14,6 +14,10 @@ Futon:
* Use "expando links" for over-long document values in Futon.
+Build and System Integration:
+
+ * Output of `couchdb --help` has been improved.
+
Version 0.11.0
--------------
diff --git a/NEWS b/NEWS
index 7cf418fb..4a37b87a 100644
--- a/NEWS
+++ b/NEWS
@@ -13,6 +13,7 @@ Version 0.12.0
This version has not been released yet.
* Use "expando links" for over-long document values in Futon.
+ * Miscellaneous improvements to system integration.
Version 0.11.0
diff --git a/bin/couchdb.tpl.in b/bin/couchdb.tpl.in
index ced524c6..34406188 100644
--- a/bin/couchdb.tpl.in
+++ b/bin/couchdb.tpl.in
@@ -61,8 +61,18 @@ Usage: $basename [OPTION]
The $basename command runs the %package_name% server.
+Erlang is called with:
+
+ -sasl errlog_type error +K true
+
Erlang inherits the environment of this command.
+You can override any of the flags using the environment:
+
+ ERL_AFLAGS, ERL_FLAGS, ERL_ZFLAGS
+
+See erl(1) for more information about the environment variables.
+
The exit status is 0 for success or 1 for failure.
The \`-s' option will exit 0 for running and 1 for not running.