Skip to content

Commit 0d68e08

Browse files
Merge pull request docker-archive#441 from nwt/docs-typos
Fix some docs typos
2 parents a475bcc + a47644c commit 0d68e08

File tree

6 files changed

+14
-14
lines changed

6 files changed

+14
-14
lines changed

docs/content/aws/index.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Docker for AWS is currently in private beta. [Sign up](https://beta.docker.com)
2121

2222
- Welcome email
2323
- Access to an AWS account with permissions to use CloudFormation and creating the following objects
24-
- EC2 instances + Autoscaling groups
24+
- EC2 instances + Auto Scaling groups
2525
- IAM profiles
2626
- DynamoDB Tables
2727
- SQS Queue
@@ -50,11 +50,11 @@ To fully automate installs, you can use the [AWS Cloudformation API](http://docs
5050
## How it works
5151
Docker for AWS starts with a CloudFormation template that will create everything that you need from scratch. There are only a few Prerequisites that are listed above.
5252

53-
It first starts off by creating a new VPC along with it's subnets and security groups. Once the networking is setup, it will create two Auto scaling groups, one for the managers and one for the workers, and set the desired capacity that was selected in the CloudFormation setup form. The Managers will start up first and create a Swarm manager quorum using Raft. The workers will then start up and join the swarm one by one, until all of the workers are up and running. At this point you will have x number of managers and y number of workers in your swarm, that are ready to handle your application deployments. See the [deployment](../deploy.md) docs for your next steps.
53+
It first starts off by creating a new VPC along with its subnets and security groups. Once the networking is set up, it will create two Auto Scaling groups, one for the managers and one for the workers, and set the desired capacity that was selected in the CloudFormation setup form. The Managers will start up first and create a Swarm manager quorum using Raft. The workers will then start up and join the swarm one by one, until all of the workers are up and running. At this point you will have x number of managers and y number of workers in your swarm, that are ready to handle your application deployments. See the [deployment](../deploy.md) docs for your next steps.
5454

55-
If you increase the number of instances running in your worker auto scaling group (via the AWS console, or updating the CloudFormation configuration), the new nodes that will start up will automatically join the swarm.
55+
If you increase the number of instances running in your worker Auto Scaling group (via the AWS console, or updating the CloudFormation configuration), the new nodes that will start up will automatically join the swarm.
5656

57-
Elastic Load Balancers (ELBs) are setup to help with routing traffic to your swarm.
57+
Elastic Load Balancers (ELBs) are set up to help with routing traffic to your swarm.
5858

5959
## System containers
6060
Each node will have a few system containers running on them to help run your swarm cluster. In order for everything to run smoothly, please keep those containers running, and don't make any changes. If you make any changes, we can't guarantee that Docker for AWS will work correctly.

docs/content/aws/release-notes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Release date: 10/27/2016
2626

2727
- Docker Engine upgraded to Docker 1.12.3
2828
- Fixed the shell container that runs on the managers, to remove a ssh host key that was accidentally added to the image.
29-
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 it's own key.
29+
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.
3030
- 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
3131
- Each Manager can be SSH'd into by following our deploy [guide](../deploy)
3232
- Added new region us-east-2 (Ohio)

docs/content/aws/scaling.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@ weight="200"
1515

1616
## Scaling workers
1717

18-
You can scale the worker count using the AWS Node Autoscaling group. Docker will automatically join or remove new instances to the Swarm.
18+
You can scale the worker count using the AWS Auto Scaling group. Docker will automatically join or remove new instances to the Swarm.
1919

20-
There are currently two ways to scale your worker group. You can "update" your stack, and change the number of workers in the CloudFormation template parameters, or you can manually update the Autoscaling group in the AWS console for EC2 auto scaling groups.
20+
There are currently two ways to scale your worker group. You can "update" your stack, and change the number of workers in the CloudFormation template parameters, or you can manually update the Auto Scaling group in the AWS console for EC2 auto scaling groups.
2121

2222
Changing manager count live is _not_ currently supported.
2323

2424
### AWS Console
2525
Login to the AWS console, and go to the EC2 dashboard. On the lower left hand side select the "Auto Scaling Groups" link.
2626

27-
Look for the Autoscaling group with the name that looks like $STACK_NAME-NodeASG-* Where `$STACK_NAME` is the name of the stack you created when filling out the CloudFormation template for Docker for AWS. Once you find it, click the checkbox, next to the name. Then Click on the "Edit" button on the lower detail pane.
27+
Look for the Auto Scaling group with the name that looks like $STACK_NAME-NodeASG-* Where `$STACK_NAME` is the name of the stack you created when filling out the CloudFormation template for Docker for AWS. Once you find it, click the checkbox, next to the name. Then Click on the "Edit" button on the lower detail pane.
2828

2929
<img src="/img/aws/autoscale_update.png">
3030

docs/content/azure/index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Once you're accepted into the beta, Docker will share with your Azure subscripti
2929

3030
### Service Principal
3131

32-
To setup Docker for Azure, a [Service Principal](https://azure.microsoft.com/en-us/documentation/articles/active-directory-application-objects/) is required. Docker for Azure uses the principal to operate Azure APIs as you scale up and down or deploy apps on your swarm. Docker provides a containerized helper-script to help create the Service Principal:
32+
To set up Docker for Azure, a [Service Principal](https://azure.microsoft.com/en-us/documentation/articles/active-directory-application-objects/) is required. Docker for Azure uses the principal to operate Azure APIs as you scale up and down or deploy apps on your swarm. Docker provides a containerized helper-script to help create the Service Principal:
3333

3434
docker run -ti docker4x/create-sp-azure sp-name
3535
...
@@ -48,6 +48,6 @@ When setting up the ARM template, you will be prompted for the App ID (a UUID) a
4848

4949
### SSH Key
5050

51-
Docker for Azure uses SSH for accessing the Docker swarm once it's deployed. During setup, you will be prompted for a SSH public key. If you don't have a SSH key, you can generate one with `puttygen` or `ssh-keygen`. You only need the public key component to setup Docker for Azure. Here's how to get the public key from a .pem file:
51+
Docker for Azure uses SSH for accessing the Docker swarm once it's deployed. During setup, you will be prompted for a SSH public key. If you don't have a SSH key, you can generate one with `puttygen` or `ssh-keygen`. You only need the public key component to set up Docker for Azure. Here's how to get the public key from a .pem file:
5252

5353
ssh-keygen -y -f my-key.pem

docs/content/azure/release-notes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Release date: 11/08/2016
2727

2828
- Docker Engine upgraded to Docker 1.12.3
2929
- Fixed the shell container that runs on the managers, to remove a ssh host key that was accidentally added to the image.
30-
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 it's own key.
30+
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.
3131
- 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
3232
- Multiple managers can be deployed
3333
- All container logs can be found in the `xxxxlog` storage account

docs/content/index.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ weight="1"
1414

1515
# Docker for AWS and Docker for Azure beta
1616

17-
Docker for AWS lets you quickly setup and configure a working Docker 1.12 swarm-mode install on Amazon Web Services and on Azure.
17+
Docker for AWS and Azure let you quickly set up and configure a working Docker 1.12 swarm-mode install on Amazon Web Services and on Azure.
1818

1919
Docker for AWS and Azure are available in private beta for testing. They’re free to use (AWS and Azure will charge for resource use).
2020

2121
Sign up for the beta on [beta.docker.com](https://beta.docker.com/).
2222

23-
## Docker for AWS signup details
23+
## Docker for AWS sign-up details
2424

2525
When you fill out the sign-up form, make sure you fill in all of the fields, especially the AWS Account Number (12 digit value, i.e. 012345678901). Docker for AWS uses a custom AMI that is currently private, and we need your AWS ID in order to give your account access to the AMI. If you have more than one AWS account that you use (testing, stage, production, etc), email us <[email protected]> after you have filled out the form with the list of additional account numbers that need access. Make sure you put the primary account in the form that you filled out, as it might take time for the other account numbers to get added to your profile.
2626

@@ -35,7 +35,7 @@ You can find your AWS account ID by doing the following.
3535

3636
<img src="/img/aws/aws_account_number.png">
3737

38-
## Docker for Azure signup details
38+
## Docker for Azure sign-up details
3939

4040
When you fill out the sign-up form, make sure you fill in all of the fields, especially the Azure Subscriber ID (36 alphanumeric value, i.e. xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxx). Docker for Azure uses a custom VHD that is currently private, and we need your Azure Subscription ID in order to give your account access to the VHD. If you have more than one Azure Subcription that you use (testing, stage, production, etc), email us <[email protected]> after you have filled out the form with the list of additional subscription ID that need access. Make sure you put the primary subscriber ID in the form that you filled out, as it might take time for the other subscription IDd to get added to your profile.
4141

0 commit comments

Comments
 (0)