Skip to content

Commit 9320d07

Browse files
authored
Merge pull request docker#7673 from newoneforasn4/master
Simplified Sentence in /develop/index.md
2 parents 2c0b5e2 + b746594 commit 9320d07

File tree

10 files changed

+15
-28
lines changed

10 files changed

+15
-28
lines changed

compose/rails.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,7 @@ a Rails/PostgreSQL app. Before starting, [install Compose](install.md).
99

1010
### Define the project
1111

12-
Start by setting up the four files needed to build the app. First, since
13-
your app is going to run inside a Docker container containing all of its
14-
dependencies, define exactly what needs to be included in the
15-
container. This is done using a file called `Dockerfile`. To begin with, the
12+
Start by setting up the four files needed to build the app. App will run inside a Docker container containing its dependencies. Defining dependencies is done using a file called `Dockerfile`. To begin with, the
1613
Dockerfile consists of:
1714

1815
FROM ruby:2.5

datacenter/dtr/2.5/guides/support.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ support. The service levels depend on your subscription.
1111
Before reaching out to Docker Support, make sure you're listed as an authorized
1212
support contact for your account. If you're not listed as an authorized
1313
support contact, find a person who is, and ask them to open a case with
14-
Docker Support in your behalf.
14+
Docker Support on your behalf.
1515

1616
You can open a new support case at the [Docker support page](https://support.docker.com/).
1717
If you're unable to submit a new case using the support page, fill in the

develop/index.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,4 @@ most benefits from Docker.
2929

3030
## Advanced development with the SDK or API
3131

32-
When you're comfortable developing apps by writing Dockerfiles or compose files
33-
and using the Docker CLI, you can take it to the next level by using the Docker
34-
Engine SDK for Go or Python or using the HTTP API directly.
32+
After you can write Dockerfiles or Compose files and use Docker CLI, take it to the next level by using Docker Engine SDK for Go/Python or use HTTP API directly.

docker-cloud/dockerid.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,11 @@ Bitbucket from your Docker Cloud account settings.
2525

2626
## Email addresses
2727

28-
You can associate multiple email addresses with your Docker ID, and one of these
29-
becomes the primary address for the account. The primary address is used by
30-
Docker to send password reset notifications and other important information, so
31-
be sure to keep it updated.
28+
You can associate multiple email addresses with your Docker ID.
29+
You may select an email address to become the primary email for the account.
30+
The primary email is used by Docker to send password reset notifications
31+
and important information, so be sure to keep it updated.
32+
3233

3334
To add another email address to your Docker ID:
3435

docker-cloud/orgs.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,7 @@ title: Organizations and Teams in Docker Cloud
66

77
You can create Organizations in Docker Cloud to share repositories, and infrastructure and applications with coworkers and collaborators.
88

9-
Members of an organization can see only the teams to which they belong, and
10-
their membership. Members of the `Owners` team can see and edit
11-
all of the teams and all of the team membership lists. Docker Cloud users
12-
outside an organization cannot see the Organizations or teams another user
13-
belongs to.
9+
Members of an organization can see only teams and memberships to which they belong. Members of the `Owners` team can see and edit all teams and team membership lists. Docker Cloud users cannot view another user’s organizations or teams if they do not share an organization.
1410

1511
## Create an Organization
1612

docker-for-windows/troubleshoot.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Desktop](https://docs.docker.com/docker-for-mac/faqs/#how-is-personal-data-handl
4444
If you click on **Report an issue**, this opens [Docker for Windows issues on
4545
GitHub](https://github.com/docker/for-win/issues/) in your web browser in a
4646
"create new issue" template, to be completed before submision. Do not forget to
47-
copy/paste your diagnistic ID.
47+
include your diagnostic ID.
4848

4949
![issue-template](images/issue-template.png){:width="600px"}
5050

docker-hub/accounts.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ from the Hub.
2323

2424
## Password reset process
2525

26-
If you forget your password, or can't access your account for some reason, you
26+
If you forget your password, or can't access your account, you
2727
can reset your password from the [*Password Reset*](https://hub.docker.com/reset-password/) page.

docker-store/index.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,7 @@ Independent Software Vendors (ISVs) can utilize Docker Store to distribute and
1111
sell their Dockerized content. Publish your software through Docker Store to
1212
experience the following benefits:
1313

14-
* **Access to Docker’s large and growing customer-base.** Docker has experienced
15-
rapid adoption, and is popular in dev-ops environments. Docker users have
16-
pulled images over twelve billion times and they are increasingly turning to
17-
Docker Store as the canonical source for high-quality, curated content.
14+
* **Access to Docker’s large and growing customer-base.** Docker is experiencing rapid adoption. Images have been pulled by Docker users over twelve billion times. More Docker users are turning to Docker Store as the canonical source for high-quality, curated content.
1815

1916
* **Customers can try or buy your software**, right from your product listing.
2017
Your content is accessible for installation, trial, and purchase from the

ee/upgrade.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,8 @@ i64lee19ia6s \_ ex_service.11 nginx:latest tk1706-ubuntu-1
194194
## Manager Upgrades When Moving to Docker Engine - Enterprise 18.09 and later
195195

196196
The following is a constraint introduced by architectural changes to the Swarm overlay networking when
197-
upgrading to Docker Engine - Enterprise 18.09 or later. It only applies to this one-time upgrade and to w
198-
orkloads that are using the Swarm overlay driver. Once upgraded to Docker Engine - Enterprise 18.09, this
197+
upgrading to Docker Engine - Enterprise 18.09 or later. It only applies to this one-time upgrade and to workloads
198+
that are using the Swarm overlay driver. Once upgraded to Docker Engine - Enterprise 18.09, this
199199
constraint does not impact future upgrades.
200200

201201
When upgrading to Docker Engine - Enterprise 18.09, manager nodes cannot reschedule new workloads on the

get-started/part2.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@ description: Learn how to write, build, and run a simple app -- the Docker way.
1818

1919
## Introduction
2020

21-
It's time to begin building an app the Docker way. We start at the bottom of
22-
the hierarchy of such an app, which is a container, which we cover on this page.
23-
Above this level is a service, which defines how containers behave in
21+
It's time to begin building an app the Docker way. We start at the bottom of the hierarchy of such app, a container, which this page covers. Above this level is a service, which defines how containers behave in
2422
production, covered in [Part 3](part3.md). Finally, at the top level is the
2523
stack, defining the interactions of all the services, covered in
2624
[Part 5](part5.md).

0 commit comments

Comments
 (0)