diff --git a/_data/toc.yaml b/_data/toc.yaml
index 754223ab51..a0f1287d2d 100644
--- a/_data/toc.yaml
+++ b/_data/toc.yaml
@@ -4041,6 +4041,8 @@ manuals:
title: Trust Chain
- path: /docker-hub/publish/byol/
title: Bring Your Own License (BYOL)
+ - path: /docker-hub/deactivate-account/
+ title: Deactivate an account or an organization
- sectiontitle: Open-source projects
section:
- sectiontitle: Docker Notary
diff --git a/_includes/global-header.html b/_includes/global-header.html
index b6aaf94384..5907915958 100644
--- a/_includes/global-header.html
+++ b/_includes/global-header.html
@@ -9,29 +9,27 @@
- - What is Docker?
- - Product
+ - Why Docker?
+ - Product
-
Get Docker
- - Docs
- Community
- Create Docker ID
- Sign In
diff --git a/docker-hub/deactivate-account.md b/docker-hub/deactivate-account.md
new file mode 100644
index 0000000000..57a513856e
--- /dev/null
+++ b/docker-hub/deactivate-account.md
@@ -0,0 +1,50 @@
+---
+title: Deactivating an account or an organization
+description: Learn how to deactivate a Docker Hub account or an organization
+keywords: Docker Hub, delete, deactivate, account, organization
+---
+
+Your Docker Hub account or organization may also be linked to other Docker products and services, so deactivating it will also disable access to those products and services.
+
+## Deactivating an account
+
+Before deactivating your Docker Hub account, please complete the following:
+
+1. Download any images and tags you want to keep:
+ `docker pull -a :`.
+
+3. If you have an active subscription, downgrade it to the **free** plan.
+
+ In Docker Hub, navigate to **_Your Account_** > **Account Settings** > **Billing**.
+
+4. If you have an enterprise license, download the key.
+
+ In Docker Hub, navigate to **_Your Account_** > **Accounts Settings** > **Licenses**. The download link will no longer be available after your account is disabled.
+
+5. If you belong to any organizations, remove your account from all of them.
+
+6. If you are the sole owner of any organization, either add someone to the **owners** team and then remove yourself from the organization, or deactivate the organization as well.
+
+7. Unlink your [Github and Bitbucket accounts](https://docs.docker.com/docker-hub/builds/link-source/#unlink-a-github-user-account).
+
+Once you have completed all the steps above, you may deactivate your account. On Docker Hub, go to **_Your Account_** > **Accounts Settings** > **Deactivate Account**.
+
+> This cannot be undone! Be sure you've gathered all the data you need from your account before deactivating it.
+
+
+## Deactivating an organization
+
+Before deactivating an organization, please complete the following:
+
+1. Download any images and tags you want to keep:
+ `docker pull -a :`.
+
+2. If you have an active subscription, downgrade it to the **free** plan:
+
+ In Docker Hub, navigate to **Organizations** > **_Your Organization_** > **Billing**.
+
+3. Unlink your [Github and Bitbucket accounts](https://docs.docker.com/docker-hub/builds/link-source/#unlink-a-github-user-account).
+
+Once you have completed all the steps above, you may deactivate your organization. On Docker Hub, go to **Organizations** > **_Your Organization_** > **Settings** > **Deactivate Org**.
+
+> This cannot be undone! Be sure you've gathered all the data you need from your organization before deactivating it.
diff --git a/docker-hub/images/org-members2019.png b/docker-hub/images/org-members2019.png
new file mode 100644
index 0000000000..1f708ef03e
Binary files /dev/null and b/docker-hub/images/org-members2019.png differ
diff --git a/docker-hub/images/orgs-add-member2019.png b/docker-hub/images/orgs-add-member2019.png
new file mode 100644
index 0000000000..dbe7bd42c9
Binary files /dev/null and b/docker-hub/images/orgs-add-member2019.png differ
diff --git a/docker-hub/images/orgs-create2019.png b/docker-hub/images/orgs-create2019.png
new file mode 100644
index 0000000000..134b281559
Binary files /dev/null and b/docker-hub/images/orgs-create2019.png differ
diff --git a/docker-hub/images/orgs-new-team2019.png b/docker-hub/images/orgs-new-team2019.png
new file mode 100644
index 0000000000..c7e3fe3ce2
Binary files /dev/null and b/docker-hub/images/orgs-new-team2019.png differ
diff --git a/docker-hub/images/orgs-repo-perms2019.png b/docker-hub/images/orgs-repo-perms2019.png
new file mode 100644
index 0000000000..0490860652
Binary files /dev/null and b/docker-hub/images/orgs-repo-perms2019.png differ
diff --git a/docker-hub/images/orgs-repos2019.png b/docker-hub/images/orgs-repos2019.png
new file mode 100644
index 0000000000..4441bd04e0
Binary files /dev/null and b/docker-hub/images/orgs-repos2019.png differ
diff --git a/docker-hub/images/orgs-team-members2019.png b/docker-hub/images/orgs-team-members2019.png
new file mode 100644
index 0000000000..1f7931e5d5
Binary files /dev/null and b/docker-hub/images/orgs-team-members2019.png differ
diff --git a/docker-hub/images/orgs-teams-perms2019.png b/docker-hub/images/orgs-teams-perms2019.png
new file mode 100644
index 0000000000..b492fa7b23
Binary files /dev/null and b/docker-hub/images/orgs-teams-perms2019.png differ
diff --git a/docker-hub/images/orgs-teams2019.png b/docker-hub/images/orgs-teams2019.png
new file mode 100644
index 0000000000..42b0ae221a
Binary files /dev/null and b/docker-hub/images/orgs-teams2019.png differ
diff --git a/docker-hub/images/repos-list2019.png b/docker-hub/images/repos-list2019.png
new file mode 100644
index 0000000000..c303eab0ab
Binary files /dev/null and b/docker-hub/images/repos-list2019.png differ
diff --git a/docker-hub/images/teams-add-member2019.png b/docker-hub/images/teams-add-member2019.png
new file mode 100644
index 0000000000..f9cea26659
Binary files /dev/null and b/docker-hub/images/teams-add-member2019.png differ
diff --git a/docker-hub/orgs.md b/docker-hub/orgs.md
index 328129f301..54442fdf86 100644
--- a/docker-hub/orgs.md
+++ b/docker-hub/orgs.md
@@ -6,72 +6,137 @@ redirect_from:
- /docker-cloud/orgs/
---
-Docker Hub Organizations let you create teams so you can give your team access to shared image repositories.
+Docker Hub Organizations let you create teams so you can give your team access
+to shared image repositories.
-### How Organizations & Teams Work
+- **Organizations** are collections of teams and repositories that can be managed together.
+- **Teams** are groups of Docker Hub users that belong to an organization.
-- **Organizations** are a collection of teams and repositories that can be managed together.
-- **Teams** are groups of Docker Hub users that belong to your organization.
+> **Note**: in Docker Hub, users cannot belong directly to an organization.
+They belong only to teams within an organization.
-> **Note**: in Docker Hub, users cannot be associated directly to an organization. They belong only to teams within an organization.
+## Working with organizations
### Create an organization
-1. Start by clicking on [Organizations](https://cloud.docker.com/orgs) in Docker Hub
-2. Click on "Create Organization"
+1. Start by clicking on **[Organizations](https://hub.docker.com/orgs)** in
+Docker Hub.
+
+2. Click on **Create Organization**.
+
3. Provide information about your organization:
-
+ 
-You've created an organization. You'll see you have a team, the **owners** team with a single member (you!)
+You've created an organization. You'll see you have a team, the **owners** team
+with a single member (you!).
-### The owners team
+#### The owners team
-The **owners** team is a special team that has full access to all repositories in the Organization.
+The **owners** team is a special team that has full access to all repositories
+in the organization.
Members of this team can:
-- Manage Organization settings and billing
+- Manage organization settings and billing
- Create a team and modify the membership of any team
-- Access and modify any repository belonging to the Organization
+- Access and modify any repository belonging to the organization
+
+## Working with teams and members
### Create a team
-To create a team:
+1. Go to **Organizations** in Docker Hub, and select your organization.
+
+2. Open the **Teams** tab and click **Create Team**.
+
+ 
+
+3. Fill out your team's information and click **Create**.
+
+ 
-1. Go to your organization by clicking on **Organizations** in Docker Hub, and select your organization.
-2. Click **Create Team** 
-3. Fill out your team's information and click **Create** 
### Add a member to a team
-1. Visit your team's page in Docker Hub. Click on **Organizations** > **_Your Organization_** > **_Your Team Name_**
-2. Click on **Add User**
-3. Provide the user's Docker ID username _or_ email to add them to the team 
+You can add a member to a team in one of two ways.
-> **Note**: You are not automatically added to teams created by your organization.
+If the user isn't in your organization:
+
+1. Go **Organizations** in Docker Hub, and select your organization.
+
+2. Click **Add Member**.
+
+ 
+
+3. Provide the user's Docker ID username _or_ email, and select a team from the dropdown.
+
+ 
+
+
+If the user already belongs to another team in the organization:
+
+1. Open the team's page in Docker Hub: **Organizations** > **_Your Organization_** > **Teams** > **_Your Team Name_**
+
+2. Click **Add User**.
+3. Provide the user's Docker ID username _or_ email to add them to the team.
+
+ 
+
+ > **Note**: You are not automatically added to teams created by your organization.
### Remove team members
-To remove a member from a team, click the **x** next to their name:
+To remove a member from all teams in an organization:
+
+1. Go **Organizations** in Docker Hub, and select your organization.
+
+2. Click the **x** next to a member's name:
+
+ 
+
+
+To remove a member from a specific team:
+
+1. Open the team this user is on. You can do this in one of two ways:
+
+ * If you know the team name, go to **Organizations** > **_Your Organization_** > **Teams** > **_Team Name_**.
+
+ > **Note:** You can filter the **Teams** tab by username, but you have to use the format _@username_ in the search field (partial names will not work).
+
+ * If you don't know the team name, go to **Organizations** > **_Your Organization_** and search for the user. Hover over **View** to see all of their teams, then click on **View** > **_Team Name_**.
+
+2. Find the user in the list, and click the **x** next to the user's name to remove them.
+
+ 
-
### Give a team access to a repository
-To provide a team access to a repository:
+1. Visit the repository list on Docker Hub by clicking on **Repositories**.
-1. Visit the repository list on Docker Hub by clicking on **Repositories**
-2. Select your organization in the namespace dropdown list
-3. Click the repository you'd like to edit 
-4. Click the **Permissions** tab
-5. Select the team, permissions level (more on this below) and click **+**
-6. Click the **+** button to add 
+2. Select your organization in the namespace dropdown list.
+
+3. Click the repository you'd like to edit.
+
+ 
+
+4. Click the **Permissions** tab.
+
+5. Select the team, the [permissions level](#permissions-reference), and click **+** to save.
+
+ 
### View a team's permissions for all repositories
To view a team's permissions over all repos:
-1. Click on **Organizations**, then select your organization and team.
-2. Click on the **Permissions** tab where you can view which repositories this team has access to 
+
+1. Open **Organizations** > **_Your Organization_** > **Teams** > **_Team Name_**.
+
+2. Click on the **Permissions** tab, where you can view the repositories this team can access.
+
+ 
+
+You can also edit repository permissions from this tab.
### Permissions reference
@@ -81,7 +146,7 @@ automatically have Read permissions:
- `Read` access allows users to view, search, and pull a private repository in the same way as they can a public repository.
- `Write` access allows users to push to repositories on Docker Hub.
-- `Admin` access allows users to modify the repositories "Description", "Collaborators" rights, "Public/Private" visibility and "Delete".
+- `Admin` access allows users to modify the repositories "Description", "Collaborators" rights, "Public/Private" visibility, and "Delete".
> **Note**: A User who has not yet verified their email address only has
> `Read` access to the repository, regardless of the rights their team
diff --git a/docker-hub/release-notes.md b/docker-hub/release-notes.md
index c22ad11a0f..182d7249ab 100644
--- a/docker-hub/release-notes.md
+++ b/docker-hub/release-notes.md
@@ -8,6 +8,21 @@ toc_max: 2
Here you can learn about the latest changes, new features, bug fixes, and
known issues for each Docker Hub release.
+## 2019-10-02
+
+### Enhancements
+* You can now manage teams and members straight from your [organization page](https://hub.docker.com/orgs). Each organization page now breaks down into these tabs:
+ * **New:** Members - manage your members directly from this page (delete, add, or open their teams)
+ * **New:** Teams - search by team or username, and open up any team page to manage the team
+ * Repositories
+ * Settings
+ * Billing
+
+### Bug fixes
+
+* Fixed an issue where Kinematic could not connect and log in to Docker Hub.
+
+
## 2019-09-19
### New features
diff --git a/storage/tmpfs.md b/storage/tmpfs.md
index a7ffe16b90..d104f9ef6b 100644
--- a/storage/tmpfs.md
+++ b/storage/tmpfs.md
@@ -50,7 +50,7 @@ the `--mount` flag was used for swarm services. However, starting with Docker
is mounted in the container. May be specified as `destination`, `dst`,
or `target`.
- The `tmpfs-type` and `tmpfs-mode` options. See
- [tmpfs options](#tmpfs-options).
+ [tmpfs options](#specify-tmpfs-options).
The examples below show both the `--mount` and `--tmpfs` syntax where possible,
and `--mount` is presented first.