Merge branch 'master' of https://github.com/microsoft/azure-docs-pr into dawesl-csp-enable-sub-may17

Author: Dan Wesley

.openpublishing.redirection.json

@@ -8345,6 +8345,11 @@
             "redirect_url": "/azure/networking/networking-overview",
             "redirect_document_id": false
         },
+        {
+            "source_path": "articles/virtual-network/virtual-networks-nsg.md",
+            "redirect_url": "/azure/virtual-network/virtual-network-vnet-plan-design-arm",
+            "redirect_document_id": false
+        },
         {
             "source_path": "articles/virtual-network/ddos-protection-manage-portal.md",
             "redirect_url": "/azure/virtual-network/manage-ddos-protection",
@@ -21306,6 +21311,151 @@
             "redirect_document_id": false
         },
         {
+            "source_path": "articles/iot-suite/iot-suite-arduino-iot-devkit-az3166-devkit-remote-monitoringV2.md",
+            "redirect_url": "/azure/iot-accelerators/iot-accelerators-arduino-iot-devkit-az3166-devkit-remote-monitoringv2",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/iot-suite/iot-suite-remote-monitoring-device-schema.md",
+            "redirect_url": "/azure/iot-accelerators/iot-accelerators-remote-monitoring-device-schema",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/iot-suite/iot-suite-remote-monitoring-explore.md",
+            "redirect_url": "/azure/iot-accelerators/iot-accelerators-remote-monitoring-explore",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/iot-suite/iot-suite-remote-monitoring-maintain.md",
+            "redirect_url": "/azure/iot-accelerators/iot-accelerators-remote-monitoring-maintain",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/iot-suite/iot-suite-remote-monitoring-manage.md",
+            "redirect_url": "/azure/iot-accelerators/iot-accelerators-remote-monitoring-manage",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/iot-suite/iot-suite-remote-monitoring-monitor.md",
+            "redirect_url": "/azure/iot-accelerators/iot-accelerators-remote-monitoring-monitor",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/iot-suite/iot-suite-remote-monitoring-sample-walkthrough.md",
+            "redirect_url": "/azure/iot-accelerators/iot-accelerators-remote-monitoring-sample-walkthrough",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/iot-suite/iot-suite-remote-monitoring-telefonica-sim.md",
+            "redirect_url": "/azure/iot-accelerators/iot-accelerators-remote-monitoring-telefonica-sim",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/iot-suite/iot-suite-remote-monitoring-test.md",
+            "redirect_url": "/azure/iot-accelerators/iot-accelerators-remote-monitoring-test",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/iot-suite/iot-suite-connected-factory-configure.md",
+            "redirect_url": "/azure/iot-accelerators/iot-accelerators-connected-factory-configure",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/iot-suite/iot-suite-connected-factory-customize.md",
+            "redirect_url": "/azure/iot-accelerators/iot-accelerators-connected-factory-customize",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/iot-suite/iot-suite-connected-factory-features.md",
+            "redirect_url": "/azure/iot-accelerators/iot-accelerators-connected-factory-features",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/iot-suite/iot-suite-connected-factory-gateway-deployment.md",
+            "redirect_url": "/azure/iot-accelerators/iot-accelerators-connected-factory-gateway-deployment",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/iot-suite/iot-suite-connected-factory-overview.md",
+            "redirect_url": "/azure/iot-accelerators/iot-accelerators-connected-factory-overview",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/iot-suite/iot-suite-connected-factory-sample-walkthrough.md",
+            "redirect_url": "/azure/iot-accelerators/iot-accelerators-connected-factory-sample-walkthrough",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/iot-suite/iot-suite-connecting-devices-linux.md",
+            "redirect_url": "/azure/iot-accelerators/iot-accelerators-connecting-devices-linux",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/iot-suite/iot-suite-connecting-devices-node.md",
+            "redirect_url": "/azure/iot-accelerators/iot-accelerators-connecting-devices-node",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/iot-suite/iot-suite-connecting-devices.md",
+            "redirect_url": "/azure/iot-accelerators/iot-accelerators-connecting-devices",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/iot-suite/iot-suite-remote-monitoring-device-behavior.md",
+            "redirect_url": "/azure/iot-accelerators/iot-accelerators-remote-monitoring-device-behavior",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/iot-suite/iot-suite-connecting-pi-c.md",
+            "redirect_url": "/azure/iot-accelerators/iot-accelerators-connecting-pi-c",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/iot-suite/iot-suite-connecting-pi-node.md",
+            "redirect_url": "/azure/iot-accelerators/iot-accelerators-connecting-pi-node",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/iot-suite/iot-suite-device-simulation-deploy.md",
+            "redirect_url": "/azure/iot-accelerators/iot-accelerators-device-simulation-deploy",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/iot-suite/iot-suite-device-simulation-explore.md",
+            "redirect_url": "/azure/iot-accelerators/iot-accelerators-device-simulation-explore",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/iot-suite/iot-suite-faq-cf.md",
+            "redirect_url": "/azure/iot-accelerators/iot-accelerators-faq-cf",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/iot-suite/iot-suite-faq-rm-v2.md",
+            "redirect_url": "/azure/iot-accelerators/iot-accelerators-faq-rm-v2",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/iot-suite/iot-suite-faq.md",
+            "redirect_url": "/azure/iot-accelerators/iot-accelerators-faq",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/iot-suite/iot-suite-integrate-data-lake.md",
+            "redirect_url": "/azure/iot-accelerators/iot-accelerators-integrate-data-lake",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/iot-suite/iot-suite-integrate-data-powerbi.md",
+            "redirect_url": "/azure/iot-accelerators/iot-accelerators-integrate-data-powerbi",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/iot-suite/iot-suite-microservices-example.md",
+            "redirect_url": "/azure/iot-accelerators/iot-accelerators-microservices-example",
+            "redirect_document_id": false
+          },
+          {
             "source_path": "articles/active-directory/develop/active-directory-v2-devquickstarts-angular-dotnet.md",
             "redirect_url": "/azure/active-directory/develop/GuidedSetups/active-directory-javascriptspa",
             "redirect_document_id": false
@@ -21475,10 +21625,55 @@
             "redirect_url": "/azure/active-directory/b2b/what-is-b2b",
             "redirect_document_id": true
         },
