Merge pull request #5261 from ostezer/fix-inline-links
Fix for broken in-document links which got scrambled during conversion.
This commit is contained in:
commit
ad8db1aa22
|
@ -360,7 +360,7 @@ container, we need to:
|
||||||
to `/proc/<thepid>/ns/net`
|
to `/proc/<thepid>/ns/net`
|
||||||
- Execute `ip netns exec <somename> ....`
|
- Execute `ip netns exec <somename> ....`
|
||||||
|
|
||||||
Please review [*Enumerating Cgroups*](#run-findpid) to learn how to find
|
Please review [*Enumerating Cgroups*](#enumerating-cgroups) to learn how to find
|
||||||
the cgroup of a pprocess running in the container of which you want to
|
the cgroup of a pprocess running in the container of which you want to
|
||||||
measure network usage. From there, you can examine the pseudo-file named
|
measure network usage. From there, you can examine the pseudo-file named
|
||||||
`tasks`, which containes the PIDs that are in the
|
`tasks`, which containes the PIDs that are in the
|
||||||
|
|
|
@ -15,7 +15,7 @@ like `/var/lib/docker/repositories: permission denied`
|
||||||
you may have an incomplete Docker installation or insufficient
|
you may have an incomplete Docker installation or insufficient
|
||||||
privileges to access docker on your machine.
|
privileges to access docker on your machine.
|
||||||
|
|
||||||
Please refer to [*Installation*](../../installation/#installation-list)
|
Please refer to [*Installation*](../../installation/)
|
||||||
for installation instructions.
|
for installation instructions.
|
||||||
|
|
||||||
## Hello World
|
## Hello World
|
||||||
|
@ -24,7 +24,7 @@ Note
|
||||||
|
|
||||||
- This example assumes you have Docker running in daemon mode. For
|
- This example assumes you have Docker running in daemon mode. For
|
||||||
more information please see [*Check your Docker
|
more information please see [*Check your Docker
|
||||||
install*](#running-examples).
|
install*](#check-your-docker-installation).
|
||||||
- **If you don’t like sudo** then see [*Giving non-root
|
- **If you don’t like sudo** then see [*Giving non-root
|
||||||
access*](../../installation/binaries/#dockergroup)
|
access*](../../installation/binaries/#dockergroup)
|
||||||
|
|
||||||
|
@ -70,7 +70,7 @@ Note
|
||||||
|
|
||||||
- This example assumes you have Docker running in daemon mode. For
|
- This example assumes you have Docker running in daemon mode. For
|
||||||
more information please see [*Check your Docker
|
more information please see [*Check your Docker
|
||||||
install*](#running-examples).
|
install*](#check-your-docker-installation).
|
||||||
- **If you don’t like sudo** then see [*Giving non-root
|
- **If you don’t like sudo** then see [*Giving non-root
|
||||||
access*](../../installation/binaries/#dockergroup)
|
access*](../../installation/binaries/#dockergroup)
|
||||||
|
|
||||||
|
|
|
@ -14,9 +14,9 @@ our blog post, ["Getting to Docker
|
||||||
There are several ways to install Docker on AWS EC2:
|
There are several ways to install Docker on AWS EC2:
|
||||||
|
|
||||||
- [*Amazon QuickStart (Release Candidate - March
|
- [*Amazon QuickStart (Release Candidate - March
|
||||||
2014)*](#amazonquickstart-new) or
|
2014)*](#amazon-quickstart-release-candidate-march-2014) or
|
||||||
- [*Amazon QuickStart*](#amazonquickstart) or
|
- [*Amazon QuickStart*](#amazon-quickstart) or
|
||||||
- [*Standard Ubuntu Installation*](#amazonstandard)
|
- [*Standard Ubuntu Installation*](#standard-ubuntu-installation)
|
||||||
|
|
||||||
**You’ll need an** [AWS account](http://aws.amazon.com/) **first, of
|
**You’ll need an** [AWS account](http://aws.amazon.com/) **first, of
|
||||||
course.**
|
course.**
|
||||||
|
@ -98,7 +98,7 @@ Repository.
|
||||||
If you want a more hands-on installation, then you can follow the
|
If you want a more hands-on installation, then you can follow the
|
||||||
[*Ubuntu*](../ubuntulinux/#ubuntu-linux) instructions installing Docker
|
[*Ubuntu*](../ubuntulinux/#ubuntu-linux) instructions installing Docker
|
||||||
on any EC2 instance running Ubuntu. Just follow Step 1 from [*Amazon
|
on any EC2 instance running Ubuntu. Just follow Step 1 from [*Amazon
|
||||||
QuickStart*](#amazonquickstart) to pick an image (or use one of your
|
QuickStart*](#amazon-quickstart) to pick an image (or use one of your
|
||||||
own) and skip the step with the *User Data*. Then continue with the
|
own) and skip the step with the *User Data*. Then continue with the
|
||||||
[*Ubuntu*](../ubuntulinux/#ubuntu-linux) instructions.
|
[*Ubuntu*](../ubuntulinux/#ubuntu-linux) instructions.
|
||||||
|
|
||||||
|
|
|
@ -18,11 +18,11 @@ our blog post, ["Getting to Docker
|
||||||
|
|
||||||
Docker is supported on the following versions of Ubuntu:
|
Docker is supported on the following versions of Ubuntu:
|
||||||
|
|
||||||
- [*Ubuntu Precise 12.04 (LTS) (64-bit)*](#ubuntu-precise)
|
- [*Ubuntu Precise 12.04 (LTS) (64-bit)*](#ubuntu-precise-1204-lts-64-bit)
|
||||||
- [*Ubuntu Raring 13.04 and Saucy 13.10 (64
|
- [*Ubuntu Raring 13.04 and Saucy 13.10 (64
|
||||||
bit)*](#ubuntu-raring-saucy)
|
bit)*](#ubuntu-raring-1304-and-saucy-1310-64-bit)
|
||||||
|
|
||||||
Please read [*Docker and UFW*](#ufw), if you plan to use [UFW
|
Please read [*Docker and UFW*](#docker-and-ufw), if you plan to use [UFW
|
||||||
(Uncomplicated Firewall)](https://help.ubuntu.com/community/UFW)
|
(Uncomplicated Firewall)](https://help.ubuntu.com/community/UFW)
|
||||||
|
|
||||||
## Ubuntu Precise 12.04 (LTS) (64-bit)
|
## Ubuntu Precise 12.04 (LTS) (64-bit)
|
||||||
|
@ -56,7 +56,7 @@ These instructions have changed for 0.6. If you are upgrading from an
|
||||||
earlier version, you will need to follow them again.
|
earlier version, you will need to follow them again.
|
||||||
|
|
||||||
Docker is available as a Debian package, which makes installation easy.
|
Docker is available as a Debian package, which makes installation easy.
|
||||||
**See the** [*Mirrors*](#installmirrors) **section below if you are not
|
**See the** [*Mirrors*](#mirrors) **section below if you are not
|
||||||
in the United States.** Other sources of the Debian packages may be
|
in the United States.** Other sources of the Debian packages may be
|
||||||
faster for you to install.
|
faster for you to install.
|
||||||
|
|
||||||
|
|
|
@ -190,7 +190,7 @@ strings in the array:
|
||||||
If you would like your container to run the same executable every time,
|
If you would like your container to run the same executable every time,
|
||||||
then you should consider using `ENTRYPOINT` in
|
then you should consider using `ENTRYPOINT` in
|
||||||
combination with `CMD`. See
|
combination with `CMD`. See
|
||||||
[*ENTRYPOINT*](#dockerfile-entrypoint).
|
[*ENTRYPOINT*](#entrypoint).
|
||||||
|
|
||||||
If the user specifies arguments to `docker run` then
|
If the user specifies arguments to `docker run` then
|
||||||
they will override the default specified in CMD.
|
they will override the default specified in CMD.
|
||||||
|
|
|
@ -854,7 +854,7 @@ to view a list of all containers.
|
||||||
|
|
||||||
The `docker run` command can be used in combination
|
The `docker run` command can be used in combination
|
||||||
with `docker commit` to [*change the command that a
|
with `docker commit` to [*change the command that a
|
||||||
container runs*](#cli-commit-examples).
|
container runs*](#commit-an-existing-container).
|
||||||
|
|
||||||
See [*Redirect Ports*](../../../use/port_redirection/#port-redirection)
|
See [*Redirect Ports*](../../../use/port_redirection/#port-redirection)
|
||||||
for more detailed information about the `--expose`,
|
for more detailed information about the `--expose`,
|
||||||
|
|
|
@ -27,7 +27,7 @@ managed by Docker for this purpose. When the Docker daemon starts it :
|
||||||
docker0 Link encap:Ethernet HWaddr xx:xx:xx:xx:xx:xx
|
docker0 Link encap:Ethernet HWaddr xx:xx:xx:xx:xx:xx
|
||||||
inet addr:172.17.42.1 Bcast:0.0.0.0 Mask:255.255.0.0
|
inet addr:172.17.42.1 Bcast:0.0.0.0 Mask:255.255.0.0
|
||||||
|
|
||||||
At runtime, a [*specific kind of virtual interface*](#vethxxxx-device)
|
At runtime, a [*specific kind of virtual interface*](#what-is-the-vethxxxx-device)
|
||||||
is given to each container which is then bonded to the
|
is given to each container which is then bonded to the
|
||||||
`docker0` bridge. Each container also receives a
|
`docker0` bridge. Each container also receives a
|
||||||
dedicated IP address from the same range as `docker0`
|
dedicated IP address from the same range as `docker0`
|
||||||
|
|
|
@ -40,7 +40,7 @@ There are two types of public repositories: *top-level* repositories
|
||||||
which are controlled by the Docker team, and *user* repositories created
|
which are controlled by the Docker team, and *user* repositories created
|
||||||
by individual contributors. Anyone can read from these repositories –
|
by individual contributors. Anyone can read from these repositories –
|
||||||
they really help people get started quickly! You could also use
|
they really help people get started quickly! You could also use
|
||||||
[*Trusted Builds*](#using-private-repositories) if you need to keep
|
[*Trusted Builds*](#trusted-builds) if you need to keep
|
||||||
control of who accesses your images, but we will only refer to public
|
control of who accesses your images, but we will only refer to public
|
||||||
repositories in these examples.
|
repositories in these examples.
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue