Merge v2.1 into master.

2020-03-05 16:07:04 +01:00
parent ad6bf936d5 b5d205b78c
commit 09c07f45ee
18 changed files with 386 additions and 82 deletions
--- a/docs/content/reference/static-configuration/cli-ref.md
+++ b/docs/content/reference/static-configuration/cli-ref.md
@@ -406,7 +406,7 @@ TLS key
 Use the ip address from the bound port, rather than from the inner network. (Default: ```false```)

 `--providers.docker.watch`:  
-Watch provider. (Default: ```true```)
+Watch Docker Swarm events. (Default: ```true```)

 `--providers.etcd`:  
 Enable Etcd backend with default settings. (Default: ```false```)