mirror of https://github.com/docker/docs.git
Fixing glossary links (#9812)
Signed-off-by: Lena Larionova <lena.larionova@docker.com>
This commit is contained in:
parent
631c2f6b67
commit
54ca6a523b
|
@ -199,8 +199,8 @@
|
|||
*Also known as : docker-machine*
|
||||
<a class="glossary" name="namespace">namespace</a>: |
|
||||
A [Linux namespace](http://man7.org/linux/man-pages/man7/namespaces.7.html)
|
||||
is a Linux kernel feature that isolates and virtualizes system resources. Processes which restricted to
|
||||
a class="glossary" namespace can only interact with resources or processes that are part of the same namespace. Namespaces
|
||||
is a Linux kernel feature that isolates and virtualizes system resources. Processes which are restricted to
|
||||
a namespace can only interact with resources or processes that are part of the same namespace. Namespaces
|
||||
are an important part of Docker's isolation model. Namespaces exist for each type of
|
||||
resource, including `net` (networking), `mnt` (storage), `pid` (processes), `uts` (hostname control),
|
||||
and `user` (UID mapping). For more information about namespaces, see [Docker run reference](/engine/reference/run/)
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
[SSH](/engine/reference/glossary.md#ssh) is a secure protocol for accessing remote machines and applications. It
|
||||
[SSH](/../../../glossary.md#SSH) is a secure protocol for accessing remote machines and applications. It
|
||||
provides authentication and encrypts data communication over insecure networks.
|
||||
|
||||
These topics describe how to find existing SSH keys or generate new ones, and
|
||||
|
|
|
@ -30,7 +30,7 @@ The default path for a Compose file is `./docker-compose.yml`.
|
|||
|
||||
>**Tip**: You can use either a `.yml` or `.yaml` extension for this file. They both work.
|
||||
|
||||
A [container](/engine/reference/glossary.md#container) definition contains configuration which are applied to each
|
||||
A [container](/../../glossary.md#container) definition contains configuration which are applied to each
|
||||
container started for that service, much like passing command-line parameters to
|
||||
`docker run`. Likewise, network and volume definitions are analogous to
|
||||
`docker network create` and `docker volume create`.
|
||||
|
@ -196,8 +196,8 @@ or a list:
|
|||
args:
|
||||
- buildno=1
|
||||
- gitcommithash=cdc3b19
|
||||
|
||||
> **Note**: In your Dockerfile, if you specify `ARG` before the `FROM` instruction,
|
||||
|
||||
> **Note**: In your Dockerfile, if you specify `ARG` before the `FROM` instruction,
|
||||
> If you need an argument to be available in both places, also specify it under the `FROM` instruction.
|
||||
> See [Understand how ARGS and FROM interact](/engine/reference/builder/#understand-how-arg-and-from-interact) for usage details.
|
||||
|
||||
|
|
|
@ -11,13 +11,13 @@ Most Dockerfiles start from a parent image. If you need to completely control
|
|||
the contents of your image, you might need to create a base image instead.
|
||||
Here's the difference:
|
||||
|
||||
- A [parent image](/glossary.md?term=parent%20image) is the image that your
|
||||
- A [parent image](/glossary.md#parent_image) is the image that your
|
||||
image is based on. It refers to the contents of the `FROM` directive in the
|
||||
Dockerfile. Each subsequent declaration in the Dockerfile modifies this parent
|
||||
image. Most Dockerfiles start from a parent image, rather than a base image.
|
||||
However, the terms are sometimes used interchangeably.
|
||||
|
||||
- A [base image](/glossary.md?term=base%20image) has `FROM scratch` in its Dockerfile.
|
||||
- A [base image](/glossary.md#base_image) has `FROM scratch` in its Dockerfile.
|
||||
|
||||
This topic shows you several ways to create a base image. The specific process
|
||||
will depend heavily on the Linux distribution you want to package. We have some
|
||||
|
|
|
@ -56,7 +56,7 @@ offers a high-level tool with several powerful functionalities:
|
|||
uploads and downloads, similar to `git pull`, so new versions of a container
|
||||
can be transferred by only sending diffs.
|
||||
|
||||
- *Component re-use.* Any container can be used as a [*"parent image"*](/glossary.md?term=image) to
|
||||
- *Component re-use.* Any container can be used as a [*parent image*](/glossary.md#parent_image) to
|
||||
create more specialized components. This can be done manually or as part of an
|
||||
automated build. For example you can prepare the ideal Python environment, and
|
||||
use it as a base for 10 different applications. Your ideal PostgreSQL setup can
|
||||
|
|
|
@ -28,7 +28,7 @@ various APIs, CLIs, and file formats.
|
|||
|
||||
| API | Description |
|
||||
|:------------------------------------------------------|:---------------------------------------------------------------------------------------|
|
||||
| [Engine API](/engine/api/) | The main API for Docker, provides programmatic access to a [daemon](/glossary/#daemon) |
|
||||
| [Engine API](/engine/api/) | The main API for Docker, provides programmatic access to a daemon |
|
||||
| [Registry API](/registry/spec/api/) | Facilitates distribution of images to the engine |
|
||||
| [DTR API](/reference/dtr/{{ site.dtr_version }}/api/) | Provides programmatic access to a Docker Trusted Registry deployment |
|
||||
| [UCP API](/reference/ucp/{{ site.ucp_version }}/api/) | Provides programmatic access to a Universal Control Plane deployment |
|
||||
|
|
6
test.md
6
test.md
|
@ -262,8 +262,8 @@ The glossary source lives in the documentation repository
|
|||
|
||||
To update glossary content, edit `_data/glossary.yaml`.
|
||||
|
||||
To link to a glossary term, link to `glossary.md?term=YourGlossaryTerm` (for
|
||||
example, [swarm](glossary.md?term=swarm)).
|
||||
To link to a glossary term, link to `glossary.md#YourGlossaryTerm` (for
|
||||
example, [swarm](glossary.md#swarm)).
|
||||
|
||||
## Site-wide variables
|
||||
|
||||
|
@ -714,7 +714,7 @@ incoming := map[string]interface{}{
|
|||
```powershell
|
||||
Install-Module DockerMsftProvider -Force
|
||||
Install-Package Docker -ProviderName DockerMsftProvider -Force
|
||||
[System.Environment]::SetEnvironmentVariable("DOCKER_FIPS", "1", "Machine")
|
||||
[System.Environment]::SetEnvironmentVariable("DOCKER_FIPS", "1", "Machine")
|
||||
Expand-Archive docker-18.09.1.zip -DestinationPath $Env:ProgramFiles -Force
|
||||
```
|
||||
|
||||
|
|
Loading…
Reference in New Issue