Improve access to org onboarding guide (#19354)

* add links to overview pages, fix redirect, update onboarding intro

* highlight enforce sso step

* remove old redirect from metadata

content/admin/_index.md

@@ -11,6 +11,10 @@ grid:
   description: Learn about organization administration.
   icon: store
   link: /admin/organization/
+- title: Onboard your organization
+  description: Learn how to onboard and secure your organization.
+  icon: explore
+  link: /admin/organization/onboard
 - title: Company FAQ
   description: Discover common questions and answers about companies.
   icon: help

content/admin/organization/_index.md

@@ -3,6 +3,10 @@ description: Learn about organizations.
 keywords: organizations, admin, overview
 title: Organization administration overview
 grid:
+- title: Onboard your organization
+  description: Learn how to onboard and secure your organization.
+  icon: explore
+  link: /admin/organization/onboard
 - title: Manage members
   description: Explore how to manage members.
   icon: group_add

content/faq/admin/general-faqs.md

@@ -2,10 +2,9 @@
 title: General FAQs for Docker accounts
 description: Frequently asked Docker account and administration questions
 keywords: onboarding, docker, teams, orgs, user accounts, organization accounts
-redirect:
-- /docker-hub/onboarding-faqs/
 aliases:
 - /docker-hub/general-faqs/
+- /docker-hub/onboarding-faqs/
 ---
 
 ### What is a Docker ID?

layouts/shortcodes/admin-org-onboarding.md

@@ -1,15 +1,12 @@
-{{ $sso_link := "[Configure SSO](/security/for-admins/single-sign-on/)" }}
-{{ $scim_link := "[Configure SCIM](/security/for-admins/scim/)" }}
-{{ $audit_link := "[Audit your domains](/docker-hub/domain-audit/)" }}
-
-{{ if eq (.Get "product") "admin" }}
-  {{ $sso_link = "[Configure SSO](/security/for-admins/single-sign-on/)" }}
-  {{ $scim_link = "[Configure SCIM](/security/for-admins/scim/)" }}
-  {{ $audit_link = "[Audit your domains](/admin/organization/security-settings/domains/)" }}
-{{ end }}
-
 Onboarding your organization allows you to gain visibility into the activity of your users and enforce security settings. In addition, members of your organization receive increased pull limits and other organization wide benefits. For more details, see [Docker subscriptions and features](/subscription/details/).
 
+In this guide, you'll learn how to get started with the following:
+
+- Identify your users to help you efficiently allocate your subscription seats
+- Invite members and owners to your organization
+- Secure authentication and authorization for your organization using Single Sign-On (SSO) and System for Cross-domain Identity Management (SCIM)
+- Enforce sign-on for Docker Desktop to ensure security best practices
+
 ## Prerequisites
 
 Before you start to onboard your organization, ensure that you:
@@ -50,11 +47,12 @@ To add a member, invite a user and assign them the member role. For more details
 
 ## Step 4: Manage members with SSO and SCIM
 
-Configuring Single Sign-On (SSO) or System for Cross-domain Identity Management (SCIM) is optional and only available to Docker Business subscribers. To upgrade a Docker Team subscription to a Docker Business subscription, see [Upgrade your subscription](/subscription/upgrade/).
+Configuring SSO and SCIM is optional and only available to Docker Business subscribers. To upgrade a Docker Team subscription to a Docker Business subscription, see [Upgrade your subscription](/subscription/upgrade/).
 
-You can manage your members in your identity provider and automatically provision them to your Docker organization with SSO or SCIM. See the following for more details.
-   - {{ $sso_link }} to automatically provision and add members when they sign in to Docker through your identity provider.
-   - {{ $scim_link }} to automatically provision, add, and de-provision members to Docker through your identity provider.
+You can manage your members in your identity provider and automatically provision them to your Docker organization with SSO and SCIM. See the following for more details.
+   - [Configure SSO](/security/for-admins/single-sign-on/) to authenticate and add members when they sign in to Docker through your identity provider.
+   - Optional: [Enforce SSO](/security/for-admins/single-sign-on/configure/#optional-step-four-enforce-sso) to ensure that users must sign in to Docker with SSO.
+   - [Configure SCIM](/security/for-admins/scim/) to automatically provision, add, and de-provision members to Docker through your identity provider.
 
 
 ## Step 5: Enforce sign-in for Docker Desktop
@@ -66,6 +64,6 @@ By default, members of your organization can use Docker Desktop on their machine
 - [Create](/docker-hub/repos/create/) and [manage](/docker-hub/repos/) repositories.
 - Create [teams](/admin/organization/manage-a-team/) for fine-grained repository access.
 - Configure [Hardened Docker Desktop](/desktop/hardened-desktop/) to improve your organization’s security posture for containerized development.
-- {{ $audit_link }} to ensure that all Docker users in your domain are part of your organization.
+- [Audit your domains](/docker-hub/domain-audit/) to ensure that all Docker users in your domain are part of your organization.
 
 Your Docker subscription provides many more additional features. To learn more, see [Docker subscriptions and features](/subscription/details/).