Browse Source

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

docs: --api-enable-cors is deprecated,updated docs description
moxiegirl 10 years ago
parent
commit
cc4095a18c

+ 1 - 1
contrib/completion/bash/docker

@@ -189,7 +189,6 @@ __docker_signals() {
 
 _docker_docker() {
 	local boolean_options="
-		--api-enable-cors
 		--daemon -d
 		--debug -D
 		--help -h
@@ -973,6 +972,7 @@ _docker() {
 	)
 
 	local main_options_with_args="
+		--api-cors-header
 		--bip
 		--bridge -b
 		--default-ulimit

+ 1 - 1
contrib/completion/fish/docker.fish

@@ -43,7 +43,7 @@ function __fish_print_docker_repositories --description 'Print a list of docker
 end
 
 # common options
-complete -c docker -f -n '__fish_docker_no_subcommand' -l api-enable-cors -d 'Enable CORS headers in the remote API'
+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"
 complete -c docker -f -n '__fish_docker_no_subcommand' -s b -l bridge -d 'Attach containers to a pre-existing network bridge'
 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"
 complete -c docker -f -n '__fish_docker_no_subcommand' -s D -l debug -d 'Enable debug mode'

+ 0 - 3
docs/man/docker.1.md

@@ -34,9 +34,6 @@ unix://[/path/to/socket] to use.
    The socket(s) to bind to in daemon mode specified using one or more
    tcp://host:port, unix:///path/to/socket, fd://* or fd://socketfd.
 
-**--api-enable-cors**=*true*|*false*
-  Enable CORS headers in the remote API. Default is false.
-
 **--api-cors-header**=""
   Set CORS headers in the remote API. Default is cors disabled. Give urls like "http://foo, http://bar, ...". Give "*" to allow all.
 

+ 0 - 1
docs/sources/reference/commandline/cli.md

@@ -74,7 +74,6 @@ expect an integer, and they can only be specified once.
     A self-sufficient runtime for linux containers.
 
     Options:
-      --api-enable-cors=false                Enable CORS headers in the remote API
       --api-cors-header=""                   Set CORS headers in the remote API
       -b, --bridge=""                        Attach containers to a network bridge
       --bip=""                               Specify network bridge IP