From 94c80bece56a736f14e9c97d45c20d99045fdfe1 Mon Sep 17 00:00:00 2001 From: Adrien Duermael Date: Wed, 14 Dec 2016 14:10:46 -0800 Subject: [PATCH] fixed absolute links (#883) * fixed absolute links Signed-off-by: Adrien Duermael * forgot one link in opensource/kitematic/set_up_dev Signed-off-by: Adrien Duermael --- docker-cloud/builds/push-images.md | 2 +- .../getting-started/deploy-app/1_introduction.md | 2 +- docker-cloud/index.md | 2 +- docker-for-mac/docker-toolbox.md | 2 +- docker-for-mac/index.md | 2 +- engine/getstarted/linux_install_help.md | 2 +- .../installation/cloud/cloud-ex-machine-ocean.md | 8 ++++---- machine/get-started-cloud.md | 8 ++++---- machine/get-started.md | 6 +++--- machine/install-machine.md | 10 +++++----- opensource/code.md | 16 ++++++++-------- opensource/kitematic/set_up_dev.md | 2 +- opensource/ways/test.md | 6 +++--- test.md | 8 ++++---- 14 files changed, 38 insertions(+), 38 deletions(-) diff --git a/docker-cloud/builds/push-images.md b/docker-cloud/builds/push-images.md index b8017ead07..6551154b4d 100644 --- a/docker-cloud/builds/push-images.md +++ b/docker-cloud/builds/push-images.md @@ -15,7 +15,7 @@ Images pushed to Docker Hub automatically appear for you in the **Launch new service** wizard. > **Note**: You must use Docker Engine 1.6 or later to push to Docker Hub. -Follow the official installation instructions depending on your system. +Follow the official installation instructions depending on your system. 1. In a terminal window, set the environment variable **DOCKER_ID_USER** as *your username* in Docker Cloud. diff --git a/docker-cloud/getting-started/deploy-app/1_introduction.md b/docker-cloud/getting-started/deploy-app/1_introduction.md index 622a527c89..89ca02510d 100644 --- a/docker-cloud/getting-started/deploy-app/1_introduction.md +++ b/docker-cloud/getting-started/deploy-app/1_introduction.md @@ -16,7 +16,7 @@ This tutorial assumes that you have: - a free Docker ID account. - at least one node running. If you don't have any nodes set up in Docker Cloud yet, [start here](../../getting-started/your_first_node.md) to set these up. -- (optional) Docker Engine installed - see the installation guides for macOS, Windows and Linux. +- (optional) Docker Engine installed - see the installation guides for macOS, Windows and Linux. Let's get started! diff --git a/docker-cloud/index.md b/docker-cloud/index.md index a2ef59bd7b..5aa49265ae 100644 --- a/docker-cloud/index.md +++ b/docker-cloud/index.md @@ -47,6 +47,6 @@ title: Welcome to the Docker Cloud docs!

Learn how to link to your hosts, upgrade the Docker Cloud agent, and manage container distribution. See the AWS FAQ and Packet.net FAQ

- API Docs    ●    Frequently Asked Questions    ●    Release Notes + API Docs    ●    Frequently Asked Questions    ●    Release Notes diff --git a/docker-for-mac/docker-toolbox.md b/docker-for-mac/docker-toolbox.md index f879aea210..13d3ccf75a 100644 --- a/docker-for-mac/docker-toolbox.md +++ b/docker-for-mac/docker-toolbox.md @@ -92,7 +92,7 @@ The coexistence setup works as is as long as your VirtualBox VMs provisioned wit Ideally, the Docker CLI client and Docker Engine should be the same version. Mismatches between client and server, and among host machines you might have created with Docker Machine can cause problems (client can't talk to the server or host machines). -If you already have Docker Toolbox installed, and then install Docker for Mac, you might get a newer version of the Docker client. Run `docker version` in a command shell to see client and server versions. In this example, the client installed with Docker for Mac is `Version: 1.11.1` and the server (which was installed earlier with Toolbox) is Version: 1.11.0. +If you already have Docker Toolbox installed, and then install Docker for Mac, you might get a newer version of the Docker client. Run `docker version` in a command shell to see client and server versions. In this example, the client installed with Docker for Mac is `Version: 1.11.1` and the server (which was installed earlier with Toolbox) is Version: 1.11.0. $ docker version Client: diff --git a/docker-for-mac/index.md b/docker-for-mac/index.md index 7f80fa98cf..94f224169a 100644 --- a/docker-for-mac/index.md +++ b/docker-for-mac/index.md @@ -298,7 +298,7 @@ Registries](#custom-registries). On the **Daemon -> Advanced dialog**, you can directly configure the daemon from the JSON file, and determine entirely how your containers will run. For a full list of options on the Docker daemon, see daemon in the Docker Engine command line reference. After editing the daemon configuration , click **Apply & Restart** to save it diff --git a/engine/getstarted/linux_install_help.md b/engine/getstarted/linux_install_help.md index 2fe820fa32..fec35fc30a 100644 --- a/engine/getstarted/linux_install_help.md +++ b/engine/getstarted/linux_install_help.md @@ -9,7 +9,7 @@ title: 'Example: Install Docker on Ubuntu Linux' This installation procedure for users who are unfamiliar with package managers, and just want to try out the Getting Started tutorial while running Docker on Linux. If you are comfortable with package managers, prefer not to use `curl`, or have problems installing and want to troubleshoot, please use our -`apt` and `yum` repositories instead for your installation. 1. Log into your Ubuntu installation as a user with `sudo` privileges. diff --git a/engine/installation/cloud/cloud-ex-machine-ocean.md b/engine/installation/cloud/cloud-ex-machine-ocean.md index 9ebfc0965e..232c1d1a3c 100644 --- a/engine/installation/cloud/cloud-ex-machine-ocean.md +++ b/engine/installation/cloud/cloud-ex-machine-ocean.md @@ -42,11 +42,11 @@ To generate your access token: 1. If you have not done so already, install Docker Machine on your local host. - * How to install Docker Machine on macOS + * How to install Docker Machine on macOS - * How to install Docker Machine on Windows + * How to install Docker Machine on Windows - * Install Docker Machine directly (e.g., on Linux) + * Install Docker Machine directly (e.g., on Linux) 2. At a command terminal, use `docker-machine ls` to get a list of Docker Machines and their status. @@ -178,7 +178,7 @@ To generate your access token: #### Understand the defaults and options on the create command -For convenience, `docker-machine` will use sensible defaults for choosing settings such as the image that the server is based on, but you override the defaults using the respective flags (e.g. `--digitalocean-image`). This is useful if, for example, you want to create a cloud server with a lot of memory and CPUs (by default `docker-machine` creates a small server). For a full list of the flags/settings available and their defaults, see the output of `docker-machine create -h` at the command line. See also Driver options and operating system defaults and information about the create command in the Docker Machine documentation. +For convenience, `docker-machine` will use sensible defaults for choosing settings such as the image that the server is based on, but you override the defaults using the respective flags (e.g. `--digitalocean-image`). This is useful if, for example, you want to create a cloud server with a lot of memory and CPUs (by default `docker-machine` creates a small server). For a full list of the flags/settings available and their defaults, see the output of `docker-machine create -h` at the command line. See also Driver options and operating system defaults and information about the create command in the Docker Machine documentation. ### Step 5. Use Machine to remove the Droplet diff --git a/machine/get-started-cloud.md b/machine/get-started-cloud.md index 8a6d955dbf..4d26d8d07b 100644 --- a/machine/get-started-cloud.md +++ b/machine/get-started-cloud.md @@ -40,7 +40,7 @@ The `docker-machine create` command typically requires that you specify, at a mi For convenience, `docker-machine` will use sensible defaults for choosing settings such as the image that the server is based on, but you override the defaults using the respective flags (e.g. `--digitalocean-image`). This is useful if, for example, you want to create a cloud server with a lot of memory and CPUs (by default `docker-machine` creates a small server). -For a full list of the flags/settings available and their defaults, see the output of `docker-machine create -h` at the command line, the create command in the Machine command line reference, and driver options and operating system defaults in the Machine driver reference. +For a full list of the flags/settings available and their defaults, see the output of `docker-machine create -h` at the command line, the create command in the Machine command line reference, and driver options and operating system defaults in the Machine driver reference. ## Drivers for cloud providers @@ -65,11 +65,11 @@ You can add a host to Docker which only has a URL and no driver. Then you can us ## Using Machine to provision Docker Swarm clusters -Docker Machine can also provision Docker Swarm clusters. This can be used with any driver and will be secured with TLS. +Docker Machine can also provision Docker Swarm clusters. This can be used with any driver and will be secured with TLS. -* To get started with Swarm, see How to get Docker Swarm. +* To get started with Swarm, see How to get Docker Swarm. -* To learn how to use Machine to provision a Swarm cluster, see Provision a Swarm cluster with Docker Machine. +* To learn how to use Machine to provision a Swarm cluster, see Provision a Swarm cluster with Docker Machine. ## Where to go next - Example: Provision Dockerized [Digital Ocean Droplets](examples/ocean.md) diff --git a/machine/get-started.md b/machine/get-started.md index 76fb0eb77d..a4a8d232e5 100644 --- a/machine/get-started.md +++ b/machine/get-started.md @@ -72,8 +72,8 @@ Microsoft Hyper-V](drivers/hyper-v.md).) * Make sure you have the latest VirtualBox correctly installed on your system. If you used Toolbox for Mac -or Mac +or Windows to install Docker Machine, VirtualBox is automatically installed.
@@ -164,7 +164,7 @@ choose another name for this new machine. **Note**: If you are using `fish`, or a Windows shell such as Powershell/`cmd.exe` the above method will not work as described. - Instead, see the `env` command's documentation + Instead, see the `env` command's documentation to learn how to set the environment variables for your shell. This sets environment variables for the current shell that the Docker client will read which specify the TLS settings. You need to do this each time you open a new shell or restart your machine. diff --git a/machine/install-machine.md b/machine/install-machine.md index d6d0368377..c082af08ea 100644 --- a/machine/install-machine.md +++ b/machine/install-machine.md @@ -6,16 +6,16 @@ title: Install Docker Machine On macOS and Windows, Machine is installed along with other Docker products when you install the Docker Toolbox. For details on installing Docker Toolbox, see -the macOS +the macOS installation instructions or Windows +href="/docker-for-windows/" target="_blank">Windows installation instructions. If you want only Docker Machine, you can install the Machine binaries directly by following the instructions in the next section. You can find the latest versions of the binaries are on the docker/machine release page on GitHub. ## Installing Machine Directly -1. Install the Docker binary. 2. Download the Docker Machine binary and extract it to your PATH. @@ -61,5 +61,5 @@ You can find additional documentation in the comments at the Docker Machine driver reference -- Docker Machine subcommand reference \ No newline at end of file +- Docker Machine driver reference +- Docker Machine subcommand reference \ No newline at end of file diff --git a/opensource/code.md b/opensource/code.md index 7af7ae3272..bc2ed4fc41 100644 --- a/opensource/code.md +++ b/opensource/code.md @@ -21,36 +21,36 @@ If you are an experienced open source contributor you may be familiar with this workflow. If you are new or just need reminders, the steps below link to more detailed documentation in Docker's project contributors guide. -1. Get the software you need. This explains how to install a couple of tools used in our development environment. What you need (or don't need) might surprise you. -2. Configure Git and fork the repo. Your Git configuration can make it easier for you to contribute. Configuration is especially key if you are new to contributing or to Docker. -3. Learn to work with the Docker development container. Docker developers run `docker` in `docker`. If you are a geek, this is a pretty cool experience. -4. Claim an issue to work on. We created a filter listing all open and unclaimed issues for Docker. 5. Work on the +href="/opensource/workflow/work-issue/" target="_blank">Work on the issue. If you change or add code or docs to a project, you should test your changes as you work. This page explains how to + href="/opensource/project/test-and-docs/" target="_blank">how to test in our development environment. Also, remember to always **sign your commits** as you work! To sign your @@ -61,7 +61,7 @@ issue. If you don't sign Gordon will get you! -6. Create a +6. Create a pull request. If you make a change to fix an issue, add reference to the issue in the pull @@ -74,6 +74,6 @@ pull request. needs](code.md#what-is-the-pre-pull-request-checklist). -7. Participate in the pull request review till a successful merge. \ No newline at end of file diff --git a/opensource/kitematic/set_up_dev.md b/opensource/kitematic/set_up_dev.md index 56b1d2b996..97d11f8cbc 100644 --- a/opensource/kitematic/set_up_dev.md +++ b/opensource/kitematic/set_up_dev.md @@ -136,7 +136,7 @@ You can set your signature globally or locally. ``` (To learn more, see Set up your signature and an upstream remote.) +href="/opensource/project/set-up-git/#set-your-signature-and-an-upstream-remote" target="_blank"> Set up your signature and an upstream remote.) ## Install dependencies, start Kitematic, and verify your setup Your Node.js install includes npm for package management. You'll use it to install supporting packages and start the app. diff --git a/opensource/ways/test.md b/opensource/ways/test.md index b6a3251f64..d6a24b4eb5 100644 --- a/opensource/ways/test.md +++ b/opensource/ways/test.md @@ -26,10 +26,10 @@ problems. Testing documentation is relatively easy: -## Step 1. Find a page in Docker's documentation that contains a procedure or example you want to test. +## Step 1. Find a page in Docker's documentation that contains a procedure or example you want to test. You should choose something that _should work_ on your machine. For example, -creating +creating a base image is something anyone with Docker can do. While changing volume directories in Kitematic requires a Mac and Docker's Kitematic @@ -47,6 +47,6 @@ What to look for: # Test code in the Docker -If you are interested in writing or fixing test code for the Docker project, learn about our test infrastructure. +If you are interested in writing or fixing test code for the Docker project, learn about our test infrastructure. View our open test issues in Docker for something to work on. Or, create one of your own. diff --git a/test.md b/test.md index 00b10f9835..1c6a12e966 100644 --- a/test.md +++ b/test.md @@ -158,12 +158,12 @@ Some tables in markdown and html. - Go to the docs!

- It is dark here. You are likely to be eaten by a grue. + Go to the docs!

+ It is dark here. You are likely to be eaten by a grue. - Go to the docs!

- It is dark here. You are likely to be eaten by a grue. + Go to the docs!

+ It is dark here. You are likely to be eaten by a grue.