diff --git a/_data/toc.yaml b/_data/toc.yaml index b01165b221..7891c3ea43 100644 --- a/_data/toc.yaml +++ b/_data/toc.yaml @@ -319,7 +319,7 @@ toc: title: Link via an ambassador container - sectiontitle: Troubleshoot Docker Engine section: - - path: /engine/admin/troubleshooting_volume_errors.md + - path: /engine/admin/troubleshooting_volume_errors/ title: Troubleshoot volume problems - sectiontitle: Manage a swarm section: @@ -365,7 +365,7 @@ toc: title: Deploy services to a swarm - path: /engine/swarm/secrets/ title: Manage sensitive data with Docker secrets - - path: /engine/swarm/swarm_manager_locking.md + - path: /engine/swarm/swarm_manager_locking/ title: Lock your swarm - path: /engine/swarm/networking/ title: Attach services to an overlay network @@ -449,8 +449,18 @@ toc: title: docker attach - path: /engine/reference/commandline/build/ title: docker build - - path: /engine/reference/commandline/checkpoint/ - title: docker checkpoint + - sectiontitle: docker checkpoint * + section: + - path: /engine/reference/commandline/checkpoint/ + title: docker checkpoint + - path: /engine/reference/commandline/checkpoint_create/ + title: docker checkpoint create + - path: /engine/reference/commandline/checkpoint_create/ + title: docker checkpoint create + - path: /engine/reference/commandline/checkpoint_ls/ + title: docker checkpoint ls + - path: /engine/reference/commandline/checkpoint_rm/ + title: docker checkpoint rm - path: /engine/reference/commandline/commit/ title: docker commit - sectiontitle: docker container * @@ -1152,7 +1162,7 @@ toc: - path: /datacenter/ucp/1.1/reference/join/ title: join - path: /datacenter/ucp/1.1/reference/regen-certs/ - title: regen-certs.md + title: regen-certs/ - path: /datacenter/ucp/1.1/reference/restart/ title: restart - path: /datacenter/ucp/1.1/reference/restore/ diff --git a/cs-engine/release-notes/release-notes.md b/cs-engine/release-notes/release-notes.md index 7907aed7e6..02a20304a9 100644 --- a/cs-engine/release-notes/release-notes.md +++ b/cs-engine/release-notes/release-notes.md @@ -90,7 +90,7 @@ This release addresses the following issues: to the local volume driver for nfs mount options. * [26111](https://github.com/docker/docker/issues/26111) Fix issue with adding iptables rules due to xtables lock message change. -* [#1572](github.com/docker/libnetwork/issues/1572) Fix daemon panic +* [#1572](https://github.com/docker/libnetwork/issues/1572) Fix daemon panic * [1130](https://github.com/docker/libnetwork/pull/1130) Fix IPAM out of sync issue on ungraceful shutdown. diff --git a/docker-for-aws/release-notes.md b/docker-for-aws/release-notes.md index 24d518ca0c..ae7c0442a2 100644 --- a/docker-for-aws/release-notes.md +++ b/docker-for-aws/release-notes.md @@ -21,7 +21,7 @@ Release date: 12/06/2016 - New option to decide if you want to send container logs to CloudWatch. (previously it was always on) - SSH access has been added to the worker nodes - The Docker daemon no longer listens on port 2375 -- Added a `swarm-exec` to execute a docker command across all of the swarm nodes. See [Executing Docker commands in all swarm nodes](deploy.md#execute-docker-commands-in-all-swarm-nodes) for more details. +- Added a `swarm-exec` to execute a docker command across all of the swarm nodes. See [Executing Docker commands in all swarm nodes](/docker-for-aws/deploy.md#execute-docker-commands-in-all-swarm-nodes) for more details. ## 1.13.0-rc2-beta12 Release date: 11/23/2016 @@ -62,8 +62,8 @@ Release date: 10/27/2016 - Docker Engine upgraded to Docker 1.12.3 - Fixed the shell container that runs on the managers, to remove a ssh host key that was accidentally added to the image. 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. -- 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 -- Each Manager can be SSH'd into by following our deploy [guide](docker-for-aws/deploy.md) +- The SSH ELB for connecting to the managers by SSH has been removed because it is no longer possible to SSH into the managers without getting a security warning +- You can connect to each manager using SSH by following our deploy [guide](/docker-for-aws/deploy.md) - Added new region us-east-2 (Ohio) - Fixed some bugs related to upgrading the swarm - SSH keypair is now a required field in CloudFormation diff --git a/docker-for-azure/release-notes.md b/docker-for-azure/release-notes.md index 9890739776..aadb845755 100644 --- a/docker-for-azure/release-notes.md +++ b/docker-for-azure/release-notes.md @@ -37,7 +37,7 @@ Release date: 11/08/2016 - Docker Engine upgraded to Docker 1.12.3 - Fixed the shell container that runs on the managers, to remove a ssh host key that was accidentally added to the image. 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. -- 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 +- The SSH ELB for connecting to the managers using SSH has been removed because it is no longer possible to SSH into the managers without getting a security warning - Multiple managers can be deployed - All container logs can be found in the `xxxxlog` storage account - You can connect to each manager using SSH by following our deploy [guide](deploy.md) diff --git a/docker-for-mac/index.md b/docker-for-mac/index.md index eadc13cd8d..bbc092fc43 100644 --- a/docker-for-mac/index.md +++ b/docker-for-mac/index.md @@ -430,7 +430,7 @@ such as To activate bash completion, these files need to be copied or symlinked to your `bash_completion.d/` directory. For example, if you use -[Homebrew](htt://brew.sh/): +[Homebrew](http://brew.sh/): ```bash ln -s /Applications/Docker.app/Contents/Resources/etc/docker.bash-completion /usr/local/etc/bash_completion.d/docker diff --git a/docker-for-windows/index.md b/docker-for-windows/index.md index 2a4a55d343..465ec925ec 100644 --- a/docker-for-windows/index.md +++ b/docker-for-windows/index.md @@ -772,7 +772,7 @@ If you want to go back to using Docker Toolbox, you have to disable the Hyper-V walkthroughs and source code. * For a summary of Docker command line interface (CLI) commands, see the - [Docker CLI Reference Guide](/engine/reference/docker.md). + [Docker CLI Reference Guide](/engine/reference/commandline/docker.md). * Check out the blog post [Introducing Docker 1.13.0](https://blog.docker.com/2017/01/whats-new-in-docker-1-13/). diff --git a/engine/reference/commandline/checkpoint_create.md b/engine/reference/commandline/checkpoint_create.md new file mode 100644 index 0000000000..b9a6e412b9 --- /dev/null +++ b/engine/reference/commandline/checkpoint_create.md @@ -0,0 +1,13 @@ +--- +datafolder: engine-cli +datafile: docker_checkpoint_create +title: docker checkpoint create +--- + +{% include cli.md %} diff --git a/engine/reference/commandline/checkpoint_ls.md b/engine/reference/commandline/checkpoint_ls.md new file mode 100644 index 0000000000..8db41a9cb2 --- /dev/null +++ b/engine/reference/commandline/checkpoint_ls.md @@ -0,0 +1,13 @@ +--- +datafolder: engine-cli +datafile: docker_checkpoint_ls +title: docker checkpoint ls +--- + +{% include cli.md %} diff --git a/engine/reference/commandline/checkpoint_rm.md b/engine/reference/commandline/checkpoint_rm.md new file mode 100644 index 0000000000..fdc8c07f86 --- /dev/null +++ b/engine/reference/commandline/checkpoint_rm.md @@ -0,0 +1,13 @@ +--- +datafolder: engine-cli +datafile: docker_checkpoint_rm +title: docker checkpoint rm +--- + +{% include cli.md %} diff --git a/engine/swarm/admin_guide.md b/engine/swarm/admin_guide.md index 2982a95881..73b2b0c0aa 100644 --- a/engine/swarm/admin_guide.md +++ b/engine/swarm/admin_guide.md @@ -171,7 +171,7 @@ directory of one of the manager nodes to restore to a new swarm. You can monitor the health of manager nodes by querying the docker `nodes` API in JSON format through the `/nodes` HTTP endpoint. Refer to the -[nodes API documentation](/engine/reference/api/docker_remote_api_v1.24.md#36-nodes) +[nodes API documentation](/engine/api/v1.25/#tag/Node) for more information. From the command line, run `docker node inspect ` to query the nodes. diff --git a/engine/swarm/stack-deploy.md b/engine/swarm/stack-deploy.md index 5f5e11b0fa..eec16d6704 100644 --- a/engine/swarm/stack-deploy.md +++ b/engine/swarm/stack-deploy.md @@ -17,7 +17,7 @@ To run through this tutorial, you will need: 1. A Docker Engine of version 1.13.0 or later, running in [swarm mode](/engine/swarm/swarm-mode.md). If you're not familiar with swarm mode, you might want to read - [Swarm mode key concepts ](/engine/swarm/how-swarm-mode-works/key-concepts.md) + [Swarm mode key concepts](/engine/swarm/key-concepts.md) and [How services work](/engine/swarm/how-swarm-mode-works/services.md). > **Note:** If you're trying things out on a local development environment, diff --git a/engine/userguide/index.md b/engine/userguide/index.md index 51841d11e9..8d6664026c 100644 --- a/engine/userguide/index.md +++ b/engine/userguide/index.md @@ -13,7 +13,7 @@ This guide helps users learn how to use Docker Engine. - [Hello world in a container](/engine/getstarted/step_one.md) - [Build your own images](/engine/getstarted/step_four.md) - [Network containers](/engine/tutorials/networkingcontainers.md) -- [Run a simple application](/engine/userguide/step_three.md) +- [Run a simple application](/engine/getstarted/step_three.md) - [Manage data in containers](/engine/tutorials/dockervolumes.md) - [Store images on Docker Hub](/engine/getstarted/step_six.md) diff --git a/opensource/workflow/advanced-contributing.md b/opensource/workflow/advanced-contributing.md index 00139d423b..e01810c3de 100644 --- a/opensource/workflow/advanced-contributing.md +++ b/opensource/workflow/advanced-contributing.md @@ -15,7 +15,7 @@ Your goal should be to understand the processes described. At this point, you should have read and worked through the earlier parts of the project contributor guide. You should also have - made at least one project contribution. +[made at least one project contribution](make-a-contribution/){: target="_blank" class="_"}. ## Refactor or cleanup proposal @@ -56,22 +56,21 @@ with someone on design work. The following provides greater detail on the process: -1. Come up with an idea. +1. Come up with an idea. Ideas usually come from limitations users feel working with a product. So, take some time to really use Docker. Try it on different platforms; explore how it works with different web applications. Go to some community events and find out what other users want. -2. Review existing issues and proposals to make sure no other user is proposing a similar idea. +2. Review existing issues and proposals to make sure no other user is proposing a similar idea. - The design proposals are all online in our GitHub pull requests. + The design proposals are + [all online in our GitHub pull requests](https://github.com/docker/docker/pulls?q=is%3Aopen+is%3Apr+label%3Akind%2Fproposal){: target="_blank" class="_"} -3. Talk to the community about your idea. +3. Talk to the community about your idea. - We have lots of community forums + We have lots of [community forums](https://forums.docker.com){: target="_blank" class="_"} where you can get feedback on your idea. Float your idea in a forum or two to get some commentary going on it. @@ -149,4 +148,4 @@ Making a pull request with a design proposal simplifies this process: * as a proposal changes and is updated, pages reset as line items resolve * GitHub maintains the entire history -While proposals in pull requests do not end up merged into a master repository, they provide a convenient tool for managing the design process. \ No newline at end of file +While proposals in pull requests do not end up merged into a master repository, they provide a convenient tool for managing the design process. diff --git a/swarm/swarm_at_scale/deploy-app.md b/swarm/swarm_at_scale/deploy-app.md index e87b9163b2..352c268e06 100644 --- a/swarm/swarm_at_scale/deploy-app.md +++ b/swarm/swarm_at_scale/deploy-app.md @@ -16,7 +16,7 @@ starting a number of "Dockerized applications" running in containers. The diagram below shows the final application configuration including the overlay container network, `voteapp`. -![](/swarm/swarm_at_scale/images/final-result.png) +![](/swarm/images/final-result.png) In this procedure you will connect containers to this network. The `voteapp` network is available to all Docker hosts using the Consul discovery backend. @@ -239,7 +239,7 @@ Now, you can test your application. You should see something similar to the following: - ![](/swarm/swarm_at_scale/images/vote-app-test.png) + ![](/swarm/images/vote-app-test.png) 2. Click on one of the two voting options. 3. Navigate to the `http://results.myenterprise.example.com` site to see the results. @@ -247,7 +247,7 @@ Now, you can test your application. You'll see both sides change as you switch your vote. - ![](/swarm/swarm_at_scale/images/votes.gif) + ![](/swarm/images/votes.gif) ## Extra Credit: Deployment with Docker Compose