From 5a08821360c1a6a9079a31d4f964aeb00629563c Mon Sep 17 00:00:00 2001 From: Dharmit Shah Date: Sat, 15 Aug 2015 12:00:21 +0530 Subject: [PATCH] Fixing docs to remove references to links under terms/ Removed terms/ directory Signed-off-by: Dharmit Shah Upstream-commit: 56632110e0d01f5674b02b13843f0245957a99be Component: cli --- components/cli/docs/reference/builder.md | 4 ++-- components/cli/docs/reference/glossary.md | 4 ++++ components/cli/docs/reference/run.md | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/components/cli/docs/reference/builder.md b/components/cli/docs/reference/builder.md index 5088edc4a9..5fbed753c1 100644 --- a/components/cli/docs/reference/builder.md +++ b/components/cli/docs/reference/builder.md @@ -100,7 +100,7 @@ be UPPERCASE in order to distinguish them from arguments more easily. Docker runs the instructions in a `Dockerfile` in order. **The first instruction must be \`FROM\`** in order to specify the [*Base -Image*](/terms/image/#base-image) from which you are building. +Image*](/reference/glossary/#base-image) from which you are building. Docker will treat lines that *begin* with `#` as a comment. A `#` marker anywhere else in the line will @@ -251,7 +251,7 @@ Or FROM @ -The `FROM` instruction sets the [*Base Image*](/terms/image/#base-image) +The `FROM` instruction sets the [*Base Image*](/reference/glossary/#base-image) for subsequent instructions. As such, a valid `Dockerfile` must have `FROM` as its first instruction. The image can be any valid image – it is especially easy to start by **pulling an image** from the [*Public Repositories*]( diff --git a/components/cli/docs/reference/glossary.md b/components/cli/docs/reference/glossary.md index 6f5c186d27..375194cd0c 100644 --- a/components/cli/docs/reference/glossary.md +++ b/components/cli/docs/reference/glossary.md @@ -19,6 +19,10 @@ aufs (advanced multi layered unification filesystem) is a Linux [filesystem](#fi Docker supports as a storage backend. It implements the [union mount](http://en.wikipedia.org/wiki/Union_mount) for Linux file systems. +## Base image + +An image that has no parent is a **base image**. + ## boot2docker [boot2docker](http://boot2docker.io/) is a lightweight Linux distribution made diff --git a/components/cli/docs/reference/run.md b/components/cli/docs/reference/run.md index 79bde75af1..009b96fc58 100644 --- a/components/cli/docs/reference/run.md +++ b/components/cli/docs/reference/run.md @@ -19,7 +19,7 @@ parent = "mn_reference" **Docker runs processes in isolated containers**. When an operator executes `docker run`, she starts a process with its own file system, its own networking, and its own isolated process tree. The -[*Image*](/terms/image/#image) which starts the process may define +[*Image*](/reference/glossary/#image) which starts the process may define defaults related to the binary to run, the networking to expose, and more, but `docker run` gives final control to the operator who starts the container from the image. That's the main reason