Merge pull request #104098 from MicrosoftDocs/master

Merge Master to Live, 4 AM

Author: PMEds28

.openpublishing.redirection.json

@@ -21030,6 +21030,186 @@
       "redirect_url": "/azure/iot-fundamentals/iot-security-ground-up",
       "redirect_document_id": true
     },
+    {
+      "source_path": "articles/active-directory/develop/active-directory-acs-migration.md",
+      "redirect_url": "https://docs.microsoft.com/azure/active-directory/azuread-dev/active-directory-acs-migration",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/active-directory/develop/active-directory-authentication-libraries.md",
+      "redirect_url": "https://docs.microsoft.com/azure/active-directory/azuread-dev/active-directory-authentication-libraries",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/active-directory/develop/active-directory-devhowto-adal-error-handling.md",
+      "redirect_url": "https://docs.microsoft.com/azure/active-directory/azuread-dev/active-directory-devhowto-adal-error-handling",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/active-directory/develop/app-types.md",
+      "redirect_url": "https://docs.microsoft.com/azure/active-directory/azuread-dev/app-types",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/active-directory/develop/azure-ad-endpoint-comparison.md",
+      "redirect_url": "https://docs.microsoft.com/azure/active-directory/azuread-dev/azure-ad-endpoint-comparison",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/active-directory/develop/azure-ad-federation-metadata.md",
+      "redirect_url": "https://docs.microsoft.com/azure/active-directory/azuread-dev/azure-ad-federation-metadata",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/active-directory/develop/conditional-access-dev-guide.md",
+      "redirect_url": "https://docs.microsoft.com/azure/active-directory/azuread-dev/conditional-access-dev-guide",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/active-directory/develop/howto-app-gallery-listing.md",
+      "redirect_url": "https://docs.microsoft.com/azure/active-directory/azuread-dev/howto-app-gallery-listing",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/active-directory/develop/howto-get-appsource-certified.md",
+      "redirect_url": "https://docs.microsoft.com/azure/active-directory/azuread-dev/howto-get-appsource-certified",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/active-directory/develop/howto-reactivate-disabled-acs-namespaces.md",
+      "redirect_url": "https://docs.microsoft.com/azure/active-directory/azuread-dev/howto-reactivate-disabled-acs-namespaces",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/active-directory/develop/howto-v1-debug-saml-sso-issues.md",
+      "redirect_url": "https://docs.microsoft.com/azure/active-directory/azuread-dev/howto-v1-debug-saml-sso-issues",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/active-directory/develop/howto-v1-enable-sso-android.md",
+      "redirect_url": "https://docs.microsoft.com/azure/active-directory/azuread-dev/howto-v1-enable-sso-android",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/active-directory/develop/howto-v1-enable-sso-ios.md",
+      "redirect_url": "https://docs.microsoft.com/azure/active-directory/azuread-dev/howto-v1-enable-sso-ios",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/active-directory/develop/native-app.md",
+      "redirect_url": "https://docs.microsoft.com/azure/active-directory/azuread-dev/native-app",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/active-directory/develop/quickstart-v1-android.md",
+      "redirect_url": "https://docs.microsoft.com/azure/active-directory/develop/quickstart-v2-android",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/active-directory/develop/quickstart-v1-angularjs-spa.md",
+      "redirect_url": "https://docs.microsoft.com/azure/active-directory/develop/authentication-flows-app-scenarios",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/active-directory/develop/quickstart-v1-aspnet-webapp.md",
+      "redirect_url": "https://docs.microsoft.com/azure/active-directory/develop/quickstart-v2-aspnet-webapp",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/active-directory/develop/quickstart-v1-dotnet.md",
+      "redirect_url": "https://docs.microsoft.com/azure/active-directory/develop/quickstart-v2-windows-desktop",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/active-directory/develop/quickstart-v1-dotnet-webapi.md",
+      "redirect_url": "https://docs.microsoft.com/azure/active-directory/develop/quickstart-v2-dotnet-native-aspnet",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/active-directory/develop/quickstart-v1-ios.md",
+      "redirect_url": "https://docs.microsoft.com/azure/active-directory/develop/quickstart-v2-ios",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/active-directory/develop/quickstart-v1-netcore-daemon.md",
+      "redirect_url": "https://docs.microsoft.com/azure/active-directory/develop/quickstart-v2-netcore-daemon",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/active-directory/develop/quickstart-v1-nodejs-webapi.md",
+      "redirect_url": "https://docs.microsoft.com/azure/active-directory/develop/authentication-flows-app-scenarios",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/active-directory/develop/quickstart-v1-xamarin.md",
+      "redirect_url": "https://docs.microsoft.com/azure/active-directory/develop/authentication-flows-app-scenarios",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/active-directory/develop/sample-v1-code.md",
+      "redirect_url": "https://docs.microsoft.com/azure/active-directory/azuread-dev/sample-v1-code",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/active-directory/develop/service-to-service.md",
+      "redirect_url": "https://docs.microsoft.com/azure/active-directory/azuread-dev/service-to-service",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/active-directory/develop/single-page-application.md",
+      "redirect_url": "https://docs.microsoft.com/azure/active-directory/azuread-dev/single-page-application",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/active-directory/develop/v1-authentication-scenarios.md",
+      "redirect_url": "https://docs.microsoft.com/azure/active-directory/azuread-dev/v1-authentication-scenarios",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/active-directory/develop/v1-oauth2-client-creds-grant-flow.md",
+      "redirect_url": "https://docs.microsoft.com/azure/active-directory/azuread-dev/v1-oauth2-client-creds-grant-flow",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/active-directory/develop/v1-oauth2-implicit-grant-flow.md",
+      "redirect_url": "https://docs.microsoft.com/azure/active-directory/azuread-dev/v1-oauth2-implicit-grant-flow",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/active-directory/develop/v1-oauth2-on-behalf-of-flow.md",
+      "redirect_url": "https://docs.microsoft.com/azure/active-directory/azuread-dev/v1-oauth2-on-behalf-of-flow",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/active-directory/develop/v1-overview.md",
+      "redirect_url": "https://docs.microsoft.com/azure/active-directory/azuread-dev/v1-overview",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/active-directory/develop/v1-permissions-and-consent.md",
+      "redirect_url": "https://docs.microsoft.com/azure/active-directory/azuread-dev/v1-permissions-and-consent",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/active-directory/develop/v1-protocols-oauth-code.md",
+      "redirect_url": "https://docs.microsoft.com/azure/active-directory/azuread-dev/v1-protocols-oauth-code",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/active-directory/develop/v1-protocols-openid-connect-code.md",
+      "redirect_url": "https://docs.microsoft.com/azure/active-directory/azuread-dev/v1-protocols-openid-connect-code",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/active-directory/develop/web-api.md",
+      "redirect_url": "https://docs.microsoft.com/azure/active-directory/azuread-dev/web-api",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/active-directory/develop/web-app.md",
+      "redirect_url": "https://docs.microsoft.com/azure/active-directory/azuread-dev/web-app",
+      "redirect_document_id": true
+    },
     {
       "source_path": "articles/active-directory/active-directory-app-gallery-listing.md",
       "redirect_url": "/azure/active-directory/develop/active-directory-app-gallery-listing",
@@ -26530,6 +26710,26 @@
       "redirect_url": "/azure/storage/common/storage-designing-ha-apps-with-ragrs",
       "redirect_document_id": true
     },
