Skip to content

Commit ef95a91

Browse files
author
Misty Stanley-Jones
committed
Fixing broken links
Formatting improvements along the way
1 parent 74e52a5 commit ef95a91

40 files changed

Lines changed: 929 additions & 647 deletions

File tree

‎_data/dockerd-cli/dockerd.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ long: |
1111
1212
## Daemon socket option
1313
14-
The Docker daemon can listen for [Docker Remote API](../api/docker_remote_api.md)
14+
The Docker daemon can listen for [Docker Remote API](/engine/api/index.md)
1515
requests via three different types of Socket: `unix`, `tcp`, and `fd`.
1616
1717
By default, a `unix` domain socket (or IPC socket) is created at

‎_data/toc.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -449,6 +449,8 @@ toc:
449449
title: docker attach
450450
- path: /engine/reference/commandline/build/
451451
title: docker build
452+
- path: /engine/reference/commandline/checkpoint/
453+
title: docker checkpoint
452454
- path: /engine/reference/commandline/commit/
453455
title: docker commit
454456
- sectiontitle: docker container *

‎_includes/content/typical_docker_workflow.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
- Build, then run your containers on a virtual host via [Docker Machine](machine/overview.md) as you develop.
1212
2. Configure [networking](engine/tutorials/networkingcontainers.md) and
1313
[storage](engine/tutorials/dockervolumes.md) for your solution, if needed.
14-
3. Upload builds to a registry ([ours](engine/tutorials/dockerrepos.md), [yours](/datacenter/dtr/2.0/index.md), or your cloud provider's), to collaborate with your team.
14+
3. Upload builds to a registry ([ours](/engine/getstarted/step_six.md), [yours](/datacenter/dtr/2.0/index.md), or your cloud provider's), to collaborate with your team.
1515
4. If you're gonna need to scale your solution across multiple hosts (VMs or physical machines), [plan
1616
for how you'll set up your Swarm cluster](engine/swarm/key-concepts.md) and [scale it to meet demand](engine/swarm/swarm-tutorial/index.md).
1717
- Note: Use [Universal Control Plane](/datacenter/ucp/1.1/overview.md) and you can manage your

‎compose/install.md‎

Lines changed: 58 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -8,46 +8,54 @@ You can run Compose on macOS, Windows and 64-bit Linux. To install it, you'll ne
88

99
To install Compose, do the following:
1010

11-
1. Install Docker Engine:
11+
1. Install Docker Engine:
1212

13-
* <a href="/engine/installation/mac/" target="_blank">macOS installation</a>
13+
* [macOS installation](/docker-for-mac/index.md){: target="_blank" class="_"}
1414

15-
* <a href="/engine/installation/windows/" target="_blank">Windows installation</a>
15+
* [Windows installation](/docker-for-windows/index.md){: target="_blank" class="_"}
1616

17-
* <a href="/engine/installation/linux/ubuntulinux/" target="_blank">Ubuntu installation</a>
17+
* [Ubuntu installation](/engine/installation/linux/ubuntu.md){: target="_blank" class="_"}
1818

19-
* <a href="/engine/installation/" target="_blank">other system installations</a>
19+
* [Other systems](/engine/installation/index.md){: target="_blank" class="_"}
2020

21-
2. The Docker Toolbox installation includes both Engine and Compose, so Mac and Windows users are done installing. Others should continue to the next step.
21+
2. The Docker Toolbox installation includes both Engine and Compose, so Mac and
22+
Windows users are done installing. Others should continue to the next step.
2223

23-
3. Go to the <a href="https://github.com/docker/compose/releases" target="_blank">Compose repository release page on GitHub</a>.
24+
3. Go to the
25+
[Compose repository release page on GitHub](https://github.com/docker/compose/releases){: target="_blank" class="_"}.
2426

25-
4. Follow the instructions from the release page and run the `curl` command,
26-
which the release page specifies, in your terminal.
27+
4. Follow the instructions from the release page and run the `curl` command,
28+
which the release page specifies, in your terminal.
2729

28-
> Note: If you get a "Permission denied" error, your `/usr/local/bin` directory
29-
probably isn't writable and you'll need to install Compose as the superuser. Run
30-
`sudo -i`, then the two commands below, then `exit`.
30+
> Note: If you get a "Permission denied" error, your `/usr/local/bin` directory
31+
> probably isn't writable and you'll need to install Compose as the superuser. Run
32+
> `sudo -i`, then the two commands below, then `exit`.
3133
32-
The following is an example command illustrating the format:
34+
The following is an example command illustrating the format:
3335

34-
$ curl -L "https://github.com/docker/compose/releases/download/1.10.0/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
36+
```bash
37+
$ curl -L "https://github.com/docker/compose/releases/download/1.10.0/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
38+
```
3539

36-
If you have problems installing with `curl`, see
37-
[Alternative Install Options](install.md#alternative-install-options).
40+
If you have problems installing with `curl`, see
41+
[Alternative Install Options](install.md#alternative-install-options).
3842

39-
5. Apply executable permissions to the binary:
43+
5. Apply executable permissions to the binary:
4044

41-
chmod +x /usr/local/bin/docker-compose
45+
```bash
46+
$ chmod +x /usr/local/bin/docker-compose
47+
```
4248

4349
6. Optionally, install [command completion](completion.md) for the
44-
`bash` and `zsh` shell.
50+
`bash` and `zsh` shell.
4551

46-
7. Test the installation.
52+
7. Test the installation.
4753

48-
$ docker-compose --version
49-
docker-compose version: 1.10.0
54+
```bash
55+
$ docker-compose --version
5056
57+
docker-compose version: 1.10.0
58+
```
5159

5260
## Alternative install options
5361

@@ -60,7 +68,9 @@ have python system packages that conflict with docker-compose dependencies. See
6068
the [virtualenv tutorial](http://docs.python-guide.org/en/latest/dev/virtualenvs/)
6169
to get started.
6270

63-
pip install docker-compose
71+
```bash
72+
$ pip install docker-compose
73+
```
6474

6575
> **Note:** pip version 6.0 or greater is required
6676

@@ -69,15 +79,18 @@ to get started.
6979
Compose can also be run inside a container, from a small bash script wrapper.
7080
To install compose as a container run:
7181

72-
$ curl -L https://github.com/docker/compose/releases/download/1.10.0/run.sh > /usr/local/bin/docker-compose
73-
$ chmod +x /usr/local/bin/docker-compose
82+
```bash
83+
$ curl -L https://github.com/docker/compose/releases/download/1.10.0/run.sh > /usr/local/bin/docker-compose
84+
$ chmod +x /usr/local/bin/docker-compose
85+
```
7486

7587
## Master builds
7688

7789
If you're interested in trying out a pre-release build you can download a
78-
binary from [https://dl.bintray.com/docker-compose/master/](https://dl.bintray.com/docker-compose/master/). Pre-release
79-
builds allow you to try out new features before they are released, but may
80-
be less stable.
90+
binary from
91+
[https://dl.bintray.com/docker-compose/master/](https://dl.bintray.com/docker-compose/master/).
92+
Pre-release builds allow you to try out new features before they are released,
93+
but may be less stable.
8194
8295
8396
## Upgrading
@@ -92,27 +105,35 @@ to run so that you don't end up with two sets of them. If you want to keep using
92105
your existing containers (for example, because they have data volumes you want
93106
to preserve) you can use compose 1.5.x to migrate them with the following command:
94107

95-
docker-compose migrate-to-labels
108+
```bash
109+
$ docker-compose migrate-to-labels
110+
```
96111

97112
Alternatively, if you're not worried about keeping them, you can remove them.
98113
Compose will just create new ones.
99114
100-
docker rm -f -v myapp_web_1 myapp_db_1 ...
115+
```bash
116+
docker rm -f -v myapp_web_1 myapp_db_1 ...
117+
```
101118
102119
## Uninstallation
103120
104121
To uninstall Docker Compose if you installed using `curl`:
105122
106-
rm /usr/local/bin/docker-compose
123+
```bash
124+
rm /usr/local/bin/docker-compose
125+
```
107126
108127
To uninstall Docker Compose if you installed using `pip`:
109128
110-
pip uninstall docker-compose
129+
```bash
130+
$ pip uninstall docker-compose
131+
```
111132
112-
>**Note**: If you get a "Permission denied" error using either of the above
113-
>methods, you probably do not have the proper permissions to remove
114-
>`docker-compose`. To force the removal, prepend `sudo` to either of the above
115-
>commands and run again.
133+
> **Note**: If you get a "Permission denied" error using either of the above
134+
> methods, you probably do not have the proper permissions to remove
135+
> `docker-compose`. To force the removal, prepend `sudo` to either of the above
136+
> >commands and run again.
116137
117138
118139
## Where to go next
@@ -122,5 +143,5 @@ To uninstall Docker Compose if you installed using `pip`:
122143
- [Get started with Django](django.md)
123144
- [Get started with Rails](rails.md)
124145
- [Get started with WordPress](wordpress.md)
125-
- [Command line reference](./reference/index.md)
146+
- [Command line reference](/compose/reference/index.md)
126147
- [Compose file reference](compose-file.md)

‎docker-for-aws/release-notes.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ Release date: 10/27/2016
6363
- Fixed the shell container that runs on the managers, to remove a ssh host key that was accidentally added to the image.
6464
This could have led to a potential man in the middle (MITM) attack. The ssh host key is now generated on host startup, so that each host has its own key.
6565
- The SSH ELB for SSH'ing into the managers has been removed because it is no longer possible to SSH into the managers without getting a security warning
66-
- Each Manager can be SSH'd into by following our deploy [guide](../deploy)
66+
- Each Manager can be SSH'd into by following our deploy [guide](docker-for-aws/deploy.md)
6767
- Added new region us-east-2 (Ohio)
6868
- Fixed some bugs related to upgrading the swarm
6969
- SSH keypair is now a required field in CloudFormation

0 commit comments

Comments
 (0)