1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00

Merge pull request #11140 from SvenDowideit/correct-notes-markup

Notes should be indented
This commit is contained in:
Fred Lifton 2015-03-03 14:16:56 -08:00
commit b47ab8cfa3
3 changed files with 13 additions and 12 deletions

View file

@ -72,7 +72,7 @@ Docker has two major components:
platform for sharing and managing Docker containers.
**Note:** Docker is licensed under the open source Apache 2.0 license.
> **Note:** Docker is licensed under the open source Apache 2.0 license.
## What is Docker's architecture?
Docker uses a client-server architecture. The Docker *client* talks to the

View file

@ -107,11 +107,11 @@ images.
### Environment Replacement
**Note:** prior to 1.3, `Dockerfile` environment variables were handled
similarly, in that they would be replaced as described below. However, there
was no formal definition on as to which instructions handled environment
replacement at the time. After 1.3 this behavior will be preserved and
canonical.
> **Note**: prior to 1.3, `Dockerfile` environment variables were handled
> similarly, in that they would be replaced as described below. However, there
> was no formal definition on as to which instructions handled environment
> replacement at the time. After 1.3 this behavior will be preserved and
> canonical.
Environment variables (declared with [the `ENV` statement](#env)) can also be used in
certain instructions as variables to be interpreted by the `Dockerfile`. Escapes
@ -337,11 +337,12 @@ specified network ports at runtime. Docker uses this information to interconnect
containers using links (see the [Docker User
Guide](/userguide/dockerlinks)) and to determine which ports to expose to the
host when [using the -P flag](/reference/run/#expose-incoming-ports).
**Note:**
`EXPOSE` doesn't define which ports can be exposed to the host or make ports
accessible from the host by default. To expose ports to the host, at runtime,
[use the `-p` flag](/userguide/dockerlinks) or
[the -P flag](/reference/run/#expose-incoming-ports).
> **Note**:
> `EXPOSE` doesn't define which ports can be exposed to the host or make ports
> accessible from the host by default. To expose ports to the host, at runtime,
> [use the `-p` flag](/userguide/dockerlinks) or
> [the -P flag](/reference/run/#expose-incoming-ports).
## ENV

View file

@ -1877,7 +1877,7 @@ flag:
fdisk: unable to open /dev/xvdc: Operation not permitted
```
**Note:**
> **Note:**
> `--device` cannot be safely used with ephemeral devices. Block devices that
> may be removed should not be added to untrusted containers with `--device`.