From 0648e59ad85e676f8e0a02156ea5e79a6e106267 Mon Sep 17 00:00:00 2001 From: Mabin Date: Tue, 10 Mar 2015 16:14:43 +0800 Subject: [PATCH] docs: api-enable-cors is deprecated,updated docs description Signed-off-by: Mabin --- contrib/completion/bash/docker | 2 +- contrib/completion/fish/docker.fish | 2 +- docs/man/docker.1.md | 3 --- docs/sources/reference/commandline/cli.md | 1 - 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/contrib/completion/bash/docker b/contrib/completion/bash/docker index 7f32cefa29..06c8b1609b 100755 --- a/contrib/completion/bash/docker +++ b/contrib/completion/bash/docker @@ -188,7 +188,6 @@ __docker_signals() { _docker_docker() { local boolean_options=" - --api-enable-cors --daemon -d --debug -D --help -h @@ -972,6 +971,7 @@ _docker() { ) local main_options_with_args=" + --api-cors-header --bip --bridge -b --default-ulimit diff --git a/contrib/completion/fish/docker.fish b/contrib/completion/fish/docker.fish index 88caf15ea8..efee52f806 100644 --- a/contrib/completion/fish/docker.fish +++ b/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' diff --git a/docs/man/docker.1.md b/docs/man/docker.1.md index 1b5288bbb5..bad6cf0494 100644 --- a/docs/man/docker.1.md +++ b/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. diff --git a/docs/sources/reference/commandline/cli.md b/docs/sources/reference/commandline/cli.md index f8073d8505..82117a53f0 100644 --- a/docs/sources/reference/commandline/cli.md +++ b/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