paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-03 13:33:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

docs: Renaming AzureAD to Entra ID, part two.

Browse Source 
This is a follow-up to #32693, which missed a bunch of places due to
varying ways of typing Azure AD. (Azure AD, Azure Active Directory etc.)

In the diff there's an apparent inconsistency with renaming, in some
places renaming to just "Microsoft Entra ID" and in others
"Microsoft Entra ID (AzureAD)".
The idea is to add (AzureAD) in ordinary documentation, as it can help
clarity since many people still think of this as AzureAD, while sticking
with brevity and cleanliness of just using the official name in
marketing focused material.
This commit is contained in:
Mateusz Mandera
2024-12-14 20:46:12 +01:00
committed by Tim Abbott
parent 426a5484bd
commit 94cc413016
7 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/production/authentication-methods.md
View File

@@ -1195,7 +1195,7 @@ Facebook, Twitter, etc.) is easy to do if you're willing to write a
bit of code, and pull requests to add new backends are welcome.
For example, the
[Azure Active Directory integration](https://github.com/zulip/zulip/commit/49dbd85a8985b12666087f9ea36acb6f7da0aa4f)
[Microsoft Entra ID integration](https://github.com/zulip/zulip/commit/49dbd85a8985b12666087f9ea36acb6f7da0aa4f)
was about 30 lines of code, plus some documentation and an
[automatically generated migration][schema-migrations]. We also have
helpful developer documentation on

2
help/configure-authentication-methods.md
View File

@@ -12,7 +12,7 @@ your organization. The following options are available on all
The following options are available for organizations on Zulip Cloud Standard,
Zulip Cloud Plus, and all self-hosted Zulip servers:
- Oauth2 with Azure Active Directory
- Oauth2 with Microsoft Entra ID (AzureAD)
The following options are available for organizations on Zulip Cloud Plus, and all self-hosted Zulip servers:

2
help/saml-authentication.md
View File

@@ -132,7 +132,7 @@ providers.
* Certificate downloaded from **Certificate (Base64)**
1. From the **Set up** section
* **Login URL**
* **Azure AD Identifier**
* **Microsoft Entra Identifier**
{!saml-login-button.md!}
{tab|keycloak}

2
templates/corporate/comparison_table_integrated.html
View File

@@ -711,7 +711,7 @@
</tr>
<tr>
<td class="comparison-table-feature">
<a href="https://zulip.readthedocs.io/en/latest/production/authentication-methods.html#plug-and-play-sso-google-github-gitlab">SSO with Azure Active Directory</a>
<a href="https://zulip.readthedocs.io/en/latest/production/authentication-methods.html#plug-and-play-sso-google-github-gitlab">SSO with Microsoft Entra ID</a>
</td>
<td class="comparison-value-negative cloud-cell"><i class="icon icon-x"></i></td>
<td class="comparison-value-positive cloud-cell"><i class="icon icon-check"></i></td>

2
templates/corporate/pricing_model.html
View File

@@ -299,7 +299,7 @@
<li><span>Complete team chat solution, with <a href="{{ billing_base_url }}/plans/#self-hosted-plan-comparison">all Zulip features</a> included</span></li>
<li><span>Unlimited <a href="https://zulip.readthedocs.io/en/stable/production/mobile-push-notifications.html">mobile notifications</a></span></li>
<li class="support-note"><span>Email and chat support for:</span></li>
<li><span><a href="/help/saml-authentication">SSO with SAML, Azure AD</a></span></li>
<li><span><a href="/help/saml-authentication">SSO with SAML, Microsoft Entra ID</a></span></li>
<li><span><a href="https://zulip.readthedocs.io/en/stable/production/authentication-methods.html">AD/LDAP user sync </a></span></li>
<li><span><a href="/help/guest-users">Guests</a> with configurable access</span></li>
<li><span><a href="/help/export-your-organization">Full</a> and <a href="https://zulip.readthedocs.io/en/stable/production/export-and-import.html#compliance-exports">compliance</a> data exports</span></li>

2
zerver/openapi/zulip.yaml
View File

@@ -18538,7 +18538,7 @@ paths:
type: boolean
azuread:
description: |
Whether the user can authenticate using their Azure Active Directory account.
Whether the user can authenticate using their Microsoft Entra ID account.
type: boolean
gitlab:
description: |

6
zproject/prod_settings_template.py
View File

@@ -153,7 +153,7 @@ AUTHENTICATION_BACKENDS: tuple[str, ...] = (
# "zproject.backends.GoogleAuthBackend", # Google auth, setup below
# "zproject.backends.GitHubAuthBackend", # GitHub auth, setup below
# "zproject.backends.GitLabAuthBackend", # GitLab auth, setup below
# "zproject.backends.AzureADAuthBackend", # Microsoft Azure Active Directory auth, setup below
# "zproject.backends.AzureADAuthBackend", # Microsoft Entra ID (AzureAD) auth, setup below
# "zproject.backends.AppleAuthBackend", # Apple auth, setup below
# "zproject.backends.SAMLAuthBackend", # SAML, setup below
# "zproject.backends.ZulipLDAPAuthBackend", # LDAP, setup below
@@ -536,9 +536,9 @@ SOCIAL_AUTH_SAML_SUPPORT_CONTACT = {
# SOCIAL_AUTH_APPLE_KEY = "<your Key ID>"
########
## Azure Active Directory OAuth.
## Microsoft Entra ID (AzureAD) OAuth.
##
## To set up Microsoft Azure AD authentication, you'll need to do the following:
## To set up Microsoft Entra ID authentication, you'll need to do the following:
##
## (1) Open "App registrations" at
## https://portal.azure.com/#view/Microsoft_AAD_RegisteredApps/ApplicationsListBlade