Update the `docker daemon` to `dockerd` for document #22386

Merged
merged 1 commit into from May 4, 2016

Projects

None yet

5 participants

@wenchma
Contributor
wenchma commented Apr 28, 2016

Signed-off-by: Wen Cheng Ma wenchma@cn.ibm.com

@wenchma
Contributor
wenchma commented Apr 28, 2016

@thaJeztah PTAL

@thaJeztah thaJeztah commented on the diff Apr 28, 2016
docs/reference/commandline/dockerd.md
@@ -1,6 +1,6 @@
<!--[metadata]>
+++
-title = "daemon"
+title = "dockerd"
@thaJeztah
thaJeztah Apr 28, 2016 Member

can you add an alias for the old filename/URL?

aliases = ["/engine/reference/commandline/daemon/"]
@wenchma
wenchma Apr 28, 2016 edited Contributor

@thaJeztah this aliases are used to make the existing links work ? if that , I have updated the links.

@thaJeztah
thaJeztah Apr 29, 2016 Member

@wenchma the alias creates a redirect from the old (/engine/reference/commandline/daemon/) to the new location so that people arriving at that location from (e.g.) an old bookmark, or external site get properly redirected

@thaJeztah thaJeztah added this to the 1.12.0 milestone Apr 28, 2016
@runcom runcom referenced this pull request Apr 28, 2016
Merged

Fixies dockerd #22278

@thaJeztah thaJeztah commented on an outdated diff Apr 28, 2016
man/docker.1.md
@@ -12,14 +12,8 @@ docker \- Docker image and container command line interface
**docker** [--help|-v|--version]
# DESCRIPTION
-**docker** has two distinct functions. It is used for starting the Docker
-daemon and to run the CLI (i.e., to command the daemon to manage images,
-containers etc.) So **docker** is both a server, as a daemon, and a client
-to the daemon, through the CLI.
-
-To run the Docker daemon you can specify **docker daemon**.
-You can view the daemon options using **docker daemon --help**.
-To see the man page for the daemon, run **man docker daemon**.
+**docker** has single function now. It is used to run the CLI.
+So **docker** is a client to the daemon, through the CLI.
@thaJeztah
thaJeztah Apr 28, 2016 Member

Perhaps this could just be;

**docker** is a client for interacting with the daemon (see **dockerd(8)**) through the CLI.
@thaJeztah
Member

Thanks! LGTM

I'm wondering if we should rename all existing docker subcommands in the reference to docker [subcommand], so that they show as (e.g.) "docker ps" in the menu, instead of just "ps"

@moxiegirl ^^

@jhowardmsft jhowardmsft and 1 other commented on an outdated diff Apr 28, 2016
docs/reference/commandline/dockerd.md
@@ -70,11 +71,11 @@ weight = -1
Options with [] may be specified multiple times.
-The Docker daemon is the persistent process that manages containers. Docker
-uses the same binary for both the daemon and client. To run the daemon you
-type `docker daemon`.
+The dockerd is the persistent process that manages containers. Docker
@jhowardmsft
jhowardmsft Apr 28, 2016 Contributor

Remove 'The'

@wenchma wenchma Update the `docker daemon` to `dockerd` for document
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
24ec73f
@vdemeester
Member

LGTM 🐱

@vdemeester vdemeester merged commit 1c1947d into docker:master May 4, 2016

2 checks passed

docker/dco-signed All commits signed
Details
documentation success
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment