Преглед на файлове

Merge pull request #21687 from allencloud/fix-typos

fix typos
Sebastiaan van Stijn преди 9 години
родител
ревизия
42494720c2
променени са 3 файла, в които са добавени 7 реда и са изтрити 6 реда
  1. 4 4
      daemon/config.go
  2. 2 1
      daemon/daemon.go
  3. 1 1
      opts/opts.go

+ 4 - 4
daemon/config.go

@@ -33,7 +33,7 @@ var flatOptions = map[string]bool{
 
 // LogConfig represents the default log configuration.
 // It includes json tags to deserialize configuration from a file
-// using the same names that the flags in the command line uses.
+// using the same names that the flags in the command line use.
 type LogConfig struct {
 	Type   string            `json:"log-driver,omitempty"`
 	Config map[string]string `json:"log-opts,omitempty"`
@@ -48,17 +48,17 @@ type commonBridgeConfig struct {
 
 // CommonTLSOptions defines TLS configuration for the daemon server.
 // It includes json tags to deserialize configuration from a file
-// using the same names that the flags in the command line uses.
+// using the same names that the flags in the command line use.
 type CommonTLSOptions struct {
 	CAFile   string `json:"tlscacert,omitempty"`
 	CertFile string `json:"tlscert,omitempty"`
 	KeyFile  string `json:"tlskey,omitempty"`
 }
 
-// CommonConfig defines the configuration of a docker daemon which are
+// CommonConfig defines the configuration of a docker daemon which is
 // common across platforms.
 // It includes json tags to deserialize configuration from a file
-// using the same names that the flags in the command line uses.
+// using the same names that the flags in the command line use.
 type CommonConfig struct {
 	AuthorizationPlugins []string            `json:"authorization-plugins,omitempty"` // AuthorizationPlugins holds list of authorization plugins
 	AutoRestart          bool                `json:"-"`

+ 2 - 1
daemon/daemon.go

@@ -1592,8 +1592,9 @@ func (daemon *Daemon) initDiscovery(config *Config) error {
 
 // Reload reads configuration changes and modifies the
 // daemon according to those changes.
-// This are the settings that Reload changes:
+// These are the settings that Reload changes:
 // - Daemon labels.
+// - Daemon debug log level.
 // - Cluster discovery (reconfigure and restart).
 func (daemon *Daemon) Reload(config *Config) error {
 	daemon.configStore.reloadLock.Lock()

+ 1 - 1
opts/opts.go

@@ -36,7 +36,7 @@ func (opts *ListOpts) String() string {
 	return fmt.Sprintf("%v", []string((*opts.values)))
 }
 
-// Set validates if needed the input value and add it to the
+// Set validates if needed the input value and adds it to the
 // internal slice.
 func (opts *ListOpts) Set(value string) error {
 	if opts.validator != nil {