Merge branch 'master' into dech-sdk-retirement

Author: deborahc

.openpublishing.publish.config.json

@@ -90,6 +90,12 @@
       "url": "https://github.com/Azure/azure-docs-json-samples",
       "branch": "master"
     },
+    {
+      "path_to_root": "samples-key-vault-dotnet-quickstart",
+      "url": "https://github.com/Azure-Samples/key-vault-dotnet-core-quickstart",
+      "branch": "master",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "samples-mediaservices-integration",
       "url": "https://github.com/Azure-Samples/media-services-dotnet-functions-integration",

.openpublishing.redirection.json

@@ -725,6 +725,21 @@
       "redirect_url": "/azure/machine-learning/service",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/cognitive-services/QnAMaker/How-To/key-management.md",
+      "redirect_url": "/azure/cognitive-services/QnAMaker/How-To/set-up-qnamaker-service-azure#types-of-keys-in-qna-maker",
+      "redirect_document_id": false
+    },  
+    {
+      "source_path": "articles/cognitive-services/QnAMaker/How-To/troubleshooting-runtime.md",
+      "redirect_url": "/azure/cognitive-services/QnAMaker/troubleshooting",
+      "redirect_document_id": false
+    },   
+    {
+      "source_path": "articles/cognitive-services/QnAMaker/How-To/upgrade-qnamaker-service.md",
+      "redirect_url": "/azure/cognitive-services/QnAMaker/How-To/set-up-qnamaker-service-azure#upgrade-qna-maker-sku",
+      "redirect_document_id": false
+    },         
     {
       "source_path": "articles/cognitive-services/Labs/Conversation-Learner/tutorials/demo-vr-app-launcher.md",
       "redirect_url": "/azure/cognitive-services/Labs/Conversation-Learner/overview",
@@ -1115,6 +1130,11 @@
       "redirect_url": "/azure/cognitive-services/bing-web-search/resize-and-crop-thumbnails",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/cognitive-services/bing-video-search/resize-and-crop-thumbnails.md",
+      "redirect_url": "/azure/cognitive-services/bing-web-search/resize-and-crop-thumbnails",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/cognitive-services/bing-image-search/bing-image-stats.md",
       "redirect_url": "/azure/cognitive-services/bing-web-search/bing-web-stats",
@@ -4870,6 +4890,11 @@
       "redirect_url": "/azure/logic-apps/logic-apps-enterprise-integration-as2",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/logic-apps/logic-apps-using-sap-connector-old.md",
+      "redirect_url": "/azure/logic-apps/logic-apps-using-sap-connector",
+      "redirect_document_id": true
+    },
     {
       "source_path": "articles/logic-apps/custom-connector-build-web-api-app-tutorial.md",
       "redirect_url": "https://docs.microsoft.com/connectors/custom-connectors/create-web-api-connector",
@@ -7200,6 +7225,11 @@
       "redirect_url": "/azure/active-directory/saas-apps/airwatch-tutorial",
       "redirect_document_id": true
     },
+    {
+      "source_path": "articles/active-directory/paloaltoglobalprotect-tutorial.md",
+      "redirect_url": "/azure/active-directory/saas-apps/palo-alto-networks-globalprotect-tutorial",
+      "redirect_document_id": true
+    },
     {
       "source_path": "articles/active-directory/active-directory-saas-alcumus-info-tutorial.md",
       "redirect_url": "/azure/active-directory/saas-apps/alcumus-info-tutorial",
@@ -8735,11 +8765,6 @@
       "redirect_url": "/azure/active-directory/saas-apps/paloaltoadmin-tutorial",
       "redirect_document_id": true
     },
