From 2d435ffd3bfc8dc228a4fdea1ff3014c9b7fc4ad Mon Sep 17 00:00:00 2001
From: Cristoffer Fairweather <fairweac@spawar.navy.mil>
Date: Tue, 18 Apr 2017 17:18:31 -0500
Subject: [PATCH 1/4] Updated documentation for UCP to clarify roles of nodes
 in a Docker Swarm (#2637). Also updated architecture diagram to reflect new
 Enterprise engine branding.

---
 datacenter/ucp/2.1/guides/architecture.md     |  8 +++++---
 .../ucp/2.1/guides/images/architecture-2.svg  | 20 +++++++++----------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/datacenter/ucp/2.1/guides/architecture.md b/datacenter/ucp/2.1/guides/architecture.md
index ab77c123818c..6175d0390dc0 100644
--- a/datacenter/ucp/2.1/guides/architecture.md
+++ b/datacenter/ucp/2.1/guides/architecture.md
@@ -25,8 +25,11 @@ and Docker Compose.
 Docker UCP leverages the clustering and orchestration functionality provided
 by Docker.
 
+<a name="figure-architecture-2">
 ![](images/architecture-2.svg)
+</a>
 
+A swarm is a collection of nodes that are in the same Docker swarm. [Nodes](/engine/swarm/key-concepts.md) in a Docker swarm operate in one of two modes: Manager or Worker. If nodes are not already running in a swarm when installing UCP, nodes will be configured to run in swarm mode.
 
 When you deploy UCP, it starts running a globally scheduled service called
 `ucp-agent`. This service monitors the node where it is running and starts
@@ -36,11 +39,10 @@ and stops UCP services, based on whether that node is a
 If the node is a:
 
 * **Manager**: the `ucp-agent` service automatically starts serving all UCP
-components including the UCP web UI and data stores used by UCP. By promoting
-a node to manager, UCP automatically becomes highly available and fault tolerant.
+components including the UCP web UI and data stores used by UCP. The `ucp-agent` accomplishes this by [deploying several containers](#ucp-components-in-manager-nodes) on the node. By promoting a node to manager, UCP automatically becomes highly available and fault tolerant. <br/><br/>
 * **Worker**: on worker nodes the `ucp-agent` service starts serving a proxy
 service that ensures only authorized users and other UCP services can run Docker
-commands in that node.
+commands in that node. The `ucp-agent` only deploys a [subset of containers](#ucp-components-in-worker-nodes) on worker nodes.
 
 
 ## UCP internal components
diff --git a/datacenter/ucp/2.1/guides/images/architecture-2.svg b/datacenter/ucp/2.1/guides/images/architecture-2.svg
index 876db1a1d51d..1131633dd928 100644
--- a/datacenter/ucp/2.1/guides/images/architecture-2.svg
+++ b/datacenter/ucp/2.1/guides/images/architecture-2.svg
@@ -22,8 +22,8 @@
                         </g>
                         <g id="engine" transform="translate(1.000000, 79.000000)">
                             <rect id="Rectangle-138" fill="#1488C6" x="0" y="0" width="95" height="22" rx="2"></rect>
-                            <text id="CS-Docker-Engine" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
-                                <tspan x="7.26025391" y="15">CS Docker Engine</tspan>
+                            <text id="Docker-Enterprise-Engine" font-family="OpenSans, Open Sans" font-size="8" font-weight="normal" fill="#FFFFFF">
+                                <tspan x="5.26025391" y="15">Docker Enterprise Edition</tspan>
                             </text>
                         </g>
                         <g id="ucp" transform="translate(1.000000, 56.000000)">
@@ -51,8 +51,8 @@
                         </g>
                         <g id="engine" transform="translate(1.000000, 79.000000)">
                             <rect id="Rectangle-138" fill="#1488C6" x="0" y="0" width="95" height="22" rx="2"></rect>
-                            <text id="CS-Docker-Engine" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
-                                <tspan x="7.26025391" y="15">CS Docker Engine</tspan>
+                            <text id="Docker-Enterprise-Engine" font-family="OpenSans, Open Sans" font-size="8" font-weight="normal" fill="#FFFFFF">
+                                <tspan x="5.26025391" y="15">Docker Enterprise Edition</tspan>
                             </text>
                         </g>
                         <g id="ucp" transform="translate(1.000000, 56.000000)">
@@ -82,8 +82,8 @@
                         </g>
                         <g id="engine" transform="translate(1.000000, 79.000000)">
                             <rect id="Rectangle-138" fill="#1488C6" x="0" y="0" width="95" height="22" rx="2"></rect>
-                            <text id="CS-Docker-Engine" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
-                                <tspan x="7.26025391" y="15">CS Docker Engine</tspan>
+                            <text id="Docker-Enterprise-Engine" font-family="OpenSans, Open Sans" font-size="8" font-weight="normal" fill="#FFFFFF">
+                                <tspan x="5.26025391" y="15">Docker Enterprise Edition</tspan>
                             </text>
                         </g>
                         <g id="ucp" transform="translate(1.000000, 56.000000)">
@@ -111,8 +111,8 @@
                         </g>
                         <g id="engine" transform="translate(1.000000, 79.000000)">
                             <rect id="Rectangle-138" fill="#1488C6" x="0" y="0" width="95" height="22" rx="2"></rect>
-                            <text id="CS-Docker-Engine" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
-                                <tspan x="7.26025391" y="15">CS Docker Engine</tspan>
+                            <text id="Docker-Enterprise-Engine" font-family="OpenSans, Open Sans" font-size="8" font-weight="normal" fill="#FFFFFF">
+                                <tspan x="5.26025391" y="15">Docker Enterprise Edition</tspan>
                             </text>
                         </g>
                         <g id="ucp" transform="translate(1.000000, 56.000000)">
@@ -140,8 +140,8 @@
                         </g>
                         <g id="engine" transform="translate(1.000000, 79.000000)">
                             <rect id="Rectangle-138" fill="#1488C6" x="0" y="0" width="95" height="22" rx="2"></rect>
-                            <text id="CS-Docker-Engine" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
-                                <tspan x="7.26025391" y="15">CS Docker Engine</tspan>
+                            <text id="Docker-Enterprise-Engine" font-family="OpenSans, Open Sans" font-size="8" font-weight="normal" fill="#FFFFFF">
+                                <tspan x="5.26025391" y="15">Docker Enterprise Edition</tspan>
                             </text>
                         </g>
                         <g id="ucp" transform="translate(1.000000, 56.000000)">

From 46ae279cc448eb9a9bcb740047439d7f1e74fee2 Mon Sep 17 00:00:00 2001
From: Cristoffer Fairweather <fairweac@spawar.navy.mil>
Date: Thu, 20 Apr 2017 10:07:48 -0500
Subject: [PATCH 2/4] Further updated text and diagrams in Docker UCP
 architecture (#2637). Updated other architecture diagram to reflect name
 change.

---
 datacenter/ucp/2.1/guides/architecture.md           |  5 +----
 datacenter/ucp/2.1/guides/images/architecture-1.svg |  4 ++--
 datacenter/ucp/2.1/guides/images/architecture-2.svg | 10 +++++-----
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/datacenter/ucp/2.1/guides/architecture.md b/datacenter/ucp/2.1/guides/architecture.md
index 6175d0390dc0..3333e52283ad 100644
--- a/datacenter/ucp/2.1/guides/architecture.md
+++ b/datacenter/ucp/2.1/guides/architecture.md
@@ -4,8 +4,7 @@ keywords: docker, ucp, architecture
 title: UCP architecture
 ---
 
-Universal Control Plane is a containerized application that runs on the
-Commercially Supported (CS) Docker Engine, and extends its functionality to
+Universal Control Plane is a containerized application that runs on [Docker Enterprise Edition](/enterprise/index.md) and extends its functionality to
 make it easier to deploy, configure, and monitor your applications at scale.
 
 It also secures Docker with role-based access control so that only authorized
@@ -25,9 +24,7 @@ and Docker Compose.
 Docker UCP leverages the clustering and orchestration functionality provided
 by Docker.
 
-<a name="figure-architecture-2">
 ![](images/architecture-2.svg)
-</a>
 
 A swarm is a collection of nodes that are in the same Docker swarm. [Nodes](/engine/swarm/key-concepts.md) in a Docker swarm operate in one of two modes: Manager or Worker. If nodes are not already running in a swarm when installing UCP, nodes will be configured to run in swarm mode.
 
diff --git a/datacenter/ucp/2.1/guides/images/architecture-1.svg b/datacenter/ucp/2.1/guides/images/architecture-1.svg
index 5128d1f28ed0..fc81f2e93463 100644
--- a/datacenter/ucp/2.1/guides/images/architecture-1.svg
+++ b/datacenter/ucp/2.1/guides/images/architecture-1.svg
@@ -30,8 +30,8 @@
                     </g>
                     <g id="docker" transform="translate(0.000000, 76.000000)">
                         <rect id="Rectangle-138" fill="#1488C6" x="0" y="0" width="524" height="34" rx="2"></rect>
-                        <text id="CS-Docker-Engine" font-family="OpenSans, Open Sans" font-size="14" font-weight="normal" fill="#FFFFFF">
-                            <tspan x="205.464355" y="23">CS Docker Engine</tspan>
+                        <text id="Docker-Enterprise-Edition" font-family="OpenSans, Open Sans" font-size="14" font-weight="normal" fill="#FFFFFF">
+                            <tspan x="225.464355" y="23">Docker EE</tspan>
                         </text>
                     </g>
                     <g id="ucp" transform="translate(0.000000, 38.000000)">
diff --git a/datacenter/ucp/2.1/guides/images/architecture-2.svg b/datacenter/ucp/2.1/guides/images/architecture-2.svg
index 1131633dd928..2bae36e37331 100644
--- a/datacenter/ucp/2.1/guides/images/architecture-2.svg
+++ b/datacenter/ucp/2.1/guides/images/architecture-2.svg
@@ -23,7 +23,7 @@
                         <g id="engine" transform="translate(1.000000, 79.000000)">
                             <rect id="Rectangle-138" fill="#1488C6" x="0" y="0" width="95" height="22" rx="2"></rect>
                             <text id="Docker-Enterprise-Engine" font-family="OpenSans, Open Sans" font-size="8" font-weight="normal" fill="#FFFFFF">
-                                <tspan x="5.26025391" y="15">Docker Enterprise Edition</tspan>
+                                <tspan x="28" y="15">Docker EE</tspan>
                             </text>
                         </g>
                         <g id="ucp" transform="translate(1.000000, 56.000000)">
@@ -52,7 +52,7 @@
                         <g id="engine" transform="translate(1.000000, 79.000000)">
                             <rect id="Rectangle-138" fill="#1488C6" x="0" y="0" width="95" height="22" rx="2"></rect>
                             <text id="Docker-Enterprise-Engine" font-family="OpenSans, Open Sans" font-size="8" font-weight="normal" fill="#FFFFFF">
-                                <tspan x="5.26025391" y="15">Docker Enterprise Edition</tspan>
+                                <tspan x="28" y="15">Docker EE</tspan>
                             </text>
                         </g>
                         <g id="ucp" transform="translate(1.000000, 56.000000)">
@@ -83,7 +83,7 @@
                         <g id="engine" transform="translate(1.000000, 79.000000)">
                             <rect id="Rectangle-138" fill="#1488C6" x="0" y="0" width="95" height="22" rx="2"></rect>
                             <text id="Docker-Enterprise-Engine" font-family="OpenSans, Open Sans" font-size="8" font-weight="normal" fill="#FFFFFF">
-                                <tspan x="5.26025391" y="15">Docker Enterprise Edition</tspan>
+                                <tspan x="28" y="15">Docker EE</tspan>
                             </text>
                         </g>
                         <g id="ucp" transform="translate(1.000000, 56.000000)">
@@ -112,7 +112,7 @@
                         <g id="engine" transform="translate(1.000000, 79.000000)">
                             <rect id="Rectangle-138" fill="#1488C6" x="0" y="0" width="95" height="22" rx="2"></rect>
                             <text id="Docker-Enterprise-Engine" font-family="OpenSans, Open Sans" font-size="8" font-weight="normal" fill="#FFFFFF">
-                                <tspan x="5.26025391" y="15">Docker Enterprise Edition</tspan>
+                                <tspan x="28" y="15">Docker EE</tspan>
                             </text>
                         </g>
                         <g id="ucp" transform="translate(1.000000, 56.000000)">
@@ -141,7 +141,7 @@
                         <g id="engine" transform="translate(1.000000, 79.000000)">
                             <rect id="Rectangle-138" fill="#1488C6" x="0" y="0" width="95" height="22" rx="2"></rect>
                             <text id="Docker-Enterprise-Engine" font-family="OpenSans, Open Sans" font-size="8" font-weight="normal" fill="#FFFFFF">
-                                <tspan x="5.26025391" y="15">Docker Enterprise Edition</tspan>
+                                <tspan x="28" y="15">Docker EE</tspan>
                             </text>
                         </g>
                         <g id="ucp" transform="translate(1.000000, 56.000000)">

From 5fb990aff2542d074c6651459e7063af08cd6539 Mon Sep 17 00:00:00 2001
From: Cristoffer Fairweather <fairweac@spawar.navy.mil>
Date: Thu, 20 Apr 2017 10:20:26 -0500
Subject: [PATCH 3/4] (#2637) Updated text size in UCP architecture diagram
 SVG.

---
 .../ucp/2.1/guides/images/architecture-2.svg  | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/datacenter/ucp/2.1/guides/images/architecture-2.svg b/datacenter/ucp/2.1/guides/images/architecture-2.svg
index 2bae36e37331..46e78337895c 100644
--- a/datacenter/ucp/2.1/guides/images/architecture-2.svg
+++ b/datacenter/ucp/2.1/guides/images/architecture-2.svg
@@ -22,8 +22,8 @@
                         </g>
                         <g id="engine" transform="translate(1.000000, 79.000000)">
                             <rect id="Rectangle-138" fill="#1488C6" x="0" y="0" width="95" height="22" rx="2"></rect>
-                            <text id="Docker-Enterprise-Engine" font-family="OpenSans, Open Sans" font-size="8" font-weight="normal" fill="#FFFFFF">
-                                <tspan x="28" y="15">Docker EE</tspan>
+                            <text id="Docker-Enterprise-Engine" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
+                                <tspan x="24" y="15">Docker EE</tspan>
                             </text>
                         </g>
                         <g id="ucp" transform="translate(1.000000, 56.000000)">
@@ -51,8 +51,8 @@
                         </g>
                         <g id="engine" transform="translate(1.000000, 79.000000)">
                             <rect id="Rectangle-138" fill="#1488C6" x="0" y="0" width="95" height="22" rx="2"></rect>
-                            <text id="Docker-Enterprise-Engine" font-family="OpenSans, Open Sans" font-size="8" font-weight="normal" fill="#FFFFFF">
-                                <tspan x="28" y="15">Docker EE</tspan>
+                            <text id="Docker-Enterprise-Engine" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
+                                <tspan x="24" y="15">Docker EE</tspan>
                             </text>
                         </g>
                         <g id="ucp" transform="translate(1.000000, 56.000000)">
@@ -82,8 +82,8 @@
                         </g>
                         <g id="engine" transform="translate(1.000000, 79.000000)">
                             <rect id="Rectangle-138" fill="#1488C6" x="0" y="0" width="95" height="22" rx="2"></rect>
-                            <text id="Docker-Enterprise-Engine" font-family="OpenSans, Open Sans" font-size="8" font-weight="normal" fill="#FFFFFF">
-                                <tspan x="28" y="15">Docker EE</tspan>
+                            <text id="Docker-Enterprise-Engine" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
+                                <tspan x="24" y="15">Docker EE</tspan>
                             </text>
                         </g>
                         <g id="ucp" transform="translate(1.000000, 56.000000)">
@@ -111,8 +111,8 @@
                         </g>
                         <g id="engine" transform="translate(1.000000, 79.000000)">
                             <rect id="Rectangle-138" fill="#1488C6" x="0" y="0" width="95" height="22" rx="2"></rect>
-                            <text id="Docker-Enterprise-Engine" font-family="OpenSans, Open Sans" font-size="8" font-weight="normal" fill="#FFFFFF">
-                                <tspan x="28" y="15">Docker EE</tspan>
+                            <text id="Docker-Enterprise-Engine" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
+                                <tspan x="24" y="15">Docker EE</tspan>
                             </text>
                         </g>
                         <g id="ucp" transform="translate(1.000000, 56.000000)">
@@ -140,8 +140,8 @@
                         </g>
                         <g id="engine" transform="translate(1.000000, 79.000000)">
                             <rect id="Rectangle-138" fill="#1488C6" x="0" y="0" width="95" height="22" rx="2"></rect>
-                            <text id="Docker-Enterprise-Engine" font-family="OpenSans, Open Sans" font-size="8" font-weight="normal" fill="#FFFFFF">
-                                <tspan x="28" y="15">Docker EE</tspan>
+                            <text id="Docker-Enterprise-Engine" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
+                                <tspan x="24" y="15">Docker EE</tspan>
                             </text>
                         </g>
                         <g id="ucp" transform="translate(1.000000, 56.000000)">

From 705028a27f82c8e5ace2c7ff39a035c533553056 Mon Sep 17 00:00:00 2001
From: Cristoffer Fairweather <fairweac@spawar.navy.mil>
Date: Thu, 20 Apr 2017 10:33:06 -0500
Subject: [PATCH 4/4] (#2637) Updated UCP architecture diagram 3. Removed
 arbitrary line breaks.

---
 datacenter/ucp/2.1/guides/architecture.md     |  2 +-
 .../ucp/2.1/guides/images/architecture-3.svg  | 20 +++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/datacenter/ucp/2.1/guides/architecture.md b/datacenter/ucp/2.1/guides/architecture.md
index 3333e52283ad..54af9dcffa23 100644
--- a/datacenter/ucp/2.1/guides/architecture.md
+++ b/datacenter/ucp/2.1/guides/architecture.md
@@ -36,7 +36,7 @@ and stops UCP services, based on whether that node is a
 If the node is a:
 
 * **Manager**: the `ucp-agent` service automatically starts serving all UCP
-components including the UCP web UI and data stores used by UCP. The `ucp-agent` accomplishes this by [deploying several containers](#ucp-components-in-manager-nodes) on the node. By promoting a node to manager, UCP automatically becomes highly available and fault tolerant. <br/><br/>
+components including the UCP web UI and data stores used by UCP. The `ucp-agent` accomplishes this by [deploying several containers](#ucp-components-in-manager-nodes) on the node. By promoting a node to manager, UCP automatically becomes highly available and fault tolerant.
 * **Worker**: on worker nodes the `ucp-agent` service starts serving a proxy
 service that ensures only authorized users and other UCP services can run Docker
 commands in that node. The `ucp-agent` only deploys a [subset of containers](#ucp-components-in-worker-nodes) on worker nodes.
diff --git a/datacenter/ucp/2.1/guides/images/architecture-3.svg b/datacenter/ucp/2.1/guides/images/architecture-3.svg
index a8a3523da845..6a9c66a0a300 100644
--- a/datacenter/ucp/2.1/guides/images/architecture-3.svg
+++ b/datacenter/ucp/2.1/guides/images/architecture-3.svg
@@ -74,8 +74,8 @@
                                 </g>
                                 <g id="engine" transform="translate(1.000000, 79.000000)">
                                     <rect id="Rectangle-138" fill="#A1CFE8" x="0" y="0" width="95" height="22" rx="2"></rect>
-                                    <text id="CS-Docker-Engine" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
-                                        <tspan x="7.26025391" y="15">CS Docker Engine</tspan>
+                                    <text id="Docker-Enterprise-Edition" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
+                                        <tspan x="24" y="15">Docker EE</tspan>
                                     </text>
                                 </g>
                                 <g id="ucp" transform="translate(1.000000, 56.000000)">
@@ -103,8 +103,8 @@
                                 </g>
                                 <g id="engine" transform="translate(1.000000, 79.000000)">
                                     <rect id="Rectangle-138" fill="#A1CFE8" x="0" y="0" width="95" height="22" rx="2"></rect>
-                                    <text id="CS-Docker-Engine" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
-                                        <tspan x="7.26025391" y="15">CS Docker Engine</tspan>
+                                    <text id="Docker-Enterprise-Edition" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
+                                        <tspan x="24" y="15">Docker EE</tspan>
                                     </text>
                                 </g>
                                 <g id="ucp" transform="translate(1.000000, 56.000000)">
@@ -134,8 +134,8 @@
                                 </g>
                                 <g id="engine" transform="translate(1.000000, 79.000000)">
                                     <rect id="Rectangle-138" fill="#1488C6" x="0" y="0" width="95" height="22" rx="2"></rect>
-                                    <text id="CS-Docker-Engine" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
-                                        <tspan x="7.26025391" y="15">CS Docker Engine</tspan>
+                                    <text id="Docker-Enterprise-Edition" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
+                                        <tspan x="24" y="15">Docker EE</tspan>
                                     </text>
                                 </g>
                                 <g id="ucp" transform="translate(1.000000, 56.000000)">
@@ -163,8 +163,8 @@
                                 </g>
                                 <g id="engine" transform="translate(1.000000, 79.000000)">
                                     <rect id="Rectangle-138" fill="#1488C6" x="0" y="0" width="95" height="22" rx="2"></rect>
-                                    <text id="CS-Docker-Engine" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
-                                        <tspan x="7.26025391" y="15">CS Docker Engine</tspan>
+                                    <text id="Docker-Enterprise-Edition" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
+                                        <tspan x="24" y="15">Docker EE</tspan>
                                     </text>
                                 </g>
                                 <g id="ucp" transform="translate(1.000000, 56.000000)">
@@ -192,8 +192,8 @@
                                 </g>
                                 <g id="engine" transform="translate(1.000000, 79.000000)">
                                     <rect id="Rectangle-138" fill="#1488C6" x="0" y="0" width="95" height="22" rx="2"></rect>
-                                    <text id="CS-Docker-Engine" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
-                                        <tspan x="7.26025391" y="15">CS Docker Engine</tspan>
+                                    <text id="Docker-Enterprise-Edition" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
+                                        <tspan x="24" y="15">Docker EE</tspan>
                                     </text>
                                 </g>
                                 <g id="ucp" transform="translate(1.000000, 56.000000)">