Browse code

Merge pull request #28021 from YuPengZTE/devString

Add “” for String

Sebastiaan van Stijn authored on 2016/11/04 09:03:56
Showing 4 changed files
... ...
@@ -53,7 +53,7 @@ func (commonOpts *CommonOptions) InstallFlags(flags *pflag.FlagSet) {
53 53
 	}
54 54
 
55 55
 	flags.BoolVarP(&commonOpts.Debug, "debug", "D", false, "Enable debug mode")
56
-	flags.StringVarP(&commonOpts.LogLevel, "log-level", "l", "info", "Set the logging level (debug, info, warn, error, fatal)")
56
+	flags.StringVarP(&commonOpts.LogLevel, "log-level", "l", "info", "Set the logging level (\"debug\", \"info\", \"warn\", \"error\", \"fatal\")")
57 57
 	flags.BoolVar(&commonOpts.TLS, "tls", false, "Use TLS; implied by --tlsverify")
58 58
 	flags.BoolVar(&commonOpts.TLSVerify, FlagTLSVerify, dockerTLSVerify, "Use TLS and verify the remote")
59 59
 
... ...
@@ -65,7 +65,7 @@ complete -c docker -f -n '__fish_docker_no_subcommand' -l ip-forward -d 'Enable
65 65
 complete -c docker -f -n '__fish_docker_no_subcommand' -l ip-masq -d "Enable IP masquerading for bridge's IP range"
66 66
 complete -c docker -f -n '__fish_docker_no_subcommand' -l iptables -d "Enable Docker's addition of iptables rules"
67 67
 complete -c docker -f -n '__fish_docker_no_subcommand' -l ipv6 -d 'Enable IPv6 networking'
68
-complete -c docker -f -n '__fish_docker_no_subcommand' -s l -l log-level -d 'Set the logging level (debug, info, warn, error, fatal)'
68
+complete -c docker -f -n '__fish_docker_no_subcommand' -s l -l log-level -d 'Set the logging level ("debug", "info", "warn", "error", "fatal")'
69 69
 complete -c docker -f -n '__fish_docker_no_subcommand' -l label -d 'Set key=value labels to the daemon (displayed in `docker info`)'
70 70
 complete -c docker -f -n '__fish_docker_no_subcommand' -l mtu -d 'Set the containers network MTU'
71 71
 complete -c docker -f -n '__fish_docker_no_subcommand' -s p -l pidfile -d 'Path to use for daemon PID file'
... ...
@@ -31,7 +31,7 @@ Options:
31 31
   -D, --debug              Enable debug mode
32 32
       --help               Print usage
33 33
   -H, --host value         Daemon socket(s) to connect to (default [])
34
-  -l, --log-level string   Set the logging level (debug, info, warn, error, fatal) (default "info")
34
+  -l, --log-level string   Set the logging level ("debug", "info", "warn", "error", "fatal") (default "info")
35 35
       --tls                Use TLS; implied by --tlsverify
36 36
       --tlscacert string   Trust certs signed only by this CA (default "/root/.docker/ca.pem")
37 37
       --tlscert string     Path to TLS certificate file (default "/root/.docker/cert.pem")
... ...
@@ -64,7 +64,7 @@ Options:
64 64
       --label value                           Set key=value labels to the daemon (default [])
65 65
       --live-restore                          Enable live restore of docker when containers are still running
66 66
       --log-driver string                     Default driver for container logs (default "json-file")
67
-  -l, --log-level string                      Set the logging level (debug, info, warn, error, fatal) (default "info")
67
+  -l, --log-level string                      Set the logging level ("debug", "info", "warn", "error", "fatal") (default "info")
68 68
       --log-opt value                         Default log driver options for containers (default map[])
69 69
       --max-concurrent-downloads int          Set the max concurrent downloads for each pull (default 3)
70 70
       --max-concurrent-uploads int            Set the max concurrent uploads for each push (default 5)