toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #22756 from wangxing1517/fix_docs_dockerd.md

Browse Source 
Fix incorrectly named "ip-mask" and "api-cors-headers" options
Upstream-commit: f0d6fd93a2b2cbe4ad177524ca52018dae2fcce7
Component: engine
This commit is contained in:
Vincent Demeester
2016-05-24 18:21:52 +02:00
parent 6f4700f12d 083263af50
commit eaeb1bdc9d
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/engine/docs/reference/commandline/dockerd.md
View File

@ -939,7 +939,7 @@ This is a full example of the allowed configuration options in the file:
"tlscacert": "",
"tlscert": "",
"tlskey": "",
"api-cors-headers": "",
"api-cors-header": "",
"selinux-enabled": false,
"userns-remap": "",
"group": "",
@ -948,7 +948,7 @@ This is a full example of the allowed configuration options in the file:
"ipv6": false,
"iptables": false,
"ip-forward": false,
"ip-mask": false,
"ip-masq": false,
"userland-proxy": false,
"ip": "0.0.0.0",
"bridge": "",