+    {
+      "source_path": "articles/storage/common/storage-redundancy-lrs.md",
+      "redirect_url": "/azure/storage/common/storage-redundancy",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/storage/common/storage-redundancy-grs.md",
+      "redirect_url": "/azure/storage/common/storage-redundancy",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/storage/common/storage-redundancy-zrs.md",
+      "redirect_url": "/azure/storage/common/storage-redundancy",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/storage/common/storage-redundancy-gzrs.md",
+      "redirect_url": "/azure/storage/common/storage-redundancy",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/storage/storage-disaster-recovery-guidance.md",
       "redirect_url": "/azure/storage/common/storage-disaster-recovery-guidance",

articles/active-directory-b2c/contentdefinitions.md

@@ -9,7 +9,7 @@ manager: celestedg
 ms.service: active-directory
 ms.workload: identity
 ms.topic: reference
-ms.date: 02/10/2020
+ms.date: 02/11/2020
 ms.author: marsma
 ms.subservice: B2C
 ---
@@ -80,11 +80,11 @@ The **DataUri** element is used to specify the page identifier. Azure AD B2C use
 | `globalexception` | Displays an error page when an exception or an error is encountered. |
 | `providerselection` |	Lists the identity providers that users can choose from during sign-in. |
 | `unifiedssp` | Displays a form for signing in with a local account that's based on an email address or a user name. This value also provides the “keep me sign-in functionality” and “Forgot your password?” link. |
-| `unifiedssp` | Displays a form for signing in with a local account that's based on an email address or a user name. |
+| `unifiedssd` | Displays a form for signing in with a local account that's based on an email address or a user name. |
 | `multifactor` | Verifies phone numbers by using text or voice during sign-up or sign-in. |
 | `selfasserted` | Displays a form that enables users to create or update their profile. |
 
-## Select a page layout
+### Select a page layout
 
 You can enable [JavaScript client-side code](javascript-samples.md) by inserting `contract` between `elements` and the page type. For example, `urn:com:microsoft:aad:b2c:elements:contract:page-name:version`.
 
@@ -122,6 +122,29 @@ The format of the value must contain the word `contract`: _urn:com:microsoft:aad
 | `urn:com:microsoft:aad:b2c:elements:unifiedssp:1.0.0` | `urn:com:microsoft:aad:b2c:elements:contract:unifiedssp:1.2.0` |
 | `urn:com:microsoft:aad:b2c:elements:unifiedssp:1.1.0` | `urn:com:microsoft:aad:b2c:elements:contract:unifiedssp:1.2.0` |
 
+
+### Metadata
+
+A **Metadata** element contains the following elements:
+
+| Element | Occurrences | Description |
+| ------- | ----------- | ----------- |
+| Item | 0:n | The metadata that relates to the content definition. |
+
+The **Item** element of the **Metadata** element contains the following attributes:
+
+| Attribute | Required | Description |
+| --------- | -------- | ----------- |
+| Key | Yes | The metadata key.  |
+
+#### Metadata keys
+
+Content definition supports following metadata items: 
+
+| Key | Required | Description |
+| --------- | -------- | ----------- |
+| DisplayName | No | A string that contains the name of the content definition. |
+
 ### LocalizedResourcesReferences
 
 The **LocalizedResourcesReferences** element contains the following elements:
@@ -130,7 +153,7 @@ The **LocalizedResourcesReferences** element contains the following elements:
 | ------- | ----------- | ----------- |
 | LocalizedResourcesReference | 1:n | A list of localized resource references for the content definition. |
 
-The **LocalizedResourcesReferences** element contains the following attributes:
+The **LocalizedResourcesReference** element contains the following attributes:
 
 | Attribute | Required | Description |
 | --------- | -------- | ----------- |

articles/active-directory-b2c/manage-user-accounts-graph-api.md

@@ -22,7 +22,7 @@ You might need to migrate an existing user store to a B2C tenant. You may want t
 For B2C tenants, there are two primary modes of communicating with the Graph API:
 
 * For **interactive**, run-once tasks, you should act as an administrator account in the B2C tenant when you perform the tasks. This mode requires an administrator to sign in with credentials before that admin can perform any calls to the Graph API.
-* For **automated**, continuous tasks, you should use some type of service account that you provide with the necessary privileges to perform management tasks. In Azure AD, you can do this by registering an application and authenticating to Azure AD. This is done by using an *Application ID* that uses the [OAuth 2.0 client credentials grant](../active-directory/develop/service-to-service.md). In this case, the application acts as itself, not as a user, to call the Graph API.
+* For **automated**, continuous tasks, you should use some type of service account that you provide with the necessary privileges to perform management tasks. In Azure AD, you can do this by registering an application and authenticating to Azure AD. This is done by using an *Application ID* that uses the [OAuth 2.0 client credentials grant](../active-directory/develop/v2-oauth2-client-creds-grant-flow.md). In this case, the application acts as itself, not as a user, to call the Graph API.
 
 In this article, you learn how to perform the automated use case. You'll build a .NET 4.5 `B2CGraphClient` that performs user create, read, update, and delete (CRUD) operations. The client will have a Windows command-line interface (CLI) that allows you to invoke various methods. However, the code is written to behave in a non-interactive, automated fashion.
 
@@ -69,7 +69,7 @@ Your Azure AD B2C application now has the additional permissions required to del
 
 ## Get the sample code
 
-The code sample is a .NET console application that uses the [Active Directory Authentication Library (ADAL)](../active-directory/develop/active-directory-authentication-libraries.md) to interact with Azure AD Graph API. Its code demonstrates how to call the API to programmatically manage users in an Azure AD B2C tenant.
+The code sample is a .NET console application that uses the [Active Directory Authentication Library (ADAL)](../active-directory/azuread-dev/active-directory-authentication-libraries.md) to interact with Azure AD Graph API. Its code demonstrates how to call the API to programmatically manage users in an Azure AD B2C tenant.
 
 You can [download the sample archive](https://github.com/AzureADQuickStarts/B2C-GraphAPI-DotNet/archive/master.zip) (\*.zip) or clone the GitHub repository:
 

articles/active-directory-domain-services/TOC.yml

@@ -77,7 +77,7 @@
           href: notifications.md
         - name: Delete a managed domain
           href: delete-aadds.md
-        - name: Migrate from a Classic deployment (preview)
+        - name: Migrate from a Classic deployment
           href: migrate-from-classic-vnet.md
         - name: Change SKU
           href: change-sku.md

articles/active-directory-domain-services/migrate-from-classic-vnet.md

@@ -13,11 +13,11 @@ ms.author: iainfou
 
 ---
 
-# Preview - Migrate Azure AD Domain Services from the Classic virtual network model to Resource Manager
+# Migrate Azure AD Domain Services from the Classic virtual network model to Resource Manager
 
 Azure Active Directory Domain Services (AD DS) supports a one-time move for customers currently using the Classic virtual network model to the Resource Manager virtual network model. Azure AD DS managed domains that use the Resource Manager deployment model provide additional features such as fine-grained password policy, audit logs, and account lockout protection.
 
-This article outlines the benefits and considerations for migration, then the required steps to successfully migrate an existing Azure AD DS instance. This migration feature is currently in preview.
+This article outlines the benefits and considerations for migration, then the required steps to successfully migrate an existing Azure AD DS instance.
 
 ## Overview of the migration process
 

articles/active-directory/app-provisioning/customize-application-attributes.md

@@ -139,7 +139,7 @@ The SCIM RFC defines a core user and group schema, while also allowing for exten
    4. Select **Edit attribute list for AppName**.
    5. At the bottom of the attribute list, enter information about the custom attribute in the fields provided. Then select **Add Attribute**.
 
-For SCIM applications, the attribute name must follow the pattern shown in the example below. The "CustomExtensionName" and "CustomAttribute" can be customized per your application's requirements, for example:  urn:ietf:params:scim:schemas:extension:2.0:CustomExtensionName:CustomAttribute
+For SCIM applications, the attribute name must follow the pattern shown in the example below. The "CustomExtensionName" and "CustomAttribute" can be customized per your application's requirements, for example:  urn:ietf:params:scim:schemas:extension:2.0:CustomExtensionName:CustomAttribute  or  urn:ietf:params:scim:schemas:extension:CustomExtensionName:2.0:User.CustomAttributeName:value
 
 These instructions are only applicable to SCIM-enabled applications. Applications such as ServiceNow and Salesforce are not integrated with Azure AD using SCIM, and therefore they don't require this specific namespace when adding a custom attribute.
 

articles/active-directory/authentication/concept-sspr-writeback.md

@@ -25,7 +25,7 @@ Password writeback is supported in environments that use:
 * [Pass-through authentication](../hybrid/how-to-connect-pta.md)
 
 > [!WARNING]
-> Password writeback will stop working for customers who are using Azure AD Connect versions 1.0.8641.0 and older when the [Azure Access Control service (ACS) is retired on November 7th, 2018](../develop/active-directory-acs-migration.md). Azure AD Connect versions 1.0.8641.0 and older will no longer allow password writeback at that time because they depend on ACS for that functionality.
+> Password writeback will stop working for customers who are using Azure AD Connect versions 1.0.8641.0 and older when the [Azure Access Control service (ACS) is retired on November 7th, 2018](../azuread-dev/active-directory-acs-migration.md). Azure AD Connect versions 1.0.8641.0 and older will no longer allow password writeback at that time because they depend on ACS for that functionality.
 >
 > To avoid a disruption in service, upgrade from a previous version of Azure AD Connect to a newer version, see the article [Azure AD Connect: Upgrade from a previous version to the latest](../hybrid/how-to-upgrade-previous-version.md)
 >