This is an automated email from the ASF dual-hosted git repository.
wohali pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb-documentation.git
The following commit(s) were added to refs/heads/master by this push:
new b41303a Startup script uses COUCHDB_ARGS_FILE for vm.args path (#358)
b41303a is described below
commit b41303aa5dc796712b68b30da3629795ba55cca3
Author: Nathan Vander Wilt <[email protected]>
AuthorDate: Thu Nov 22 16:56:23 2018 -0800
Startup script uses COUCHDB_ARGS_FILE for vm.args path (#358)
This seems to be a discrepancy from the start, see original pull requests:
* https://github.com/apache/couchdb/pull/1095 (code)
* https://github.com/apache/couchdb-documentation/pull/227 (docs)
Note also the script seems unhappy with relative paths, so I've also snuck
a wording change alongside the main fix here.
---
src/config/intro.rst | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/config/intro.rst b/src/config/intro.rst
index 35d5d88..2cf2ba2 100644
--- a/src/config/intro.rst
+++ b/src/config/intro.rst
@@ -66,10 +66,10 @@ is the same as setting the ``ERL_FLAGS`` environment
variable.
If there is a need to use different ``vm.args`` or ``sys.config`` files, for
example, in different locations to the ones provided by CouchDB, or you don't
want to edit the original files, the default locations may be changed by
-setting the COUCHDB_VM_ARGS_FILE or COUCHDB_SYSCONFIG_FILE environment
+setting the COUCHDB_ARGS_FILE or COUCHDB_SYSCONFIG_FILE environment
variables::
- export COUCHDB_VM_ARGS_FILE="/path/to/my/vm.args"
+ export COUCHDB_ARGS_FILE="/path/to/my/vm.args"
export COUCHDB_SYSCONFIG_FILE="/path/to/my/sys.config"
Parameter names and values
