issue #695: arangosh server.password error

Documentation is fixed

CHANGELOG

@@ -1,6 +1,8 @@
 v1.5.x (XXXX-XX-XX)
 -------------------
 
+* fixed issue #695: arangosh server.password error
+
 * use pretty-printing in `--console` mode by defaul
 
 * added `check-server` binary for testing

Documentation/UserManual/Arangosh.md

@@ -22,9 +22,9 @@ command-line options:
 
 - `--server.database <string>`: name of the database to connect to
 - `--server.endpoint <string>`: endpoint to connect to
-- `--server.username <string>`: username
-- `--server.password <string>`: password to use (omit this and you'll be prompted for the
-  password)
+- `--server.username <string>`: database username
+- `--server.password <string>`: password to use when connecting 
+- `--server.disable-authentication <bool>`: disable password prompt and authentication
 
 For example, to connect to an ArangoDB server on IP `192.168.173.13` on port
 8530 with the user `foo` and using the database `test`, use

Documentation/UserManual/FoxxManager.md

@@ -370,11 +370,11 @@ use the options of `arangosh`. To retrieve a list of the options for `arangosh`,
 
 To most relevant `arangosh` options to pass to the `foxx-manager` will be:
 
-    --server.database <string>                database name to use when connecting (default: "_system")
-    --server.disable-authentication <bool>    disable authentication (will disable password prompt) (default: false)
-    --server.endpoint <string>                endpoint to connect to, use 'none' to start without a server (default: "tcp://127.0.0.1:8529")
-    --server.password <string>                password to use when connecting (leave empty for prompt)
-    --server.username <string>                username to use when connecting (default: "root")
+    --server.database <string>                database name to use when connecting
+    --server.disable-authentication <bool>    disable the password prompt and authentication when connecting to the server 
+    --server.endpoint <string>                endpoint to connect to, use 'none' to start without a server 
+    --server.password <string>                password to use when connecting
+    --server.username <string>                username to use when connecting
 
 These options allow you to use the foxx-manager with a different database or with another
 than the default user.

Documentation/man1/arangob

@@ -36,7 +36,9 @@ database name to use when connection (default: "_system") ENDOPTION
 OPTION "--server.username <string>"
 username to use when connecting (default "root") ENDOPTION
 OPTION "--server.password <string>"
-password to use when connecting. Leave empty for a password prompt ENDOPTION
+password to use when connecting. Don't specify this option to get a password prompt ENDOPTION
+OPTION "--server.disable-authentication <boolean>"
+disable the password prompt and authentication when connecting to the server ENDOPTION
 EXAMPLES
 EXAMPLE COMMAND 
 starts COMMAND with the default user and server endpoint ENDEXAMPLE

Documentation/man1/arangodump

@@ -51,6 +51,8 @@ database name to use when connection (default: "_system") ENDOPTION
 OPTION "--server.username <string>"
 username to use when connecting (default "root") ENDOPTION
 OPTION "--server.password <string>"
-password to use when connecting. Leave empty for a password prompt ENDOPTION
+password to use when connecting. Don't specify this option to get a password prompt ENDOPTION
+OPTION "--server.disable-authentication <boolean>"
+disable the password prompt and authentication when connecting to the server ENDOPTION
 EXAMPLES
 AUTHOR

Documentation/man1/arangoimp

@@ -36,6 +36,8 @@ database name to use when connection (default: "_system") ENDOPTION
 OPTION "--server.username <string>"
 username to use when connecting (default "root") ENDOPTION
 OPTION "--server.password <string>"
-password to use when connecting. Leave empty for a password prompt ENDOPTION
+password to use when connecting. Don't specify this option to get a password prompt ENDOPTION
+OPTION "--server.disable-authentication <boolean>"
+disable the password prompt and authentication when connecting to the server ENDOPTION
 EXAMPLES
 AUTHOR

Documentation/man1/arangorestore

