Merge pull request #91599 from MicrosoftDocs/master

Merge master to live 4:00 PM

Author: ktoliver

.openpublishing.redirection.json

@@ -24581,6 +24581,11 @@
       "redirect_url": "/azure/storage/common/storage-performance-checklist",
       "redirect_document_id": true
     },
+    {
+      "source_path": "articles/storage/common/storage-performance-checklist.md",
+      "redirect_url": "/azure/storage/blobs/storage-performance-checklist",
+      "redirect_document_id": true
+    },
     {
       "source_path": "articles/storage/storage-php-how-to-use-blobs.md",
       "redirect_url": "/azure/storage/blobs/storage-php-how-to-use-blobs",

articles/active-directory-b2c/active-directory-b2c-faqs.md

@@ -23,7 +23,7 @@ There are two common reasons for why the Azure AD extension is not working for y
 
 ### Can I use Azure AD B2C features in my existing, employee-based Azure AD tenant?
 
-Azure AD and Azure AD B2C are separate product offerings and cannot coexist in the same tenant. An Azure AD tenant represents an organization. An Azure AD B2C tenant represents a collection of identities to be used with relying party applications. With custom policies (in public preview), Azure AD B2C can federate to Azure AD allowing authentication of employees in an organization.
+Azure AD and Azure AD B2C are separate product offerings and cannot coexist in the same tenant. An Azure AD tenant represents an organization. An Azure AD B2C tenant represents a collection of identities to be used with relying party applications. With custom policies, Azure AD B2C can federate to Azure AD allowing authentication of employees in an organization.
 
 ### Can I use Azure AD B2C to provide social login (Facebook and Google+) into Office 365?
 
@@ -118,7 +118,7 @@ No, Azure AD B2C does not support the same set of reports as Azure AD Premium. H
 
 ### Can I localize the UI of pages served by Azure AD B2C? What languages are supported?
 
-Yes!  Read about [language customization](active-directory-b2c-reference-language-customization.md), which is in public preview. We provide translations for 36 languages, and you can override any string to suit your needs.
+Yes, see [language customization](active-directory-b2c-reference-language-customization.md). We provide translations for 36 languages, and you can override any string to suit your needs.
 
 ### Can I use my own URLs on my sign-up and sign-in pages that are served by Azure AD B2C? For instance, can I change the URL from contoso.b2clogin.com to login.contoso.com?
 

articles/azure-netapp-files/azure-netapp-files-create-volumes.md

@@ -28,12 +28,12 @@ A subnet must be delegated to Azure NetApp Files.
 
 ## Considerations 
 
-* Deciding which NFS version to use  
-  NFSv3 can handle a wide variety of use cases and is commonly deployed in most enterprise applications. You should validate what version (NFSv3 or NFSv4.1) your application requires and create your volume using the appropriate version. For example, if you use [Apache ActiveMQ](https://activemq.apache.org/shared-file-system-master-slave), file locking with NFSv4.1 is recommended over NFSv3. 
-
 > [!IMPORTANT] 
 > Access to the NFSv4.1 feature requires whitelisting.  To request whitelisting, submit a request to <[email protected]>. 
 
+* Deciding which NFS version to use  
+  NFSv3 can handle a wide variety of use cases and is commonly deployed in most enterprise applications. You should validate what version (NFSv3 or NFSv4.1) your application requires and create your volume using the appropriate version. For example, if you use [Apache ActiveMQ](https://activemq.apache.org/shared-file-system-master-slave), file locking with NFSv4.1 is recommended over NFSv3. 
+
 * Security  
   Support for UNIX mode bits (read, write, and execute) is available for NFSv3 and NFSv4.1. Root-level access is required on the NFS client to mount NFS volumes.
 

articles/azure-netapp-files/azure-netapp-files-mount-unmount-volumes-for-virtual-machines.md

@@ -26,3 +26,6 @@ You can mount or unmount a volume for Windows or Linux virtual machines as neces
     ![Mount instructions NFS](../media/azure-netapp-files/azure-netapp-files-mount-instructions-nfs.png)
 
     ![Mount instructions SMB](../media/azure-netapp-files/azure-netapp-files-mount-instructions-smb.png)
+    
+If you are using NFSv4.1, use the following command to mount your file system: 
+`sudo mount -t nfs -o rw,hard,rsize=65536,wsize=65536,vers=4.1,tcp,sec=sys $MOUNTTARGETIPADDRESS:/$VOLUMENAME $MOUNTPOINT`

articles/azure-netapp-files/azure-netapp-files-quickstart-set-up-account-create-volumes.md

@@ -251,10 +251,12 @@ This how-to article requires the Azure PowerShell module Az version 2.6.0 or lat
     * Select **NFS** as the protocol type for the volume.  
     * Enter **myfilepath1** as the file path that will be used to create the export path for the volume.  
     * Select the NFS version (**NFSv3** or **NFSv4.1**) for the volume.  
+      See [considerations](azure-netapp-files-create-volumes.md#considerations) and [best practice](azure-netapp-files-create-volumes.md#best-practice) about NFS versions. 
+      
 > [!IMPORTANT] 
 > Access to the NFSv4.1 feature requires whitelisting.  To request whitelisting, submit a request to <[email protected]>. 
 
-    ![Specify NFS protocol for quickstart](../media/azure-netapp-files/azure-netapp-files-quickstart-protocol-nfs.png)
+  ![Specify NFS protocol for quickstart](../media/azure-netapp-files/azure-netapp-files-quickstart-protocol-nfs.png)
 
 5. Click **Review + create**.
 

articles/batch/batch-task-output-file-conventions.md

@@ -59,12 +59,12 @@ To persist output data to Azure Storage using the File Conventions library, you
 
 ## Persist output data
 
-To persist job and task output data with the File Conventions library, create a container in Azure Storage, then save the output to the container. Use the [Azure Storage client library for .NET](https://www.nuget.org/packages/WindowsAzure.Storage) in your task code to upload the task output to the container. 
+To persist job and task output data with the File Conventions library, create a container in Azure Storage, then save the output to the container. Use the [Azure Storage client library for .NET](https://www.nuget.org/packages/WindowsAzure.Storage) in your task code to upload the task output to the container.
 
 For more information about working with containers and blobs in Azure Storage, see [Get started with Azure Blob storage using .NET](../storage/blobs/storage-dotnet-how-to-use-blobs.md).
 
 > [!WARNING]
-> All job and task outputs persisted with the File Conventions library are stored in the same container. If a large number of tasks try to persist files at the same time, [storage throttling limits](../storage/common/storage-performance-checklist.md#blobs) may be enforced.
+> All job and task outputs persisted with the File Conventions library are stored in the same container. If a large number of tasks try to persist files at the same time, Azure Storage throttling limits may be enforced. For more information about throttling limits, see [Performance and scalability checklist for Blob storage](../storage/blobs/storage-performance-checklist.md).
 
 ### Create storage container
 

articles/frontdoor/waf-faq.md

@@ -26,7 +26,7 @@ An Azure WAF policy can be applied to web applications hosted on Application Gat
 
 ## What is WAF for Azure Front Door Service? 
 
-Azure Front Door is a highly scalable, globally distributed application and content delivery network. Azure WAF, when integrated with Front Door, stops denial-of-service and targeted application attacks at the Azure network edge, close to attack sources before they enter your virtual network, offers protection without sacrificing performance.
+Azure Front Door is a highly scalable, globally distributed application and content delivery network. When Azure WAF is integrated with Azure Front Door, denial-of-service and targeted application attacks are stopped at the edge of the Azure  network. This protection occurs close to the source of the attacks before they have a chance to enter your vitrual network. WAF for Azure Front Door service offers protection without sacrificing performance.
 
 ## Does Azure WAF support HTTPS?
 

articles/governance/policy/tutorials/create-and-manage.md

@@ -462,7 +462,7 @@ overview](../overview.md).
 
 1. Select **Compliance** in the left side of the Azure Policy page.
 
-1. Locate the **Get Source** initiative. It's likely still in _Compliance state_ of **Not started**.
+1. Locate the **Get Secure** initiative. It's likely still in _Compliance state_ of **Not started**.
    Click on the initiative to get full details on the progress of the assignment.
 
    ![Initiative compliance page - evaluations not started](../media/create-and-manage/compliance-status-not-started.png)

articles/lab-services/devtest-lab-add-tag.md

@@ -13,7 +13,7 @@ ms.workload: na
 ms.tgt_pltfrm: na
 ms.devlang: na
 ms.topic: article
-ms.date: 04/17/2018
+ms.date: 10/13/2019
 ms.author: spelluru
 
 ---
@@ -48,6 +48,9 @@ Every tag is made up of a **name**/**value** pair. For example, you might create
 
     ![Manage tags](./media/devtest-lab-add-tag/devtestlab-manage-tags.png)
 
+> [!NOTE]
+> Tags created at the lab level flow through all billable resources that the lab spins up in your subscription. For example, lab level tags flow to the underlying compute VMs of lab VMs.You can use tags in the context of cost management. Lab level tags show up in the tag filter for the cost management.
+
 ## Understanding limitations to tags
 
 The following limitations apply to tags:
@@ -62,4 +65,4 @@ The following limitations apply to tags:
 
 ## Next steps
 * You can apply restrictions and conventions across your subscription by using customized policies. A policy that you define might require that all resources have a value for a particular tag. For more information, see [Set policies and schedules](devtest-lab-set-lab-policy.md).
-* Explore the [DevTest Labs Azure Resource Manager QuickStart template gallery](https://github.com/Azure/azure-devtestlab/tree/master/samples/DevTestLabs/QuickStartTemplates).
+* Explore the [DevTest Labs Azure Resource Manager quickstart template gallery](https://github.com/Azure/azure-devtestlab/tree/master/samples/DevTestLabs/QuickStartTemplates).

articles/lighthouse/how-to/view-manage-customers.md

@@ -32,7 +32,7 @@ You can view the following info from this page:
 
 - To see all of the subscriptions, offers, and delegations associated with a customer, select the customer's name.
 - To see more details about an offer and its delegations, select the offer name.
-- To view more details about acrolecess assignments for delegated subscriptions or resource groups, select the entry in the **Delegations** column.
+- To view more details about role assignments for delegated subscriptions or resource groups, select the entry in the **Delegations** column.
 
 ## View delegations