+        {
+            "source_path": "articles/security/manage-personal-data-azure.md",
+            "redirect_url": "/azure/security",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/security/how-to-discover-classify-personal-data-azure.md",
+            "redirect_url": "/azure/security",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/security/protect-personal-data-azure.md",
+            "redirect_url": "/azure/security",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/security/protect-personal-data-azure-security-center.md",
+            "redirect_url": "/azure/security",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/security/protect-personal-data-network-security.md",
+            "redirect_url": "/azure/security",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/security/protect-personal-data-identity-access-controls.md",
+            "redirect_url": "/azure/security",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/security/protect-personal-data-at-rest.md",
+            "redirect_url": "/azure/security",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/security/protect-personal-data-in-transit-encryption.md",
+            "redirect_url": "/azure/security",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/security/protection-personal-data-azure-reporting-tools.md",
+            "redirect_url": "/azure/security",
+            "redirect_document_id": false
+        },
         {
             "source_path": "articles/cognitive-services/bing-visual-search/upload-images.md",
             "redirect_url": "/azure/cognitive-services/bing-visual-search/quickstarts/csharp",
             "redirect_document_id": false
         }
     ]
-}
+}

articles/active-directory-domain-services/active-directory-ds-admin-guide-configure-secure-ldap-enable-ldaps.md

@@ -102,7 +102,7 @@ The following table illustrates a sample NSG you can configure, to lock down sec
 
 ![Sample NSG to secure LDAPS access over the internet](./media/active-directory-domain-services-admin-guide/secure-ldap-sample-nsg.png)
 
-**More information** - [Network security groups](../virtual-network/virtual-networks-nsg.md).
+**More information** - [Network security groups](../virtual-network/security-overview.md).
 
 <br>
 
