From 2b50e0f8524120276b118e55c8f0c9f8225846a6 Mon Sep 17 00:00:00 2001 From: Mary Anthony Date: Sat, 13 Jun 2015 09:21:50 -0700 Subject: [PATCH] Carry of PR #13520 Removinig files Signed-off-by: Mary Anthony --- docs/README.md | 1 + docs/sources/reference/commandline/cli.md | 14 +++++++------- docs/sources/reference/glossary.md | 2 +- experimental/README.md | 2 +- man/docker-build.1.md | 4 ++-- man/docker-create.1.md | 2 +- 6 files changed, 13 insertions(+), 12 deletions(-) diff --git a/docs/README.md b/docs/README.md index 9cdb2098..f22ae49e 100755 --- a/docs/README.md +++ b/docs/README.md @@ -288,3 +288,4 @@ project. + diff --git a/docs/sources/reference/commandline/cli.md b/docs/sources/reference/commandline/cli.md index 3b98c6fc..7f632e14 100644 --- a/docs/sources/reference/commandline/cli.md +++ b/docs/sources/reference/commandline/cli.md @@ -698,13 +698,13 @@ to any of the files in the context. For example, your build can use an [*ADD*](/reference/builder/#add) instruction to reference a file in the context. -The `URL` parameter can specify the location of a Git repository; the -repository acts as the build context. The system recursively clones the -repository and its submodules using a `git clone --depth 1 --recursive` -command. This command runs in a temporary directory on your local host. After -the command succeeds, the directory is sent to the Docker daemon as the -context. Local clones give you the ability to access private repositories using -local user credentials, VPN's, and so forth. +The `URL` parameter can specify the location of a Git repository; the repository +acts as the build context. The system recursively clones the repository and its +submodules using a `git clone --depth 1 --recursive` command. This command runs +in a temporary directory on your local host. After the command succeeds, the +directory is sent to the Docker daemon as the context. Local clones give you the +ability to access private repositories using local user credentials, VPNs, and +so forth. Git URLs accept context configuration in their fragment section, separated by a colon `:`. The first part represents the reference that Git will check out, diff --git a/docs/sources/reference/glossary.md b/docs/sources/reference/glossary.md index d33d0156..c04f27d5 100644 --- a/docs/sources/reference/glossary.md +++ b/docs/sources/reference/glossary.md @@ -90,7 +90,7 @@ Docker and its components. It provides the following services: - Docker image hosting - User authentication - Automated image builds and work-flow tools such as build triggers and web hooks -- Integration with GitHub and BitBucket +- Integration with GitHub and Bitbucket ## Dockerfile diff --git a/experimental/README.md b/experimental/README.md index c8a02cb9..b129ec72 100644 --- a/experimental/README.md +++ b/experimental/README.md @@ -4,7 +4,7 @@ This page contains a list of features in the Docker engine which are experimental. Experimental features are **not** ready for production. They are provided for test and evaluation in your sandbox environments. -The information below describes each feature and the Github pull requests and +The information below describes each feature and the GitHub pull requests and issues associated with it. If necessary, links are provided to additional documentation on an issue. As an active Docker user and community member, please feel free to provide any feedback on these features you wish. diff --git a/man/docker-build.1.md b/man/docker-build.1.md index 7a5ceab0..08909178 100644 --- a/man/docker-build.1.md +++ b/man/docker-build.1.md @@ -200,9 +200,9 @@ into account Docker community conventions. ## Building an image using a URL -This will clone the specified Github repository from the URL and use it +This will clone the specified GitHub repository from the URL and use it as context. The Dockerfile at the root of the repository is used as -Dockerfile. This only works if the Github repository is a dedicated +Dockerfile. This only works if the GitHub repository is a dedicated repository. docker build github.com/scollier/Fedora-Dockerfiles/tree/master/apache diff --git a/man/docker-create.1.md b/man/docker-create.1.md index 939fcbc1..3882fbf0 100644 --- a/man/docker-create.1.md +++ b/man/docker-create.1.md @@ -91,7 +91,7 @@ The initial status of the container created with **docker create** is 'created'. **--cgroup-parent**="" Path to cgroups under which the cgroup for the container will be created. If the path is not absolute, the path is considered to be relative to the cgroups path of the init process. Cgroups will be created if they do not already exist. -**--cpu-peroid**=0 +**--cpu-period**=0 Limit the CPU CFS (Completely Fair Scheduler) period **--cpuset-cpus**=""