From 4c85a41bfbd009a350697e262272557e12d83e9c Mon Sep 17 00:00:00 2001 From: Michael Date: Tue, 27 Mar 2018 14:58:03 +0200 Subject: [PATCH] Fix basic documentation --- docs/basics.md | 15 +++++++-------- docs/configuration/entrypoints.md | 2 +- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/docs/basics.md b/docs/basics.md index 9a20d200e..800f944e1 100644 --- a/docs/basics.md +++ b/docs/basics.md @@ -62,13 +62,12 @@ And here is another example with client certificate authentication: [entryPoints.https] address = ":443" [entryPoints.https.tls] - [entryPoints.https.tls] - [entryPoints.https.tls.ClientCA] - files = ["tests/clientca1.crt", "tests/clientca2.crt"] - optional = false - [[entryPoints.https.tls.certificates]] - certFile = "tests/traefik.crt" - keyFile = "tests/traefik.key" + [entryPoints.https.tls.ClientCA] + files = ["tests/clientca1.crt", "tests/clientca2.crt"] + optional = false + [[entryPoints.https.tls.certificates]] + certFile = "tests/traefik.crt" + keyFile = "tests/traefik.key" ``` - We enable SSL on `https` by giving a certificate and a key. @@ -483,7 +482,7 @@ Each item takes precedence over the item below it: It means that arguments override configuration file, and key-value store overrides arguments. -!!! note +!!! note the provider-enabling argument parameters (e.g., `--docker`) set all default values for the specific provider. It must not be used if a configuration source with less precedence wants to set a non-default provider value. diff --git a/docs/configuration/entrypoints.md b/docs/configuration/entrypoints.md index 10208916e..7dfcf714e 100644 --- a/docs/configuration/entrypoints.md +++ b/docs/configuration/entrypoints.md @@ -365,7 +365,7 @@ To enable IP white listing at the entry point level. [entryPoints.http] address = ":80" - [entryPoints.http] + [entryPoints.http.whiteList] sourceRange = ["127.0.0.1/32", "192.168.1.7"] # useXForwardedFor = true ```