Merge pull request #42125 from MicrosoftDocs/master

5/24 AM Publish

Author: huypub

.openpublishing.redirection.json

@@ -30,6 +30,11 @@
             "redirect_url": "/azure/active-directory/active-directory-saas-zwayam-tutorial",
             "redirect_document_id": true
         },
+        {
+            "source_path": "articles/marketplace-consumer/mytemplates-getstarted.md",
+            "redirect_url": "/azure/azure-resource-manager/resource-manager-create-first-template",
+            "redirect_document_id": true
+        },
         {
             "source_path": "articles/active-directory/develop/active-directory-v2-devquickstarts-univ.md",
             "redirect_url": "https://github.com/Azure-Samples/active-directory-dotnet-native-uwp-v2",
@@ -21865,6 +21870,23 @@
             "redirect_url": "/azure/application-gateway/application-gateway-ilb-arm",
             "redirect_document_id": false
         }
-
+        ,
+	    {
+            "source_path": "articles/active-directory/active-directory-conditional-access-vpn-connectivity-windows10.md",
+            "redirect_url": "https://docs.microsoft.com/en-us/windows-server/remote/remote-access/vpn/always-on-vpn/deploy/always-on-vpn-deploy",
+            "redirect_document_id": true
+        }
+        ,
+        {
+            "source_path": "articles/security/azure-security-architecture-overview.md",
+            "redirect_url": "https://docs.microsoft.com/azure/security",
+            "redirect_document_id": true
+        }
+        ,
+        {
+            "source_path": "articles/security/azure-security-getting-started.md",
+            "redirect_url": "https://docs.microsoft.com/azure/security",
+            "redirect_document_id": true
+        }
     ]
 }

articles/active-directory/TOC.md

@@ -309,7 +309,7 @@
 ##### [Set up device-based conditional access](active-directory-conditional-access-policy-connected-applications.md)
 ##### [Set up app-based conditional access](active-directory-conditional-access-mam.md)
 ##### [Provide terms of use for users and apps](active-directory-tou.md)
-##### [Set up VPN connectivity](active-directory-conditional-access-vpn-connectivity-windows10.md)
+##### [Set up VPN connectivity](https://docs.microsoft.com/windows-server/remote/remote-access/vpn/always-on-vpn/deploy/always-on-vpn-deploy)
 ##### [Set up SharePoint and Exchange Online](active-directory-conditional-access-no-modern-authentication.md)
 ##### [Remediation](active-directory-conditional-access-device-remediation.md)
 #### [Technical reference](active-directory-conditional-access-technical-reference.md)

articles/active-directory/active-directory-auto-acceleration-using-hrd.md

@@ -11,7 +11,7 @@ ms.workload: infrastructure-services
 ms.tgt_pltfrm: na
 ms.devlang: na
 ms.topic: it-pro
-ms.date: 11/09/2017
+ms.date: 05/22/2018
 ms.author: barbkess
 ---