Merging changes synced from https://github.com/MicrosoftDocs/azure-docs-pr (branch live)

Author: Banani-Rath

articles/active-directory-b2c/conditional-access-user-flow.md

@@ -170,7 +170,7 @@ Configure Conditional Access through the Azure portal or Microsoft Graph APIs to
 
 ### Enable template 1 with Conditional Access APIs (optional)
 
-Create a sign-in risk-based Conditional Access policy with MS Graph APIs. For more information, see [Conditional Access APIs](../active-directory/conditional-access/howto-conditional-access-apis.md#graph-api).
+Create a sign-in risk-based Conditional Access policy with MS Graph APIs. For more information, see [Conditional Access APIs](../active-directory/conditional-access/howto-conditional-access-apis.md#microsoft-graph-apis).
 The following template can be used to create a Conditional Access policy with display name "Template 1: Require MFA for medium+ sign-in risk" in report-only mode.
 
 ```json
@@ -232,7 +232,7 @@ To configure your user based conditional access:
 
 ### Enable template 2 with Conditional Access APIs (optional)
 
-To create a user risk-based Conditional Access policy with Conditional Access APIs, refer to the documentation for [Conditional Access APIs](../active-directory/conditional-access/howto-conditional-access-apis.md#graph-api).
+To create a user risk-based Conditional Access policy with Conditional Access APIs, refer to the documentation for [Conditional Access APIs](../active-directory/conditional-access/howto-conditional-access-apis.md#microsoft-graph-apis).
 
 The following template can be used to create a Conditional Access policy with display name "Template 2: Require secure password change for medium+ user risk" in report-only mode.
 
@@ -303,7 +303,7 @@ To enable with condition access policy:
 
 ### Enable template 3 with Conditional Access APIs (optional)
 
-To create a location-based Conditional Access policy with Conditional Access APIs,  refer to the documentation for [Conditional Access APIs](../active-directory/conditional-access/howto-conditional-access-apis.md#graph-api). To set up Named Locations, refer to the documentations for [Named Locations](/graph/api/resources/namedlocation).
+To create a location-based Conditional Access policy with Conditional Access APIs,  refer to the documentation for [Conditional Access APIs](../active-directory/conditional-access/howto-conditional-access-apis.md#microsoft-graph-apis). To set up Named Locations, refer to the documentations for [Named Locations](/graph/api/resources/namedlocation).
 
 The following template can be used to create a Conditional Access policy with display name "Template 3: Block unallowed locations" in report-only mode.
 

articles/active-directory/conditional-access/TOC.yml

@@ -134,16 +134,18 @@
   items:
   - name: Office 365 application
     href: reference-office-365-application-contents.md
-  - name: Beta Graph APIs
+  - name: Microsoft Graph APIs
     items: 
-    - name: conditionalAccessPolicy API
+    - name: conditionalAccessPolicy
       href: /graph/api/resources/conditionalaccesspolicy
-    - name: namedLocation API
+    - name: namedLocation
       href: /graph/api/resources/namedlocation
-    - name: countryNamedLocation API
+    - name: countryNamedLocation
       href: /graph/api/resources/countrynamedlocation
-    - name: ipNamedLocation API
+    - name: ipNamedLocation
       href: /graph/api/resources/ipnamedlocation
+    - name: conditionalAccessTemplate
+      href: /graph/api/resources/conditionalaccesstemplate
 - name: Resources
   items:
   - name: Azure feedback forum
@@ -157,4 +159,4 @@
   - name: Stack Overflow
     href: https://stackoverflow.com/questions/tagged/azure-active-directory
   - name: Videos
-    href: https://azure.microsoft.com/documentation/videos/index/?services=active-directory
+    href: https://azure.microsoft.com/documentation/videos/index/?services=active-directory

articles/active-directory/conditional-access/howto-conditional-access-apis.md

@@ -38,9 +38,9 @@ For many administrators, PowerShell is already an understood scripting tool. The
 
 - [Configure Conditional Access policies with Azure AD PowerShell commands](https://github.com/Azure-Samples/azure-ad-conditional-access-apis/tree/main/01-configure/powershell)
 
-### Graph API
+### Microsoft Graph APIs
 
-This example shows the basic Create, Read, Update, and Delete (CRUD) options available in the Conditional Access Graph APIs. The example also includes some JSON templates you can use to create some sample policies.
+This example shows the basic Create, Read, Update, and Delete (CRUD) options available in the Conditional Access APIs in Microsoft Graph. The example also includes some JSON templates you can use to create some sample policies.
 
 - [Configure Conditional Access policies with Microsoft Graph API calls](https://github.com/Azure-Samples/azure-ad-conditional-access-apis/tree/main/01-configure/graphapi)
 
@@ -90,7 +90,7 @@ Things don't always work the way you want, when that happens you need a way to g
 
 ## Community contribution
 
-These samples are available in our [GitHub repository](https://github.com/Azure-Samples/azure-ad-conditional-access-apis). We are happy to support community contributions thorough GitHub Issues and Pull Requests.
+These samples are available in our [GitHub repository](https://github.com/Azure-Samples/azure-ad-conditional-access-apis). We are happy to support community contributions through GitHub Issues and Pull Requests.
 
 ## Next steps
 

articles/active-directory/develop/TOC.yml

@@ -281,45 +281,6 @@
               href: scenario-spa-call-api.md
             - name: Move to production
               href: scenario-spa-production.md
-    - name: Reference
-      items:
-        - name: MSAL.js
-          displayName: Angular, JavaScript, Node.js, React
-          items:
-            - name: Library initialization
-              items:
-                - name: Init MSAL.js 2.x and 1.x clients
-                  href: msal-js-initializing-client-applications.md
-                - name: Running and debugging in IE
-                  href: msal-js-use-ie-browser.md
-                - name: Integrate with Azure AD B2C
-                  href: msal-b2c-overview.md
-            - name: Authentication and single sign-on (SSO)
-              items:
-                - name: Single sign-on with MSAL.js
-                  href: msal-js-sso.md
-                - name: Pass custom state in authentication requests
-                  href: msal-js-pass-custom-state-authentication-request.md
-                - name: Prompt behavior
-                  href: msal-js-prompt-behavior.md
-                - name: Avoid page reloads
-                  href: msal-js-avoid-page-reloads.md
-            - name: Migration
-              items:
-                - name: Migrate to MSAL.js
-                  href: msal-compare-msal-js-and-adal-js.md
-                - name: Migrate SPA from implicit to auth code flow
-                  displayName: authorization, single-page app, 2.0
-                  href: migrate-spa-implicit-to-auth-code.md
-            - name: Logging and error handling
-              items:
-                - name: Logging in MSAL.js
-                  href: msal-logging-js.md
-                - name: Handle errors and exceptions in MSAL.js
-                  displayName: handling, catch
-                  href: msal-error-handling-js.md
-                - name: Known issues - IE and Microsoft Edge
-                  href: msal-js-known-issues-ie-edge-browsers.md
 - name: Web app
   items:
     - name: Web app authentication documentation
@@ -663,6 +624,43 @@
               href: msal-error-handling-java.md
             - name: Logging in MSAL for Java
               href: msal-logging-java.md
+        - name: MSAL.js
+          displayName: Angular, JavaScript, Node.js, React
+          items:
+            - name: Library initialization
+              items:
+                - name: Init MSAL.js 2.x and 1.x clients
+                  href: msal-js-initializing-client-applications.md
+                - name: Running and debugging in IE
+                  href: msal-js-use-ie-browser.md
+                - name: Integrate with Azure AD B2C
+                  href: msal-b2c-overview.md
+            - name: Authentication and single sign-on (SSO)
+              items:
+                - name: Single sign-on with MSAL.js
+                  href: msal-js-sso.md
+                - name: Pass custom state in authentication requests
+                  href: msal-js-pass-custom-state-authentication-request.md
+                - name: Prompt behavior
+                  href: msal-js-prompt-behavior.md
+                - name: Avoid page reloads
+                  href: msal-js-avoid-page-reloads.md
+            - name: Migration
+              items:
+                - name: Migrate to MSAL.js
+                  href: msal-compare-msal-js-and-adal-js.md
+                - name: Migrate SPA from implicit to auth code flow
+                  displayName: authorization, single-page app, 2.0
+                  href: migrate-spa-implicit-to-auth-code.md
+            - name: Logging and error handling
+              items:
+                - name: Logging in MSAL.js
+                  href: msal-logging-js.md
+                - name: Handle errors and exceptions in MSAL.js
+                  displayName: handling, catch
+                  href: msal-error-handling-js.md
+                - name: Known issues - IE and Microsoft Edge
+                  href: msal-js-known-issues-ie-edge-browsers.md
         - name: MSAL.NET
           displayName: ASP.NET Core, Xamarin
           items:

articles/static-web-apps/deploy-blazor.md

@@ -6,13 +6,14 @@ ms.custom: engagement-fy23
 author: craigshoemaker
 ms.service: static-web-apps
 ms.topic: tutorial
-ms.date: 10/11/2022
+ms.date: 11/22/2022
 ms.author: cshoe
 ---
 
-# Build an Azure Static Web Apps website with Blazor
+# Build an Azure Static Web Apps website with Blazor and serverless API
 
 Azure Static Web Apps publishes a website to a production environment by building apps from a GitHub repository, which is supported by a serverless backend. The following tutorial shows how to deploy C# Blazor WebAssembly app that displays weather data returned by a serverless API.
+
 ## Prerequisites
 
 - [GitHub](https://github.com) account
@@ -60,7 +61,7 @@ Now that the repository is created, create a static web app from the Azure porta
     | Property | Value | Description |
     | --- | --- | --- |
     | App location | **Client** | Folder containing the Blazor WebAssembly app |
-    | API location | **Api** | Folder containing the Azure Functions app |
+    | API location | **ApiIsolated** | Folder containing the .NET 7 Azure Functions app |
     | Output location | **wwwroot** | Folder in the build output containing the published Blazor WebAssembly application |
 
 8. Select **Review + Create** to verify the details are all correct.
@@ -88,13 +89,15 @@ The Static Web Apps overview window displays a series of links that help you int
 2. Once GitHub Actions workflow is complete, you can select the _URL_ link to open the website in new tab.
 
    :::image type="content" source="media/deploy-blazor/my-first-static-blazor-app.png" alt-text="Screenshot of Static Web Apps Blazor webpage.":::
+   
 ## 4. Understand the application overview
 
 Together, the following projects make up the parts required to create a Blazor WebAssembly application running in the browser supported by an Azure Functions API backend.
 
 |Visual Studio project |Description |
 |---------|---------|
-|API   | The C# Azure Functions application implements the API endpoint that provides weather information to the Blazor WebAssembly app. The **WeatherForecastFunction** returns an array of `WeatherForecast` objects.        |
+|Api   | The *.NET 6 in-process* C# Azure Functions application implements the API endpoint that provides weather information to the Blazor WebAssembly app. The **WeatherForecastFunction** returns an array of `WeatherForecast` objects.        |
+|ApiIsolated   | The *.NET 7 isolated-process* C# Azure Functions application implements the API endpoint that provides weather information to the Blazor WebAssembly app. The **WeatherForecastFunction** returns an array of `WeatherForecast` objects.        |
 |Client    |The front-end Blazor WebAssembly project. A [fallback route](#fallback-route) is implemented to ensure client-side routing is functional.         |
 |Shared    | Holds common classes referenced by both the Api and Client projects, which allow data to flow from API endpoint to the front-end web app. The [`WeatherForecast`](https://github.com/staticwebdev/blazor-starter/blob/main/Shared/WeatherForecast.cs) class is shared among both apps.        |
 
@@ -113,7 +116,7 @@ The app exposes URLs like `/counter` and `/fetchdata`, which map to specific rou
 }
 ```
 
-The json configuration ensures that requests to any route in the app return the `index.html` page.
+The JSON configuration ensures that requests to any route in the app return the `index.html` page.
 
 ## Clean up resources