From 12aa5ea8b1a056081d42039cdfe9591e74163013 Mon Sep 17 00:00:00 2001
From: lixiaobing10051267
Date: Thu, 1 Dec 2016 19:35:27 +0800
Subject: [PATCH] rectify several wrong URLs in branch of man
Signed-off-by: lixiaobing10051267
(cherry picked from commit 576780369fa8c0b117dec6614db1b8d89cf2721b)
Signed-off-by: Victor Vieux
---
man/docker-login.1.md | 2 +-
man/docker-pause.1.md | 2 +-
man/docker-unpause.1.md | 2 +-
man/docker-version.1.md | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/man/docker-login.1.md b/man/docker-login.1.md
index 6bb0355946..c0d4f795db 100644
--- a/man/docker-login.1.md
+++ b/man/docker-login.1.md
@@ -20,7 +20,7 @@ do not specify a `SERVER`, the command uses Docker's public registry located at
`docker login` requires user to use `sudo` or be `root`, except when:
1. connecting to a remote daemon, such as a `docker-machine` provisioned `docker engine`.
-2. user is added to the `docker` group. This will impact the security of your system; the `docker` group is `root` equivalent. See [Docker Daemon Attack Surface](https://docs.docker.com/articles/security/#docker-daemon-attack-surface) for details.
+2. user is added to the `docker` group. This will impact the security of your system; the `docker` group is `root` equivalent. See [Docker Daemon Attack Surface](https://docs.docker.com/engine/articles/security/#docker-daemon-attack-surface) for details.
You can log into any public or private repository for which you have
credentials. When you log in, the command stores encoded credentials in
diff --git a/man/docker-pause.1.md b/man/docker-pause.1.md
index ffc3b35ca0..1f7d81e749 100644
--- a/man/docker-pause.1.md
+++ b/man/docker-pause.1.md
@@ -18,7 +18,7 @@ that it is being suspended, and subsequently resumed. On Windows, only Hyper-V
containers can be paused.
See the [cgroups freezer documentation]
-(https://www.kernel.org/doc/Documentation/cgroups/freezer-subsystem.txt) for
+(https://www.kernel.org/doc/Documentation/cgroup-v1/freezer-subsystem.txt) for
further details.
# OPTIONS
diff --git a/man/docker-unpause.1.md b/man/docker-unpause.1.md
index 8c64e68de6..f1ea14bbe2 100644
--- a/man/docker-unpause.1.md
+++ b/man/docker-unpause.1.md
@@ -14,7 +14,7 @@ The `docker unpause` command un-suspends all processes in a container.
On Linux, it does this using the cgroups freezer.
See the [cgroups freezer documentation]
-(https://www.kernel.org/doc/Documentation/cgroups/freezer-subsystem.txt) for
+(https://www.kernel.org/doc/Documentation/cgroup-v1/freezer-subsystem.txt) for
further details.
# OPTIONS
diff --git a/man/docker-version.1.md b/man/docker-version.1.md
index bb521c4eed..1838f82052 100644
--- a/man/docker-version.1.md
+++ b/man/docker-version.1.md
@@ -59,4 +59,4 @@ To view all available fields, you can use the format `{{json .}}`.
# HISTORY
June 2014, updated by Sven Dowideit
June 2015, updated by John Howard
-June 2015, updated by Patrick Hemmer