@@ -42,6 +42,8 @@ database name to use when connection (default: "_system") ENDOPTION
 OPTION "--server.username <string>"
 username to use when connecting (default "root") ENDOPTION
 OPTION "--server.password <string>"
-password to use when connecting. Leave empty for a password prompt ENDOPTION
+password to use when connecting. Don't specify this option to get a password prompt ENDOPTION
+OPTION "--server.disable-authentication <boolean>"
+disable the password prompt and authentication when connecting to the server ENDOPTION
 EXAMPLES
 AUTHOR

Documentation/man1/arangosh

@@ -26,14 +26,14 @@ database name to use when connection (default: "_system") ENDOPTION
 OPTION "--server.username <string>"
 username to use when connecting (default "root") ENDOPTION
 OPTION "--server.password <string>"
-password to use when connecting. Leave empty for a password prompt ENDOPTION
+password to use when connecting. Don't specify this option to get a password prompt ENDOPTION
 OPTION "--server.disable-authentication <boolean>"
-turn off autpassword to use when connecting. Leave empty for a password prompt ENDOPTION
+disable the password prompt and authentication when connecting to the server ENDOPTION
 EXAMPLES
 EXAMPLE COMMAND 
 starts COMMAND with the default user and server endpoint ENDEXAMPLE
 EXAMPLE COMMAND --server.username fuchsia 
-starts COMMAND with a specific user. Password prompt will follow ENDEXAMPLE
+starts COMMAND with a specific user. Password prompt will follow if --server.disable-authentication is true. ENDEXAMPLE
 EXAMPLE COMMAND --server.username fuchsia --server.password "abcd@34"
 starts COMMAND with a specific user and password given on command line ENDEXAMPLE
 EXAMPLE COMMAND --server.endpoint tcp://192.168.173.13:8529

Documentation/man8/arangod

@@ -31,7 +31,7 @@ set the log level (possible values: "fatal", "error", "warning", "info", "debug"
 OPTION "--server.endpoint <string>"
 listen endpoint for client requests, consisting of protocol, ip address and port ENDOPTION
 OPTION "--server.disable-authentication <boolean>"
-disable the password prompt when connecting to the server ENDOPTION
+disable authentication for all clients ENDOPTION
 OPTION "--database.directory <string>"
 path to the database directory ENDOPTION
 EXAMPLES

Documentation/man8/foxx-manager

@@ -11,8 +11,12 @@ More specific instructions are displayed when the program is invoked.
 OPTIONS
 OPTION "--server.database <string>"
 database name to use when connection (default: "_system") ENDOPTION
+OPTION "--server.username <string>"
+username to use when connecting (default "root") ENDOPTION
+OPTION "--server.password <string>"
+password to use when connecting. Don't specify this option to get a password prompt ENDOPTION
 OPTION "--server.disable-authentication <boolean>"
-disable the password prompt when connecting to the server ENDOPTION
+disable the password prompt and authentication when connecting to the server ENDOPTION
 EXAMPLES
 EXAMPLE COMMAND search "foobar"
 searches the central repository for an application "foobar"ENDEXAMPLE

arangosh/ArangoShell/ArangoClient.cpp

@@ -235,10 +235,10 @@ void ArangoClient::setupServer (ProgramOptionsDescription& description) {
 
   clientOptions
     ("server.database", &_databaseName, "database name to use when connecting")
-    ("server.disable-authentication", &_disableAuthentication, "disable authentication (will disable password prompt)")
+    ("server.disable-authentication", &_disableAuthentication, "disable the password prompt and authentication when connecting")
     ("server.endpoint", &_endpointString, "endpoint to connect to, use 'none' to start without a server")
     ("server.username", &_username, "username to use when connecting")
-    ("server.password", &_password, "password to use when connecting (leave empty for prompt)")
+    ("server.password", &_password, "password to use when connecting. Don't specify this option to get a password prompt")
     ("server.connect-timeout", &_connectTimeout, "connect timeout in seconds")
     ("server.request-timeout", &_requestTimeout, "request timeout in seconds")
   ;