docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix broken links (#2521)

This commit is contained in:
Misty Stanley-Jones 2017-03-28 16:42:44 -07:00 committed by GitHub
parent 9ff9a61346
commit 669b51a889
8 changed files with 48 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_data/toc.yaml
View File

@ -701,6 +701,8 @@ reference:
title: docker plugin rm title: docker plugin rm
- path: /engine/reference/commandline/plugin_set/ - path: /engine/reference/commandline/plugin_set/
title: docker plugin set title: docker plugin set
- path: /engine/reference/commandline/plugin_upgrade/
title: docker plugin upgrade
- path: /engine/reference/commandline/port/ - path: /engine/reference/commandline/port/
title: docker port title: docker port
- path: /engine/reference/commandline/ps/ - path: /engine/reference/commandline/ps/

2
compose/compose-file/index.md
View File

@ -37,7 +37,7 @@ tutorial](/engine/getstarted-voting-app/index.md).
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading" role="tab" id="headingThree"> <div class="panel-heading" role="tab" id="headingThree">
<h4 class="panel-title" id="collapsible-group-item-3"> <a class="" role="button" data-toggle="collapse" data-parent="#accordion" href="/components/#collapseThree" aria-expanded="true" aria-controls="collapseThree"> Example Compose file version 3 </a> </h4> <h4 class="panel-title" id="collapsible-group-item-3"> <a class="" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseThree" aria-expanded="true" aria-controls="collapseThree"> Example Compose file version 3 </a> </h4>
</div> </div>
<div id="collapseThree" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingThree" aria-expanded="true"> <div id="collapseThree" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingThree" aria-expanded="true">
<div class="panel-body"> <div class="panel-body">

4
cs-engine/1.12/release-notes/release-notes.md
View File