-    {
-      "source_path": "articles/active-directory/active-directory-saas-paloaltoglobalprotect-tutorial.md",
-      "redirect_url": "/azure/active-directory/saas-apps/paloaltoglobalprotect-tutorial",
-      "redirect_document_id": true
-    },
     {
       "source_path": "articles/active-directory/active-directory-saas-paloaltonetworks-aperture-tutorial.md",
       "redirect_url": "/azure/active-directory/saas-apps/paloaltonetworks-aperture-tutorial",
@@ -8750,6 +8775,11 @@
       "redirect_url": "/azure/active-directory/saas-apps/paloaltonetworks-captiveportal-tutorial",
       "redirect_document_id": true
     },
+    {
+      "source_path": "articles/active-directory/saas-apps/thefundingportal-tutorial.md",
+      "redirect_url": "/azure/active-directory/saas-apps/the-funding-portal-tutorial",
+      "redirect_document_id": true
+    },
     {
       "source_path": "articles/active-directory/active-directory-saas-panopto-tutorial.md",
       "redirect_url": "/azure/active-directory/saas-apps/panopto-tutorial",
@@ -26034,6 +26064,16 @@
       "redirect_url": "/azure/security-center/security-center-alerts-overview",
       "redirect_document_id": false
     },  
+    {
+      "source_path": "articles/security-center/security-center-enable-network-security-groups.md",
+      "redirect_url": "/azure/security-center/security-center-network-recommendations",
+      "redirect_document_id": false
+    },  
+    {
+      "source_path": "articles/security-center/security-center-events-dashboard.md",
+      "redirect_url": "/azure/security-center/security-center-features-retirement-july2019#events-dashboard---the-new-experience",
+      "redirect_document_id": false
+    },  
     {
       "source_path": "articles/virtual-network/virtual-network-deploy-multinic-arm-cli.md",
       "redirect_url": "/azure/virtual-machines/linux/multiple-nics",
@@ -31564,6 +31604,11 @@
       "redirect_url": "/azure/hdinsight/storm/apache-storm-overview",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/storage/blobs/storage-unstructured-search.md",
+      "redirect_url": "/azure/search/search-howto-indexing-azure-blob-storage",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/storage/data-lake-storage/index.md",
       "redirect_url": "/azure/storage/blobs/data-lake-storage-introduction",
@@ -38883,6 +38928,16 @@
       "redirect_url": "https://github.com/Microsoft/Cognitive-Vision-Python",
       "redirect_document_id": false
     },