@@ -125,5 +125,5 @@ If you still have trouble connecting to the managed domain using secure LDAP, [c
 * [Azure AD Domain Services - Getting Started guide](active-directory-ds-getting-started.md)
 * [Administer an Azure AD Domain Services managed domain](active-directory-ds-admin-guide-administer-domain.md)
 * [Administer Group Policy on an Azure AD Domain Services managed domain](active-directory-ds-admin-guide-administer-group-policy.md)
-* [Network security groups](../virtual-network/virtual-networks-nsg.md)
+* [Network security groups](../virtual-network/security-overview.md)
 * [Create a Network Security Group](../virtual-network/virtual-networks-create-nsg-arm-pportal.md)

articles/active-directory-domain-services/active-directory-ds-networking.md

@@ -93,7 +93,7 @@ AAD Domain Services needs outbound access to various other Azure services in ord
 
 
 ## Network Security Groups
-A [Network Security Group (NSG)](../virtual-network/virtual-networks-nsg.md) contains a list of Access Control List (ACL) rules that allow or deny network traffic to your VM instances in a Virtual Network. NSGs can be associated with either subnets or individual VM instances within that subnet. When an NSG is associated with a subnet, the ACL rules apply to all the VM instances in that subnet. In addition, traffic to an individual VM can be restricted further by associating an NSG directly to that VM.
+A [Network Security Group (NSG)](../virtual-network/security-overview.md) contains a list of Access Control List (ACL) rules that allow or deny network traffic to your VM instances in a Virtual Network. NSGs can be associated with either subnets or individual VM instances within that subnet. When an NSG is associated with a subnet, the ACL rules apply to all the VM instances in that subnet. In addition, traffic to an individual VM can be restricted further by associating an NSG directly to that VM.
 
 ### Sample NSG for virtual networks with Azure AD Domain Services
 The following table illustrates a sample NSG you can configure for a virtual network with an Azure AD Domain Services managed domain. This rule allows inbound traffic over the required ports to ensure your managed domain stays patched, updated and can be monitored by Microsoft. The default 'DenyAll' rule applies to all other inbound traffic from the internet.
@@ -139,5 +139,5 @@ You can connect a Resource Manager-based virtual network to the Azure classic vi
 ## Related Content
 * [Azure virtual network peering](../virtual-network/virtual-network-peering-overview.md)
 * [Configure a VNet-to-VNet connection for the classic deployment model](../vpn-gateway/virtual-networks-configure-vnet-to-vnet-connection.md)
-* [Azure Network Security Groups](../virtual-network/virtual-networks-nsg.md)
+* [Azure Network Security Groups](../virtual-network/security-overview.md)
 * [Create a Network Security Group](../virtual-network/virtual-networks-create-nsg-arm-pportal.md)

articles/active-directory/connect/active-directory-aadconnect-sql-delegation.md

@@ -12,7 +12,7 @@ ms.workload: identity
 ms.tgt_pltfrm: na
 ms.devlang: na
 ms.topic: article
-ms.date: 03/19/2018
+ms.date: 05/18/2018
 ms.author: billmath
 ---
 
@@ -38,7 +38,7 @@ To provision the database out of band and install Azure AD Connect with database
 
 
 1.	Have the SQL Administrator create the ADSync database with a case insensitive collation sequence **(Latin1_General_CI_AS)**.  The database must be named **ADSync**.  The recovery model, compatibility level, and containment type are updated to the correct values when Azure AD Connect is installed.  However the collation sequence must be set correctly by the SQL administrator otherwise Azure AD Connect will block the installation.  To recover the SA must delete and recreate the database.</br>
-![Collation](media/active-directory-aadconnect-sql-delegation/sql1.png)
+![Collation](media/active-directory-aadconnect-sql-delegation/sql4.png)
 2.	Grant the Azure AD Connect administrator and the domain service account the following permissions:
     - SQL Login 
     - **database owner(dbo)** rights.  </br>

articles/active-directory/connect/active-directory-aadconnect.md

@@ -142,7 +142,7 @@ Azure AD Connect provides several features that simplify federating with Azure A
 
 ADFS can be configured to support [multiple domains](active-directory-aadconnect-multiple-domains.md). For example you might have multiple top domains you need to use for federation.
 
-if your ADFS server has not been configured to automatically update certificates from Azure AD or if you use a non-ADFS solution, then you will be notified when you have to [update certificates](active-directory-aadconnect-o365-certs.md).
+If your ADFS server has not been configured to automatically update certificates from Azure AD or if you use a non-ADFS solution, then you will be notified when you have to [update certificates](active-directory-aadconnect-o365-certs.md).
 
 ### Next steps to configure federation features
 |Topic |Link|  

articles/active-directory/connect/media/active-directory-aadconnect-sql-delegation/sql4.png

@@ -25,6 +25,7 @@ The following Azure services support Managed Service Identity.
 | Azure App Service | Preview | September 2017 | [Azure portal](/azure/app-service/app-service-managed-service-identity#using-the-azure-portal)<br>[Azure Resource Manager template](/azure/app-service/app-service-managed-service-identity#using-an-azure-resource-manager-template) | [.NET](/azure/app-service/app-service-managed-service-identity#asal)<br>[REST](/azure/app-service/app-service-managed-service-identity#using-the-rest-protocol) |
 | Azure Functions | Preview | September 2017 | [Azure portal](/azure/app-service/app-service-managed-service-identity#using-the-azure-portal)<br>[Azure Resource Manager template](/azure/app-service/app-service-managed-service-identity#using-an-azure-resource-manager-template) | [.NET](/azure/app-service/app-service-managed-service-identity#asal)<br>[REST](/azure/app-service/app-service-managed-service-identity#using-the-rest-protocol) |
 | Azure Data Factory V2 | Preview | November 2017 | [Azure portal](~/articles/data-factory/data-factory-service-identity.md#generate-service-identity)<br>[PowerShell](~/articles/data-factory/data-factory-service-identity.md#generate-service-identity-using-powershell)<br>[REST](~/articles/data-factory/data-factory-service-identity.md#generate-service-identity-using-rest-api)<br>[SDK](~/articles/data-factory/data-factory-service-identity.md#generate-service-identity-using-sdk) |
+| Azure API Management | Preview | October 2017 | [Azure Resource Manager template](/azure/api-management/api-management-howto-use-managed-service-identity) |
 
 ## Azure services that support Azure AD authentication
 
@@ -34,7 +35,7 @@ The following services support Azure AD authentication, and have been tested wit
 | ------- | ----------- | ------ | ---- | ------------- |
 | Azure Resource Manager | https://management.azure.com/ | Available | September 2017 | [Azure portal](howto-assign-access-portal.md) <br>[PowerShell](howto-assign-access-powershell.md) <br>[Azure CLI](howto-assign-access-CLI.md) |
 | Azure Key Vault | https://vault.azure.net | Available | September 2017 | |
-| Azure Data Lake | https://datalake.azure.net | Available | September 2017 | |
-| Azure SQL | https://database.windows.net | Available | October 2017 | |
+| Azure Data Lake | https://datalake.azure.net/ | Available | September 2017 | |
+| Azure SQL | https://database.windows.net/ | Available | October 2017 | |
 | Azure Event Hubs | https://eventhubs.azure.net | Available | December 2017 | |
-| Azure Service Bus | https://servicebus.azure.net | Available | December 2017 | |
+| Azure Service Bus | https://servicebus.azure.net | Available | December 2017 | |

articles/active-directory/managed-service-identity/services-support-msi.md

@@ -45,13 +45,13 @@
       href: delete-cluster.md
   - name: Configure data volumes
     items:
-    - name: AzureDisk dynamic provisioning
+    - name: Azure Disk - Dynamic
       href: azure-disks-dynamic-pv.md
-    - name: AzureDisk static provisioning
+    - name: Azure Disk - Static
       href: azure-disk-volume.md
-    - name: AzureFile dynamic provisioning
+    - name: Azure Files - Dynamic
       href: azure-files-dynamic-pv.md
-    - name: AzureFile static provisioning
+    - name: Azure Files - Static
       href: azure-files-volume.md
   - name: Configure networking
     items: