Skip to content

Commit 3c5c308

Browse files
v-aljev-alje
committed
Merge branch 'main' into release-vmware-pup2
2 parents 8ff23f6 + 08892dd commit 3c5c308

File tree

118 files changed

+1724
-892
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

118 files changed

+1724
-892
lines changed

‎.openpublishing.redirection.azure-monitor.json

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6310,11 +6310,6 @@
63106310
"redirect_url": "/azure/azure-monitor/agents/solution-agenthealth",
63116311
"redirect_document_id": false
63126312
},
6313-
{
6314-
"source_path_from_root": "/articles/azure-monitor/containers/container-insights-hybrid-setup.md",
6315-
"redirect_url": "/azure/azure-monitor/containers/container-insights-enable-arc-enabled-clusters",
6316-
"redirect_document_id": false
6317-
},
63186313
{
63196314
"source_path_from_root": "/articles/azure-monitor/containers/container-insights-optout-openshift-v3.md",
63206315
"redirect_url": "/azure/azure-monitor/containers/container-insights-optout",
@@ -6324,11 +6319,6 @@
63246319
"source_path_from_root": "/articles/azure-monitor/containers/container-insights-optout-openshift-v4.md",
63256320
"redirect_url": "/azure/azure-monitor/containers/container-insights-optout",
63266321
"redirect_document_id": false
6327-
},
6328-
{
6329-
"source_path_from_root": "/articles/azure-monitor/containers/container-insights-optout-hybrid.md",
6330-
"redirect_url": "/azure/azure-monitor/containers/container-insights-optout",
6331-
"redirect_document_id": false
63326322
}
63336323
]
63346324
}

‎articles/active-directory/authentication/concept-authentication-oath-tokens.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ OATH TOTP hardware tokens typically come with a secret key, or seed, pre-program
4040

4141
Programmable OATH TOTP hardware tokens that can be reseeded can also be set up with Azure AD in the software token setup flow.
4242

