New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from May 4, 2016

Conversation

Projects
None yet
5 participants
@wenchma
Contributor

wenchma commented Apr 28, 2016

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

@wenchma

This comment has been minimized.

Show comment
Hide comment
@wenchma

wenchma Apr 28, 2016

Contributor

@thaJeztah PTAL

Contributor

wenchma commented Apr 28, 2016

@thaJeztah PTAL

@@ -1,6 +1,6 @@
<!--[metadata]>
+++
title = "daemon"
title = "dockerd"

This comment has been minimized.

@thaJeztah

thaJeztah Apr 28, 2016

Member

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

aliases = ["/engine/reference/commandline/daemon/"]
@thaJeztah

thaJeztah Apr 28, 2016

Member

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

aliases = ["/engine/reference/commandline/daemon/"]

This comment has been minimized.

@wenchma

wenchma Apr 28, 2016

Contributor

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

@wenchma

wenchma Apr 28, 2016

Contributor

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

This comment has been minimized.

@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 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

Show outdated Hide outdated man/docker.1.md
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.

This comment has been minimized.

@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

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

This comment has been minimized.

Show comment
Hide comment
@thaJeztah

thaJeztah Apr 28, 2016

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 ^^

Member

thaJeztah commented Apr 28, 2016

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 ^^

Show outdated Hide outdated docs/reference/commandline/dockerd.md
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

This comment has been minimized.

@jhowardmsft

jhowardmsft Apr 28, 2016

Contributor

Remove 'The'

@jhowardmsft

jhowardmsft Apr 28, 2016

Contributor

Remove 'The'

This comment has been minimized.

@wenchma

wenchma Apr 29, 2016

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

This comment has been minimized.

Show comment
Hide comment
@vdemeester

vdemeester May 4, 2016

Member

LGTM 🐱

Member

vdemeester commented May 4, 2016

LGTM 🐱

@vdemeester vdemeester merged commit 1c1947d into moby: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