docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

branding changes 

Signed-off-by: Dawn W Docker <dawn.wood@users.noreply.github.com>
This commit is contained in:
Dawn W Docker 2019-06-11 14:48:19 -07:00
parent 9b6409c806
commit 7b45982a0a
8 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
develop/sdk/index.md
View File

@ -128,7 +128,7 @@ You can specify the API version to use, in one of the following ways:
or the
[Python SDK documentation for `client`](https://docker-py.readthedocs.io/en/stable/client.html).
### Docker EE and CE API mismatch
### Docker EE and Docker Engine - Community API mismatch
If you use Docker EE in production, we recommend using Docker EE in development
too. If you can't, such as when your developers use Docker Desktop for Mac or Docker Desktop for

2
docker-for-mac/edge-release-notes.md
View File

@ -11,7 +11,7 @@ For system requirements, see
[What to know before you install](install.md#what-to-know-before-you-install).
Release notes for _edge_ releases are listed below, [_stable_ release
notes](release-notes) are also available. (Following the CE release model,
notes](release-notes) are also available. (Following the Docker Engine - Community release model,
'beta' releases are called 'edge' releases.) You can learn about both kinds of
releases, and download stable and edge product installers at [Download Docker
for Mac](install.md#download-docker-for-mac).

2
docker-for-mac/release-notes.md
View File

@ -13,7 +13,7 @@ For system requirements, see
[What to know before you install](install.md#what-to-know-before-you-install).
Release notes for _stable_ releases are listed below, [_edge_ release
notes](edge-release-notes) are also available. (Following the CE release model,
notes](edge-release-notes) are also available. (Following the Docker Engine - Community release model,
'beta' releases are called 'edge' releases.) You can learn about both kinds of
releases, and download stable and edge product installers at [Download Docker
Desktop for Mac](install.md#download-docker-for-mac).

2
docker-for-windows/edge-release-notes.md
View File

@ -11,7 +11,7 @@ For system requirements, see
[What to know before you install](install.md#what-to-know-before-you-install).
Release notes for _edge_ releases are listed below, [_stable_ release
notes](release-notes) are also available. (Following the CE release model,
notes](release-notes) are also available. (Following the Docker Engine - Community release model,
'beta' releases are called 'edge' releases.) You can learn about both kinds of
releases, and download stable and edge product installers at [Download Docker
for Windows](install.md#download-docker-for-windows).

2
docker-for-windows/release-notes.md
View File

@ -13,7 +13,7 @@ For system requirements, see
[What to know before you install](install.md#what-to-know-before-you-install).
Release notes for _stable_ releases are listed below, [_edge_ release
notes](edge-release-notes) are also available. (Following the CE release model,
notes](edge-release-notes) are also available. (Following the Docker Engine - Community release model,
'beta' releases are called 'edge' releases.) You can learn about both kinds of
releases, and download stable and edge product installers at [Download Docker
for Windows](install.md#download-docker-for-windows).

10
engine/ce-ee-node-activate.md
View File

@ -1,10 +1,10 @@
---
description: Engine
keywords: Engine, CE, EE, node, activation, enterprise, patching
keywords: Engine, Docker Engine - Community, EE, node, activation, enterprise, patching
title: CE-EE Node Activate
---
The Docker Engine `18.09` release introduces a new feature called **CE-EE Node Activate**, which allows a user to perform an in-place seamless activation of the Enterprise engine feature set on an existing Community Edition (CE) node through the Docker command line.
The Docker Engine `18.09` release introduces a new feature called **CE-EE Node Activate**, which allows a user to perform an in-place seamless activation of the Enterprise engine feature set on an existing Docker Engine - Community node through the Docker command line.
CE-EE Node Activate will apply a license, and switch the Docker engine to the Enterprise engine binary.
@ -21,17 +21,17 @@ CE-EE Node Activate will apply a license, and switch the Docker engine to the En
## Notes on patching after running Docker Engine - Community to EE Node Activation
Docker recommends replacing the apt or yum repository from CE with the EE repository that appears
Docker recommends replacing the apt or yum repository from Docker Engine - Community with the EE repository that appears
on your hub/store account after starting the trial or paid license. This allows apt/yum
upgrade operations to work as expected and keep them current as long as your license is still
valid and has not expired.
> **Note**: You can use the `docker engine update` command. However, if you continue to use
> the CE packages, the OS package will no longer replace the active daemon binary during apt/yum
> the Docker Engine - Community packages, the OS package will no longer replace the active daemon binary during apt/yum
> updates, so you are responsible for performing the `docker engine update` operation periodically
> to keep your engine up to date.
## Docker Engine 18.09 CE to EE Node Activation Process
## Docker Engine 18.09 Docker Engine - Community to EE Node Activation Process
The activation can be performed either online with connection to Docker Hub, or offline.

6
engine/release-notes.md
View File

@ -1,6 +1,6 @@
---
title: Docker Engine release notes
description: Learn about the new features, bug fixes, and breaking changes for Docker Engine CE and EE
description: Learn about the new features, bug fixes, and breaking changes for Docker Engine - Community and EE
keywords: docker, docker engine, ee, ce, whats new, release notes
toc_min: 1
toc_max: 2
@ -10,9 +10,9 @@ redirect_from:
---
This document describes the latest changes, additions, known issues, and fixes
for Docker Engine Enterprise Edition (Docker EE) and Community Edition (CE).
for Docker Engine - Enterprise and Docker Engine - Community.
Docker EE is a superset of all the features in Docker CE. It incorporates defect fixes
Docker EE is a superset of all the features in Docker Docker Engine - Community. It incorporates defect fixes
that you can use in environments where new features cannot be adopted as quickly for
consistency and compatibility reasons.

12
install/index.md
View File

@ -98,17 +98,17 @@ Binaries built from this releases are available in the stable channel
`stable-YY.mm`, for example `stable-18.09`, as well as the corresponding
test channel.
### Relationship between CE and EE code
### Relationship between Docker Engine - Community and EE code
For a given year-month release, Docker releases both CE and EE
For a given year-month release, Docker releases both Docker Engine - Community and EE
variants concurrently. EE is a superset of the code delivered in
CE. Docker maintains publicly visible repositories for the CE code
CE. Docker maintains publicly visible repositories for the Docker Engine - Community code
as well as private repositories for the EE code. Automation (a bot)
is used to keep the branches between CE and EE in sync so as features
and fixes are merged on the various branches in the CE repositories
is used to keep the branches between Docker Engine - Community and EE in sync so as features
and fixes are merged on the various branches in the Docker Engine - Community repositories
(upstream), the corresponding EE repositories and branches are kept
in sync (downstream). While Docker and its partners make every effort
to minimize merge conflicts between CE and EE, occasionally they will
to minimize merge conflicts between Docker Engine - Community and EE, occasionally they will
happen, and Docker will work hard to resolve them in a timely fashion.
## Next release