From 4ee2bbb3728d4a2e734764aaa114db80d0b3c725 Mon Sep 17 00:00:00 2001 From: Traci Morrison Date: Wed, 27 Nov 2019 11:01:39 -0500 Subject: [PATCH] Remove Enterprise terms from glossary --- _data/glossary.yaml | 32 +------------------------------- 1 file changed, 1 insertion(+), 31 deletions(-) diff --git a/_data/glossary.yaml b/_data/glossary.yaml index 13f15a1823..e9eff619e7 100644 --- a/_data/glossary.yaml +++ b/_data/glossary.yaml @@ -1,4 +1,4 @@ -

Term

: | +

Term

: |

Definition

amd64: | AMD64 is AMD's 64-bit extension of Intel's x86 architecture, and is also @@ -31,10 +31,6 @@ *Also known as : control groups* cluster: | A cluster is a group of machines that work together to run workloads and provide high availability. -collection: | - A collection is a group of swarm resources that Docker Engine - Enterprise uses for role-based - access control. Collections enable organizing permissions for resources like - nodes, services, containers, volumes, networks, and secrets. [Learn how to manage collections](/datacenter/ucp/2.2/guides/access-control/manage-access-with-collections/). Compose: | [Compose](https://github.com/docker/compose) is a tool for defining and running complex applications with Docker. With Compose, you define a @@ -81,11 +77,6 @@ develop, ship, and run applications - The docker daemon process running on the host which manages images and containers (also called Docker Engine) -Docker Enterprise: | - Docker Enterprise is a platform to build, ship, and run - containerized applications, that you can deploy in the cloud or on-premise. It - includes a tested and certified version of Docker, web UIs for managing - your app resources, and support. Docker Desktop for Mac: | [Docker Desktop for Mac](/docker-for-mac/) is an easy-to-install, lightweight Docker development environment designed specifically for the Mac. A native @@ -155,11 +146,6 @@ - Linux : ext4, aufs, btrfs, zfs - Windows : NTFS - macOS : HFS+ -grant: | - A grant enables role-based access control for managing how users and - organizations access Docker Engine - Enterprise swarm resources. A grant is made up of a - subject, a role, and a collection. For more about grants and role-based access - control, see [Grant permissions to users based on roles](/datacenter/ucp/2.2/guides/access-control/grant-permissions/). image: | Docker images are the basis of [containers](#container). An Image is an ordered collection of root filesystem changes and the corresponding @@ -244,18 +230,6 @@ Here is an example of the shared [nginx repository](https://hub.docker.com/_/nginx/) and its [tags](https://hub.docker.com/r/library/nginx/tags/). -role: | - A role is a set of permitted API operations on a collection of Docker Engine - Enterprise swarm - resources. As part of a grant, a role is assigned to a subject (a user, team, or - organization) and a collection. For more about roles, see [Roles and - permission levels](/datacenter/ucp/2.2/guides/access-control/permission-levels/). -role-based access control: | - Role-based access control enables managing how Docker Engine - Enterprise users can access - swarm resources. UCP administrators create grants to control how users access - resource collections. A grant is made up of a subject, a role, and a collection. - A grant defines who (subject) has how much access (role) to a set of resources - (collection). For more about role-based access control, see - [Authentication](/datacenter/ucp/2.2/guides/access-control/). SSH: | SSH (secure shell) is a secure protocol for accessing remote machines and applications. It provides authentication and encrypts data communication over insecure networks such @@ -282,10 +256,6 @@ You don’t need to expose service-specific ports to make the service available to other services on the same overlay network. The swarm’s internal load balancer automatically distributes requests to the service VIP among the active tasks. -subject: | - A subject represents a user, team, or organization in Docker Enterprise. A subject is - granted a role for access to a collection of swarm resources. - For more about role-based access, see [Authentication](/datacenter/ucp/2.2/guides/access-control/). swarm: | A [swarm](/engine/swarm/) is a cluster of one or more Docker Engines running in [swarm mode](#swarm_mode). Docker Swarm: |