diff --git a/source/about/editions-and-offerings.rst b/source/about/editions-and-offerings.rst
index 236e01a1222..2535a9bf356 100644
--- a/source/about/editions-and-offerings.rst
+++ b/source/about/editions-and-offerings.rst
@@ -70,7 +70,7 @@ Features include:
 - Pre-packaged integrations with most common developer tools, including Jira, Confluence, GitHub, GitLab, CircleCI, Zoom, Jitsi, and more.
 - Tools for `custom branding </configure/custom-branding-tools.html>`__ and `themes </messaging/customizing-theme-colors.html>`__.
 - `Multi-factor authentication </onboard/multi-factor-authentication.html>`__.
-- `Single Sign-on with GitLab </onboard/sso-gitlab.html>`__, `Google </onboard/sso-google.html>`__, or `OpenID Connect </onboard/sso-openidconnect.html>`__.
+- Single Sign-on with `GitLab </onboard/sso-gitlab.html>`__ using the OAuth 2.0 standard.
 - `Granular system permissions </onboard/advanced-permissions.html>`__.
 - Highly customizable `third-party bots, integrations <https://mattermost.com/marketplace/#publicApps>`__, and `command line tools </manage/mmctl-command-line-tool.html>`__.
 - Extensive integration support via `webhooks, APIs, drivers <https://developers.mattermost.com/integrate/other-integrations/>`__, and `third-party extensions <https://mattermost.com/marketplace/>`__.
@@ -91,7 +91,7 @@ This offering includes all the features of Mattermost Free, plus:
 
 - `Guest access </onboard/guest-accounts.html>`__ and `custom user groups </collaborate/organize-using-custom-user-groups.html>`__.
 - `Active Directory/LDAP Single Sign-on and user synchronization </onboard/ad-ldap.html>`__.
-- Single Sign-on with `SAML </onboard/sso-saml.html>`__ or `Office365 </onboard/sso-office.html>`__.
+- Single Sign-on with `GitLab </onboard/sso-gitlab.html>`__ using the OpenID Connect standard, `Google </onboard/sso-google.html>`__, `OpenID Connect </onboard/sso-openidconnect.html>`__, `SAML </onboard/sso-saml.html>`__ or `Office365 </onboard/sso-office.html>`__.
 - `MFA enforcement </onboard/multi-factor-authentication.html#enforcing-mfa-e10>`__.
 - `Advanced team permissions </onboard/advanced-permissions.html#team-override-schemes-e20>`__.
 - `Read-only announcement channels </manage/team-channel-members.html#channel-moderation-e20>`__.
diff --git a/source/onboard/sso-gitlab.rst b/source/onboard/sso-gitlab.rst
index 836945085a8..2c4e0679400 100644
--- a/source/onboard/sso-gitlab.rst
+++ b/source/onboard/sso-gitlab.rst
@@ -9,11 +9,11 @@ Configuring GitLab as a Single Sign-On (SSO) service
 
 Follow these steps to configure Mattermost to use GitLab as a Single Sign-on (SSO) service for team creation, account creation, and user login.
 
-.. note::  
+.. important::  
   - Only the default GitLab SSO is officially supported. 
   - "Double SSO", where GitLab SSO is chained to other SSO solutions, is not supported. It may be possible to connect GitLab SSO with AD, LDAP, SAML, or MFA add-ons in some cases, but because of the special logic required, they're not officially supported, and they're known not to work in some cases. 
-  - Mattermost's open source Team Edition supports the OAuth 2.0 standard.
-  - Mattermost Professional and Enterprise support the OpenID Connect standard.
+  - `Mattermost Free (self-hosted only) </about/editions-and-offerings.html#mattermost-free-self-hosted-only>`__ supports the OAuth 2.0 standard.
+  - `Mattermost Professional </about/editions-and-offerings.html#mattermost-professional>`__ and `Mattermost Enterprise </about/editions-and-offerings.html#mattermost-enterprise>`__ support the OpenID Connect standard.
 
 Step 1: Add a Mattermost application to your GitLab account
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~