Merge pull request #114174 from MicrosoftDocs/master

UHF Header

Author: SyntaxC4

.openpublishing.redirection.json

@@ -28210,6 +28210,16 @@
       "redirect_url": "/azure/storage/blobs/storage-blob-snapshots",
       "redirect_document_id": true
     },
+    {
+      "source_path": "articles/storage/blobs/storage-blob-snapshots.md",
+      "redirect_url": "/azure/storage/blobs/snapshots-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/storage/blobs/storage-blob-soft-delete.md",
+      "redirect_url": "/azure/storage/blobs/soft-delete-overview",
+      "redirect_document_id": true
+    },
     {
       "source_path": "articles/storage/storage-blob-storage-tiers.md",
       "redirect_url": "/azure/storage/blobs/storage-blob-storage-tiers",
@@ -52333,11 +52343,6 @@
       "source_path": "articles/load-balancer/azure-media-player/components-limitations.md",
       "redirect_url": "/articles/load-balancer/concepts",
       "redirect_document_id": false
-    },
-    {
-      "source_path": "articles/virtual-machines/troubleshooting/linux-virtual-machine-cannot-start-fstab-errors.md",
-      "redirect_url": "/articles/virtual-machines/troubleshooting",
-      "redirect_document_id": false
     }
 
  ]

articles/active-directory/develop/msal-authentication-flows.md

