Skip to content

Commit

Permalink
Spelling mistakes (docker#2970)
Browse files Browse the repository at this point in the history
* Spelling mistakes

* Delete last_page.md
  • Loading branch information
stevenhanna6 authored and johndmulhausen committed Apr 20, 2017
1 parent a3a7ae1 commit b43c302
Show file tree
Hide file tree
Showing 39 changed files with 50 additions and 51 deletions.
2 changes: 1 addition & 1 deletion _includes/why_d4a.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ reduced.

Centralized logging is a critical component of many modern infrastructure
stacks. To have these logs indexed and searchable proves invaluable for
debugging appliation and system issues as they come up. Out of the box, Docker
debugging application and system issues as they come up. Out of the box, Docker
for {{cloudprovider}} forwards logs from containers to a native cloud provider
abstraction ({{cloudprovider_log_dest}}).

Expand Down
2 changes: 1 addition & 1 deletion apidocs/cloud-api-source/source/includes/action.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

An action represents an API call by a user. Details of the API call such as timestamp, origin IP address, and user agent are logged in the action object.

Simple API calls that do not require asynchronous execution will return immediately with the appropiate HTTP error code and an action object will be created either in `Success` or `Failed` states. API calls that do require asynchronous execution will return HTTP code `202 Accepted` immediately and create an action object in `In progress` state, which will change to `Success` or `Failed` state depending on the outcome of the operation being performed. In both cases the response will include a `X-DockerCloud-Action-URI` header with the resource URI of the created action.
Simple API calls that do not require asynchronous execution will return immediately with the appropriate HTTP error code and an action object will be created either in `Success` or `Failed` states. API calls that do require asynchronous execution will return HTTP code `202 Accepted` immediately and create an action object in `In progress` state, which will change to `Success` or `Failed` state depending on the outcome of the operation being performed. In both cases the response will include a `X-DockerCloud-Action-URI` header with the resource URI of the created action.


### Attributes
Expand Down
2 changes: 1 addition & 1 deletion apidocs/cloud-api-source/source/includes/container.md
Original file line number Diff line number Diff line change
Expand Up @@ -709,7 +709,7 @@ uuid | The UUID of the container to redeploy

Parameter | Description
--------- | -----------
reuse_volumes | Wheather to reuse container volumes for this redeploy operation or not (default: `true`).
reuse_volumes | Whether to reuse container volumes for this redeploy operation or not (default: `true`).


## Terminate a container
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ This is a [namespaced endpoint](#namespaced-endpoints).

| Attribute | Description |
|:-------------|:---------------------------------------------------------------------------------------------------------------------------------|
| type | Type of object that was created or updated. For possible values, check the [events types](#event-types) table below. |
| action | Type of action that was executed on the object. Posible values: `create`, `update` or `delete` |
| type | Type of object that was created or updated. For possible values, check the [events types](#event-types) table below. |
| action | Type of action that was executed on the object. Possible values: `create`, `update` or `delete` |
| parents | List of resource URIs (REST API) of the parents of the object, according to the "Parent-child hierarchy" table below |
| resource_uri | Resource URI (REST API) of the object that was created or updated. You can do a `GET` operation on this URL to fetch its details |
| state | The current state of the object |
Expand Down
2 changes: 1 addition & 1 deletion apidocs/cloud-api-source/source/includes/nodecluster.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ You can specify the following options when using the Amazon Web Services provide

* `vpc`: VPC-related options (optional)
* `id`: AWS VPC identifier of the target VPC where the nodes of the cluster will be deployed (required)
* `subnets`: a list of target subnet indentifiers inside selected VPC. If you specify more than one subnet, Docker Cloud will balance among all of them following a high-availability schema (optional)
* `subnets`: a list of target subnet identifiers inside selected VPC. If you specify more than one subnet, Docker Cloud will balance among all of them following a high-availability schema (optional)
* `security_groups`: the security group that will be applied to every node of the cluster (optional)
* `iam`: IAM-related options (optional)
* `instance_profile_name`: name of the instance profile (container for instance an IAM role) to attach to every node of the cluster (required)
Expand Down
2 changes: 1 addition & 1 deletion apidocs/cloud-api-source/source/includes/service.md
Original file line number Diff line number Diff line change
Expand Up @@ -881,7 +881,7 @@ uuid | The UUID of the service to redeploy

Parameter | Description
--------- | -----------
reuse_volumes | Wheather to reuse container volumes for this redeploy operation or not (default: `true`).
reuse_volumes | Whether to reuse container volumes for this redeploy operation or not (default: `true`).


## Terminate a service
Expand Down
2 changes: 1 addition & 1 deletion apidocs/cloud-api-source/source/includes/stack.md
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,7 @@ uuid | The UUID of the stack to redeploy

Parameter | Description
--------- | -----------
reuse_volumes | Wheather to reuse container volumes for this redeploy operation or not (default: `true`).
reuse_volumes | Whether to reuse container volumes for this redeploy operation or not (default: `true`).


## Terminate a stack
Expand Down
2 changes: 1 addition & 1 deletion components.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
description: Componenets page
description: Components page
title: Components
hide_from_sitemap: true
---
Expand Down
2 changes: 1 addition & 1 deletion datacenter/dtr/2.0/monitor-troubleshoot/troubleshoot.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ docker run -it --rm --net dtr-ol --name overlay-test2 --entrypoint ping docker/d
```

You can create new overlay network for this test with `docker network create
-d overaly network-name`. You can also use any images that contain `sh` and
-d overlay network-name`. You can also use any images that contain `sh` and
`ping` for this test.

If the second command succeeds, overlay networking is working.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ docker run -it --rm --net dtr-ol --name overlay-test1 --entrypoint sh docker/dtr
docker run -it --rm --net dtr-ol --name overlay-test2 --entrypoint ping docker/dtr -c 3 overlay-test1
```

You can create new overlay network for this test with `docker network create -d overaly network-name`.
You can create new overlay network for this test with `docker network create -d overlay network-name`.
You can also use any images that contain `sh` and `ping` for this test.

If the second command succeeds, overlay networking is working.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ metadata
- The "manifest", which is pulled first and lists all layers and the config file
for the image.

All of these files are stored in a content-addressible manner. We take the
All of these files are stored in a content-addressable manner. We take the
sha256 hash of the file's content and use the hash as the filename. This means
that if tag `example.com/user/blog:1.11.0` and `example.com/user/blog:latest`
use the same layers we only store them once.
Expand Down
2 changes: 1 addition & 1 deletion datacenter/dtr/2.2/guides/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ DTR has the ability to [clean up unreferenced manifests and layers](https://docs
## Built-in access control

DTR uses the same authentication mechanism as Docker Universal Control Plane.
Users can be managed manually or syched from LDAP or Active Directory. DTR
Users can be managed manually or synched from LDAP or Active Directory. DTR
uses [Role Based Access Control](admin/manage-users/index.md) (RBAC) to allow you to implement fine-grained
access control policies for who has access to your Docker images.

Expand Down
4 changes: 2 additions & 2 deletions datacenter/dtr/2.2/guides/release-notes/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ events like image push, repository creation, and others
* The install command was improved to avoid deploying DTR to a node where it
cannot run due to port collisions
* The `docker/dtr install --ucp-node` flag is now mandatory
* The install command no longer allows deploying replicas with duplica ids
* The install command no longer allows deploying replicas with duplicate ids
* The upgrade command now validates if all tags were migrated to the latest
version before trying to migrate blob links

Expand All @@ -141,7 +141,7 @@ letters
created
* The copy to clipboard button on the repository page now works on Firefox
* The repository page now renders properly the repository permissions
* You can now delete a users's full name from the UI
* You can now delete a users full name from the UI
* Organization administrators can now see the repositories owned by the organization
* The garbage collection settings now show the correct cron values
* You can now specify DTR to use port 443 when installing DTR
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -308,6 +308,6 @@ To delete a webhook subscription send a `DELETE` request to
which you would like to delete.

Note that in order to delete a subscription you must be either a system
administrator or an admistrator for the resource which the payload subscribes
administrator or an administrator for the resource which the payload subscribes
to. For example, as a normal user you can only delete subscriptions for
repositories which you are an admin of.
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ $ notary status <dtr_url>/<account>/<repository> --unstage 0
$ notary status <dtr_url>/<account>/<repository> --reset
```

When you're ready to publish your chages to the Notary server, run:
When you're ready to publish your changes to the Notary server, run:

```bash
$ notary publish <dtr_url>/<account>/<repository>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
description: Learn how to configure Docker Universal Control Plane to use your own
certificates.
keywords: Universal Control Plane, UCP, certificate, authentiation, tls
keywords: Universal Control Plane, UCP, certificate, authentication, tls
redirect_from:
- /ucp/configuration/use-externally-signed-certs/
title: Use externally-signed certificates
Expand Down
2 changes: 1 addition & 1 deletion datacenter/ucp/2.0/guides/configuration/index.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
description: Learn how to configure Docker Universal Control Plane to use your own
certificates.
keywords: Universal Control Plane, UCP, certificate, authentiation, tls
keywords: Universal Control Plane, UCP, certificate, authentication, tls
title: Use externally-signed certificates
---

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ will still need to provide them for the commands to work correctly.
Now that the repository is initialized, we need to create the delegations for Jenkins. Docker
Content Trust treats a delegation role called `targets/releases` specially. It considers this
delegation to contain the canonical list of published images for the repository. It is therefore
generally desiable to add all users to this delegation with the following command:
generally desirable to add all users to this delegation with the following command:

```
notary delegation add my_repository targets/releases --all-paths /path/to/cert.pem
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ $ notary status <dtr_url>/<account>/<repository> --unstage 0
$ notary status <dtr_url>/<account>/<repository> --reset
```

When you're ready to publish your chages to the Notary server, run:
When you're ready to publish your changes to the Notary server, run:

```bash
$ notary publish <dtr_url>/<account>/<repository>
Expand Down
2 changes: 1 addition & 1 deletion datacenter/ucp/2.0/guides/monitor/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ are deployed on a node, depend on whether the node is a manager or worker.
[Learn more about the UCP architecture](../architecture.md)

To check the state and logs of other UCP internal components, go to the
**Containers** page, and appply the **System containers** filter.
**Containers** page, and apply the **System containers** filter.
This can help validate that all UCP internal components are up and running.

![](../images/monitor-ucp-3.png){: .with-border}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ will still need to provide them for the commands to work correctly.
Now that the repository is initialized, we need to create the delegations for Jenkins. Docker
Content Trust treats a delegation role called `targets/releases` specially. It considers this
delegation to contain the canonical list of published images for the repository. It is therefore
generally desiable to add all users to this delegation with the following command:
generally desirable to add all users to this delegation with the following command:

```
notary delegation add my_repository targets/releases --all-paths /path/to/cert.pem
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
description: Learn how to configure Docker Universal Control Plane to use your own
certificates.
keywords: Universal Control Plane, UCP, certificate, authentiation, tls
keywords: Universal Control Plane, UCP, certificate, authentication, tls
title: Use your own TLS certificates
---

Expand Down
2 changes: 1 addition & 1 deletion docker-cloud/cloud-swarm/create-cloud-swarm.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ Learn how to [connect to a swarm through Docker Cloud](connect-to-swarm.md).

Learn how to [register existing swarms](register-swarms.md).

You can get an overivew of topics on [swarms in Docker Cloud](index.md).
You can get an overview of topics on [swarms in Docker Cloud](index.md).

To find out more about Docker swarm in general, see the Docker engine
[Swarm Mode overview](/engine/swarm/).
4 changes: 2 additions & 2 deletions docker-cloud/cloud-swarm/link-aws-swarm.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ If you already have your AWS account connected to Docker Cloud and used the lega
7. In the **Policy Document** section, copy and paste the policy document found in the [Docker for AWS page](/docker-for-aws/iam-permissions/).
8. Click **Create Policy**.
9. Select and copy the **Role ARN** on the role screen.
It should't have changed, but you'll use it to re-link your account.
It shouldn't have changed, but you'll use it to re-link your account.

Because you edited the role's permissions, you need to re-link to your account.
Back in Docker Cloud, click the account menu and select **Cloud Settings**, and
Expand All @@ -91,7 +91,7 @@ You're now ready to deploy a swarm!

For next steps, see [create a new swarm in Docker Cloud](create-cloud-swarm.md).

You can get an overivew of topics on [swarms in Docker Cloud](index.md).
You can get an overview of topics on [swarms in Docker Cloud](index.md).

<!-- TODO: Commenting out until this replaces the existing ../infrastructure/link-aws file.
Expand Down
2 changes: 1 addition & 1 deletion docker-for-aws/faqs.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ There isn't anything we can do right now to fix this issue, we have contacted Am
This AWS documentation page will describe how you can tell if you have EC2-Classic, EC2-VPC or both. http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-supported-platforms.html

### Possible fixes to the EC2-Classic region issue:
There are a few work arounds that you can try to get Docker for AWS up and running for you.
There are a few workarounds that you can try to get Docker for AWS up and running for you.

1. Create your own VPC, then [install Docker for AWS with a pre-existing VPC](index.md#install-with-an-existing-vpc).
2. Use a region that doesn't have **EC2-Classic**. The most common region with this issue is `us-east-1`. So try another region, `us-west-1`, `us-west-2`, or the new `us-east-2`. These regions will more then likely be setup with **EC2-VPC** and you will not longer have this issue.
Expand Down
2 changes: 1 addition & 1 deletion docker-for-aws/upgrade.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ To initiate an update, use either the AWS Console or the AWS cli to initiate a s

![Upgrade in AWS console](img/cloudformation_update.png)

Note that single containers started (for example) with `docker run -d` are **not** preserved during an upgrade. This is because the're not Docker Swarm objects, but are known only to the individual Docker engines.
Note that single containers started (for example) with `docker run -d` are **not** preserved during an upgrade. This is because they're not Docker Swarm objects, but are known only to the individual Docker engines.

## Changing instance sizes and other template parameters

Expand Down
2 changes: 1 addition & 1 deletion docker-for-mac/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ interactive settings, or switch to **Advanced** to edit the JSON directly.
The settings offered on **Basic** dialog can be
configured directly in the JSON as well. This version just surfaces
some of the commmon settings to make it easier to configure them.
some of the common settings to make it easier to configure them.
* [Experimental mode](#experimental-mode)
* [Custom registries](#custom-registries)
Expand Down
4 changes: 2 additions & 2 deletions docker-for-mac/release-notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -620,7 +620,7 @@ events or unexpected unmounts.
- Memory can be allocated with 256 MiB steps
- The storage location of the Linux volume can now be moved
- More explicit proxy settings
- Proxy can now be completly disabled
- Proxy can now be completely disabled
- You can switch daemon tabs without losing your settings
- You can't edit settings while docker is restarting

Expand Down Expand Up @@ -1225,7 +1225,7 @@ The `osxfs` file system now persists ownership changes in an extended attribute.

**New**

* Token validation is now done over an actual SSL tunnel (HTTPS). (This should fix issues with antivirus applictions.)
* Token validation is now done over an actual SSL tunnel (HTTPS). (This should fix issues with antivirus applications.)

**Upgrades**

Expand Down
9 changes: 4 additions & 5 deletions docker-for-windows/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -237,11 +237,10 @@ PowerShell Module as follows.
1. Start an "elevated" PowerShell (i.e., run it as administrator).
To do this, search for PowerShell, right-click, and choose
**Run as administrator**.<br>
To do this, search for PowerShell, right-click, and choose **Run as administrator**.
![Run PowerShell as administrator](/docker-for-windows/images/PowerShell-as-admin.png)
<br><br>
When asked if you want to allow this app to make changes to your device,
click **Yes**.
Expand Down Expand Up @@ -306,7 +305,7 @@ arrow on the taskbar to show it.
>**Tip**: You can pin the whale outside of the notification box so that it is
always visible on the taskbar. To do this, drag-and-drop the whale icon. Or,
right-click an empty porition of the taskbar, select Settings, and choose
right-click an empty portion of the taskbar, select Settings, and choose
display options through taskbar settings for notifications.
>
![whale pinned to taskbar](/docker-for-windows/images/whale-taskbar.png)
Expand Down Expand Up @@ -457,7 +456,7 @@ containers will run. You can configure some **Basic** options on the daemon with

The settings offered on **Basic** dialog can be
configured directly in the JSON as well. This version just surfaces
some of the commmon settings to make it easier to configure them.
some of the common settings to make it easier to configure them.

* [Experimental mode](#experimental-mode)
* [Custom registries](#custom-registries)
Expand Down
4 changes: 2 additions & 2 deletions docker-for-windows/release-notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -574,7 +574,7 @@ We did not distribute a 1.12.4 stable release

**Bug fixes and minor changes**

- Time drifts between Windows and Linux containers should disapear
- Time drifts between Windows and Linux containers should disappear
- VPNKit: Improved diagnostics
- Improvements in drive sharing code
- Removed the legacy "Disable oplocks" trick for enabling Windows Containers on older insider previews
Expand Down Expand Up @@ -605,7 +605,7 @@ dialogs](index.md#about-the-docker-windows-containers-specific-dialogs).)

**Bug fixes and minor changes**

- Time drifts between Windows and Linux containers should disapear
- Time drifts between Windows and Linux containers should disappear
- VPNKit: Improved diagnostics
- Improvements in drive sharing code
- Removed the legacy "Disable oplocks" trick for enabling Windows Containers on older insider previews
Expand Down
2 changes: 1 addition & 1 deletion docker-for-windows/troubleshoot.md
Original file line number Diff line number Diff line change
Expand Up @@ -509,7 +509,7 @@ docker app.

### Docker fails to start when firewall or anti-virus software is installed

**Some firewalls and anti-virus software might be incompatible with Microsoft Windows 10 buids** (e.g., Windows 10 Anniversary Update). The conflict typically occurs after a Windows update or new install of the firewall, and manifests as an error response from the Docker daemon and a **Docker for Windows start failure**. The Comodo Firewall was one example of this problem, but users report that software has since been updated to work with these Windows 10 builds.
**Some firewalls and anti-virus software might be incompatible with Microsoft Windows 10 builds** (e.g., Windows 10 Anniversary Update). The conflict typically occurs after a Windows update or new install of the firewall, and manifests as an error response from the Docker daemon and a **Docker for Windows start failure**. The Comodo Firewall was one example of this problem, but users report that software has since been updated to work with these Windows 10 builds.

See the Comodo forums topics [Comodo Firewall conflict with
Hyper-V](https://forums.comodo.com/bug-reports-cis/comodo-firewall-began-conflict-with-hyperv-t116351.0.html)
Expand Down
2 changes: 1 addition & 1 deletion engine/admin/logging/overview.md
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ The `awslogs` supports the following options:

### Examples

This exampe sends the logs to region `us-east-1` and uses the log group
This example sends the logs to region `us-east-1` and uses the log group
`myLogGroup`.

```bash
Expand Down
Loading

0 comments on commit b43c302

Please sign in to comment.