Skip to content

Commit

Permalink
Fix broken links (docker#2521)
Browse files Browse the repository at this point in the history
  • Loading branch information
Misty Stanley-Jones authored Mar 28, 2017
1 parent 9ff9a61 commit 669b51a
Show file tree
Hide file tree
Showing 8 changed files with 49 additions and 31 deletions.
2 changes: 2 additions & 0 deletions _data/toc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -701,6 +701,8 @@ reference:
title: docker plugin rm
- path: /engine/reference/commandline/plugin_set/
title: docker plugin set
- path: /engine/reference/commandline/plugin_upgrade/
title: docker plugin upgrade
- path: /engine/reference/commandline/port/
title: docker port
- path: /engine/reference/commandline/ps/
Expand Down
2 changes: 1 addition & 1 deletion compose/compose-file/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ tutorial](/engine/getstarted-voting-app/index.md).

<div class="panel panel-default">
<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 id="collapseThree" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingThree" aria-expanded="true">
<div class="panel-body">
Expand Down
4 changes: 2 additions & 2 deletions cs-engine/1.12/release-notes/release-notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
(28 Feb 2017)

* Fixes an issue causing containerd to deadlock [#336](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 causing containerd to deadlock [#336](https://github.com/docker/containerd/pull/336)
* Fixes an issue where encrypted overlay networks stop working [#30727](https://github.com/docker/docker/issues/30727)

## CS Engine 1.12.6-cs8
(8 Feb 2017)
Expand Down
13 changes: 13 additions & 0 deletions engine/reference/commandline/plugin_upgrade.md
Original file line number Diff line number Diff line change
@@ -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 changes: 1 addition & 1 deletion machine/get-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ Toolbox.

* Make sure you have [the latest VirtualBox](https://www.virtualbox.org/wiki/Downloads){: target="_blank" class="_"}
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="_"}
to install Docker Machine, VirtualBox is
automatically installed.
Expand Down
9 changes: 4 additions & 5 deletions notary/advanced_usage.md
Original file line number Diff line number Diff line change
Expand Up @@ -98,15 +98,14 @@ The targets key must be locally managed - to rotate the targets key, for instanc
### Use a Yubikey

Notary can be used with
<a href="https://www.yubico.com/products/yubikey-hardware/yubikey4/" target="_blank">Yubikey
4</a> keys, via a PKCS11 interface when the Yubikey has CCID mode enabled.
[Yubikey 4](https://www.yubico.com/products/yubikey-hardware/yubikey4/){: target="_blank" class="_"}
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.
Note that Yubikey support is included with the Docker Engine 1.11 client for use with Docker Content Trust.

Yubikey support requires
<a href="https://www.yubico.com/support/downloads" target="_blank">Yubico PIV libraries
(which are bundled with the PIV tools)</a> to be available in standard
library locations.
[Yubico PIV libraries](https://www.yubico.com/support/knowledge-base/categories/downloads/){: target="_blank" class="_"}
(bundled with the PIV tools) to be available in standard library locations.

## Work with delegation roles

Expand Down
4 changes: 2 additions & 2 deletions opensource/project/test-and-docs.md
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ make any changes, just run these commands again.

The Docker documentation source files are in a centralized repository at
[https://github.com/docker/docker.github.io](https://github.com/docker/docker.github.io). The content is
written using extended Markdown, which you can edit in a plain text editor such as
written using extended Markdown, which you can edit in a plain text editor such as
Atom or Notepad. The docs are built using [Jekyll](https://jekyllrb.com/).

Most documentation is developed in the centralized repository. The exceptions are
Expand Down Expand Up @@ -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
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
detected, even if you change branches.
Expand Down
44 changes: 24 additions & 20 deletions opensource/workflow/review-pr.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
"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

Expand All @@ -28,27 +32,29 @@ 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
safety check.

After Gordon and the bots, the "beings" review your work. Docker maintainers look
at your pull request and comment on it. The shortest comment you might see is
`LGTM` which means **l**ooks-**g**ood-**t**o-**m**e. If you get an `LGTM`, that
is a good thing, you passed that review.
After Gordon and the bots, Docker maintainers look at your pull request and
provide feedback. The shortest comment you might see is `LGTM` which means
"Looks Good To Me". If you get an `LGTM`, that is a good thing, you passed that
review.

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
email address associated with your GitHub account. Any GitHub user who
"participates" in a PR receives an email to. Participating means creating or
commenting on a PR.

Our maintainers are very experienced Docker users and open source contributors.
So, they value your time and will try to work efficiently with you by keeping
something about your submission. You are notified about all maintainer comments
on a PR, depending on the way you have configured Github to notify you. Any
GitHub user who participates in a PR receives an email. Participation includes
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 experienced Docker users and open source contributors.
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
need to update your pull request with additional changes.

## Update an 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.

Expand Down Expand Up @@ -79,9 +85,10 @@ To update your existing pull request:
# modified: docs/installation/mac.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>

Expand All @@ -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
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.

Expand All @@ -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
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
from your fork. For information on how to do this,
<a href="https://help.github.com/articles/deleting-unused-branches/" target="_blank">
see the GitHub help on deleting branches</a>.
from your fork.
[See the GitHub help on deleting branches](https://help.github.com/articles/deleting-unused-branches/){: target="_blank" class="_"}.

## Where to go next

Expand Down

0 comments on commit 669b51a

Please sign in to comment.