Merge branch 'MicrosoftDocs:main' into main

Author: GabstaMSFT

.openpublishing.redirection.json

@@ -23733,6 +23733,16 @@
             "redirect_url": "/azure/azure-functions/functions-how-to-custom-container",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/azure-functions/create-function-app-linux-app-service-plan.md",
+            "redirect_url": "/azure/azure-functions/functions-create-function-app-portal",
+            "redirect_document_id": false
+        },  
+        {
+            "source_path_from_root": "/articles/azure-functions/create-premium-plan-function-app-portal.md",
+            "redirect_url": "/azure/azure-functions/functions-create-function-app-portal",
+            "redirect_document_id": false
+        },       
         {
             "source_path_from_root": "/articles/sentinel/data-connectors/windows-firewall-events-via-ama.md",
             "redirect_url": "/azure/sentinel/data-connectors-reference",
@@ -23858,6 +23868,51 @@
             "redirect_url": "/azure/active-directory/authentication/how-to-migrate-mfa-server-to-mfa-with-federation",
             "redirect_document_id": true
         },
+	{
+            "source_path_from_root": "/articles/active-directory/external-identities/customers/how-to-single-page-app-vanillajs-sample-sign-in.md",
+            "redirect_url": "/azure/active-directory/external-identities/customers/sample-single-page-app-vanillajs-sign-in",
+            "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/active-directory/external-identities/customers/how-to-single-page-application-angular-sample.md",
+            "redirect_url": "/azure/active-directory/external-identities/customers/sample-single-page-application-angular",
+            "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/active-directory/external-identities/customers/how-to-single-page-application-react-sample.md",
+            "redirect_url": "/azure/active-directory/external-identities/customers/sample-single-page-application-react",
+            "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/active-directory/external-identities/customers/how-to-web-app-node-sample-sign-in.md",
+            "redirect_url": "/azure/active-directory/external-identities/customers/sample-web-app-node-sign-in",
+            "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/active-directory/external-identities/customers/how-to-web-app-node-sample-sign-in-call-api.md",
+            "redirect_url": "/azure/active-directory/external-identities/customers/sample-web-app-node-sign-in-call-api",
+            "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/active-directory/external-identities/customers/how-to-web-app-dotnet-sample-sign-in.md",
+            "redirect_url": "/azure/active-directory/external-identities/customers/sample-web-app-dotnet-sign-in",
+            "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/active-directory/external-identities/customers/how-to-browserless-app-node-sample-sign-in.md",
+            "redirect_url": "/azure/active-directory/external-identities/customers/sample-browserless-app-node-sign-in",
+            "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/active-directory/external-identities/customers/how-to-browserless-app-dotnet-sample-sign-in.md",
+            "redirect_url": "/azure/active-directory/external-identities/customers/sample-browserless-app-dotnet-sign-in",
+            "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/active-directory/external-identities/customers/how-to-daemon-node-sample-call-api.md",
+            "redirect_url": "/azure/active-directory/external-identities/customers/sample-daemon-node-call-api",
+            "redirect_document_id": true
+        },
         {
             "source_path_from_root": "/articles/active-directory/manage-apps/migrate-okta-sync-provisioning-to-azure-active-directory.md",
             "redirect_url": "/azure/active-directory/manage-apps/migrate-okta-sync-provisioning",

articles/active-directory/authentication/concept-authentication-phone-options.md

@@ -6,7 +6,7 @@ services: active-directory
 ms.service: active-directory
 ms.subservice: authentication
 ms.topic: conceptual
-ms.date: 04/17/2023
+ms.date: 06/23/2023
 
 ms.author: justinha
 author: justinha
@@ -35,17 +35,20 @@ To work properly, phone numbers must be in the format *+CountryCode PhoneNumber*
 
 ## Mobile phone verification
 
-For Azure AD Multi-Factor Authentication or SSPR, users can choose to receive a text message with a verification code to enter in the sign-in interface, or receive a phone call.
+For Azure AD Multi-Factor Authentication or SSPR, users can choose to receive an SMS message with a verification code to enter in the sign-in interface, or receive a phone call.
 
 If users don't want their mobile phone number to be visible in the directory but want to use it for password reset, administrators shouldn't populate the phone number in the directory. Instead, users should populate their **Authentication Phone** attribute via the combined security info registration at [https://aka.ms/setupsecurityinfo](https://aka.ms/setupsecurityinfo). Administrators can see this information in the user's profile, but it's not published elsewhere.
 
 :::image type="content" source="media/concept-authentication-methods/user-authentication-methods.png" alt-text="Screenshot of the Azure portal that shows authentication methods with a phone number populated":::
 
 Microsoft doesn't guarantee consistent SMS or voice-based Azure AD Multi-Factor Authentication prompt delivery by the same number. In the interest of our users, we may add or remove short codes at any time as we make route adjustments to improve SMS deliverability. Microsoft doesn't support short codes for countries/regions besides the United States and Canada.
 
-### Text message verification
+> [!NOTE]
+> Starting July 2023, we apply delivery method optimization such that tenants with a free or trial subscription may receive an SMS message or voice call.
+
+### SMS message verification
 
-With text message verification during SSPR or Azure AD Multi-Factor Authentication, a Short Message Service (SMS) text is sent to the mobile phone number containing a verification code. To complete the sign-in process, the verification code provided is entered into the sign-in interface. 
+With SMS message verification during SSPR or Azure AD Multi-Factor Authentication, a Short Message Service (SMS) text is sent to the mobile phone number containing a verification code. To complete the sign-in process, the verification code provided is entered into the sign-in interface. 
 
 Android users can enable Rich Communication Services (RCS) on their devices. RCS offers encryption and other improvements over SMS. For Android, MFA text messages may be sent over RCS rather than SMS. The MFA text message is similar to SMS, but RCS messages have more Microsoft branding and a verified checkmark so users know they can trust the message.
 

articles/active-directory/develop/sample-v2-code.md

@@ -85,11 +85,11 @@ The following samples show public client desktop applications that access the Mi
 > | .NET | [Invoke protected API with integrated Windows authentication](https://github.com/azure-samples/active-directory-dotnet-iwa-v2) | [MSAL.NET](/entra/msal/dotnet) | Integrated Windows authentication |
 > | Java | [Call Microsoft Graph](https://github.com/Azure-Samples/ms-identity-msal-java-samples/tree/main/2.%20Client-Side%20Scenarios/Integrated-Windows-Auth-Flow) | [MSAL Java](/java/api/com.microsoft.aad.msal4j) | Integrated Windows authentication |
 > | Node.js | [Sign in users](https://github.com/Azure-Samples/ms-identity-javascript-nodejs-desktop) | [MSAL Node](/javascript/api/@azure/msal-node) | Authorization code with PKCE |
-> | PowerShell | [Call Microsoft Graph by signing in users using username/password](https://github.com/azure-samples/active-directory-dotnetcore-console-up-v2) | [MSAL.NET](/entra/msal/dotnet) | Resource owner password credentials |
+> | .NET Core | [Call Microsoft Graph by signing in users using username/password](https://github.com/azure-samples/active-directory-dotnetcore-console-up-v2) | [MSAL.NET](/entra/msal/dotnet) | Resource owner password credentials |
 > | Python | [Sign in users](https://github.com/Azure-Samples/ms-identity-python-desktop) | [MSAL Python](/python/api/msal/overview-msal) | Resource owner password credentials |
 > | Universal Window Platform (UWP) | [Call Microsoft Graph](https://github.com/Azure-Samples/active-directory-xamarin-native-v2/tree/main/2-With-broker) | [MSAL.NET](/entra/msal/dotnet) | Web account manager |
 > | Windows Presentation Foundation (WPF) | [Sign in users and call Microsoft Graph](https://github.com/Azure-Samples/active-directory-dotnet-native-aspnetcore-v2/tree/master/2.%20Web%20API%20now%20calls%20Microsoft%20Graph) | [MSAL.NET](/entra/msal/dotnet) | Authorization code with PKCE |
-> | XAML | &#8226; [Sign in users and call ASP.NET Core web API](https://github.com/Azure-Samples/active-directory-dotnet-native-aspnetcore-v2/tree/master/1.%20Desktop%20app%20calls%20Web%20API) <br/> &#8226; [Sign in users and call Microsoft Graph](https://github.com/azure-samples/active-directory-dotnet-desktop-msgraph-v2) | [MSAL.NET](/entra/msal/dotnet) | Authorization code with PKCE |
+> | Windows Presentation Foundation (WPF) | &#8226; [Sign in users and call ASP.NET Core web API](https://github.com/Azure-Samples/active-directory-dotnet-native-aspnetcore-v2/tree/master/1.%20Desktop%20app%20calls%20Web%20API) <br/> &#8226; [Sign in users and call Microsoft Graph](https://github.com/azure-samples/active-directory-dotnet-desktop-msgraph-v2) | [MSAL.NET](/entra/msal/dotnet) | Authorization code with PKCE |
 
 ### Mobile
 
@@ -129,7 +129,7 @@ The following samples show how to protect an Azure Function using HttpTrigger an
 > | Node.js | [Call Microsoft Graph API on behalf of a user](https://github.com/Azure-Samples/ms-identity-nodejs-webapi-onbehalfof-azurefunctions) | [MSAL Node](/javascript/api/@azure/msal-node) | On-Behalf-Of (OBO)|
 > | Python | [Python Azure function web API secured by Azure AD](https://github.com/Azure-Samples/ms-identity-python-webapi-azurefunctions) | [MSAL Python](/python/api/msal/overview-msal) | Authorization code |
 
-### Headless
+### Browserless (Headless)
 
 The following sample shows a public client application running on a device without a web browser. The app can be a command-line tool, an app running on Linux or Mac, or an IoT application. The sample features an app accessing the Microsoft Graph API, in the name of a user who signs-in interactively on another device (such as a mobile phone). This client application uses the Microsoft Authentication Library (MSAL).
 

articles/active-directory/external-identities/customers/how-to-browserless-app-dotnet-sample-sign-in.md renamed to articles/active-directory/external-identities/customers/sample-browserless-app-dotnet-sign-in.md

@@ -9,8 +9,8 @@ ms.author: shermanouko
 ms.service: active-directory
 ms.workload: identity
 ms.subservice: ciam
-ms.topic: how-to
-ms.date: 05/10/2023
+ms.topic: sample
+ms.date: 06/23/2023
 ms.custom: developer
 
 #Customer intent: As a dev, devops, I want to learn about how to configure a sample ASP.NET browserless app to sign in users with my Azure Active Directory (Azure AD) for customers tenant

articles/active-directory/external-identities/customers/how-to-browserless-app-node-sample-sign-in.md renamed to articles/active-directory/external-identities/customers/sample-browserless-app-node-sign-in.md

@@ -9,8 +9,8 @@ ms.author: dmwendia
 ms.service: active-directory
 ms.workload: identity
 ms.subservice: ciam
-ms.topic: how-to
-ms.date: 05/09/2023
+ms.topic: sample
+ms.date: 06/23/2023
 ms.custom: developer
 
 #Customer intent: As a dev, devops, I want to learn about how to configure a sample Node.js browserless application to authenticate users with my Azure Active Directory (Azure AD) for customers tenant
@@ -118,4 +118,4 @@ You can now test the sample Node.js browserless app.
 
 Learn how to: 
 
-- [Sign in users in your own Node.js browserless application by using Microsoft Entra](how-to-browserless-app-node-sign-in-overview.md)
+- [Sign in users in your own Node.js browserless application by using Microsoft Entra](how-to-browserless-app-node-sign-in-overview.md)

articles/active-directory/external-identities/customers/how-to-daemon-node-sample-call-api.md renamed to articles/active-directory/external-identities/customers/sample-daemon-node-call-api.md

@@ -9,8 +9,8 @@ ms.author: kengaderdus
 ms.service: active-directory
 ms.workload: identity
 ms.subservice: ciam
-ms.topic: how-to
-ms.date: 05/22/2023
+ms.topic: sample
+ms.date: 06/23/2023
 ms.custom: developer
 
 #Customer intent: As a dev, devops, I want to configure a sample Node.js daemon application that calls an API protected by Azure Active Directory (Azure AD) for customers tenant
@@ -166,4 +166,4 @@ A Web API endpoint should be prepared to accept calls from both users and applic
 
 - Learn how to [Use client certificate instead of a secret for authentication in your Node.js confidential app](how-to-web-app-node-use-certificate.md).
 
-- Learn about [permissions and consent](../../develop/permissions-consent-overview.md).
+- Learn about [permissions and consent](../../develop/permissions-consent-overview.md).

articles/active-directory/external-identities/customers/how-to-single-page-app-vanillajs-sample-sign-in.md renamed to articles/active-directory/external-identities/customers/sample-single-page-app-vanillajs-sign-in.md

@@ -7,16 +7,16 @@ manager: CelesteDG
 ms.author: owenrichards
 ms.service: active-directory
 ms.subservice: ciam
-ms.topic: how-to
-ms.date: 05/25/2023
+ms.topic: sample
+ms.date: 06/23/2023
 
 
 #Customer intent: As a dev, devops, I want to learn about how to configure a sample vanilla JS SPA to sign in and sign out users with my Azure Active Directory (Azure AD) for customers tenant
 ---
 
 # Sign in users in a sample vanilla JavaScript single-page application
 
-This how-to guide uses a sample vanilla JavaScript single-page Application (SPA) to demonstrate how to add authentication to a SPA. The SPA enables users to sign in and sign out by using their own Azure Azure Active Directory (AD) for customers tenant. The sample uses the [Microsoft Authentication Library for JavaScript (MSAL.js)](https://github.com/AzureAD/microsoft-authentication-library-for-js) to handle authentication.
+This how-to guide uses a sample vanilla JavaScript single-page Application (SPA) to demonstrate how to add authentication to a SPA. The SPA enables users to sign in and sign out by using their own Azure Active Directory (AD) for customers tenant. The sample uses the [Microsoft Authentication Library for JavaScript (MSAL.js)](https://github.com/AzureAD/microsoft-authentication-library-for-js) to handle authentication.
 
 ## Prerequisites
 

articles/active-directory/external-identities/customers/how-to-single-page-application-angular-sample.md renamed to articles/active-directory/external-identities/customers/sample-single-page-application-angular.md

@@ -8,8 +8,8 @@ ms.author: godonnell
 ms.service: active-directory
 ms.workload: identity
 ms.subservice: ciam
-ms.topic: how-to
-ms.date: 05/23/2023
+ms.topic: sample
+ms.date: 06/23/2023
 ms.custom: developer
 
 #Customer intent: As a dev, devops, I want to learn about how to configure a sample Angular Single Page Application to sign in and sign out users with my Azure Active Directory (Azure AD) for customers tenant

articles/active-directory/external-identities/customers/how-to-single-page-application-react-sample.md renamed to articles/active-directory/external-identities/customers/sample-single-page-application-react.md

@@ -7,8 +7,8 @@ manager: celestedg
 ms.author: godonnell
 ms.service: active-directory
 ms.subservice: ciam
-ms.topic: how-to
-ms.date: 05/23/2023
+ms.topic: sample
+ms.date: 06/23/2023
 
 #Customer intent: As a dev, devops, I want to learn about how to configure a sample React single-page app to sign in and sign out users with my Azure Active Directory (Azure AD) for customers tenant
 ---

articles/active-directory/external-identities/customers/how-to-web-app-dotnet-sample-sign-in.md renamed to articles/active-directory/external-identities/customers/sample-web-app-dotnet-sign-in.md

@@ -9,8 +9,8 @@ ms.author: cwerner
 ms.service: active-directory
 ms.workload: identity
 ms.subservice: ciam
-ms.topic: how-to
-ms.date: 05/22/2023
+ms.topic: sample
+ms.date: 06/23/2023
 ms.custom: developer
 
 #Customer intent: As a dev, devops, I want to learn about how to configure a sample ASP.NET web app to sign in and sign out users with my Azure Active Directory (Azure AD) for customers tenant