43-
OATH hardware tokens are supported as part of a public preview. For more information about previews, see [Supplemental Terms of Use for Microsoft Azure Previews](https://azure.microsoft.com/support/legal/preview-supplemental-terms/).
43+
OATH hardware tokens are supported as part of a public preview. For more information about previews, see [Supplemental Terms of Use for Microsoft Azure Previews](https://aka.ms/EntraPreviewsTermsOfUse).
4444

4545
:::image type="content" border="true" source="./media/concept-authentication-methods/oath-tokens.png" alt-text="Screenshot of OATH token management." lightbox="./media/concept-authentication-methods/oath-tokens.png":::
4646

‎articles/active-directory/authentication/howto-authentication-use-email-signin.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ms.reviewer: calui
1717
# Sign-in to Azure AD with email as an alternate login ID (Preview)
1818

1919
> [!NOTE]
20-
> Sign-in to Azure AD with email as an alternate login ID is a public preview feature of Azure Active Directory. For more information about previews, see [Supplemental Terms of Use for Microsoft Azure Previews](https://azure.microsoft.com/support/legal/preview-supplemental-terms/).
20+
> Sign-in to Azure AD with email as an alternate login ID is a public preview feature of Azure Active Directory. For more information about previews, see [Supplemental Terms of Use for Microsoft Azure Previews](https://aka.ms/EntraPreviewsTermsOfUse).
2121
2222
Many organizations want to let users sign in to Azure Active Directory (Azure AD) using the same credentials as their on-premises directory environment. With this approach, known as hybrid authentication, users only need to remember one set of credentials.
2323

‎articles/active-directory/authentication/howto-mfa-mfasettings.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ OATH TOTP hardware tokens typically come with a secret key, or seed, pre-program
139139

140140
Programmable OATH TOTP hardware tokens that can be reseeded can also be set up with Azure AD in the software token setup flow.
141141

142-
OATH hardware tokens are supported as part of a public preview. For more information about previews, see [Supplemental Terms of Use for Microsoft Azure Previews](https://azure.microsoft.com/support/legal/preview-supplemental-terms).
142+
OATH hardware tokens are supported as part of a public preview. For more information about previews, see [Supplemental Terms of Use for Microsoft Azure Previews](https://aka.ms/EntraPreviewsTermsOfUse).
143143

144144
![Screenshot that shows the OATH tokens section.](media/concept-authentication-methods/mfa-server-oath-tokens-azure-ad.png)
145145

‎articles/active-directory/develop/includes/develop-preview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ ms.topic: include
1515
# > FEATURE_OR_LIBRARY [!INCLUDE [PREVIEW BOILERPLATE](../../../includes/active-directory-develop-preview.md)]
1616
#
1717
---
18-
is in public preview. This preview is provided without a service-level agreement and isn't recommended for production workloads. Some features might be unsupported or have constrained capabilities. For more information, see [Supplemental terms of use for Microsoft Azure previews](https://azure.microsoft.com/support/legal/preview-supplemental-terms/).
18+
is in public preview. This preview is provided without a service-level agreement and isn't recommended for production workloads. Some features might be unsupported or have constrained capabilities. For more information, see [Universal License Terms for Online Services](https://aka.ms/EntraPreviewsTermsOfUse).

‎articles/active-directory/develop/includes/libraries/libraries-daemon.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
|PHP| [The PHP League oauth2-client](https://oauth2-client.thephpleague.com/usage/) | [League\OAuth2](https://oauth2-client.thephpleague.com/) | ![Green check mark.][n] | ![X indicating no.][n] | ![Green check mark.][y] | -- |
99
-->
1010

11-
<sup>1</sup> [Supplemental terms of use for Microsoft Azure Previews][preview-tos] apply to libraries in *Public preview*.
11+
<sup>1</sup> [Universal License Terms for Online Services][preview-tos] apply to libraries in *Public preview*.
1212

1313
<!--Image references-->
1414

@@ -17,4 +17,4 @@
1717

1818
<!--Reference-style links -->
1919

20-
[preview-tos]: https://azure.microsoft.com/support/legal/preview-supplemental-terms/
20+
[preview-tos]: https://aka.ms/EntraPreviewsTermsOfUse

‎articles/active-directory/develop/includes/libraries/libraries-desktop.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
| React Native | [React Native App Auth](https://github.com/FormidableLabs/react-native-app-auth/blob/main/docs/config-examples/azure-active-directory.md) | [react-native-app-auth](https://www.npmjs.com/package/react-native-app-auth) | ![X indicating no.][n] | ![Green check mark.][y] | ![Green check mark.][y] | -- |
1111
-->
1212

13-
<sup>1</sup> [Supplemental terms of use for Microsoft Azure Previews][preview-tos] apply to libraries in *Public preview*.
13+
<sup>1</sup> [Universal License Terms for Online Services][preview-tos] apply to libraries in *Public preview*.
1414

1515
<!--Image references-->
1616

@@ -20,4 +20,4 @@
2020

2121
<!--Reference-style links -->
2222

23-
[preview-tos]: https://azure.microsoft.com/support/legal/preview-supplemental-terms/
23+
[preview-tos]: https://aka.ms/EntraPreviewsTermsOfUse

‎articles/active-directory/develop/includes/libraries/libraries-mobile.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
| React Native |[React Native App Auth](https://github.com/FormidableLabs/react-native-app-auth/blob/main/docs/config-examples/azure-active-directory.md) | [react-native-app-auth](https://www.npmjs.com/package/react-native-app-auth) | ![X indicating no.][n] | ![Green check mark.][y] | ![Green check mark.][y] | -- |
99
-->
1010

11-
<sup>1</sup> [Supplemental terms of use for Microsoft Azure Previews][preview-tos] apply to libraries in *Public preview*.
11+
<sup>1</sup> [Universal License Terms for Online Services][preview-tos] apply to libraries in *Public preview*.
1212

1313
<!--Image references-->
1414

@@ -17,4 +17,4 @@
1717

1818
<!--Reference-style links -->
1919

20-
[preview-tos]: https://azure.microsoft.com/support/legal/preview-supplemental-terms/
20+
[preview-tos]: https://aka.ms/EntraPreviewsTermsOfUse

‎articles/active-directory/develop/includes/libraries/libraries-spa.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ ms.author: henrymbugua
1919
| Vue | [Vue MSAL]( https://github.com/mvertopoulos/vue-msal) | [vue-msal]( https://www.npmjs.com/package/vue-msal) | ![X indicating no.][n] | ![Green check mark.][y] | ![Green check mark.][y] | -- |
2020
-->
2121

22-
<sup>1</sup> [Supplemental terms of use for Microsoft Azure Previews][preview-tos] apply to libraries in _Public preview_.
22+
<sup>1</sup> [Universal License Terms for Online Services][preview-tos] apply to libraries in _Public preview_.
2323

2424
<sup>2</sup> [Auth code flow][auth-code-flow] with PKCE only (Recommended).
2525

@@ -34,6 +34,6 @@ ms.author: henrymbugua
3434

3535
[aad-app-model-v2-overview]: v2-overview.md
3636
[microsoft-sdl]: https://www.microsoft.com/securityengineering/sdl/
37-
[preview-tos]: https://azure.microsoft.com/support/legal/preview-supplemental-terms/
37+
[preview-tos]: https://aka.ms/EntraPreviewsTermsOfUse
3838
[auth-code-flow]: ../../v2-oauth2-auth-code-flow.md
3939
[implicit-flow]: ../../v2-oauth2-implicit-grant-flow.md

‎articles/active-directory/develop/includes/libraries/libraries-webapp.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
| Ruby | [OmniAuth](https://github.com/omniauth/omniauth) | [omniauth 1.3.1](https://github.com/omniauth/omniauth/releases/tag/v1.3.1)<br/>[omniauth-oauth2 1.4.0](https://github.com/intridea/omniauth-oauth2) | ![X indicating no.][n] | ![X indicating no.][n] | ![Green check mark.][y] | -- |
1818
-->
1919

20-
<sup>(1)</sup> [Supplemental terms of use for Microsoft Azure Previews][preview-tos] apply to libraries in *Public preview*.
20+
<sup>(1)</sup> [Universal License Terms for Online Services][preview-tos] apply to libraries in *Public preview*.
2121

2222
<sup>(2)</sup> The [Microsoft.IdentityModel](https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet) library only _validates_ tokens - it can't request ID or access tokens.
2323

@@ -28,4 +28,4 @@
2828

2929
<!--Reference-style links -->
3030

31-
[preview-tos]: https://azure.microsoft.com/support/legal/preview-supplemental-terms/
31+
[preview-tos]: https://aka.ms/EntraPreviewsTermsOfUse

0 commit comments

Comments
 (0)