Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into aca/networking-updates

Author: craigshoemaker

articles/active-directory/develop/TOC.yml

@@ -45,10 +45,12 @@
           href: application-consent-experience.md
         - name: Consent framework
           href: consent-framework.md
-        - name: Conditional access (CA) dev guide
+        - name: Conditional Access dev guide
           href: v2-conditional-access-dev-guide.md
-        - name: Conditional access (CA) auth context
+          displayName: ca
+        - name: Conditional Access auth context
           href: developer-guide-conditional-access-authentication-context.md
+          displayName: ca
     - name: App registrations and workload identities
       displayName: App configuration
       items:
@@ -234,22 +236,6 @@
           href: ./howto-remove-app.md
         - name: Restore or remove a deleted app registration
           href: ./howto-restore-app.md
-- name: Multi-service tutorials
-  items: 
-    - name: Secure web app accesses storage and Microsoft Graph
-      items:
-        - name: Overview
-          href: multi-service-web-app-overview.md        
-        - name: Set up App Service authentication
-          href: multi-service-web-app-authentication-app-service.md
-        - name: Access storage as the app
-          href: multi-service-web-app-access-storage.md
-        - name: Access Microsoft Graph as the user
-          href: multi-service-web-app-access-microsoft-graph-as-user.md
-        - name: Access Microsoft Graph as the app
-          href: multi-service-web-app-access-microsoft-graph-as-app.md
-        - name: Clean up resources
-          href: multi-service-web-app-clean-up-resources.md        
 - name: Single-page app (SPA)
   items:
     - name: SPA authentication documentation
@@ -340,6 +326,20 @@
           href: tutorial-blazor-server.md
         - name: Node.js
           href: tutorial-v2-nodejs-webapp-msal.md
+        - name: Secure web app accesses storage and Microsoft Graph
+          items:
+            - name: Overview
+              href: multi-service-web-app-overview.md
+            - name: Set up App Service authentication
+              href: multi-service-web-app-authentication-app-service.md
+            - name: Access storage as the app
+              href: multi-service-web-app-access-storage.md
+            - name: Access Microsoft Graph as the user
+              href: multi-service-web-app-access-microsoft-graph-as-user.md
+            - name: Access Microsoft Graph as the app
+              href: multi-service-web-app-access-microsoft-graph-as-app.md
+            - name: Clean up resources
+              href: multi-service-web-app-clean-up-resources.md
     - name: Samples
       displayName: code samples, example code, code snippets
       href: sample-v2-code.md#web-applications

articles/active-directory/develop/developer-guide-conditional-access-authentication-context.md

@@ -42,14 +42,20 @@ landingContent:
             url: tutorial-blazor-webassembly.md
           - text: Node.js with Express
             url: tutorial-v2-nodejs-webapp-msal.md
-  - title: "Scenarios in depth"
+  - title: "Web apps in depth"
     linkLists:
       - linkListType: how-to-guide
         links:
           - text: Web app that signs in users
             url: scenario-web-app-sign-user-overview.md
           - text: Web app that calls a web API
             url: scenario-web-app-call-api-overview.md
+  - title: "Scenarios in depth"
+    linkLists:
+      - linkListType: tutorial
+        links:
+          - text: Secure web app accesses storage and Microsoft Graph
+            url: multi-service-web-app-overview.md          
 ## ROW  ################################################### ROW 2 ##
   # - title: $CARD_TITLE
   #   linkLists:

articles/active-directory/develop/index-web-app.yml

@@ -47,7 +47,7 @@ There are two ways for applications using MSAL for Android to achieve SSO:
 We recommend that you use one of Microsoft's authentication brokers to participate in device-wide single sign-on (SSO) and to meet organizational Conditional Access policies. Integrating with a broker provides the following benefits:
 
 - Device single sign-on
-- Conditional access for:
+- Conditional Access for:
   - Intune App Protection
   - Device Registration (Workplace Join)
   - Mobile Device Management

articles/active-directory/develop/msal-android-single-sign-on.md

@@ -35,9 +35,9 @@ MSAL for macOS doesn't support:
 
 Keychain sharing between apps from the same publisher is more limited on macOS 10.14 and earlier. Use [access control lists](https://developer.apple.com/documentation/security/keychain_services/access_control_lists?language=objc) to specify the paths to the apps that should share the keychain. User may see additional keychain prompts.
 
-On macOS 10.15+, MSAL's behavior is the same between iOS and macOS. MSAL uses [keychain access groups](https://developer.apple.com/documentation/security/keychain_services/keychain_items/sharing_access_to_keychain_items_among_a_collection_of_apps?language=objc) for keychain sharing. 
+On macOS 10.15+, MSAL's behavior is the same between iOS and macOS. MSAL uses [keychain access groups](https://developer.apple.com/documentation/security/keychain_services/keychain_items/sharing_access_to_keychain_items_among_a_collection_of_apps?language=objc) for keychain sharing.
 
-### Conditional access authentication differences
+### Conditional Access authentication differences
 
 For Conditional Access scenarios, there will be fewer user prompts when you use MSAL for iOS. This is because iOS uses the broker app (Microsoft Authenticator) which negates the need to prompt the user in some cases.
 
@@ -47,7 +47,7 @@ For Conditional Access scenarios, there will be fewer user prompts when you use
 
 - When you set up your project on macOS, ensure that your application is signed with a valid development or production certificate. MSAL still works in the unsigned mode, but it will behave differently with regards to cache persistence. The app should only be run unsigned for debugging purposes. If you distribute the app unsigned, it will:
 1. On 10.14 and earlier, MSAL will prompt the user for a keychain password every time they restart the app.
-2. On 10.15+, MSAL will prompt user for credentials for every token acquisition. 
+2. On 10.15+, MSAL will prompt user for credentials for every token acquisition.
 
 - macOS apps don't need to implement the AppDelegate call.