Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into overview-rewrite

Author: eross-msft

.openpublishing.redirection.json

@@ -6,12 +6,12 @@ services: active-directory
 ms.service: active-directory
 ms.subservice: conditional-access
 ms.topic: conceptual
-ms.date: 11/21/2019
+ms.date: 12/10/2019
 
 ms.author: joflore
 author: MicrosoftGuyJFlo
 manager: daveba
-ms.reviewer: calebb, rogoya
+ms.reviewer: rogoya
 
 ms.collection: M365-identity-device-management
 ---
@@ -84,6 +84,6 @@ To protect privileged actions, this **Require MFA for service management (previe
 
 For more information, see:
 
+* [Enabling security defaults](../fundamentals/concept-fundamentals-security-defaults.md)
 * [Common Conditional Access policies](concept-conditional-access-policy-common.md)
 * [Five steps to securing your identity infrastructure](../../security/fundamentals/steps-secure-identity.md)
-* [What is Conditional Access in Azure Active Directory?](overview.md)

articles/active-directory/conditional-access/concept-baseline-protection.md

@@ -6,7 +6,7 @@ services: active-directory
 ms.service: active-directory
 ms.subservice: conditional-access
 ms.topic: conceptual
-ms.date: 12/03/2019
+ms.date: 12/10/2019
 
 ms.author: joflore
 author: MicrosoftGuyJFlo
@@ -17,7 +17,7 @@ ms.collection: M365-identity-device-management
 ---
 # Common Conditional Access policies
 
-Baseline protection policies are great but many organizations need more flexibility than they offer. For example, many organizations need the ability to exclude specific accounts like their emergency access or break-glass administration accounts from Conditional Access policies requiring multi-factor authentication. For those organizations, the common policies referenced in this article can be of use.
+[Security defaults](../fundamentals/concept-fundamentals-security-defaults.md) are great for some but many organizations need more flexibility than they offer. For example, many need the ability to exclude specific accounts like their emergency access or break-glass administration accounts from Conditional Access policies requiring multi-factor authentication. For those organizations, the common policies referenced in this article can be of use.
 
 ![Conditional Access policies in the Azure portal](./media/concept-conditional-access-policy-common/conditional-access-policies-azure-ad-listing.png)
 

articles/active-directory/conditional-access/concept-conditional-access-policy-common.md

@@ -35,6 +35,7 @@
         href: quickstart-v2-aspnet-core-webapp.md
       - name: NodeJS
         href: quickstart-v2-nodejs-webapp.md
+        displayName: OIDC
       - name: Java
         href: quickstart-v2-java-webapp.md
       - name: Python
@@ -135,7 +136,7 @@
           href: scenario-web-app-call-api-app-registration.md
         - name: Code configuration
           href: scenario-web-app-call-api-app-configuration.md
-        - name: Sign-in
+        - name: Global sign-out
           href: scenario-web-app-call-api-sign-in.md
         - name: Acquire token for the app
           href: scenario-web-app-call-api-acquire-token.md
@@ -213,11 +214,12 @@
             href: msal-net-system-browser-android-considerations.md
           - name: Xamarin iOS
             href: msal-net-xamarin-ios-considerations.md
-          - name: Use brokers with Xamarin iOS and Android Applications
+          - name: Use brokers with Xamarin iOS and Android
+            displayName: Microsoft Authenticator Microsoft Intune
             href: msal-net-use-brokers-with-xamarin-apps.md
           - name: Universal Windows Platform
             href: msal-net-uwp-considerations.md
-        - name: Acquiring a token for the app
+        - name: Acquire a token for the app
           href: scenario-mobile-acquire-token.md
         - name: Calling a web API
           href: scenario-mobile-call-api.md
@@ -241,13 +243,13 @@
           href: msal-compare-msal-js-and-adal-js.md
         - name: Migrate to MSAL.Android
           href: migrate-android-adal-msal.md
-        - name: Migrate to MSAL.iOS and MacOS
+        - name: Migrate to MSAL.iOS / MacOS
           href: migrate-objc-adal-msal.md
         - name: Migrate to MSAL Python
           href: migrate-python-adal-msal.md
         - name: Migrate to MSAL for Java
           href: migrate-adal-msal-java.md
-        - name: Migrate Xamarin apps using brokers from ADAL.NET to MSAL.NET
+        - name: Migrate Xamarin apps using brokers to MSAL.NET
           href: msal-net-migration-ios-broker.md
       - name: Supported authentication flows
         href: msal-authentication-flows.md
@@ -263,7 +265,7 @@
         items:
         - name: Client applications
           href: msal-client-applications.md
-        - name: Application configuration (.NET)
+        - name: Application configuration
           href: msal-client-application-configuration.md
         - name: Initialize applications (.NET)
           href: msal-net-initializing-client-applications.md
@@ -313,11 +315,11 @@
             items:
             - name: Considerations using IE
               href: msal-js-use-ie-browser.md
-            - name: Known issues- IE and Microsoft Edge
+            - name: Known issues - IE and Microsoft Edge
               href: msal-js-known-issues-ie-edge-browsers.md
-            - name: Known issues- Safari 
+            - name: Known issues - Safari 
               href: msal-js-known-issues-safari-browser.md
-          - name: MSAL for iOS and macOS SSL issues
+          - name: Troubleshoot SSL issues (MSAL iOS/macOS)
             href: ssl-issues.md
     - name: Authentication protocol
       items:
@@ -388,7 +390,7 @@
     items:
     - name: Authentication
       items:
-      - name: Configure role claims
+      - name: Configure role claim
         href: active-directory-enterprise-app-role-management.md
       - name: Customize claims - Portal
         href: active-directory-saml-claims-customization.md
@@ -400,9 +402,9 @@
         href: active-directory-configurable-token-lifetimes.md
     - name: Application configuration
       items:
-      - name: Transitioning from App registrations (Legacy) to the new App registrations experience in the Azure portal
+      - name: New Azure portal app registration training guide
         href: app-registrations-training-guide-for-app-registrations-legacy-users.md
-      - name: Transitioning from Application Registration Portal to the new App registrations experience in the Azure portal
+      - name: New Azure portal app registration experience
         href: app-registration-portal-training-guide.md
       - name: Convert a single-tenant app to a multi-tenant app
         href: howto-convert-app-to-be-multi-tenant.md
@@ -418,7 +420,7 @@
         href: howto-add-app-roles-in-azure-ad-apps.md
       - name: Branding guidelines
         href: howto-add-branding-in-azure-ad-apps.md
-      - name: Publisher domain
+      - name: Configure publisher domain
         href: howto-configure-publisher-domain.md
       - name: Terms of Service and Privacy Statement
         href: howto-add-terms-of-service-privacy-statement.md
@@ -432,7 +434,7 @@
               href: msal-net-token-cache-serialization.md
             - name: Clear the token cache
               href: msal-net-clear-token-cache.md
-            - name: Instantiate a public client with options
+            - name: Instantiate a public client app
               href: msal-net-instantiate-public-client-config-options.md
             - name: Instantiate a confidential client with options
               href: msal-net-instantiate-confidential-client-config-options.md
@@ -462,13 +464,13 @@
               href: redirect-uris-ios.md
         - name: MSAL for Python
           items:
-            - name: Token cache serialization
+            - name: Custom token cache serialization
               href: msal-python-token-cache-serialization.md
         - name: MSAL for Java
           items:
-            - name: Token cache serialization
+            - name: Custom token cache serialization
               href: msal-java-token-cache-serialization.md
-            - name: Add and remove accounts from the token cache
+            - name: Get and remove accounts from the token cache
               href: msal-java-get-remove-accounts-token-cache.md
     - name: Work with Visual Studio
       items:
@@ -482,7 +484,7 @@
         href: vs-active-directory-webapi-getting-started.md
       - name: What happened to my WebAPI project?
         href: vs-active-directory-webapi-what-happened.md
-      - name: Error during authentication detection
+      - name: Diagnose errors during authentication
         href: vs-active-directory-error.md
   - name: References
     items:

articles/active-directory/develop/TOC.yml

@@ -1,5 +1,5 @@
 ---
-title: Customize Azure AD tenant app claims
+title: Customize Azure AD tenant app claims (Powershell)
 titleSuffix: Microsoft identity platform
 description: This page describes Azure Active Directory claims mapping.
 services: active-directory

articles/active-directory/develop/active-directory-claims-mapping.md

@@ -1,5 +1,5 @@
 ---
-title: How and why to add apps to Azure AD
+title: How and why apps are added to Azure AD
 titleSuffix: Microsoft identity platform
 description: What does it mean for an application to be added to Azure AD and how do they get there?
 services: active-directory

articles/active-directory/develop/active-directory-how-applications-are-added.md

@@ -1,5 +1,5 @@
 ---
-title: Authorization protocols supported by the Microsoft identity platform | Azure
+title: OAuth 2.0 and OpenID Connect protocols - Microsoft identity platform | Azure
 description: A guide to OAuth 2.0 and OpenID Connect protocols that are supported by the Microsoft identity platform endpoint.
 services: active-directory
 author: rwike77
@@ -17,7 +17,7 @@ ms.custom: aaddev
 ms.collection: M365-identity-device-management
 ---
 
-# Microsoft identity platform protocols
+# OAuth 2.0 and OpenID Connect protocols on the Microsoft identity platform
 
 The Microsoft identity platform endpoint for identity-as-a-service with industry standard protocols, OpenID Connect and OAuth 2.0. While the service is standards-compliant, there can be subtle differences between any two implementations of these protocols. The information here will be useful if you choose to write your code by directly sending and handling HTTP requests or use a third party open-source library, rather than using one of our [open-source libraries](reference-v2-libraries.md).
 

articles/active-directory/develop/active-directory-v2-protocols.md

@@ -1,5 +1,5 @@
 ---
-title: Microsoft identity platform authentication scenarios | Azure
+title: Microsoft identity platform authentication flows & app scenarios | Azure
 description: Learn about authentication flows and application scenarios for the Microsoft identity platform. Learn about the different types of applications that can authenticate identities, acquire tokens, and call protected APIs.
 services: active-directory
 author: jmprieur

articles/active-directory/develop/authentication-flows-app-scenarios.md

@@ -1,5 +1,5 @@
 ---
-title: Customize browsers & WebViews | Azure
+title: Customize browsers & WebViews (MSAL iOS/macOS) | Azure
 titleSuffix: Microsoft identity platform
 description: Learn how to customize the MSAL iOS/macOS browser experience to sign in users.
 services: active-directory

articles/active-directory/develop/customize-webviews.md

@@ -1,5 +1,5 @@
 ---
-title: Azure AD app branding guidelines
+title: App branding guidelines | Azure
 titleSuffix: Microsoft identity platform
 description: A comprehensive guide to developer-oriented resources for Azure Active Directory
 services: active-directory