Merge branch 'v2.0' into v2.1

2019-12-02 18:20:29 +01:00
parent 4cb9eec257 ecd51a1428
commit 89919dbe36
52 changed files with 677 additions and 336 deletions
--- a/docs/content/user-guides/grpc.md
+++ b/docs/content/user-guides/grpc.md
@@ -32,7 +32,7 @@ api: {}
 ```

 ```yaml tab="CLI"
--entryPoints.web.address=":80"
+--entryPoints.web.address=:80
 --providers.file.filename=dynamic_conf.toml
 --api.insecure=true
 ```
@@ -153,7 +153,7 @@ api: {}
 ```

 ```yaml tab="CLI"
--entryPoints.websecure.address=":4443"
+--entryPoints.websecure.address=:4443
 # For secure connection on backend.local
 --serversTransport.rootCAs=./backend.cert
 --providers.file.filename=dynamic_conf.toml