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

Author: JasonWHowell

.openpublishing.redirection.json

@@ -165,6 +165,12 @@
             "redirect_url": "/azure/iot-fundamentals/iot-introduction",
             "redirect_document_id": false
         },
+
+        {
+            "source_path": "articles/iot-hub/iot-hub-create-using-cli-nodejs.md",
+            "redirect_url": "/azure/iot-hub/iot-hub-create-using-cli",
+            "redirect_document_id": true
+        },
         {
             "source_path": "articles/cognitive-services/custom-decision-service/custom-decision-service-tutorial-analytics.md",
             "redirect_url": "/azure/cognitive-services/custom-decision-service",
@@ -26466,6 +26472,26 @@
             "redirect_url": "/azure/azure-stack/azure-stack-powershell-download",
             "redirect_document_id": false
         },
+        {
+            "source_path": "articles/azure-stack/azure-stack-extension-host-prepare.md",
+            "redirect_url": "/azure/azure-stack",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/azure-stack/user/azure-stack-metrics-azure-data.md",
+            "redirect_url": "/azure/azure-stack",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/azure-stack/user/azure-stack-metrics-monitor.md",
+            "redirect_url": "/azure/azure-stack",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/azure-stack/user/azure-stack-metrics-supported.md",
+            "redirect_url": "/azure/azure-stack",
+            "redirect_document_id": false
+        },
         {
             "source_path": "articles/active-directory/application-proxy-teams.md",
             "redirect_url": "/azure/active-directory/manage-apps/application-proxy-integrate-with-teams",

articles/active-directory/devices/hybrid-azuread-join-federated-domains.md

@@ -13,8 +13,8 @@ ms.component: devices
 ms.workload: identity
 ms.tgt_pltfrm: na
 ms.devlang: na
-ms.topic: article
-ms.date: 07/31/2018
+ms.topic: tutorial
+ms.date: 08/25/2018
 ms.author: markvi
 ms.reviewer: sandeo
 

articles/active-directory/devices/hybrid-azuread-join-managed-domains.md

@@ -13,8 +13,8 @@ ms.component: devices
 ms.workload: identity
 ms.tgt_pltfrm: na
 ms.devlang: na
-ms.topic: article
-ms.date: 08/08/2018
+ms.topic: tutorial
+ms.date: 08/25/2018
 ms.author: markvi
 ms.reviewer: sandeo
 

articles/active-directory/devices/hybrid-azuread-join-manual-steps.md

@@ -13,25 +13,37 @@ ms.component: devices
 ms.workload: identity
 ms.tgt_pltfrm: na
 ms.devlang: na
-ms.topic: article
-ms.date: 08/08/2018
+ms.topic: tutorial
+ms.date: 08/25/2018
 ms.author: markvi
 ms.reviewer: sandeo
 
+#Customer intent: As a IT admin, I want to setup hybrid Azure AD joined devices so that I can automatically bring AD domain-joined devices under control
 ---
 # Tutorial: Configure hybrid Azure Active Directory joined devices manually 
 
 With device management in Azure Active Directory (Azure AD), you can ensure that your users are accessing your resources from devices that meet your standards for security and compliance. For more details, see the [Introduction to device management in Azure Active Directory](overview.md).
 
-If you have an on-premises Active Directory environment and you want to join your domain-joined devices to Azure AD, you can accomplish this by configuring hybrid Azure AD joined devices. This article provides you with the related steps. 
-
-
 
 > [!TIP]
 > If using Azure AD Connect is an option for you, see [Select your scenario](hybrid-azuread-join-plan.md#select-your-scenario). By using Azure AD Connect, you can simplify the configuration of hybrid Azure AD join significantly.
 
 
 
+If you have an on-premises Active Directory environment and you want to join your domain-joined devices to Azure AD, you can accomplish this by configuring hybrid Azure AD joined devices. In this tutorial, you learn how to manually configure hybrid Azure AD join for your devices.
+
+> [!div class="checklist"]
+> * Prerequisites
+> * Configuration steps
+> * Configure service connection point
+> * Setup issuance of claims
+> * Enable Windows down-level devices
+> * Verify joined devices
+> * Troubleshoot your implementation
+ 
+
+
+
 
 ## Prerequisites
 

articles/api-management/TOC.yml

@@ -101,6 +101,8 @@
       href: api-management-howto-integrate-internal-vnet-appgateway.md
     - name: Mutual Certificate authentication
       href: api-management-howto-mutual-certificates.md
+    - name: Manage CA certificates
+      href: api-management-howto-ca-certificates.md
     - name: Manage protocols and ciphers
       href: api-management-howto-manage-protocols-ciphers.md
   - name: Customize the developer experience

articles/api-management/api-management-howto-ca-certificates.md

@@ -0,0 +1,57 @@
+---
+title: Add a custom CA certificate - Azure API Management | Microsoft Docs
+description: Learn how to add a custom CA certificate in Azure API Management.
+services: api-management
+documentationcenter: ''
+author: mikebudzynski
+manager: cfowler
+editor: ''
+
+ms.service: api-management
+ms.workload: mobile
+ms.tgt_pltfrm: na
+ms.devlang: na
+ms.topic: article
+ms.date: 08/20/2018
+ms.author: apimpm
+---
+
+# How to add a custom CA certificate in Azure API Management
+
+Azure API Management allows installing CA certificates on the machine inside the trusted root and intermediate certificate stores. This functionality should be used if your services require a custom CA certificate.
+
+The article shows how to manage CA certificates of an Azure API Management service instance in the Azure portal.
+
+## <a name="step1"> </a>Upload a CA certificate
+
+![Add CA certificates](media/api-management-howto-ca-certificates/00.png)
+
+Follow the steps below to upload a new CA certificate. If you have not created an API Management service instance yet, see the tutorial [Create an API Management service instance](get-started-create-service-instance.md).
+
+1. Navigate to your Azure API Management service instance in the Azure portal.
+
+2. Select **CA certificates** from the menu.
+
+3. Click the **+ Add** button.  
+
+    ![Add CA certificates](media/api-management-howto-ca-certificates/01.png)  
+
+4. Browse for the certificate and decide on the certificate store. Only the public key is needed, so the password is not required.
+
+    ![Add CA certificates](media/api-management-howto-ca-certificates/02.png)  
+
+5. Click **Save**. This operation may take a few minutes.
+
+    ![Add CA certificates](media/api-management-howto-ca-certificates/03.png)  
+
+> [!NOTE]
+> You can upload a CA certificate using the `New-AzureRmApiManagementSystemCertificate` Powershell command.
+
+## <a name="step1a"> </a>Delete a client certificate
+
+To delete a certificate, click context menu **...** and select **Delete** beside the certificate.
+
+![Delete CA certificates](media/api-management-howto-ca-certificates/04.png)  
+
+[Upload a CA certificate]: #step1
+[Delete a CA certificate]: #step1a

articles/api-management/api-management-howto-mutual-certificates.md

@@ -3,7 +3,7 @@ title: Secure back-end services using client certificate authentication - Azure
 description: Learn how to secure back-end services using client certificate authentication in Azure API Management.
 services: api-management
 documentationcenter: ''
-author: vladvino
+author: mikebudzynski
 manager: cfowler
 editor: ''