Merging with master

Author: cartacioS

.openpublishing.redirection.json

@@ -25,6 +25,11 @@
       "redirect_url": "/azure/storage/common/storage-use-azcopy-v10",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/virtual-machines/windows/sql/virtual-machines-windows-portal-sql-create-failover-cluster-premium-file-storage.md",
+      "redirect_url": "/azure//virtual-machines/windows/sql/virtual-machines-windows-portal-sql-create-failover-cluster-premium-file-share",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/machine-learning/service/how-to-load-data.md",
       "redirect_url": "/azure/machine-learning/service/how-to-create-register-datasets",
@@ -3821,7 +3826,7 @@
       "redirect_document_id": false
     },
     {
-      "source_path": "articles/billing-mca-setup-account.md",
+      "source_path": "articles/billing/billing-mca-setup-account.md",
       "redirect_url": "/azure/billing/mca-setup-account",
       "redirect_document_id": false
     },
@@ -15810,6 +15815,16 @@
       "redirect_url": "/azure/traffic-manager/traffic-manager-manage-endpoints",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/virtual-machine-scale-sets/virtual-machine-scale-sets-encrypt-disks-cli.md",
+      "redirect_url": "/azure/virtual-machine-scale-sets/disk-encryption-cli",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/virtual-machine-scale-sets/virtual-machine-scale-sets-encrypt-disks-ps.md",
+      "redirect_url": "/azure/virtual-machine-scale-sets/disk-encryption-powershell",
+      "redirect_document_id": true
+    },
     {
       "source_path": "articles/virtual-machine-scale-sets/virtual-machine-scale-sets-advanced-autoscale.md",
       "redirect_url": "/azure/monitoring-and-diagnostics/insights-advanced-autoscale-virtual-machine-scale-sets",
@@ -34614,11 +34629,6 @@
       "redirect_url": "/azure/cognitive-services/video-indexer/video-indexer-output-json-v2",
       "redirect_document_id": true
     },
-    {
-      "source_path": "articles/security/azure-security-disk-encryption.md",
-      "redirect_url": "/azure/security/azure-security-disk-encryption-overview",
-      "redirect_document_id": true
-    },
     {
       "source_path": "articles/active-directory/device-management-hybrid-azuread-joined-devices-setup.md",
       "redirect_url": "/azure/active-directory/devices/hybrid-azuread-join-manual-steps",
@@ -34913,6 +34923,56 @@
       "redirect_url": "/azure/aks/ssh",
       "redirect_document_id": true
     },
+    {
+      "source_path": "articles/security/azure-security-disk-encryption-appendix.md",
+      "redirect_url": "/azure/security/fundamentals/azure-disk-encryption-vms-vmss",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/security/azure-security-disk-encryption-faq.md",
+      "redirect_url": "/azure/security/fundamentals/azure-disk-encryption-vms-vmss",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/security/azure-security-disk-encryption-linux.md",
+      "redirect_url": "/azure/virtual-machines/linux/disk-encryption-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/security/azure-security-disk-encryption-linux-aad.md",
+      "redirect_url": "/azure/virtual-machines/linux/disk-encryption-overview-aad",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/security/azure-security-disk-encryption-overview.md",
+      "redirect_url": "/azure/security/fundamentals/azure-disk-encryption-vms-vmss",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/security/azure-security-disk-encryption-prerequisites.md",
+      "redirect_url": "/azure/security/fundamentals/azure-disk-encryption-vms-vmss",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/security/azure-security-disk-encryption-prerequisites-aad.md",
+      "redirect_url": "/azure/security/fundamentals/azure-disk-encryption-vms-vmss",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/security/azure-security-disk-encryption-tsg.md",
+      "redirect_url": "/azure/security/fundamentals/azure-disk-encryption-vms-vmss",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/security/azure-security-disk-encryption-windows.md",
+      "redirect_url": "/azure/virtual-machines/linux/disk-encryption-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/security/azure-security-disk-encryption-windows-aad.md",
+      "redirect_url": "/azure/virtual-machines/linux/disk-encryption-overview-aad",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/cognitive-services/luis/Home.md",
       "redirect_url": "/azure/cognitive-services/luis/what-is-luis",
@@ -34945,7 +35005,7 @@
     },
     {
       "source_path": "articles/security-center/security-center-disk-encryption.md",
-      "redirect_url": "/azure/security/azure-security-disk-encryption-overview",
+      "redirect_url": "/azure/security-center/security-center-apply-disk-encryption",
       "redirect_document_id": false
     },
     {
@@ -42497,6 +42557,36 @@
       "source_path": "articles/security/fundamentals/global-admin.md",
       "redirect_url": "/azure/active-directory/authentication/multi-factor-authentication",
       "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/aks/istio-install.md",
+      "redirect_url": "/azure/aks/servicemesh-istio-install",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/aks/istio-scenario-routing.md",
+      "redirect_url": "/azure/aks/servicemesh-istio-scenario-routing",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/aks/consul-install.md",
+      "redirect_url": "/azure/aks/servicemesh-consul-install",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/security/fundamentals/iot-overview.md",
+      "redirect_url": "/azure/iot-fundamentals/iot-security-architecture",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/security/fundamentals/service-fabric-overview.md",
+      "redirect_url": "/azure/service-fabric/service-fabric-best-practices-security",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/security/fundamentals/service-fabric-checklist.md",
+      "redirect_url": "/azure/service-fabric/service-fabric-best-practices-security",
+      "redirect_document_id": false
     }
   ]
 }

articles/active-directory-b2c/active-directory-b2c-reference-oidc.md

@@ -9,8 +9,10 @@
 - name: Tutorials
   expanded: true
   items:
-    - name: Create a managed domain
+    - name: Create a basic managed domain
       href: tutorial-create-instance.md
+    - name: Configure the virtual network for apps
+      href: tutorial-configure-networking.md
     - name: Domain-join a Windows Server VM
       href: join-windows-vm.md
     - name: Install management tools
@@ -19,6 +21,8 @@
       href: tutorial-configure-ldaps.md
     - name: Configure password hash sync
       href: tutorial-configure-password-hash-sync.md
+    - name: Create an advanced managed domain
+      href: tutorial-create-instance-advanced.md
 - name: Samples
   items:
     - name: Create a managed domain using Azure PowerShell
@@ -65,6 +69,8 @@
           href: notifications.md
         - name: Delete a managed domain
           href: delete-aadds.md
+        - name: Migrate from a Classic deployment (preview)
+          href: migrate-from-classic-vnet.md
     - name: Secure Azure AD DS
       items:
         - name: Secure your managed domain