@@ -229,4 +229,4 @@ Apart from the [Integrated Windows Authentication constraints](#integrated-windo
 
 ### Azure AD B2C specifics
 
-For more information on using MSAL.NET and Azure AD B2C, see [Using ROPC with Azure AD B2C (MSAL.NET)](msal-net-aad-b2c-considerations.md#resource-owner-password-credentials-ropc-with-azure-ad-b2c).
+For more information on using ROPC in MSAL.NET and Azure AD B2C, see [Using ROPC with Azure AD B2C](msal-net-aad-b2c-considerations.md#resource-owner-password-credentials-ropc).

articles/active-directory/develop/msal-net-aad-b2c-considerations.md

@@ -119,28 +119,28 @@ Following is a minimal example of a configuration file that enables collection o
     "PublicConfig": {
         "WadCfg": {
             "DiagnosticMonitorConfiguration": {
-                "overallQuotaInMB": 10000
-            },
-            "DiagnosticInfrastructureLogs": {
-                "scheduledTransferLogLevelFilter": "Error"
-            },
-            "PerformanceCounters": {
-                "scheduledTransferPeriod": "PT1M",
-                "PerformanceCounterConfiguration": [
-                    {
-                        "counterSpecifier": "\\Processor(_Total)\\% Processor Time",
-                        "sampleRate": "PT3M",
-                        "unit": "percent"
-                    }
-                ]
-            },
-            "WindowsEventLog": {
-                "scheduledTransferPeriod": "PT1M",
-                    "DataSource": [
-                    {
-                        "name": "Application!*[System[(Level=1 or Level=2 or Level=3)]]"
-                    }
-                ]
+                "overallQuotaInMB": 10000,
+                "DiagnosticInfrastructureLogs": {
+                    "scheduledTransferLogLevelFilter": "Error"
+                },
+                "PerformanceCounters": {
+                    "scheduledTransferPeriod": "PT1M",
+                    "PerformanceCounterConfiguration": [
+                        {
+                            "counterSpecifier": "\\Processor(_Total)\\% Processor Time",
+                            "sampleRate": "PT3M",
+                            "unit": "percent"
+                        }
+                    ]
+                },
+                "WindowsEventLog": {
+                    "scheduledTransferPeriod": "PT1M",
+                        "DataSource": [
+                        {
+                            "name": "Application!*[System[(Level=1 or Level=2 or Level=3)]]"
+                        }
+                    ]
+                }
             }
         },
         "StorageAccount": "mystorageaccount",

articles/azure-monitor/platform/diagnostics-extension-windows-install.md

@@ -4,6 +4,8 @@
   items:
   - name: What is Azure Load Balancer?
     href: load-balancer-overview.md
+  - name: Frequently asked questions
+    href: load-balancer-faqs.md
 - name: Quickstart
   items:
   - name: Create Load Balancer - Portal

articles/load-balancer/TOC.yml

@@ -106,3 +106,7 @@ landingContent:
             url: https://docs.microsoft.com/powershell/module/az.network/?view=azps-2.5.0#load_balancer
           - text: Azure CLI
             url: https://docs.microsoft.com/cli/azure/network/lb?view=azure-cli-latest
+          - text: ARM templates
+            url: https://docs.microsoft.com/azure/templates/microsoft.network/loadbalancers#quickstart-templates
+          - text: Frequently asked Load Balancer questions
+            url: load-balancer-faqs.md

articles/load-balancer/index.yml

@@ -0,0 +1,31 @@
+---
+title: Frequently asked questions - Azure Load Balancer
+description: Answers to frequently asked questions about the Azure Load Balancer. 
+services: load-balancer
+author: erichrt
+ms.service: load-balancer
+ms.topic: article
+ms.date: 04/22/2020
+ms.author: errobin
+---
+# Frequently asked questions
+
+## What types of Load Balancer exist?
+Internal load balancers which balance traffic within a VNET and external load balancers which balance traffic to and from an internet connected endpoint. For more information, see [Load Balancer Types] (https://docs.microsoft.com/azure/load-balancer/concepts-limitations#load-balancer-types). 
+
+For both these types, Azure offers a Basic SKU and Standard SKU that have different functional, performance, security and health tracking capabilities. These differences are explained in our [SKU Comparison] (https://docs.microsoft.com/azure/load-balancer/concepts-limitations#skus) article.
+
+ ## How can I upgrade from a Basic to a Standard Load Balancer?
+See the [upgrade from Basic to Standard](upgrade-basic-standard.md) article for an automated script and guidance on upgrading a Load Balancer SKU.
+
+ ## What are the different load-balancing options in Azure?
+See the [load balancer technology guide](https://docs.microsoft.com/azure/architecture/guide/technology-choices/load-balancing-overview)  for the available load-balancing services and recommended uses for each.
+
+## Where can I find Load Balancer ARM templates?
+See the [list of Azure Load Balancer quickstart templates](https://docs.microsoft.com/azure/templates/microsoft.network/loadbalancers#quickstart-templates) for ARM templates of common deployments.
+
+## How are inbound NAT rules different from load-balancing rules?
+NAT rules are used to specify a backend resource to route traffic to. For example, configuring a specific load balancer port to send RDP traffic to a specific VM. Load-balancing rules are used to specify a pool of backend resources to route traffic to, balancing the load across each instance. For example, a load balancer rule can route TCP packets on port 80 of the load balancer across a pool of web servers.
+
+## Next Steps
+If your question is not listed above, please send feedback about this page with your question. This will create a GitHub issue for the product team to ensure all of our valued customer questions are answered.

articles/load-balancer/load-balancer-faqs.md

@@ -147,6 +147,16 @@
         href: ../common/storage-private-endpoints.md?toc=%2fazure%2fstorage%2fblobs%2ftoc.json
     - name: Data redundancy
       href: ../common/storage-redundancy.md?toc=%2fazure%2fstorage%2fblobs%2ftoc.json
+    - name: Data protection
+      items:
+      - name: Versioning
+        href: versioning-overview.md
+      - name: Soft delete
+        href: soft-delete-overview.md
+      - name: Snapshots
+        href: snapshots-overview.md  
+      - name: Change feed
+        href: storage-blob-change-feed.md
     - name: Access and performance tiers
       items:
       - name: Access tiers
@@ -243,8 +253,6 @@
           href: ../common/storage-monitoring-diagnosing-troubleshooting.md?toc=%2fazure%2fstorage%2fblobs%2ftoc.json
     - name: Event handling
       href: storage-blob-event-overview.md
-    - name: Change feed
-      href: storage-blob-change-feed.md
     - name: Page blob features
       href: storage-blob-pageblob-overview.md
     - name: Static websites
@@ -278,8 +286,6 @@
         href: storage-blob-properties-metadata.md
       - name: Copy a blob (.NET)
         href: storage-blob-copy.md
-      - name: Create and manage blob snapshots (.NET)
-        href: storage-blob-snapshots.md
     - name: Secure blob data
       items:
       - name: Authorize access to blob data
@@ -372,14 +378,22 @@
         href: ../common/redundancy-migration.md?toc=%2fazure%2fstorage%2fblobs%2ftoc.json
       - name: Design highly available applications
         href: ../common/geo-redundant-design.md?toc=%2fazure%2fstorage%2fblobs%2ftoc.json
+    - name: Protect your data
+      items:
+      - name: Enable blob versioning
+        href: versioning-enable.md
+      - name: Enable soft delete
+        href: soft-delete-enable.md
+      - name: Create snapshots (.NET)
+        href: snapshots-manage-dotnet.md
+      - name: Process change feed logs
+        href: storage-blob-change-feed-how-to.md
     - name: Manage disaster recovery
       items:
       - name: Check the Last Sync Time property
         href: ../common/last-sync-time-get.md?toc=%2fazure%2fstorage%2fblobs%2ftoc.json
       - name: Initiate account failover
         href: ../common/storage-initiate-account-failover.md?toc=%2fazure%2fstorage%2fblobs%2ftoc.json
-      - name: Recover deleted blobs
-        href: storage-blob-soft-delete.md
     - name: Use a storage emulator
       items:
       - name: Use the Azurite open-source emulator
@@ -398,8 +412,6 @@
       href: storage-blob-event-quickstart.md
     - name: Utilize Blob Index
       href: storage-blob-index-how-to.md
-    - name: Process change feed logs
-      href: storage-blob-change-feed-how-to.md
     - name: Transfer data
       items:
       - name: AzCopy