Merge branch 'v2.2' into master

docs/content/reference/static-configuration/cli-ref.md

@@ -162,9 +162,6 @@ WriteTimeout is the maximum duration before timing out writes of the response. I
 `--global.checknewversion`:  
 Periodically check if a new version has been released. (Default: ```false```)
 
-`--global.insecuresni`:  
-Allow domain fronting. If the option is not specified, it will be disabled by default. (Default: ```false```)
-
 `--global.sendanonymoususage`:  
 Periodically send anonymous usage statistics. If the option is not specified, it will be enabled by default. (Default: ```false```)
 

docs/content/reference/static-configuration/env-ref.md

@@ -162,9 +162,6 @@ WriteTimeout is the maximum duration before timing out writes of the response. I
 `TRAEFIK_GLOBAL_CHECKNEWVERSION`:  
 Periodically check if a new version has been released. (Default: ```false```)
 
-`TRAEFIK_GLOBAL_INSECURESNI`:  
-Allow domain fronting. If the option is not specified, it will be disabled by default. (Default: ```false```)
-
 `TRAEFIK_GLOBAL_SENDANONYMOUSUSAGE`:  
 Periodically send anonymous usage statistics. If the option is not specified, it will be enabled by default. (Default: ```false```)
 

docs/content/reference/static-configuration/file.toml

@@ -1,7 +1,6 @@
 [global]
   checkNewVersion = true
   sendAnonymousUsage = true
-  insecureSNI = false
 
 [serversTransport]
   insecureSkipVerify = true
@@ -153,7 +152,7 @@
         username = "foobar"
         password = "foobar"
   [providers.consul]
-    rootKey = "traefik"
+    rootKey = "foobar"
     endpoints = ["foobar", "foobar"]
     username = "foobar"
     password = "foobar"
@@ -164,7 +163,7 @@
       key = "foobar"
       insecureSkipVerify = true
   [providers.etcd]
-    rootKey = "traefik"
+    rootKey = "foobar"
     endpoints = ["foobar", "foobar"]
     username = "foobar"
     password = "foobar"
@@ -175,7 +174,7 @@
       key = "foobar"
       insecureSkipVerify = true
   [providers.zooKeeper]
-    rootKey = "traefik"
+    rootKey = "foobar"
     endpoints = ["foobar", "foobar"]
     username = "foobar"
     password = "foobar"
@@ -186,7 +185,7 @@
       key = "foobar"
       insecureSkipVerify = true
   [providers.redis]
-    rootKey = "traefik"
+    rootKey = "foobar"
     endpoints = ["foobar", "foobar"]
     username = "foobar"
     password = "foobar"

docs/content/reference/static-configuration/file.yaml

@@ -1,8 +1,6 @@
 global:
   checkNewVersion: true
   sendAnonymousUsage: true
-  insecureSNI: false
-
 serversTransport:
   insecureSkipVerify: true
   rootCAs:
@@ -127,7 +125,7 @@ providers:
     - foobar
     labelSelector: foobar
     ingressClass: foobar
-    throttleDuration: 10s
+    throttleDuration: 42s
   rest:
     insecure: true
   rancher:
@@ -164,7 +162,7 @@ providers:
         username: foobar
         password: foobar
   consul:
-    rootKey: traefik
+    rootKey: foobar
     endpoints:
     - foobar
     - foobar
@@ -177,7 +175,7 @@ providers:
       key: foobar
       insecureSkipVerify: true
   etcd:
-    rootKey: traefik
+    rootKey: foobar
     endpoints:
     - foobar
     - foobar
@@ -190,10 +188,10 @@ providers:
       key: foobar
       insecureSkipVerify: true
   zooKeeper:
-    rootKey: traefik
+    rootKey: foobar
     endpoints:
-      - foobar
-      - foobar
+    - foobar
+    - foobar
     username: foobar
     password: foobar
     tls:
@@ -203,10 +201,10 @@ providers:
       key: foobar
       insecureSkipVerify: true
   redis:
-    rootKey: traefik
+    rootKey: foobar
     endpoints:
-      - foobar
-      - foobar
+    - foobar
+    - foobar
     username: foobar
     password: foobar
     tls: