Browse code

Merge pull request #11280 from MabinGo/docs_api-enable-cors_deprecated

docs: --api-enable-cors is deprecated,updated docs description

moxiegirl authored on 2015/03/12 07:28:28
Showing 4 changed files
... ...
@@ -189,7 +189,6 @@ __docker_signals() {
189 189
 
190 190
 _docker_docker() {
191 191
 	local boolean_options="
192
-		--api-enable-cors
193 192
 		--daemon -d
194 193
 		--debug -D
195 194
 		--help -h
... ...
@@ -973,6 +972,7 @@ _docker() {
973 973
 	)
974 974
 
975 975
 	local main_options_with_args="
976
+		--api-cors-header
976 977
 		--bip
977 978
 		--bridge -b
978 979
 		--default-ulimit
... ...
@@ -43,7 +43,7 @@ function __fish_print_docker_repositories --description 'Print a list of docker
43 43
 end
44 44
 
45 45
 # common options
46
-complete -c docker -f -n '__fish_docker_no_subcommand' -l api-enable-cors -d 'Enable CORS headers in the remote API'
46
+complete -c docker -f -n '__fish_docker_no_subcommand' -l api-cors-header -d "Set CORS headers in the remote API. Default is cors disabled"
47 47
 complete -c docker -f -n '__fish_docker_no_subcommand' -s b -l bridge -d 'Attach containers to a pre-existing network bridge'
48 48
 complete -c docker -f -n '__fish_docker_no_subcommand' -l bip -d "Use this CIDR notation address for the network bridge's IP, not compatible with -b"
49 49
 complete -c docker -f -n '__fish_docker_no_subcommand' -s D -l debug -d 'Enable debug mode'
... ...
@@ -34,9 +34,6 @@ unix://[/path/to/socket] to use.
34 34
    The socket(s) to bind to in daemon mode specified using one or more
35 35
    tcp://host:port, unix:///path/to/socket, fd://* or fd://socketfd.
36 36
 
37
-**--api-enable-cors**=*true*|*false*
38
-  Enable CORS headers in the remote API. Default is false.
39
-
40 37
 **--api-cors-header**=""
41 38
   Set CORS headers in the remote API. Default is cors disabled. Give urls like "http://foo, http://bar, ...". Give "*" to allow all.
42 39
 
... ...
@@ -74,7 +74,6 @@ expect an integer, and they can only be specified once.
74 74
     A self-sufficient runtime for linux containers.
75 75
 
76 76
     Options:
77
-      --api-enable-cors=false                Enable CORS headers in the remote API
78 77
       --api-cors-header=""                   Set CORS headers in the remote API
79 78
       -b, --bridge=""                        Attach containers to a network bridge
80 79
       --bip=""                               Specify network bridge IP