pull base content,head:MicrosoftDocs:main,into:wwlpublishsync

Author: wwlpublish

learn-pr/azure/cna-set-up-azure-ad-use-scale/includes/3-exercise-set-up-azure-ad.md

@@ -40,7 +40,7 @@ You'll start by creating Microsoft Entra user and group objects. After the objec
     ```azurecli
     ADMIN_NAME=adatumadmin1
     ADMIN=$(az ad user create --display-name $ADMIN_NAME \
-                      --password Pa55w.rd1234 \
+                      --password <enter your password> \
                       --user-principal-name $ADMIN_NAME@$DOMAIN_NAME \
                       --force-change-password-next-sign-in false)
     ```
@@ -76,7 +76,7 @@ You'll start by creating Microsoft Entra user and group objects. After the objec
     ```azurecli
     USER_NAME=adatumuser1
     USER=$(az ad user create --display-name $USER_NAME \
-                      --password Pa55w.rd1234 \
+                      --password <enter your password> \
                       --user-principal-name $USER_NAME@$DOMAIN_NAME \
                       --force-change-password-next-sign-in false)
     ```
@@ -152,7 +152,7 @@ In this task, you'll create a Microsoft Entra tenant and a user account in the n
     | User name | **contosouser1** |
     | Name | **contosouser1** |
     | Let me create the password | Enabled |
-    | Initial password | **Pa55w.rd1234** |
+    | Initial password | Enter a `<password>` |
 
 1. Use the **Copy to clipboard** icon next to the **User name** drop-down list to record the value of the **User principal name** attribute of **contosouser1**. You'll need it later in this and subsequent exercises.
 
@@ -168,7 +168,7 @@ In this task, you'll create a Microsoft Entra tenant and a user account in the n
 
 To conclude this exercise, you'll use the Azure portal to configure the user account in the **Contoso** Microsoft Entra tenant as a guest user in the **Adatum** Microsoft Entra tenant, create a new group in that tenant, and add the guest user to that group.
 
-1. In the web browser, on the Azure portal blade displaying the **Contoso \| Overview** blade of the **Contoso** Microsoft Entra tenant, in the toolbar, in the upper right corner, select the **Subscriptions** icon next to the **Cloud Shell** icon, and then select the **Switch directory** link. 
+1. In the web browser, on the Azure portal blade displaying the **Contoso \| Overview** blade of the **Contoso** Microsoft Entra tenant, in the toolbar, in the upper right corner, select the **Subscriptions** icon next to the **Cloud Shell** icon, and then select the **Switch directory** link.
 1. On the **Directories + subscriptions** blade, select the entry representing the Microsoft Entra tenant associated with the Azure subscription you're using in the exercises of this module, and then select **Switch**.
 
     > [!NOTE]

learn-pr/azure/cna-set-up-azure-ad-use-scale/includes/4-azure-ad-app-development.md

@@ -11,7 +11,7 @@ To implement Microsoft Entra ID-based applications, you'll need to perform sever
 When operating in a Microsoft Entra environment, a user authenticates to an application in two stages:
 
 1. First, Microsoft Entra ID verifies the user's identity. Upon successful authentication, Microsoft Entra ID issues tokens that contain information reflecting the successful authentication.
-1. The user passes tokens to the application. The application validates the user’s security tokens to ensure that authentication was successful.
+1. The user passes tokens to the application. The application validates the user's security tokens to ensure that authentication was successful.
 
 To perform such validation, the application must be able to communicate securely with Microsoft Entra ID. This, in turn, requires that the application itself operates as a Microsoft Entra security principal. To make it possible, you must ensure that the application is represented in some form in the same Microsoft Entra tenant that contains the account of the authenticating user.
 

learn-pr/azure/cna-set-up-azure-ad-use-scale/includes/5-exercise-implement-multitenant-data.md

@@ -47,7 +47,7 @@ You'll start by creating an instance of Azure Database for PostgreSQL server:
     | Version | Select **11**. |
     | Compute + storage | Select the **Configure server** link. On the **Configure** blade, select **Basic**, set the **vCore** value to **1** and **Storage** to **5 GB**, and then select **OK**. |
     | Admin username | Enter **student**. |
-    | Password | Enter **Pa55w0rd1234**. |
+    | Password | Enter a `<password>`. |
 
     :::image type="content" source="../media/5-azure-db-postgresql-create-basics.png" alt-text="Screenshot of the Basics tab of the server blade in the Azure portal.":::
 
