From 639112b0911dd24d3f69368cb2edc3301b14d653 Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <thaJeztah@users.noreply.github.com>
Date: Sat, 1 Apr 2017 20:52:26 +0200
Subject: [PATCH] Merge pull request #32282 from
 mstanleyjones/improve-attach-desc

Clarify meaning of docker attach
(cherry picked from commit 571e4031685e730ba7cb0c49620e9f9580fdabc6)

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
---
 docs/reference/commandline/attach.md  | 11 +++++++----
 docs/reference/commandline/dockerd.md |  1 -
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/docs/reference/commandline/attach.md b/docs/reference/commandline/attach.md
index 9f76a546af..34ae390544 100644
--- a/docs/reference/commandline/attach.md
+++ b/docs/reference/commandline/attach.md
@@ -18,7 +18,7 @@ keywords: "attach, running, container"
 ```markdown
 Usage: docker attach [OPTIONS] CONTAINER
 
-Attach to a running container
+Attach local standard input, output, and error streams to a running container
 
 Options:
       --detach-keys string   Override the key sequence for detaching a container
@@ -29,10 +29,13 @@ Options:
 
 ## Description
 
-Use `docker attach` to attach to a running container using the container's ID
-or name, either to view its ongoing output or to control it interactively.
+Use `docker attach` to attach your terminal's standard input, output, and error
+(or any combination of the three) to a running container using the container's
+ID or name. This allows you to view its ongoing output or to control it
+interactively, as though the commands were running directly in your terminal.
+
 You can attach to the same contained process multiple times simultaneously,
-screen sharing style, or quickly view the progress of your detached process.
+even as a different user with the appropriate permissions.
 
 To stop a container, use `CTRL-c`. This key sequence sends `SIGKILL` to the
 container. If `--sig-proxy` is true (the default),`CTRL-c` sends a `SIGINT` to
diff --git a/docs/reference/commandline/dockerd.md b/docs/reference/commandline/dockerd.md
index a92fd3bea6..edca26bb6f 100644
--- a/docs/reference/commandline/dockerd.md
+++ b/docs/reference/commandline/dockerd.md
@@ -413,7 +413,6 @@ Specifies extra mkfs arguments to be used when creating the base device.
 
 ###### Example
 
->>>>>>> 52df69f00... Standardized formatting of CLI reference commands
 ```bash
 $ sudo dockerd --storage-opt "dm.mkfsarg=-O ^has_journal"
 ```