From 1f039a66ac55c937f5dfa281a04009626d191f83 Mon Sep 17 00:00:00 2001 From: allencloud Date: Fri, 18 Nov 2016 15:51:36 +0800 Subject: [PATCH] fix typo Signed-off-by: allencloud --- api/server/httputils/errors.go | 2 +- api/server/server.go | 2 +- integration-cli/daemon.go | 2 +- man/docker-run.1.md | 2 +- pkg/discovery/backends.go | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/api/server/httputils/errors.go b/api/server/httputils/errors.go index aa9b4c337b..59098a9df0 100644 --- a/api/server/httputils/errors.go +++ b/api/server/httputils/errors.go @@ -28,7 +28,7 @@ type inputValidationError interface { IsValidationError() bool } -// GetHTTPErrorStatusCode retrieve status code from error message +// GetHTTPErrorStatusCode retrieves status code from error message func GetHTTPErrorStatusCode(err error) int { if err == nil { logrus.WithFields(logrus.Fields{"error": err}).Error("unexpected HTTP error handling") diff --git a/api/server/server.go b/api/server/server.go index 5d6a5d8682..d988b8e17f 100644 --- a/api/server/server.go +++ b/api/server/server.go @@ -102,7 +102,7 @@ func (s *Server) serveAPI() error { } // HTTPServer contains an instance of http server and the listener. -// srv *http.Server, contains configuration to create a http server and a mux router with all api end points. +// srv *http.Server, contains configuration to create an http server and a mux router with all api end points. // l net.Listener, is a TCP or Socket listener that dispatches incoming request to the router. type HTTPServer struct { srv *http.Server diff --git a/integration-cli/daemon.go b/integration-cli/daemon.go index 922a348ac8..97819e1ab1 100644 --- a/integration-cli/daemon.go +++ b/integration-cli/daemon.go @@ -495,7 +495,7 @@ func (d *Daemon) SockRequest(method, endpoint string, data interface{}) (int, [] return res.StatusCode, b, err } -// SockRequestRaw executes a socket request on a daemon and returns a http +// SockRequestRaw executes a socket request on a daemon and returns an http // response and a reader for the output data. func (d *Daemon) SockRequestRaw(method, endpoint string, data io.Reader, ct string) (*http.Response, io.ReadCloser, error) { return sockRequestRawToDaemon(method, endpoint, data, ct, d.sock()) diff --git a/man/docker-run.1.md b/man/docker-run.1.md index 5224895c91..061f509c27 100644 --- a/man/docker-run.1.md +++ b/man/docker-run.1.md @@ -907,7 +907,7 @@ should fix the problem. ## Mapping Ports for External Usage The exposed port of an application can be mapped to a host port using the **-p** -flag. For example, a httpd port 80 can be mapped to the host port 8080 using the +flag. For example, an httpd port 80 can be mapped to the host port 8080 using the following: # docker run -p 8080:80 -d -i -t fedora/httpd diff --git a/pkg/discovery/backends.go b/pkg/discovery/backends.go index c09d9a1316..2eab550e29 100644 --- a/pkg/discovery/backends.go +++ b/pkg/discovery/backends.go @@ -86,7 +86,7 @@ func ParseAdvertise(advertise string) (string, error) { break } if addr == "" { - return "", fmt.Errorf("couldnt find a valid ip-address in interface %s", advertise) + return "", fmt.Errorf("could not find a valid ip-address in interface %s", advertise) } addr = net.JoinHostPort(addr, port)