Browse code

Merge pull request #21687 from allencloud/fix-typos

fix typos

Sebastiaan van Stijn authored on 2016/04/01 06:18:31
Showing 3 changed files
... ...
@@ -33,7 +33,7 @@ var flatOptions = map[string]bool{
33 33
 
34 34
 // LogConfig represents the default log configuration.
35 35
 // It includes json tags to deserialize configuration from a file
36
-// using the same names that the flags in the command line uses.
36
+// using the same names that the flags in the command line use.
37 37
 type LogConfig struct {
38 38
 	Type   string            `json:"log-driver,omitempty"`
39 39
 	Config map[string]string `json:"log-opts,omitempty"`
... ...
@@ -48,17 +48,17 @@ type commonBridgeConfig struct {
48 48
 
49 49
 // CommonTLSOptions defines TLS configuration for the daemon server.
50 50
 // It includes json tags to deserialize configuration from a file
51
-// using the same names that the flags in the command line uses.
51
+// using the same names that the flags in the command line use.
52 52
 type CommonTLSOptions struct {
53 53
 	CAFile   string `json:"tlscacert,omitempty"`
54 54
 	CertFile string `json:"tlscert,omitempty"`
55 55
 	KeyFile  string `json:"tlskey,omitempty"`
56 56
 }
57 57
 
58
-// CommonConfig defines the configuration of a docker daemon which are
58
+// CommonConfig defines the configuration of a docker daemon which is
59 59
 // common across platforms.
60 60
 // It includes json tags to deserialize configuration from a file
61
-// using the same names that the flags in the command line uses.
61
+// using the same names that the flags in the command line use.
62 62
 type CommonConfig struct {
63 63
 	AuthorizationPlugins []string            `json:"authorization-plugins,omitempty"` // AuthorizationPlugins holds list of authorization plugins
64 64
 	AutoRestart          bool                `json:"-"`
... ...
@@ -1592,8 +1592,9 @@ func (daemon *Daemon) initDiscovery(config *Config) error {
1592 1592
 
1593 1593
 // Reload reads configuration changes and modifies the
1594 1594
 // daemon according to those changes.
1595
-// This are the settings that Reload changes:
1595
+// These are the settings that Reload changes:
1596 1596
 // - Daemon labels.
1597
+// - Daemon debug log level.
1597 1598
 // - Cluster discovery (reconfigure and restart).
1598 1599
 func (daemon *Daemon) Reload(config *Config) error {
1599 1600
 	daemon.configStore.reloadLock.Lock()
... ...
@@ -36,7 +36,7 @@ func (opts *ListOpts) String() string {
36 36
 	return fmt.Sprintf("%v", []string((*opts.values)))
37 37
 }
38 38
 
39
-// Set validates if needed the input value and add it to the
39
+// Set validates if needed the input value and adds it to the
40 40
 // internal slice.
41 41
 func (opts *ListOpts) Set(value string) error {
42 42
 	if opts.validator != nil {