From 4d22c45b760e613a34f42bd94e3ff5926f579b8f Mon Sep 17 00:00:00 2001 From: Pascal Borreli Date: Thu, 21 Apr 2016 23:38:44 +0100 Subject: [PATCH] Fixed typos --- README.md | 2 +- acme/acme.go | 2 +- docs/basics.md | 4 ++-- docs/toml.md | 2 +- examples/whoami.json | 2 +- rules.go | 2 +- types/types.go | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index efd0f31fd..f27915984 100644 --- a/README.md +++ b/README.md @@ -76,7 +76,7 @@ You can access to a simple HTML frontend of Træfik. ## Plumbing -- [Oxy](https://github.com/vulcand/oxy): an awsome proxy library made by Mailgun guys +- [Oxy](https://github.com/vulcand/oxy): an awesome proxy library made by Mailgun guys - [Gorilla mux](https://github.com/gorilla/mux): famous request router - [Negroni](https://github.com/codegangsta/negroni): web middlewares made simple - [Manners](https://github.com/mailgun/manners): graceful shutdown of http.Handler servers diff --git a/acme/acme.go b/acme/acme.go index 6ebbe6590..1a93d3e17 100644 --- a/acme/acme.go +++ b/acme/acme.go @@ -181,7 +181,7 @@ func (a *ACME) CreateConfig(tlsConfig *tls.Config, CheckOnDemandDomain func(doma acme.Logger = fmtlog.New(ioutil.Discard, "", 0) if len(a.StorageFile) == 0 { - return errors.New("Empty StorageFile, please provide a filenmae for certs storage") + return errors.New("Empty StorageFile, please provide a filename for certs storage") } log.Debugf("Generating default certificate...") diff --git a/docs/basics.md b/docs/basics.md index 749f77d1d..73d9089ac 100644 --- a/docs/basics.md +++ b/docs/basics.md @@ -19,7 +19,7 @@ Let's zoom on Træfɪk and have an overview of its internal architecture: ![Architecture](img/internal.png) - Incoming requests end on [entrypoints](#entrypoints), as the name suggests, they are the network entry points into Træfɪk (listening port, SSL, traffic redirection...). -- Traffic is then forwared to a matching [frontend](#frontends). A frontend defines routes from [entrypoints](#entrypoints) to [backends](#backends). +- Traffic is then forwarded to a matching [frontend](#frontends). A frontend defines routes from [entrypoints](#entrypoints) to [backends](#backends). Routes are created using requests fields (`Host`, `Path`, `Headers`...) and can match or not a request. - The [frontend](#frontends) will then send the request to a [backend](#backends). A backend can be composed by one or more [servers](#servers), and by a load-balancing strategy. - Finally, the [server](#servers) will forward the request to the corresponding microservice in the private network. @@ -142,7 +142,7 @@ For example: ## Servers -Servers are simply defined using a `URL`. You can also apply a custom `weight` to each server (this will be used by load-balacning). +Servers are simply defined using a `URL`. You can also apply a custom `weight` to each server (this will be used by load-balancing). Here is an example of backends and servers definition: diff --git a/docs/toml.md b/docs/toml.md index 7929f02bb..5d929ccd6 100644 --- a/docs/toml.md +++ b/docs/toml.md @@ -258,7 +258,7 @@ defaultEntryPoints = ["http", "https"] rule = "Path:/test" ``` -- or put your rules in a separate file, for example `rules.tml`: +- or put your rules in a separate file, for example `rules.toml`: ```toml # traefik.toml diff --git a/examples/whoami.json b/examples/whoami.json index 6b4cc719b..980316388 100644 --- a/examples/whoami.json +++ b/examples/whoami.json @@ -25,7 +25,7 @@ ], "labels": { "traefik.weight": "1", - "traefik.protocole": "http", + "traefik.protocol": "http", "traefik.frontend.rule" : "Host:test.marathon.localhost" } } diff --git a/rules.go b/rules.go index 23668725d..e6b299d86 100644 --- a/rules.go +++ b/rules.go @@ -116,7 +116,7 @@ func (r *Rules) Parse(expression string) (*mux.Route, error) { } parsedFunction, ok := functions[parsedFunctions[0]] if !ok { - return nil, errors.New("Error parsing rule: " + expression + ". Unknow function: " + parsedFunctions[0]) + return nil, errors.New("Error parsing rule: " + expression + ". Unknown function: " + parsedFunctions[0]) } parsedFunctions = append(parsedFunctions[:0], parsedFunctions[1:]...) fargs := func(c rune) bool { diff --git a/types/types.go b/types/types.go index 44661e836..eeedcb73b 100644 --- a/types/types.go +++ b/types/types.go @@ -13,7 +13,7 @@ type Backend struct { MaxConn *MaxConn `json:"maxConn,omitempty"` } -// MaxConn holds maximum connection configuraiton +// MaxConn holds maximum connection configuration type MaxConn struct { Amount int64 `json:"amount,omitempty"` ExtractorFunc string `json:"extractorFunc,omitempty"`