Revamp the Teams and Orgs page

Signed-off-by: Usha Mandya <usha.mandya@docker.com>

_data/toc.yaml

@@ -1304,6 +1304,8 @@ manuals:
     title: Quickstart
   - path: /docker-id/
     title: Docker ID accounts
+  - path: /docker-hub/orgs/
+    title: Teams and organizations
   - path: /docker-hub/repos/
     title: Repositories
   - path: /docker-hub/service-accounts/
@@ -1324,8 +1326,6 @@ manuals:
     title: Webhooks
   - path: /docker-hub/slack_integration/
     title: Slack integration
-  - path: /docker-hub/orgs/
-    title: Teams and organizations
   - path: /docker-hub/image-access-management/
     title: Image Access Management
   - path: /docker-hub/vulnerability-scanning/

docker-hub/orgs.md

@@ -9,151 +9,231 @@ redirect_from:
 Docker Hub organizations let you create teams so you can give your team access
 to shared image repositories.
 
-- **Organizations** are collections of teams and repositories that can be managed together.
+An **Organization** is a collection of teams and repositories
-- **Teams** are groups of Docker Hub users that belong to an organization.
+that can be managed together. Docker users become members of an organization
+when they are assigned to at least one team in the organization. When you first
+create an organization, you’ll see that you have a team, the **owners** (Admins)
+team, with a single member. An organization owner is someone that is part of the
+owners team. They can create new teams and add
+members to an existing team using their Docker ID or email address and by
+selecting a team the user should be part of. An org owner can also add
+additional org owners to help them manage users, teams, and repositories in the
+organization.
 
-> **Note:** in Docker Hub, users cannot belong directly to an organization.
+A **Team** is a group of Docker users that belong to an organization. An
-They belong only to teams within an organization.
+organization can have multiple teams. When you first create an organization,
+you’ll see that you have a team, the **owners** team, with a single member. An
+organization owner can then create new teams and add members to an existing team
+using their Docker ID or email address and by selecting a team the user should be part of.
 
-<iframe width="560" height="315" src="https://www.youtube-nocookie.com/embed/G7lvSnAqed8" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
+## Create an organization
 
-## Working with organizations
+There are multiple ways to create an organization. You can create a brand new
+organization using the **Create Organization** option in Docker Hub, or you can
+convert an existing user account to an organization. The following section
+contains instructions on how to create new organization. For prerequisites and
+detailed instructions on converting an existing user account to an org, see
+[Convert an account into an organization](convert-account.md).
 
-### Create an organization
+To create an organization:
 
-<iframe width="560" height="315" src="https://www.youtube-nocookie.com/embed/b0TKcIqa9Po" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
+1. Sign into [Docker Hub](https://hub.docker.com/){: target="_blank"
+rel="noopener" class="_"} using your [Docker ID](../docker-id/index.md) or your email address.
+2. Select **Organizations**. Click **Create Organization** to create a new organization.
+3. Choose a plan for your organization. See [Docker Pricing](https://www.docker.com/pricing/){: target="_blank" rel="noopener"
+class="_" id="dkr_docs_subscription_btl"} for details on the features offered
+in the Team and Business plan.
+4. Enter a name for your organization. This is the official, unique name for
+your organization in Docker Hub. Note that it is not possible to change the name
+of the organization after you've created it.
 
