diff --git a/cmd/storeconfig/storeconfig.go b/cmd/storeconfig/storeconfig.go index fd7070f9f..7cb4d8f91 100644 --- a/cmd/storeconfig/storeconfig.go +++ b/cmd/storeconfig/storeconfig.go @@ -14,7 +14,7 @@ import ( func NewCmd(traefikConfiguration *cmd.TraefikConfiguration, traefikPointersConfiguration *cmd.TraefikConfiguration) *flaeg.Command { return &flaeg.Command{ Name: "storeconfig", - Description: `Stores the static traefik configuration into a Key-value stores. Traefik will not start.`, + Description: `Stores the static traefik configuration into a Key-value store. Traefik will not start.`, Config: traefikConfiguration, DefaultPointersConfig: traefikPointersConfiguration, HideHelp: true, // TODO storeconfig diff --git a/docs/content/getting-started/concepts.md b/docs/content/getting-started/concepts.md index a7481a790..12d860720 100644 --- a/docs/content/getting-started/concepts.md +++ b/docs/content/getting-started/concepts.md @@ -14,7 +14,7 @@ it knows all the logic and every rule that determine which services handle which Where traditionally edge routers (or reverse proxies) need a configuration file that contains every possible route to your services, Traefik gets them from the services themselves. -Deploying your services, you attach information that tell Traefik the characteristics of the requests the services can handle. +Deploying your services, you attach information that tells Traefik the characteristics of the requests the services can handle. ![Decentralized Configuration](../assets/img/traefik-concepts-2.png) diff --git a/docs/content/getting-started/quick-start.md b/docs/content/getting-started/quick-start.md index dd18019b4..c6e976184 100644 --- a/docs/content/getting-started/quick-start.md +++ b/docs/content/getting-started/quick-start.md @@ -81,7 +81,7 @@ docker-compose up -d --scale whoami=2 Go back to your browser ([http://localhost:8080/api/rawdata](http://localhost:8080/api/rawdata)) and see that Traefik has automatically detected the new instance of the container. -Finally, see that Traefik load-balances between the two instances of your services by running twice the following command: +Finally, see that Traefik load-balances between the two instances of your service by running the following command twice: ```shell curl -H Host:whoami.docker.localhost http://127.0.0.1 diff --git a/docs/content/operations/cli.md b/docs/content/operations/cli.md index 843ee0177..8cd3fc39b 100644 --- a/docs/content/operations/cli.md +++ b/docs/content/operations/cli.md @@ -11,8 +11,8 @@ traefik [command] [--flag=flag_argument] Available commands: -- `version` : Print version -- `storeconfig` : Store the static Traefik configuration into a Key-value stores. Please refer to the `Store Traefik configuration`(TODO: add doc and link) section to get documentation on it. +- `version` : Print version +- `storeconfig` : Store the static Traefik configuration into a Key-value store. Please refer to the `Store Traefik configuration`(TODO: add doc and link) section to get documentation on it. - `healthcheck`: Calls Traefik `/ping` to check health. Each command can have additional flags. diff --git a/docs/content/providers/docker.md b/docs/content/providers/docker.md index b1675256e..4119ad89e 100644 --- a/docs/content/providers/docker.md +++ b/docs/content/providers/docker.md @@ -86,7 +86,7 @@ Traefik requires access to the docker socket to get its dynamic configuration. - [KubeCon EU 2018 Keynote, Running with Scissors, from Liz Rice](https://www.youtube.com/watch?v=ltrV-Qmh3oY) - [Don't expose the Docker socket (not even to a container)](https://www.lvh.io/posts/dont-expose-the-docker-socket-not-even-to-a-container.html) - [A thread on Stack Overflow about sharing the `/var/run/docker.sock` file](https://news.ycombinator.com/item?id=17983623) - - [To Dind or not to DinD](https://blog.loof.fr/2018/01/to-dind-or-not-do-dind.html) + - [To DinD or not to DinD](https://blog.loof.fr/2018/01/to-dind-or-not-do-dind.html) ??? tip "Security Compensation" @@ -273,7 +273,7 @@ You can declare TCP Routers and/or Services using labels. !!! warning "TCP and HTTP" - If you declare a TCP Router/Service, it will prevent Traefik from automatically create an HTTP Router/Service (like it does by default if no TCP Router/Service is defined). + If you declare a TCP Router/Service, it will prevent Traefik from automatically creating an HTTP Router/Service (like it does by default if no TCP Router/Service is defined). You can declare both a TCP Router/Service and an HTTP Router/Service for the same container (but you have to do so manually). ### Specific Options diff --git a/docs/content/providers/overview.md b/docs/content/providers/overview.md index 65fefb78f..fc2c2ab7a 100644 --- a/docs/content/providers/overview.md +++ b/docs/content/providers/overview.md @@ -43,7 +43,7 @@ Below is the list of the currently supported providers in Traefik. ## Constraints Configuration -If you want to limit the scope of Traefik service discovery, you can set constraints. +If you want to limit the scope of Traefik's service discovery, you can set constraints. Doing so, Traefik will create routes for containers that match these constraints only. ??? example "Containers with the api Tag" diff --git a/docs/content/routing/overview.md b/docs/content/routing/overview.md index 771db0383..8fbb01242 100644 --- a/docs/content/routing/overview.md +++ b/docs/content/routing/overview.md @@ -3,7 +3,7 @@ What's Happening to the Requests? {: .subtitle } -Let's zoom on Traefik's architecture and talk about the components that enable the routes to be created. +Let's zoom in on Traefik's architecture and talk about the components that enable the routes to be created. First, when you start Traefik, you define [entrypoints](../entrypoints) (in their most basic forms, they are port numbers). Then, connected to these entrypoints, [routers](../routers) analyze the incoming requests to see if they match a set of [rules](../routers#rule). diff --git a/docs/content/routing/routers/index.md b/docs/content/routing/routers/index.md index d6a5e9626..1400a3957 100644 --- a/docs/content/routing/routers/index.md +++ b/docs/content/routing/routers/index.md @@ -51,7 +51,7 @@ In the process, routers may use pieces of [middleware](../../middlewares/overvie ### EntryPoints If not specified, HTTP routers will accept requests from all defined entrypoints. -If you want to limit the router scope to a set of entrypoint, set the entrypoints option. +If you want to limit the router scope to a set of entrypoints, set the entrypoints option. ??? example "Listens to Every EntryPoint" @@ -92,7 +92,7 @@ If you want to limit the router scope to a set of entrypoint, set the entrypoint ### Rule Rules are a set of matchers that determine if a particular request matches specific criteria. -If the rule is verified, then the router becomes active and calls middlewares, then forward the request to the service. +If the rule is verified, the router becomes active, calls middlewares, and then forwards the request to the service. ??? example "Host is traefik.io"