docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix some mistakes in dockerd.md 

Signed-off-by: Wang Xing <hzwangxing@corp.netease.com>
This commit is contained in:
root 2016-05-16 11:18:48 +08:00 committed by Wang Xing
parent 1691fe6d23
commit f53902aa77
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
daemon/config.go
View File

@ -88,7 +88,7 @@ type CommonConfig struct {
Root string `json:"graph,omitempty"` Root string `json:"graph,omitempty"`
SocketGroup string `json:"group,omitempty"` SocketGroup string `json:"group,omitempty"`
TrustKeyPath string `json:"-"` TrustKeyPath string `json:"-"`
CorsHeaders string `json:"api-cors-headers,omitempty"` CorsHeaders string `json:"api-cors-header,omitempty"`
EnableCors bool `json:"api-enable-cors,omitempty"` EnableCors bool `json:"api-enable-cors,omitempty"`
// ClusterStore is the storage backend used for the cluster information. It is used by both // ClusterStore is the storage backend used for the cluster information. It is used by both

2
daemon/config_unix.go
View File

@ -41,7 +41,7 @@ type bridgeConfig struct {
EnableIPv6 bool `json:"ipv6,omitempty"` EnableIPv6 bool `json:"ipv6,omitempty"`
EnableIPTables bool `json:"iptables,omitempty"` EnableIPTables bool `json:"iptables,omitempty"`
EnableIPForward bool `json:"ip-forward,omitempty"` EnableIPForward bool `json:"ip-forward,omitempty"`
EnableIPMasq bool `json:"ip-mask,omitempty"` EnableIPMasq bool `json:"ip-masq,omitempty"`
EnableUserlandProxy bool `json:"userland-proxy,omitempty"` EnableUserlandProxy bool `json:"userland-proxy,omitempty"`
DefaultIP net.IP `json:"ip,omitempty"` DefaultIP net.IP `json:"ip,omitempty"`
IP string `json:"bip,omitempty"` IP string `json:"bip,omitempty"`

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

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