docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Tidy language on daemon index (#6128)

This commit is contained in:
Gwendolynne Barr 2018-03-02 16:30:41 -08:00 committed by GitHub
parent 1b9d732e46
commit 313ec1f836
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
config/daemon/index.md
View File

@ -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.
@ -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.
@ -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.
@ -277,4 +277,3 @@ utilities.
Finally, you can check in the process list for the `dockerd` process, using
commands like `ps` or `top`.