Merge pull request #19279 from tiborvass/rename-authz-to-authorization

Rename authz to authorization for greater clarity
Upstream-commit: 612cf0f172948c892d642af3213a012fcf292135
Component: engine
This commit is contained in:
Tibor Vass
2016-01-13 14:30:18 -05:00
11 changed files with 58 additions and 55 deletions
+4 -4
View File
@@ -7,7 +7,7 @@ docker-daemon - Enable daemon mode
# SYNOPSIS
**docker daemon**
[**--api-cors-header**=[=*API-CORS-HEADER*]]
[**--authz-plugin**[=*[]*]]
[**--authorization-plugin**[=*[]*]]
[**-b**|**--bridge**[=*BRIDGE*]]
[**--bip**[=*BIP*]]
[**--cgroup-parent**[=*[]*]]
@@ -73,7 +73,7 @@ format.
**--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.
**--authz-plugin**=""
**--authorization-plugin**=""
Set authorization plugins to load
**-b**, **--bridge**=""
@@ -473,10 +473,10 @@ Key/Value store.
Docker's access authorization can be extended by authorization plugins that your
organization can purchase or build themselves. You can install one or more
authorization plugins when you start the Docker `daemon` using the
`--authz-plugin=PLUGIN_ID` option.
`--authorization-plugin=PLUGIN_ID` option.
```bash
docker daemon --authz-plugin=plugin1 --authz-plugin=plugin2,...
docker daemon --authorization-plugin=plugin1 --authorization-plugin=plugin2,...
```
The `PLUGIN_ID` value is either the plugin's name or a path to its specification