Skip to content

Commit

Permalink
Tidy language on daemon index (docker#6128)
Browse files Browse the repository at this point in the history
  • Loading branch information
gbarr01 authored Mar 3, 2018
1 parent 1b9d732 commit 313ec1f
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions config/daemon/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ redirect_from:
title: Configure and troubleshoot the Docker daemon
---

After successfully installing Docker and starting Docker, the `dockerd` daemon
After successfully installing and starting Docker, the `dockerd` daemon
runs with its default configuration. This topic shows how to customize
the configuration, start the daemon manually, and troubleshoot and debug the
daemon if you run into issues.
Expand Down Expand Up @@ -111,8 +111,8 @@ operating system.

One notable example of a configuration conflict that is difficult to troubleshoot
is when you want to specify a different daemon address from
the default. Docker listens on a socket by default. On Debian and Ubuntu systems using `systemd`),
this means that a `-H` flag is always used when starting `dockerd`. If you specify a
the default. Docker listens on a socket by default. On Debian and Ubuntu systems using `systemd`,
this means that a host flag `-H` is always used when starting `dockerd`. If you specify a
`hosts` entry in the `daemon.json`, this causes a configuration conflict (as in the above message)
and Docker fails to start.

Expand Down Expand Up @@ -209,7 +209,7 @@ Docker platform.
On Windows hosts, restart Docker.

Instead of following this procedure, you can also stop the Docker daemon and
restart it manually with the `-D` flag. However, this may result in Docker
restart it manually with the debug flag `-D`. However, this may result in Docker
restarting with a different environment than the one the hosts' startup scripts
create, and this may make debugging more difficult.

Expand Down Expand Up @@ -277,4 +277,3 @@ utilities.

Finally, you can check in the process list for the `dockerd` process, using
commands like `ps` or `top`.

0 comments on commit 313ec1f

Please sign in to comment.