From 7fc553aeac56a65a8f3dbf2d5ed6c774db6abdd8 Mon Sep 17 00:00:00 2001
From: Stephanie Aurelio <133041642+stephaurelio@users.noreply.github.com>
Date: Wed, 13 Sep 2023 11:53:14 -0700
Subject: [PATCH] Add tip to group mapping docs and update Hub release notes
 (#18156)

* link to role mapping and add to release notes

* move callout to top of page

* add space

* add multi teams use case to callout
---
 content/docker-hub/release-notes.md         |  4 ++++
 layouts/shortcodes/admin-group-mapping.html | 12 ++++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/content/docker-hub/release-notes.md b/content/docker-hub/release-notes.md
index c5e1ddd59b..3dcf7df3b2 100644
--- a/content/docker-hub/release-notes.md
+++ b/content/docker-hub/release-notes.md
@@ -12,6 +12,10 @@ known issues for each Docker Hub release.
 
 Take a look at the [Docker Public Roadmap](https://github.com/docker/roadmap/projects/1) to see what's coming next.
 
+## 2023-08-28
+
+- Organizations with SSO enabled can assign members to roles, organizations, and teams with [SCIM role mapping](scim.md#set-up-role-mapping). 
+
 ## 2023-07-26
 
 ### New
diff --git a/layouts/shortcodes/admin-group-mapping.html b/layouts/shortcodes/admin-group-mapping.html
index adb6c56364..cda9d95caf 100644
--- a/layouts/shortcodes/admin-group-mapping.html
+++ b/layouts/shortcodes/admin-group-mapping.html
@@ -1,14 +1,22 @@
 {{ $scim_link := "[Enable SCIM](/docker-hub/scim/)" }}
+{{ $mapping_link := "[user-level attributes](docker-hub/scim.md#set-up-role-mapping)"}}
 
 {{ if eq (.Get "product") "admin" }}
-{{ $scim_link = "[Enable SCIM](/admin/company/settings/scim/)" }}
-{{ if eq (.Get "layer") "company" }}
 {{ $scim_link = "[Enable SCIM](/admin/organization/security-settings/scim/)" }}
+{{ $mapping_link = "[user-level attributes](admin/organization/security-settings/scim.md#set-up-role-mapping)"}}
+{{ if eq (.Get "layer") "company" }}
+{{ $scim_link = "[Enable SCIM](/admin/company/settings/scim/)" }}
+{{ $mapping_link = "[user-level attributes](admin/company/settings/scim.md#set-up-role-mapping)"}}
 {{ end }}
 {{ end }}
 
 With directory group-to-team provisioning from your IdP, user updates will automatically sync with your Docker organizations and teams.
 
+> **Tip**
+>
+> Group mapping is ideal for adding a user to multiple organizations or multiple teams within one organization. If you don't need to set up multi-organization or multi-team assignment, you can use {{ $mapping_link }}.
+{ .tip }
+
 ## How group mapping works
 
 IdPs share with Docker the main attributes of every authorized user through SSO, such as email address, name, surname, and groups. These attributes are used by Just-In-Time (JIT) Provisioning to create or update the user’s Docker profile and their associations with organizations and teams on Docker Hub.