From 2fad6265d299500f79b49685be3f5713ef1881dc Mon Sep 17 00:00:00 2001 From: Jakob Krigovsky Date: Thu, 11 Jul 2019 00:08:00 +0200 Subject: [PATCH] =?UTF-8?q?Fix=20spelling=20of=20=E2=80=9CDigitalOcean?= =?UTF-8?q?=E2=80=9D=20(#8938)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Thanks for helping with this as well! --- _data/toc.yaml | 4 ++-- get-started/part2.md | 2 +- machine/concepts.md | 2 +- machine/drivers/digital-ocean.md | 16 ++++++++-------- machine/drivers/index.md | 2 +- machine/examples/index.md | 2 +- machine/examples/ocean.md | 20 ++++++++++---------- machine/get-started-cloud.md | 14 +++++++------- machine/index.md | 2 +- machine/overview.md | 2 +- release-notes/docker-machine.md | 6 +++--- swarm/provision-with-machine.md | 2 +- 12 files changed, 37 insertions(+), 37 deletions(-) diff --git a/_data/toc.yaml b/_data/toc.yaml index 3e18ac5f10..348e8a55dd 100644 --- a/_data/toc.yaml +++ b/_data/toc.yaml @@ -3247,7 +3247,7 @@ manuals: - sectiontitle: Learn by example section: - path: /machine/examples/ocean/ - title: Provision Digital Ocean Droplets + title: Provision DigitalOcean Droplets - path: /machine/examples/aws/ title: Provision AWS EC2 instances - path: /machine/concepts/ @@ -3309,7 +3309,7 @@ manuals: - path: /machine/drivers/aws/ title: Amazon Web Services - path: /machine/drivers/digital-ocean/ - title: Digital Ocean + title: DigitalOcean - path: /machine/drivers/exoscale/ title: Exoscale - path: /machine/drivers/generic/ diff --git a/get-started/part2.md b/get-started/part2.md index 89968c1e96..4f3b056d74 100644 --- a/get-started/part2.md +++ b/get-started/part2.md @@ -402,7 +402,7 @@ application by running this container in a **service**. [Continue to Part 3 >>](part3.md){: class="button outline-btn"} -Or, learn how to [launch your container on your own machine using Digital Ocean](https://docs.docker.com/machine/examples/ocean/){: target="_blank" class="_" }. +Or, learn how to [launch your container on your own machine using DigitalOcean](https://docs.docker.com/machine/examples/ocean/){: target="_blank" class="_" }. ## Recap and cheat sheet (optional) diff --git a/machine/concepts.md b/machine/concepts.md index 7129318707..3a684f76ff 100644 --- a/machine/concepts.md +++ b/machine/concepts.md @@ -8,7 +8,7 @@ Docker Machine allows you to provision Docker machines in a variety of environme ## Drivers for creating machines -To create a virtual machine, you supply Docker Machine with the name of the driver you want to use. The driver determines where the virtual machine is created. For example, on a local Mac or Windows system, the driver is typically Oracle VirtualBox. For provisioning physical machines, a generic driver is provided. For cloud providers, Docker Machine supports drivers such as AWS, Microsoft Azure, Digital Ocean, and many more. The Docker Machine reference includes a complete [list of supported drivers](drivers/index.md). +To create a virtual machine, you supply Docker Machine with the name of the driver you want to use. The driver determines where the virtual machine is created. For example, on a local Mac or Windows system, the driver is typically Oracle VirtualBox. For provisioning physical machines, a generic driver is provided. For cloud providers, Docker Machine supports drivers such as AWS, Microsoft Azure, DigitalOcean, and many more. The Docker Machine reference includes a complete [list of supported drivers](drivers/index.md). ## Default base operating systems for local and cloud hosts diff --git a/machine/drivers/digital-ocean.md b/machine/drivers/digital-ocean.md index d7baa1cc1e..20dd2b1a69 100644 --- a/machine/drivers/digital-ocean.md +++ b/machine/drivers/digital-ocean.md @@ -1,12 +1,12 @@ --- -description: Digital Ocean driver for machine +description: DigitalOcean driver for machine keywords: machine, digitalocean, driver -title: Digital Ocean +title: DigitalOcean --- -Create Docker machines on [Digital Ocean](https://www.digitalocean.com/). +Create Docker machines on [DigitalOcean](https://www.digitalocean.com/). -You need to create a personal access token under "Apps & API" in the Digital Ocean +You need to create a personal access token under "Apps & API" in the DigitalOcean Control Panel and pass that to `docker-machine create` with the `--digitalocean-access-token` option. ## Usage @@ -26,14 +26,14 @@ Control Panel and pass that to `docker-machine create` with the `--digitalocean- ## Options -- `--digitalocean-access-token`: **required**. Your personal access token for the Digital Ocean API. -- `--digitalocean-backups`: Enable Digital Ocean backups for the droplet. -- `--digitalocean-image`: The name of the Digital Ocean image to use. +- `--digitalocean-access-token`: **required**. Your personal access token for the DigitalOcean API. +- `--digitalocean-backups`: Enable DigitalOcean backups for the droplet. +- `--digitalocean-image`: The name of the DigitalOcean image to use. - `--digitalocean-ipv6`: Enable IPv6 support for the droplet. - `--digitalocean-monitoring`: Enable monitoring for the droplet. - `--digitalocean-private-networking`: Enable private networking support for the droplet. - `--digitalocean-region`: The region to create the droplet in, see [Regions API](https://developers.digitalocean.com/documentation/v2/#regions) for how to get a list. -- `--digitalocean-size`: The size of the Digital Ocean droplet (larger than default options are of the form `2gb`). +- `--digitalocean-size`: The size of the DigitalOcean droplet (larger than default options are of the form `2gb`). - `--digitalocean-ssh-key-fingerprint`: Use an existing SSH key instead of creating a new one, see [SSH keys](https://developers.digitalocean.com/documentation/v2/#ssh-keys). - `--digitalocean-ssh-key-path`: SSH private key path. - `--digitalocean-ssh-port`: SSH port. diff --git a/machine/drivers/index.md b/machine/drivers/index.md index 4990e89786..58728b852e 100644 --- a/machine/drivers/index.md +++ b/machine/drivers/index.md @@ -6,7 +6,7 @@ title: Machine drivers - [Amazon Web Services](aws.md) - [Microsoft Azure](azure.md) -- [Digital Ocean](digital-ocean.md) +- [DigitalOcean](digital-ocean.md) - [Exoscale](exoscale.md) - [Google Compute Engine](gce.md) - [Linode](linode.md) (unofficial plugin, not supported by Docker) diff --git a/machine/examples/index.md b/machine/examples/index.md index c11cf5dc27..b5ec8af70f 100644 --- a/machine/examples/index.md +++ b/machine/examples/index.md @@ -3,5 +3,5 @@ description: Examples of cloud installs keywords: docker, machine, amazonec2, azure, digitalocean, google, openstack, rackspace, softlayer, virtualbox, vmwarefusion, vmwarevcloudair, vmwarevsphere, exoscale title: Learn by example --- -- [Digital Ocean Example](ocean.md) +- [DigitalOcean Example](ocean.md) - [AWS Example](aws.md) diff --git a/machine/examples/ocean.md b/machine/examples/ocean.md index 1abfbf2810..b0830b0f8f 100644 --- a/machine/examples/ocean.md +++ b/machine/examples/ocean.md @@ -1,22 +1,22 @@ --- -description: Using Docker Machine to provision hosts on Digital Ocean +description: Using Docker Machine to provision hosts on DigitalOcean keywords: docker, machine, cloud, digitalocean -title: Digital Ocean example +title: DigitalOcean example --- -Follow along with this example to create a Dockerized [Digital Ocean](https://digitalocean.com) Droplet (cloud host). +Follow along with this example to create a Dockerized [DigitalOcean](https://digitalocean.com) Droplet (cloud host). -### Step 1. Create a Digital Ocean account +### Step 1. Create a DigitalOcean account -If you have not done so already, go to [Digital Ocean](https://digitalocean.com), create an account, and log in. +If you have not done so already, go to [DigitalOcean](https://digitalocean.com), create an account, and log in. ### Step 2. Generate a personal access token To generate your access token: -1. Go to the Digital Ocean administrator console and click **API** in the header. +1. Go to the DigitalOcean administrator console and click **API** in the header. - ![Click API in Digital Ocean console](../img/ocean_click_api.png) + ![Click API in DigitalOcean console](../img/ocean_click_api.png) 2. Click **Generate new token** to get to the token generator. @@ -59,9 +59,9 @@ To generate your access token: When the Droplet is created, Docker generates a unique SSH key and stores it on your local system in `~/.docker/machines`. Initially, this is used to provision the host. Later, it's used under the hood to access the Droplet directly with the `docker-machine ssh` command. Docker Engine is installed on the cloud server and the daemon is configured to accept remote connections over TCP using TLS for authentication. -2. Go to the Digital Ocean console to view the new Droplet. +2. Go to the DigitalOcean console to view the new Droplet. - ![Droplet in Digital Ocean created with Machine](../img/ocean_droplet.png) + ![Droplet in DigitalOcean created with Machine](../img/ocean_droplet.png) 3. At the command terminal, run `docker-machine ls`. @@ -131,7 +131,7 @@ To remove a host and all of its containers and images, first stop the machine, t NAME ACTIVE DRIVER STATE URL SWARM default * virtualbox Running tcp:////xxx.xxx.xx.xxx:xxxx -If you monitor the Digital Ocean console while you run these commands, notice +If you monitor the DigitalOcean console while you run these commands, notice that it updates first to reflect that the Droplet was stopped, and then removed. If you create a host with Docker Machine, but remove it through the cloud diff --git a/machine/get-started-cloud.md b/machine/get-started-cloud.md index dc9d3e8b05..e94c0a5670 100644 --- a/machine/get-started-cloud.md +++ b/machine/get-started-cloud.md @@ -13,15 +13,15 @@ cloud provider. Then you provide account verification, security credentials, and configuration options for the providers as flags to `docker-machine create`. The flags are -unique for each cloud-specific driver. For instance, to pass a Digital Ocean +unique for each cloud-specific driver. For instance, to pass a DigitalOcean access token you use the `--digitalocean-access-token` flag. Take a look at the -examples below for Digital Ocean and AWS. +examples below for DigitalOcean and AWS. ## Examples -### Digital Ocean +### DigitalOcean -For Digital Ocean, this command creates a Droplet (cloud host) called +For DigitalOcean, this command creates a Droplet (cloud host) called "docker-sandbox". ```shell @@ -29,7 +29,7 @@ $ docker-machine create --driver digitalocean --digitalocean-access-token xxxxx ``` For a step-by-step guide on using Machine to create Docker hosts on Digital -Ocean, see the [Digital Ocean Example](examples/ocean.md). +Ocean, see the [DigitalOcean Example](examples/ocean.md). ### Amazon Web Services (AWS) @@ -72,7 +72,7 @@ Machine driver reference. ## Drivers for cloud providers When you install Docker Machine, you get a set of drivers for various cloud -providers (like Amazon Web Services, Digital Ocean, or Microsoft Azure) and +providers (like Amazon Web Services, DigitalOcean, or Microsoft Azure) and local providers (like Oracle VirtualBox, VMWare Fusion, or Microsoft Hyper-V). See [Docker Machine driver reference](/machine/drivers/index.md){: @@ -120,7 +120,7 @@ tutorials: ## Where to go next -- Example: Provision Dockerized [Digital Ocean Droplets](examples/ocean.md) +- Example: Provision Dockerized [DigitalOcean Droplets](examples/ocean.md) - Example: Provision Dockerized [AWS EC2 Instances](examples/aws.md) - [Understand Machine concepts](concepts.md) - [Docker Machine driver reference](drivers/index.md) diff --git a/machine/index.md b/machine/index.md index d9f0228ef2..a850137f44 100644 --- a/machine/index.md +++ b/machine/index.md @@ -8,7 +8,7 @@ title: Docker Machine - [Install Docker Machine](install-machine.md) - [Install a machine on your local system using VirtualBox](get-started.md) - [Install multiple machines on your cloud provider](get-started-cloud.md) -- [Digital Ocean Example](examples/ocean.md) +- [DigitalOcean Example](examples/ocean.md) - [AWS Example](examples/aws.md) - [Machine concepts and help](concepts.md) - [Migrate from Boot2Docker to Docker Machine](migrate-to-machine.md) diff --git a/machine/overview.md b/machine/overview.md index 9606519418..d8d0d35e9a 100644 --- a/machine/overview.md +++ b/machine/overview.md @@ -15,7 +15,7 @@ You can use Docker Machine to: Docker Machine is a tool that lets you install Docker Engine on virtual hosts, and manage the hosts with `docker-machine` commands. You can use Machine to create Docker hosts on your local Mac or Windows box, on your company network, -in your data center, or on cloud providers like Azure, AWS, or Digital Ocean. +in your data center, or on cloud providers like Azure, AWS, or DigitalOcean. Using `docker-machine` commands, you can start, inspect, stop, and restart a managed host, upgrade the Docker client and daemon, and configure a Docker diff --git a/release-notes/docker-machine.md b/release-notes/docker-machine.md index 9ad0da9b09..48190f4ddd 100644 --- a/release-notes/docker-machine.md +++ b/release-notes/docker-machine.md @@ -505,7 +505,7 @@ toc_max: 2 - Amazon EC2 - Convert API calls to official SDK - Make DeviceName configurable -- Digital Ocean +- DigitalOcean - Custom SSH port support - Generic - Don't support `kill` since `stop` is not supported @@ -594,7 +594,7 @@ Non-core driver plugins should still work as intended (in externally distributed - Activate the plugin only on OSX - Add id/gid option to mount when using vmhgfs - Fix for vSphere driver boot2docker ISO issues -- Digital Ocean +- DigitalOcean - Support for creating Droplets with Cloud-init User Data - Openstack - Sanitize keynames by replacing dots with underscores @@ -877,7 +877,7 @@ Initial beta release. ### Included drivers - Amazon EC2 -- Digital Ocean +- DigitalOcean - Google - Microsoft Azure - Microsoft Hyper-V diff --git a/swarm/provision-with-machine.md b/swarm/provision-with-machine.md index 5b7cd5c011..1cec0976f9 100644 --- a/swarm/provision-with-machine.md +++ b/swarm/provision-with-machine.md @@ -32,7 +32,7 @@ should already have Machine installed. If you need to install, see the instructions for [macOS](/docker-for-mac/) or [Windows](/docker-for-windows/). -Machine supports installing on AWS, Digital Ocean, Google Cloud Platform, IBM +Machine supports installing on AWS, DigitalOcean, Google Cloud Platform, IBM Softlayer, Microsoft Azure and Hyper-V, OpenStack, Rackspace, VirtualBox, VMware Fusion®, vCloud® AirTM and vSphere®. This example uses VirtualBox to run several VMs based on the `boot2docker.iso` image.