Browse code

Merge pull request #12209 from ahmetalpbalkan/daemon/cli-help-log-driver-reword

cli: Better wording for daemon --log-driver

Arnaud Porterie authored on 2015/04/11 00:29:29
Showing 3 changed files
... ...
@@ -74,7 +74,7 @@ func (config *Config) InstallFlags() {
74 74
 	opts.LabelListVar(&config.Labels, []string{"-label"}, "Set key=value labels to the daemon")
75 75
 	config.Ulimits = make(map[string]*ulimit.Ulimit)
76 76
 	opts.UlimitMapVar(config.Ulimits, []string{"-default-ulimit"}, "Set default ulimits for containers")
77
-	flag.StringVar(&config.LogConfig.Type, []string{"-log-driver"}, "json-file", "Containers logging driver")
77
+	flag.StringVar(&config.LogConfig.Type, []string{"-log-driver"}, "json-file", "Default driver for container logs")
78 78
 }
79 79
 
80 80
 func getDefaultNetworkMtu() int {
... ...
@@ -90,7 +90,7 @@ unix://[/path/to/socket] to use.
90 90
   Set key=value labels to the daemon (displayed in `docker info`)
91 91
 
92 92
 **--log-driver**="*json-file*|*syslog*|*none*"
93
-  Container's logging driver. Default is `default`.
93
+  Default driver for container logs. Default is `json-file`.
94 94
   **Warning**: `docker logs` command works only for `json-file` logging driver.
95 95
 
96 96
 **--mtu**=VALUE
... ...
@@ -134,7 +134,7 @@ expect an integer, and they can only be specified once.
134 134
       --ipv6=false                           Enable IPv6 networking
135 135
       -l, --log-level="info"                 Set the logging level
136 136
       --label=[]                             Set key=value labels to the daemon
137
-      --log-driver="json-file"               Container's logging driver (json-file/none)
137
+      --log-driver="json-file"               Default driver for container logs
138 138
       --mtu=0                                Set the containers network MTU
139 139
       -p, --pidfile="/var/run/docker.pid"    Path to use for daemon PID file
140 140
       --registry-mirror=[]                   Preferred Docker registry mirror