diff --git a/README.md b/README.md index 368b58a..3e8ed75 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Kamal Proxy is a tiny HTTP proxy, designed to make it easy to coordinate zero-downtime deployments. By running your web applications behind Kamal Proxy, -you can deploy changes to them without interruping any of the traffic that's in +you can deploy changes to them without interrupting any of the traffic that's in progress. No particular cooperation from an application is required for this to work. diff --git a/example/README.md b/example/README.md index 837afd2..5d29fda 100644 --- a/example/README.md +++ b/example/README.md @@ -1,6 +1,6 @@ # Deployment example -You can start up a example environment using Docker Compose in this directory. +You can start up an example environment using Docker Compose in this directory. First, start the services: diff --git a/internal/cmd/deploy.go b/internal/cmd/deploy.go index e7b8e44..d22c905 100644 --- a/internal/cmd/deploy.go +++ b/internal/cmd/deploy.go @@ -32,7 +32,7 @@ func newDeployCommand() *deployCommand { deployCommand.cmd.Flags().StringVar(&deployCommand.args.Host, "host", "", "Host to serve this target on (empty for wildcard)") deployCommand.cmd.Flags().BoolVar(&deployCommand.tls, "tls", false, "Configure TLS for this target (requires a non-empty host)") - deployCommand.cmd.Flags().BoolVar(&deployCommand.tlsStaging, "tls-staging", false, "Use Let's Encrypt staging environmnent for certificate provisioning") + deployCommand.cmd.Flags().BoolVar(&deployCommand.tlsStaging, "tls-staging", false, "Use Let's Encrypt staging environment for certificate provisioning") deployCommand.cmd.Flags().DurationVar(&deployCommand.args.DeployTimeout, "deploy-timeout", server.DefaultDeployTimeout, "Maximum time to wait for the new target to become healthy") deployCommand.cmd.Flags().DurationVar(&deployCommand.args.DrainTimeout, "drain-timeout", server.DefaultDrainTimeout, "Maximum time to allow existing connections to drain before removing old target") diff --git a/internal/server/error_page_middleware.go b/internal/server/error_page_middleware.go index ba89df4..d49f166 100644 --- a/internal/server/error_page_middleware.go +++ b/internal/server/error_page_middleware.go @@ -95,7 +95,7 @@ func (h *ErrorPageMiddleware) getTemplate(statusCode int) *template.Template { func (h *ErrorPageMiddleware) writeErrorWithoutTemplate(w http.ResponseWriter, statusCode int) bool { if h.root { - // Only do this when we're the root middleware. Otherwise we can let our parent try to handle it. + // Only do this when we're the root middleware. Otherwise, we can let our parent try to handle it. fmt.Fprintf(w, "