+	{
+      "source_path": "articles/cognitive-services/Computer-vision/Tutorials/java-tutorial.md",
+      "redirect_url": "https://github.com/Azure-Samples/cognitive-services-java-computer-vision-tutorial",
+      "redirect_document_id": false
+    },
+	{
+		"source_path": "articles/cognitive-services/Computer-vision/Tutorials/javascript-tutorial.md",
+		"redirect_url": "https://github.com/Azure-Samples/cognitive-services-javascript-computer-vision-tutorial",
+		"redirect_document_id": false
+	  },
     {
       "source_path": "articles/media-services/previous/media-services-hyperlapse-content.md",
       "redirect_url": "/azure/media-services/previous/media-services-analytics-overview",

articles/active-directory-b2c/TOC.yml

@@ -309,7 +309,7 @@
       href: b2clogin.md
     - name: Migrate web API to b2clogin.com
       href: multiple-token-endpoints.md
-      displayName: migrate, b2clogin, owin, jwt
+      displayName: migrate, b2clogin, owin
   - name: Automation
     items:
     - name: Export usage report
@@ -318,6 +318,9 @@
       href: active-directory-b2c-devquickstarts-graph-dotnet.md
   - name: Audit logs
     href: active-directory-b2c-reference-audit-logs.md
+  - name: Secure API Management API
+    href: secure-api-management.md
+    displayName: apim, api management, migrate, b2clogin.com
   - name: Compliance
     items:
     - name: User access

articles/active-directory-b2c/active-directory-b2c-faqs.md

@@ -8,7 +8,7 @@ manager: celestedg
 ms.service: active-directory
 ms.workload: identity
 ms.topic: conceptual
-ms.date: 08/08/2019
+ms.date: 08/31/2019
 ms.author: marsma
 ms.subservice: B2C
 ---
@@ -139,7 +139,7 @@ Follow these steps to delete your Azure AD B2C tenant:
 1. Select **View all applications**
 1. Select the application named **b2c-extensions-app**, select **Delete**, and then select **Yes** when prompted.
 1. Under **Manage**, select **User settings**.
-1. Under **LinkedIn account connections**, select **No**, then select **Save**.
+1. If present, under **LinkedIn account connections**, select **No**, then select **Save**.
 1. Under **Manage**, select **Properties**
 1. Under **Access management for Azure resources**, select **Yes**, and then select **Save**.
 1. Sign out of the Azure portal and then sign back in to refresh your access.

articles/active-directory-b2c/active-directory-b2c-reference-kmsi-custom.md

@@ -1,5 +1,5 @@
 ---
-title: Keep Me Signed In in Azure Active Directory B2C | Microsoft Docs
+title: Keep Me Signed In in Azure Active Directory B2C
 description: Learn how to set up Keep Me Signed In (KMSI) in Azure Active Directory B2C.
 services: active-directory-b2c
 author: mmacy
@@ -8,7 +8,7 @@ manager: celestedg
 ms.service: active-directory
 ms.workload: identity
 ms.topic: conceptual
-ms.date: 12/03/2018
+ms.date: 08/29/2019
 ms.author: marsma
 ms.subservice: B2C
 ---
@@ -17,15 +17,17 @@ ms.subservice: B2C
 
 [!INCLUDE [active-directory-b2c-advanced-audience-warning](../../includes/active-directory-b2c-advanced-audience-warning.md)]
 
-You can enable Keep Me Signed In (KMSI) functionality for your web and native applications in Azure Active Directory (Azure AD) B2C. This feature grants access to returning users to the application without prompting them to reenter their username and password. This access is revoked when a user signs out.
+You can enable Keep Me Signed In (KMSI) functionality for users of your web and native applications that have local accounts in your Azure Active Directory B2C (Azure AD B2C) directory. This feature grants access to users returning to your application without prompting them to reenter their username and password. This access is revoked when a user signs out.
 
 Users should not enable this option on public computers.
 
 ![Example sign-up sign-in page showing a Keep me signed in checkbox](./media/active-directory-b2c-reference-kmsi-custom/kmsi.PNG)
 
 ## Prerequisites
 
-An Azure AD B2C tenant that is configured to allow local account sign-up and sign-in. If you don't have a tenant, you can create one using the steps in [Tutorial: Create an Azure Active Directory B2C tenant](tutorial-create-tenant.md).
+An Azure AD B2C tenant that is configured to allow local account sign-in. KMSI is unsupported for external identity provider accounts.
+
+If you don't have a tenant, you can create one using the steps in [Tutorial: Create an Azure Active Directory B2C tenant](tutorial-create-tenant.md).
 
 ## Add a content definition element
 
@@ -83,7 +85,7 @@ Add the application identifiers to the *TrustFrameworkExtensions.xml* file.
 
 1. In the *TrustFrameworkExtensions.xml* file, find the **TechnicalProfile** element with the identifier of `login-NonInteractive` and the **TechnicalProfile** element with an identifier of `login-NonInteractive-PasswordChange` and replace all values of `IdentityExperienceFrameworkAppId` with the application identifier of the Identity Experience Framework application as described in [Getting started](active-directory-b2c-get-started-custom.md).
 
-    ```
+    ```XML
     <Item Key="client_id">8322dedc-cbf4-43bc-8bb6-141d16f0f489</Item>
     ```
 
@@ -179,11 +181,3 @@ Update the relying party (RP) file that initiates the user journey that you crea
 5. To test the custom policy that you uploaded, in the Azure portal, go to the policy page, and then select **Run now**.
 
 You can find the sample policy [here](https://github.com/Azure-Samples/active-directory-b2c-custom-policy-starterpack/tree/master/scenarios/keep%20me%20signed%20in).
-
-
-
-
-
-
-
-

articles/active-directory-b2c/active-directory-b2c-ui-customization-custom.md

@@ -60,17 +60,16 @@ To host this HTML content in Blob storage, do the following:
 
 1. Sign in to the [Azure portal](https://portal.azure.com).
 2. On the **Hub** menu, select **New** > **Storage** > **Storage account**.
-3. Enter a unique **Name** for your storage account.
-4. **Deployment model** can remain **Resource Manager**.
-5. Change **Account Kind** to **Blob storage**.
-6. **Performance** can remain **Standard**.
-7. **Replication** can remain **RA-GRS**.
-8. **Access tier** can remain **Hot**.
-9. **Storage service encryption** can remain **Disabled**.
-10. Select a **Subscription** for your storage account.
-11. Create a **Resource group** or select an existing one.
-12. Select the **Geographic location** for your storage account.
-13. Click **Create** to create the storage account.  
+3. Select a **Subscription** for your storage account.
+4. Create a **Resource group** or select an existing one.
+5. Enter a unique **Name** for your storage account.
+6. Select the **Geographic location** for your storage account. 
+7. **Deployment model** can remain **Resource Manager**.
+8. **Performance** can remain **Standard**.
+9. Change **Account Kind** to **Blob storage**.
+10. **Replication** can remain **RA-GRS**.
+11. **Access tier** can remain **Hot**. 
+12. Click **Review + create** to create the storage account.  
     After the deployment is completed, the **Storage account** blade opens automatically.
 
 ## Create a container

articles/active-directory-b2c/active-directory-b2c-user-migration.md

@@ -8,7 +8,7 @@ manager: celestedg
 ms.service: active-directory
 ms.workload: identity
 ms.topic: conceptual
-ms.date: 07/31/2019
+ms.date: 08/31/2019
 ms.author: marsma
 ms.subservice: B2C
 ---
@@ -135,7 +135,9 @@ Change the `$AppId` value with your Azure AD **Application ID**.
 
 ## Step 2: Pre-migration application sample
 
-[Download and run the sample code][UserMigrationSample]. You can download it as a .zip file.
+You can find the pre-migration code sample in the community-maintained `azure-ad-b2c/user-migration` GitHub repository:
+
+[azure-ad-b2c/user-migration/pre-migration][UserMigrationSample-code] (GitHub)
 
 ### Step 2.1: Edit the migration data file
 
@@ -360,7 +362,7 @@ You can view and monitor logging information in near-real time.
 
 ## (Optional) Download the complete policy files
 
-After you complete the [Get started with custom policies][B2C-GetStartedCustom] walk-through, we recommend that you build your scenario by using your own custom policy files. For your reference, we have provided [sample policy files][UserMigrationSample].
+After you complete the [Get started with custom policies][B2C-GetStartedCustom] walk-through, we recommend that you build your scenario by using your own custom policy files. For your reference, we have provided [sample policy files][UserMigrationSample-policy].
 
 [AD-PasswordPolicies]: https://docs.microsoft.com/azure/active-directory/active-directory-passwords-policy
 [AD-Powershell]: https://docs.microsoft.com/powershell/azure/active-directory/install-adv2
@@ -371,4 +373,5 @@ After you complete the [Get started with custom policies][B2C-GetStartedCustom]
 [B2C-GraphQuickStart]: https://docs.microsoft.com/azure/active-directory-b2c/active-directory-b2c-devquickstarts-graph-dotnet
 [B2C-NavContext]: https://docs.microsoft.com/azure/active-directory-b2c/active-directory-b2c-navigate-to-b2c-context
 [Portal]: https://portal.azure.com/
-[UserMigrationSample]: https://github.com/azure-ad-b2c/user-migration
+[UserMigrationSample-code]: https://github.com/azure-ad-b2c/user-migration/tree/master/pre-migration/source-code
+[UserMigrationSample-policy]: https://github.com/azure-ad-b2c/user-migration/tree/master/pre-migration/policy