From 6c08d0b20bed0bc297f9528746e005348714a8c9 Mon Sep 17 00:00:00 2001 From: Michael Date: Tue, 7 Apr 2020 18:38:04 +0200 Subject: [PATCH] Fix documentation --- docs/content/reference/static-configuration/cli-ref.md | 2 +- docs/content/reference/static-configuration/env-ref.md | 2 +- docs/content/routing/services/index.md | 2 +- pkg/config/static/entrypoints.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/content/reference/static-configuration/cli-ref.md b/docs/content/reference/static-configuration/cli-ref.md index 900786896..aed610b9a 100644 --- a/docs/content/reference/static-configuration/cli-ref.md +++ b/docs/content/reference/static-configuration/cli-ref.md @@ -106,7 +106,7 @@ HTTP configuration. Default middlewares for the routers linked to the entry point. `--entrypoints..http.redirections.entrypoint.permanent`: -Applied a permanent redirection. (Default: ```true```) +Applies a permanent redirection. (Default: ```true```) `--entrypoints..http.redirections.entrypoint.priority`: Priority of the generated router. (Default: ```2147483647```) diff --git a/docs/content/reference/static-configuration/env-ref.md b/docs/content/reference/static-configuration/env-ref.md index 70c7803e4..2228bec10 100644 --- a/docs/content/reference/static-configuration/env-ref.md +++ b/docs/content/reference/static-configuration/env-ref.md @@ -106,7 +106,7 @@ HTTP configuration. Default middlewares for the routers linked to the entry point. `TRAEFIK_ENTRYPOINTS__HTTP_REDIRECTIONS_ENTRYPOINT_PERMANENT`: -Applied a permanent redirection. (Default: ```true```) +Applies a permanent redirection. (Default: ```true```) `TRAEFIK_ENTRYPOINTS__HTTP_REDIRECTIONS_ENTRYPOINT_PRIORITY`: Priority of the generated router. (Default: ```2147483647```) diff --git a/docs/content/routing/services/index.md b/docs/content/routing/services/index.md index 380df3c75..7a85a0039 100644 --- a/docs/content/routing/services/index.md +++ b/docs/content/routing/services/index.md @@ -337,7 +337,7 @@ Below are the available options for the health check mechanism: !!! warning "Health check in Kubernetes" The Traefik health check is not available for `kubernetesCRD` and `kubernetesIngress` providers because Kubernetes - has already an health check mecanism. + already has a health check mechanism. Unhealthy pods will be removed by kubernetes. (cf [liveness documentation](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/#define-a-liveness-http-request)) ??? example "Custom Interval & Timeout -- Using the [File Provider](../../providers/file.md)" diff --git a/pkg/config/static/entrypoints.go b/pkg/config/static/entrypoints.go index 46629b7c6..1c0e030ca 100644 --- a/pkg/config/static/entrypoints.go +++ b/pkg/config/static/entrypoints.go @@ -63,7 +63,7 @@ type Redirections struct { type RedirectEntryPoint struct { To string `description:"Targeted entry point of the redirection." json:"to,omitempty" toml:"to,omitempty" yaml:"to,omitempty"` Scheme string `description:"Scheme used for the redirection." json:"https,omitempty" toml:"https,omitempty" yaml:"https,omitempty"` - Permanent bool `description:"Applied a permanent redirection." json:"permanent,omitempty" toml:"permanent,omitempty" yaml:"permanent,omitempty"` + Permanent bool `description:"Applies a permanent redirection." json:"permanent,omitempty" toml:"permanent,omitempty" yaml:"permanent,omitempty"` Priority int `description:"Priority of the generated router." json:"priority,omitempty" toml:"priority,omitempty" yaml:"priority,omitempty"` }