@@ -90,7 +90,7 @@ With the Azure Database for PostgreSQL server provisioned, you'll connect to it
 1. Within the Bash session on the **Cloud Shell** pane, paste the value of the **psql** connection string from the clipboard, modify it so it matches the following command, and run it to connect to the **postgres** database hosted on the newly deployed server instance of Azure Database for PostgreSQL. The value of the `<server_name>` placeholder will be already included in the connection string you pasted from the clipboard:
 
     ```
-    psql "host=<server_name>.postgres.database.azure.com port=5432 dbname=postgres user=student@<server_name>.postgres.database.azure.com password=Pa55w0rd1234 sslmode=require"
+    psql "host=<server_name>.postgres.database.azure.com port=5432 dbname=postgres user=student@<server_name>.postgres.database.azure.com password=<enter your password> sslmode=require"
     ```
 
     > [!NOTE]
@@ -125,7 +125,7 @@ With the Azure Database for PostgreSQL server provisioned, you'll connect to it
 
     ```t-sql
     CREATE TABLE inventory (
-    id bigserial, 
+    id bigserial,
     tenant_id bigint REFERENCES tenants (id),
     name VARCHAR(50),
     quantity INTEGER,
@@ -179,7 +179,7 @@ To integrate the Azure Database for PostgreSQL server instance with Microsoft En
 
 1. Within the browser window displaying the Azure portal with the Azure Database for PostgreSQL server blade, in the vertical menu, in the **Settings** section, select **Active Directory admin**, and then in the toolbar, select **Set admin**.
 1. On the **Active Directory admin** blade, in the list of Microsoft Entra user accounts, select the **adatumadmin1** user account you created in the previous exercise, select **Select**, and then select **Save**.
-1. Open another web browser window in the Incognito/InPrivate mode, navigate to the [Azure portal](https://portal.azure.com/?azure-portal=true), and sign in by using the **adatumadmin1** user account (with the **Pa55w.rd1234** password) you created in the previous exercise.
+1. Open another web browser window in the Incognito/InPrivate mode, navigate to the [Azure portal](https://portal.azure.com/?azure-portal=true), and sign in by using the **adatumadmin1** user account with the password you created in the previous exercise.
 1. In the Azure portal, open the **Cloud Shell** by selecting its icon in the toolbar next to the search text box.
 1. When you're prompted to select either **Bash** or **PowerShell**, select **Bash**, and then when presented with the message **You have no storage mounted**, select **Create storage**.
 1. Within the Bash session on the **Cloud Shell** pane, run the following commands to retrieve and display a Microsoft Entra access token required to access Azure Database for PostgreSQL:
@@ -363,7 +363,7 @@ With the application registered in the Microsoft Entra tenant, you can now proce
     const cca = new msal.ConfidentialClientApplication(config);
 
     app.get('/auth', (req, res) => {
-    
+
     redirectUri = req.hostname.toLowerCase()=="localhost" ? "http://localhost:8080/redirect" : "https://<webapp_name>.azurewebsites.net/redirect";
 
     // Construct a request object for auth code
@@ -381,7 +381,7 @@ With the application registered in the Microsoft Entra tenant, you can now proce
 
     app.get('/redirect', (req, res) => {
     redirectUri = req.hostname.toLowerCase()=="localhost" ? "http://localhost:8080/redirect" : "https://<webapp_name>.azurewebsites.net/redirect";
-    
+
     // Use the auth code in redirect request to construct a token request object
     const tokenRequest = {
         code: req.query.code,

learn-pr/azure/cna-set-up-azure-ad-use-scale/includes/7-exercise-integrate-next-js-web-app-azure-ad.md

@@ -1,4 +1,4 @@
-This exercise takes you through the process of configuring a simple Next.js-based application that integrates with Microsoft Entra ID. 
+This exercise takes you through the process of configuring a simple Next.js-based application that integrates with Microsoft Entra ID.
 
 In this exercise, you'll:
 
@@ -126,7 +126,7 @@ With the application registered in the Microsoft Entra tenant, you can now proce
         return (
             <>
                 <h5 className="card-title">Welcome {accounts[0].name}</h5>
-                {graphData ? 
+                {graphData ?
                     <ProfileData graphData={graphData} />
                     :
                     <Button variant="secondary" onClick={RequestProfileData}>Request Profile Information</Button>
@@ -139,7 +139,7 @@ With the application registered in the Microsoft Entra tenant, you can now proce
     /**
      * If a user is authenticated the ProfileContent component above is rendered. Otherwise, a message indicating a user is not authenticated is rendered.
      */
-    const MainContent = () => {    
+    const MainContent = () => {
         return (
             <div className="App">
                 <AuthenticatedTemplate>
@@ -175,9 +175,9 @@ With the application registered in the Microsoft Entra tenant, you can now proce
     import { LogLevel } from "@azure/msal-browser";
 
     /**
-     * Configuration object to be passed to MSAL instance on creation. 
+     * Configuration object to be passed to MSAL instance on creation.
      * For a full list of MSAL.js configuration parameters, visit:
-     * https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/dev/lib/msal-browser/docs/configuration.md 
+     * https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/dev/lib/msal-browser/docs/configuration.md
      */
     export const msalConfig = {
         auth: {
@@ -189,35 +189,35 @@ With the application registered in the Microsoft Entra tenant, you can now proce
             cacheLocation: "sessionStorage", // This configures where your cache will be stored
             storeAuthStateInCookie: false, // Set this to "true" if you are having issues on IE11 or Edge
         },
-        system: {  
-            loggerOptions: {  
-                loggerCallback: (level, message, containsPii) => {  
-                    if (containsPii) {    
-                        return;    
-                    }  
-                    switch (level) {    
-                        case LogLevel.Error:    
-                            console.error(message);    
-                            return;    
-                        case LogLevel.Info:    
-                            console.info(message);    
-                            return;    
-                        case LogLevel.Verbose:    
-                            console.debug(message);    
-                            return;    
-                        case LogLevel.Warning:    
-                            console.warn(message);    
-                            return;    
-                    }  
-                }  
-            }  
+        system: {
+            loggerOptions: {
+                loggerCallback: (level, message, containsPii) => {
+                    if (containsPii) {
+                        return;
+                    }
+                    switch (level) {
+                        case LogLevel.Error:
+                            console.error(message);
+                            return;
+                        case LogLevel.Info:
+                            console.info(message);
+                            return;
+                        case LogLevel.Verbose:
+                            console.debug(message);
+                            return;
+                        case LogLevel.Warning:
+                            console.warn(message);
+                            return;
+                    }
+                }
+            }
         }
     };
 
     /**
      * Scopes you add here will be prompted for user consent during sign-in.
      * By default, MSAL.js will add OIDC scopes (openid, profile, email) to any login request.
-     * For more information about OIDC scopes, visit: 
+     * For more information about OIDC scopes, visit:
      * https://learn.microsoft.com/azure/active-directory/develop/v2-permissions-and-consent#openid-connect-scopes
      */
     export const loginRequest = {
@@ -275,7 +275,7 @@ You're ready to validate the Microsoft Entra integration of the app. You could c
 
     :::image type="content" source="../media/7-azure-ad-next-js-app-sign-in-popup.png" alt-text="Screenshot of the Welcome to the Microsoft Authentication Library For JavaScript - React Quickstart page with the Sign in using Popup menu option.":::
 
-1. When prompted to sign in, authenticate by using the **adatumuser1** **userPrincipalName** and its password **Pa55w.rd1234**.
+1. When prompted to sign in, authenticate by using the **adatumuser1** **userPrincipalName** and its password.
 
     > [!NOTE]
     > You created this user account in the first exercise of this module.
@@ -307,7 +307,7 @@ You're ready to validate the Microsoft Entra integration of the app. You could c
 
 1. Start another web browser window in the Incognito/InPrivate mode, and navigate to the **http://localhost:3000** URL.
 1. On the **Welcome to the Microsoft Authentication Library For JavaScript - React Quickstart** page, select **Sign In**, and then in the expanding menu, select **Sign in using Popup**.
-1. When prompted to sign in, authenticate by using the **contosouser1** **userPrincipalName** and its password **Pa55w.rd1234**.
+1. When prompted to sign in, authenticate by using the **contosouser1** **userPrincipalName** and its password.
 
     > [!NOTE]
     > You created this user account in the first exercise of this module.
@@ -331,4 +331,4 @@ Congratulations! You completed the third exercise of this module. In this exerci
 
 ## Clean up the resources
 
-To avoid unnecessary charges from using Azure resources, you should delete the **postgresql-db-RG** and **cna-aadexpress-RG** resource groups you created in the previous exercise of this module. To do so, in the Azure portal, navigate to the blade of each of these resource groups, and select the **Delete resource group** entry in the toolbar. In the **TYPE THE RESOURCE GROUP NAME** textbox, enter the name of the resource group, and then select **Delete**. 
+To avoid unnecessary charges from using Azure resources, you should delete the **postgresql-db-RG** and **cna-aadexpress-RG** resource groups you created in the previous exercise of this module. To do so, in the Azure portal, navigate to the blade of each of these resource groups, and select the **Delete resource group** entry in the toolbar. In the **TYPE THE RESOURCE GROUP NAME** textbox, enter the name of the resource group, and then select **Delete**.

learn-pr/azure/cna-set-up-azure-ad-use-scale/index.yml

@@ -11,15 +11,14 @@ metadata:
   ms.author: robmcm
   ms.topic: module-standard-task-based
   ms.service: azure-active-directory
-### NOTE: Temporarily hiding this module while SFI issues are addressed.
-  hidden: true
+hidden: true
 title: Authenticate and authorize multi-tenant apps using Microsoft Entra ID
 summary: Microsoft Entra ID enables you to improve the functionality of cloud-native apps in multitenant scenarios.
 abstract: |
   In this module, you'll:
   - Describe the characteristics and functionality of Microsoft Entra ID
   - Implement Microsoft Entra authentication for cloud-native applications
-prerequisites: | 
+prerequisites: |
   Before working on this module, it's helpful but not required that you have:
   - A basic understanding of cloud computing
   - Basic familiarity with Azure
@@ -50,4 +49,3 @@ units:
 - learn.azure.cna-set-up-apps-use-scale.9-summary
 badge:
   uid: learn.azure.cna-set-up-apps-use-scale.badge
-

learn-pr/azure/create-serverless-logic-with-azure-functions/includes/3-create-an-azure-functions-app-in-the-azure-portal.md

@@ -1,22 +1,22 @@
-You're now ready to start implementing the temperature service. In the previous unit, you determined that a serverless solution would best fit your needs. Let's start by creating a function app to hold our Azure Function.
+You're now ready to start implementing the temperature service. In the previous unit, you determined that a serverless solution would best fit your needs. Let's start by creating a function app that can hold our Azure Function.
 
 ## What is a function app?
 
 Functions are hosted in an execution context called a **function app**. You define function apps to logically group and structure your functions and a compute resource in Azure. In our escalator example, you would create a function app to host the escalator drive gear temperature service. There are a few decisions that need to be made to create the function app; you need to choose a service plan and select a compatible storage account.
 
 ### Choose a service plan
 
-Function apps may use one of the following hosting plans:
+Function apps can use one of the following hosting plans:
 
 - Consumption plan
 - Premium plan
 - Dedicated (App service) plan
 
-When using the Azure serverless application platform, choose the **Consumption plan**. This plan provides automatic scaling and bills you only when your functions are running. The Consumption plan comes with a configurable timeout period for executing a function. By default, it's five (5) minutes, but may be configured to have a timeout as long as 10 minutes.
+When using the Azure serverless application platform, choose the **Consumption plan**. This plan provides automatic scaling and bills you only when your functions are running. The Consumption plan comes with a configurable timeout period for executing a function. By default, it's five (5) minutes, but can be configured to have a timeout as long as 10 minutes.
 
-The **Premium plan** also dynamically scales your resources to meet demand, but you can specify a minimum number of VM instances to keep warm and reduce so called "cold starts." The Premium plan also lets your functions connect to and run inside virtual networks. Like the Dedicated plan, the default timeout for apps in a Premium plan is 30 minutes, but they can essentially run for an unlimited time (depending on server availability). 
+The **Premium plan** also dynamically scales your resources to meet demand, but you can specify a minimum number of virtual machine (VM) instances to keep warm and reduce so called "cold starts." The Premium plan also lets your functions connect to and run inside virtual networks. Like the Dedicated plan, the default timeout for apps in a Premium plan is 30 minutes, but they can essentially run for an unlimited time (depending on server availability). 
 
-The **Dedicated (App service) plan** enables you to avoid timeout periods by having your function run continuously on a VM that you define. An App service plan is technically not a serverless plan, because you're responsible for managing the app resources the function runs on. However, it may be a better choice when you already have excess App Service resources available on which to also run your functions.
+The **Dedicated (App service) plan** enables you to avoid timeout periods by having your function run continuously on a VM that you define. An App service plan is technically not a serverless plan, because you're responsible for managing the app resources the function runs on. However, it might be a better choice when you already have excess App Service resources available on which to also run your functions.
 
 ### Storage account requirements
 
@@ -115,4 +115,4 @@ Let's create a function app in the Azure portal. Completing this module incurs a
 
 1. When deployment completes, select **Go to resource**. The Function App pane for your escalator function appears.
 
-1. In the **Essentials** section, select the **URL** link to open it in a browser. A default Azure web page appears with a message that your Functions app is up and running.
+1. In the **Essentials** section, select the **Default domain** link to open it in a browser. A default Azure web page appears with a message that your Functions app is up and running.