Merge pull request #10764 from jingyih/clarify_config_file_setting

*: more clarification on when server config file is provided
2019-05-28 16:23:19 -07:00
parent 9c5426830b 5e9c424f1f
commit bdcecd1fc4
3 changed files with 4 additions and 4 deletions
--- a/etcdmain/help.go
+++ b/etcdmain/help.go
@ -35,7 +35,7 @@ var (
    Show the help information about etcd.

  etcd --config-file
-    Path to the server configuration file.
+    Path to the server configuration file. Note that if a configuration file is provided, other command line flags and environment variables will be ignored.

  etcd gateway
    Run the stateless pass-through etcd TCP connection forwarding proxy.