-1. Start by clicking on **[Organizations](https://hub.docker.com/orgs)** in
+      > The organization name cannot be the same as your Docker ID.
-Docker Hub.
 
-2. Click on **Create Organization**.
+5. Enter the name of your company. This is the full name of your company.
+This info is displayed on your organization page, and in the details of any
+public images you publish. You can update the company name anytime by navigating
+to your organization's **Settings** page. Click **Continue to Org size**.
+6. On the Organization Size page, specify the number of users (seats) you'd
+require and click **Continue to payment**.
 
-3. Provide information about your organization.
+You've now created an organization. Select the newly created organization from
+the Organizations page. You'll now see that 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
+### View an organization
-with a single member (you!).
 
-#### The owners team
+To view an organization:
 
-The **owners** team is a special team that has full access to all repositories
+1. Log into Docker Hub with a user account that is a member of any team in the
-in the organization.
+   organization. You must be part of the **owners** team to access the
+   organization's **Settings** page.
 
-Members of this team can:
+      > **Note:**
-- Manage organization settings and billing
+      >
-- Create a team and modify the membership of any team
+      > You can't _directly_ log into an organization. This is especially
-- Access and modify any repository belonging to the organization
+      > important to note if you create an organization by
+      [converting a user account](convert-account.md), as conversion means you lose the ability to log into that
+      > "account", since it no longer exists. If you don't see the organization,
+      > then you are neither a member or an owner of it. An organization
+      > administrator will need to add you as a member of the organization team.
 
-### Access an organization
+2. Click **Organizations** in the top navigation bar, then choose your
+   organization from the list.
 
-You can't _directly_ log into an organization. This is especially important to note if you create an organization by converting a user account, as conversion means you lose the ability to log into that "account", since it no longer exists.
+      ![View organization details](images/view-org.png){:width="700px"}
 
-To access an organization:
+The Organization landing page displays various options that allow you to
+configure your organization.
 
-1. Log into Docker Hub with a user account that is a member of any team in the organization.
+- **Members**: Displays a list of team members. You
+  can invite new members using the **Add Member** option. See [Add team members](#add-team-members) for details.
 
-    > If you want access to organization settings, this account has to be part of the **owners** team.
+- **Teams**: Displays a list of existing teams and the number of
+  members in each team. See [Create a team](#create-a-team) for details.
 
-2. Click **Organizations** in the top navigation bar, then choose your organization from the list.
+- **Repositories**: Displays a list of repositories associated with the
+  organization. See [Repositories](repos.md) for detailed information about
+  working with repositories.
 
-If you don't see the organization, then you are neither a member or an owner of it. An organization administrator will need to add you as a member of the organization team.
+- **Activity** - Displays the audit log, a chronological list of activities that
+  occur at organization and repository levels. It provides the org owners a
+  report of all their team member activities. See [Audit log](audit-log.md) for
+  details.
 
-## Working with teams and members
+- **Settings**: Displays information about your
+  organization, and allows you to view and change your repository privacy
+  settings, configure org permissions such as
+  [Image Access Management](image-access-management.md) and notification settings. You can
+  also [deactivate](deactivate-account.md#deactivating-an-organization) your
+  organization on this tab.
 
-<iframe width="560" height="315" src="https://www.youtube-nocookie.com/embed/MROKmtmWCVI" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
+- **Billing**: Displays information about your existing 
+[Docker subscription (plan)](../subscription/index.md) and your billing history. You can also access your invoices from this tab.
 
-### Create a team
+## Create a team
 
-<iframe width="560" height="315" src="https://www.youtube-nocookie.com/embed/78wbbBoasIc" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
+A **Team** is a group of Docker users that belong to an organization. An
+organization can have multiple teams. When you first create an organization,
+you’ll see that you have a team, the **owners** team, with a single member. An
+organization owner can then create new teams and add members to an existing team
+using their Docker ID or email address and by selecting a team the user should be part of.
+
+The org owner can add additional org owners to the owners team to help them
+manage users, teams, and repositories in the organization. See [Owners
+team](#the-owners-team) for details.
+
+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**.
 
-### Add a member to a team
+### The owners team
 
-You can add a member to a team in one of two ways.
+The **owners** team is a special team created by default during the org creation
+process. The owners team has full access to all repositories in the organization.
+
+An organization owner is an administrator who is responsible to manage
+repositories and add team members to the organization. They have full access to
+private repositories, all teams, billing information, and org settings. An org
+owner can also specify [permissions](#permissions-reference) for each team in
+the organization. Only an org owner can enable [SSO](../single-sign-on/index.md)
+for
+the organization. When SSO is enabled for your organization, the org owner can
+also manage users. Docker can auto-provision Docker IDs for new end-users or
+users who'd like to have a separate Docker ID for company use through SSO
+enforcement.
+
+The org owner can also add additional org owners to help them manage users, teams, and repositories in the organization.
+
+## Add team members
+
+Org owners can invite new members to the team using their Docker ID or email
+address.
 
 If the user isn't in your organization:
 
 1. Go to **Organizations** in Docker Hub, and select your organization.
-
 2. Click **Add Member**.
-
 3. Enter the user's Docker ID or email, and select a team from the drop-down list.
-
 4. Click **Add** to confirm.
 
 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 Member**.
+3. Enter the user's Docker ID or email address to add them to the team.
 
-2. Click **Add user**.
+When org owners add team members, the members receive an email
+informing them that they have been added to the organization as a member of the team.
 
-3. Enter the user's Docker ID or email to add them to the team.
+> **Note**: You are not automatically added to teams created by your
+> organization.
 
-      > **Note**: You are not automatically added to teams created by your organization.
+## Configure repository permissions
 
-### Remove team members
+Organization owners can configure repository permissions on a per-team basis.
+For example, you can specify that all teams within an organization have Read and
+Write access to repositories A and B, whereas only specific teams have Admin
+access. Note that org owners have full administrative access to all repositories within the organization.
+
+To give a team access to a repository
+
+1. Go to **Organizations** in Docker Hub, and select your organization.
+2. Click on the **Teams** tab and select the team that you'd like to configure  repository access to.
+3. Click on the **Permissions** tab and select a repository from the
+   **Repository** drop-down.
+4. Choose a permission from the **Permissions** drop-down list and click **Add**.
+
+      ![Team Repo Permissions](images/team-repo-permission.png){:width="700px"}
+
+### View a team's permissions for all repositories
+
+To view a team's permissions across all repositories:
+
+1. Open **Organizations** > **_Your Organization_** > **Teams** > **_Team Name_**.
+2. Click on the **Permissions** tab, where you can view the repositories this team can access.
+
+### Permissions reference
+
+Permissions are cumulative. For example, if you have Read & Write permissions,
+you automatically have Read-only permissions:
+
+- `Read-only` access allows users to view, search, and pull a private repository in the same way as they can a public repository.
+- `Read & Write` access allows users to pull, push, and view a repository Docker
+  Hub. In addition, it allows users to view, cancel, retry or trigger builds
+- `Admin` access allows users to Pull, push, view, edit, and delete a
+  repository; edit build settings; update the repository description 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-only` access to the repository, regardless of the rights their team
+> membership has given them.
+
+## Remove team members
 
 To remove a member from all teams in an organization:
 
 1. Go to **Organizations** in Docker Hub, and select your organization. The Organizations page lists all team members.
-
+2. Click the **X** next to a member’s name to remove them from all the teams in the organization.
-2. Click the **x** next to a member’s name to remove them from all the teams in the organization.
-
 3. When prompted, click **Remove** to confirm the removal.
 
 To remove a member from a specific team:
 
 1. Go to **Organizations** in Docker Hub, and select your organization.
-
 2. Click on the **Teams** tab and select the team from the list.
-
+3. Click the **X** next to the user's name to remove them from the team.
-3. Click the **x** next to the user's name to remove them from the team.
-
 4. When prompted, click **Remove** to confirm the removal.
-to confirm the removal.
 
-### Give a team access to a repository
+## Videos
 
-1. Visit the repository list on Docker Hub by clicking on **Repositories**.
+You can also check out the following videos for information about creating Teams
+and Organizations in Docker Hub.
 
-2. Select your organization in the namespace dropdown list.
+- [Overview of organizations](https://www.youtube-nocookie.com/embed/G7lvSnAqed8){: target="_blank" rel="noopener" class="_"}
-
+- [Create an organization](https://www.youtube-nocookie.com/embed/b0TKcIqa9Po){: target="_blank" rel="noopener" class="_"}
-3. Click the repository you'd like to edit.
+- [Working with Teams](https://www.youtube-nocookie.com/embed/MROKmtmWCVI){: target="_blank" rel="noopener" class="_"}
-
+- [Create Teams](https://www.youtube-nocookie.com/embed/78wbbBoasIc){: target="_blank" rel="noopener" class="_"}
-      ![Org Repos](images/repos-list2019.png)
-
-4. Click the **Permissions** tab.
-
-5. Select the team, the [permissions level](#permissions-reference), and click **+** to save.
-
-      ![Add Repo Permissions for Team](images/orgs-repo-perms2019.png)
-
-### View a team's permissions for all repositories
-
-To view a team's permissions over all repos:
-
-1. Open **Organizations** > **_Your Organization_** > **Teams** > **_Team Name_**.
-
-2. Click on the **Permissions** tab, where you can view the repositories this team can access.
-
-      ![Team Audit Permissions](images/orgs-teams-perms2019.png)
-
-You can also edit repository permissions from this tab.
-
-
-### Permissions reference
-
-Permissions are cumulative. For example, if you have Write permissions, you
-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".
-
-> **Note**: A User who has not yet verified their email address only has
-> `Read` access to the repository, regardless of the rights their team
-> membership has given them.

docker-hub/service-accounts.md

@@ -38,8 +38,8 @@ To create a new service account for your Team account:
 
 1. Create a new Docker ID.
 2. Create a [team](orgs.md#create-a-team) in your organization and grant it read-only access to your private repositories.
-3. Add the new Docker ID to your [organization](orgs.md#working-with-organizations).
+3. Add the new Docker ID to your [organization](orgs.md).
-4. Add the new Docker ID  to the [team](orgs.md#add-a-member-to-a-team) you created earlier.
+4. Add the new Docker ID  to the [team](orgs.md#create-a-team) you created earlier.
 5. Create a new [personal access token (PAT)](/access-tokens.md) from the user account and use it for CI.
 
 > **Note**

subscription/add-seats.md

@@ -19,7 +19,7 @@ to add seats to a subscription:
 
 5. The **Billing** tab displays the number of seats currently in use.
 
-6. Navigate to the **Members** tab to add new members. For more information, see [Add a member to a team](../docker-hub/orgs.md#add-a-member-to-a-team).
+6. Navigate to the **Members** tab to add new members. For more information, see [Add a member to a team](../docker-hub/orgs.md#add-team-members).
 
 > **Note:**
 >