@ -30,8 +30,8 @@ CS Engine. For notes on older versions, see the [CS Engine prior release notes a
## CS Engine 1.12.6-cs9 ## CS Engine 1.12.6-cs9
(28 Feb 2017) (28 Feb 2017)
* Fixes an issue causing containerd to deadlock [#336](github.com/docker/containerd/pull/336) * Fixes an issue causing containerd to deadlock [#336](https://github.com/docker/containerd/pull/336)
* Fixes an issue where encrypted overlay networks stop working [#30727](github.com/docker/docker/issues/30727) * Fixes an issue where encrypted overlay networks stop working [#30727](https://github.com/docker/docker/issues/30727)
## CS Engine 1.12.6-cs8 ## CS Engine 1.12.6-cs8
(8 Feb 2017) (8 Feb 2017)

13
engine/reference/commandline/plugin_upgrade.md Normal file
View File

@ -0,0 +1,13 @@
---
datafolder: engine-cli
datafile: docker_plugin_upgrade
title: docker plugin upgrade
---
<!--
Sorry, but the contents of this page are automatically generated from
Docker's source code. If you want to suggest a change to the text that appears
here, you'll need to find the string by searching this repo:
https://www.github.com/docker/docker
-->
{% include cli.md %}

2
machine/get-started.md
View File

@ -73,7 +73,7 @@ Toolbox.
* Make sure you have [the latest VirtualBox](https://www.virtualbox.org/wiki/Downloads){: target="_blank" class="_"} * Make sure you have [the latest VirtualBox](https://www.virtualbox.org/wiki/Downloads){: target="_blank" class="_"}
correctly installed on your system. If you used correctly installed on your system. If you used
[Toolbox]("https://www.docker.com/products/docker-toolbox"){: target="_blank" class="_"} [Toolbox](https://www.docker.com/products/docker-toolbox){: target="_blank" class="_"}
or [Docker for Windows](/docker-for-windows/index.md){: target="_blank" class="_"} or [Docker for Windows](/docker-for-windows/index.md){: target="_blank" class="_"}
to install Docker Machine, VirtualBox is to install Docker Machine, VirtualBox is
automatically installed. automatically installed.

9
notary/advanced_usage.md
View File

@ -98,15 +98,14 @@ The targets key must be locally managed - to rotate the targets key, for instanc
### Use a Yubikey ### Use a Yubikey
Notary can be used with Notary can be used with
<a href="https://www.yubico.com/products/yubikey-hardware/yubikey4/" target="_blank">Yubikey [Yubikey 4](https://www.yubico.com/products/yubikey-hardware/yubikey4/){: target="_blank" class="_"}
4</a> keys, via a PKCS11 interface when the Yubikey has CCID mode enabled. keys, via a PKCS11 interface when the Yubikey has CCID mode enabled.
The Yubikey will be prioritized to store root keys, and will require user touch-input for signing. The Yubikey will be prioritized to store root keys, and will require user touch-input for signing.
Note that Yubikey support is included with the Docker Engine 1.11 client for use with Docker Content Trust. Note that Yubikey support is included with the Docker Engine 1.11 client for use with Docker Content Trust.
Yubikey support requires Yubikey support requires
<a href="https://www.yubico.com/support/downloads" target="_blank">Yubico PIV libraries [Yubico PIV libraries](https://www.yubico.com/support/knowledge-base/categories/downloads/){: target="_blank" class="_"}
(which are bundled with the PIV tools)</a> to be available in standard (bundled with the PIV tools) to be available in standard library locations.
library locations.
## Work with delegation roles ## Work with delegation roles

2
opensource/project/test-and-docs.md
View File

@ -282,7 +282,7 @@ which will build an image named `docs/docstage` and launch a container with Jeky
correctly. The container uses Jekyll to incrementally build and serve the site using the correctly. The container uses Jekyll to incrementally build and serve the site using the
files in the local repository. files in the local repository.
Go to [http://localhost:4000/](http://localhost:4000/) in your web browser to view the documentation. Go to `http://localhost:4000/` in your web browser to view the documentation.
The container runs in the foreground. It will continue to run and incrementally build the site when changes are The container runs in the foreground. It will continue to run and incrementally build the site when changes are
detected, even if you change branches. detected, even if you change branches.

42
opensource/workflow/review-pr.md
View File

@ -12,6 +12,10 @@ The CI system is an automated system. The maintainers are human beings that also
work on Docker. You need to understand and work with both the "bots" and the work on Docker. You need to understand and work with both the "bots" and the
"beings" to review your contribution. "beings" to review your contribution.
> **Note**: These guidelines apply to Docker code submissions. If you want to
> contribute to the Docker documentation itself, see the guidelines in the
> `docker.github.io` repository's
> [README.md](https://github.com/docker/docker.github.io).
## How we process your review ## How we process your review
@ -28,19 +32,21 @@ code. Building includes running the same tests you ran locally. If you forgot
to run tests or missed something in fixing problems, the automated build is our to run tests or missed something in fixing problems, the automated build is our
safety check. safety check.
After Gordon and the bots, the "beings" review your work. Docker maintainers look After Gordon and the bots, Docker maintainers look at your pull request and
at your pull request and comment on it. The shortest comment you might see is provide feedback. The shortest comment you might see is `LGTM` which means
`LGTM` which means **l**ooks-**g**ood-**t**o-**m**e. If you get an `LGTM`, that "Looks Good To Me". If you get an `LGTM`, that is a good thing, you passed that
is a good thing, you passed that review. review.
For complex changes, maintainers may ask you questions or ask you to change For complex changes, maintainers may ask you questions or ask you to change
something about your submission. All maintainer comments on a PR go to the something about your submission. You are notified about all maintainer comments
email address associated with your GitHub account. Any GitHub user who on a PR, depending on the way you have configured Github to notify you. Any
"participates" in a PR receives an email to. Participating means creating or GitHub user who participates in a PR receives an email. Participation includes
commenting on a PR. creating the PR, commenting on it, committing into someone else's PR, or being
at-mentioned in a comment. You can unsubscribe from notifications to a PR by
clicking the **Unsubscribe** button.
Our maintainers are very experienced Docker users and open source contributors. Our maintainers are experienced Docker users and open source contributors.
So, they value your time and will try to work efficiently with you by keeping They value your time and will try to work efficiently with you by keeping
their comments specific and brief. If they ask you to make a change, you'll their comments specific and brief. If they ask you to make a change, you'll
need to update your pull request with additional changes. need to update your pull request with additional changes.
@ -48,7 +54,7 @@ need to update your pull request with additional changes.
To update your existing pull request: To update your existing pull request:
1. Checkout the PR branch in your local `docker-fork` repository. 1. Checkout the PR branch in your local repository.
This is the branch associated with your request. This is the branch associated with your request.
@ -79,9 +85,10 @@ To update your existing pull request:
# modified: docs/installation/mac.md # modified: docs/installation/mac.md
# modified: docs/installation/rhel.md # modified: docs/installation/rhel.md
5. Force push the change to your origin. 5. Force-push the change to your origin.
The command syntax is: Force-pushing is necessary because you amended your commit, and effectively
changed history. The command syntax is:
git push -f origin <branch_name> git push -f origin <branch_name>
@ -107,7 +114,7 @@ It can take time to see a merged pull request in Docker's official release.
A master build is available almost immediately though. Docker builds and A master build is available almost immediately though. Docker builds and
updates its development binaries after each merge to `master`. updates its development binaries after each merge to `master`.
1. Browse to <a href="https://master.dockerproject.org/" target="_blank">https://master.dockerproject.org/</a>. 1. Browse to [https://master.dockerproject.org/](https://master.dockerproject.org/){: target="_blank" class="_"}.
2. Look for the binary appropriate to your system. 2. Look for the binary appropriate to your system.
@ -116,12 +123,9 @@ updates its development binaries after each merge to `master`.
You might want to run the binary in a container though. This You might want to run the binary in a container though. This
will keep your local host environment clean. will keep your local host environment clean.
4. View any documentation changes at <a href="http://docs.master.dockerproject.org/" target="_blank">docs.master.dockerproject.org</a>.
Once you've verified everything merged, feel free to delete your feature branch Once you've verified everything merged, feel free to delete your feature branch
from your fork. For information on how to do this, from your fork.
<a href="https://help.github.com/articles/deleting-unused-branches/" target="_blank"> [See the GitHub help on deleting branches](https://help.github.com/articles/deleting-unused-branches/){: target="_blank" class="_"}.
see the GitHub help on deleting branches</a>.
## Where to go next ## Where to go next