Merge pull request #133310 from MicrosoftDocs/master

10/09 PM Publish

Author: huypub

articles/azure-netapp-files/TOC.yml

@@ -39,6 +39,8 @@
     href: azure-netapp-files-cost-model.md
   - name: Guidelines for Azure NetApp Files network planning 
     href: azure-netapp-files-network-topologies.md
+  - name: Manual QoS capacity pool
+    href: manual-qos-capacity-pool-introduction.md
   - name: Cross-region replication
     items: 
     - name: Understand cross-region replication

articles/azure-netapp-files/manual-qos-capacity-pool-introduction.md

@@ -0,0 +1,54 @@
+---
+title: Manual QoS capacity pool of Azure NetApp Files | Microsoft Docs
+description: Provides an introduction to the manual QoS capacity pool and references for additional information. 
+services: azure-netapp-files
+documentationcenter: ''
+author: b-juche
+manager: ''
+editor: ''
+
+ms.assetid:
+ms.service: azure-netapp-files
+ms.workload: storage
+ms.tgt_pltfrm: na
+ms.devlang: na
+ms.topic: conceptual
+ms.date: 09/23/2020
+ms.author: b-juche
+---
+# Manual QoS capacity pool
+
+This article provides an introduction to the manual Quality of Service (QoS) capacity pool functionality.
+
+## How manual QoS differs from auto QoS
+
+The [QoS type](azure-netapp-files-understand-storage-hierarchy.md#qos_types) is an attribute of a capacity pool. Azure NetApp Files provides two QoS types of capacity pools – auto (default) and manual.  
+
+In a *manual* QoS capacity pool, you can assign the capacity and throughput for a volume independently. The total throughput of all volumes created with a manual QoS capacity pool is limited by the total throughput of the pool. It is determined by the combination of the pool size and the service-level throughput. 
+
+In an *auto* QoS capacity pool, throughput is assigned automatically to the volumes in the pool, proportional to the size quota assigned to the volumes.  
+
+See [Storage hierarchy of Azure NetApp Files](azure-netapp-files-understand-storage-hierarchy.md) and [Performance considerations for Azure NetApp Files](azure-netapp-files-performance-considerations.md) for considerations about QoS types.
+
+## How to specify the manual QoS type
+
+When you [create a capacity pool](azure-netapp-files-set-up-capacity-pool.md), you can specify for the capacity pool to use the manual QoS type.  You can also [change an existing capacity pool](manage-manual-qos-capacity-pool.md#change-to-qos) to use the manual QoS type. 
+
+Setting the capacity type to manual QoS is a permanent change. You cannot convert a manual QoS type capacity tool to an auto QoS capacity pool. 
+
+Using the manual QoS type requires that you [register the feature](manage-manual-qos-capacity-pool.md#register-the-feature).  
+
+## Next steps
+
+* [Manage a manual QoS capacity pool](manage-manual-qos-capacity-pool.md)
+* [Set up a capacity pool](azure-netapp-files-set-up-capacity-pool.md)
+* [Storage Hierarchy](azure-netapp-files-understand-storage-hierarchy.md) 
+* [Service levels for Azure NetApp Files](azure-netapp-files-service-levels.md)
+* [Performance considerations for Azure NetApp Files](azure-netapp-files-performance-considerations.md)
+* [Cost model for Azure NetApp Files](azure-netapp-files-cost-model.md)
+* [Resource limits for Azure NetApp Files](azure-netapp-files-resource-limits.md)
+* [Create an NFS volume](azure-netapp-files-create-volumes.md)
+* [Create an SMB volume](azure-netapp-files-create-volumes-smb.md)
+* [Create a dual-protocol volume](create-volumes-dual-protocol.md)
+* [Metrics for Azure NetApp Files](azure-netapp-files-metrics.md)
+* [Troubleshoot capacity pool issues](troubleshoot-capacity-pools.md)

articles/azure-netapp-files/whats-new.md

@@ -27,7 +27,7 @@ Azure NetApp Files is updated on a regular basis. This article provides a summar
 
   Azure NetApp Files now supports cross-region replication. With this new disaster recovery capability, you can replicate your Azure NetApp Files volumes from one Azure region to another in a fast and cost-effective way, protecting your data from unforeseeable regional failures. Azure NetApp Files cross region replication leverages NetApp SnapMirror® technology; only changed blocks are sent over the network in a compressed, efficient format. This proprietary technology minimizes the amount of data required to replicate across the regions, therefore saving data transfer costs. It also shortens the replication time, so you can achieve a smaller Restore Point Objective (RPO).
 
-* [Manual QoS Capacity Pool](manage-manual-qos-capacity-pool.md) (Preview)  
+* [Manual QoS Capacity Pool](manual-qos-capacity-pool-introduction.md) (Preview)  
 
     In a manual QoS capacity pool, you can assign the capacity and throughput for a volume independently. The total throughput of all volumes created with a manual QoS capacity pool is limited by the total throughput of the pool. It is determined by the combination of the pool size and the service-level throughput. Alternatively, a capacity pool’s [QoS type](azure-netapp-files-understand-storage-hierarchy.md#qos_types) can be auto (automatic), which is the default. In an auto QoS capacity pool, throughput is assigned automatically to the volumes in the pool, proportional to the size quota assigned to the volumes.
 

articles/iot-edge/how-to-authenticate-downstream-device.md

@@ -54,7 +54,7 @@ When you create the new device identity, provide the following information:
 
 * Select **Symmetric key** as the authentication type.
 
-* Optionally, choose to **Set a parent device** and select the IoT Edge gateway device that this downstream device will connect through. This step is optional for symmetric key authentication, but it's recommended because setting a parent device enables [offline capabilities](offline-capabilities.md) for your downstream device. You can always update the device details to add or change the parent later.
+* Select **Set a parent device** and select the IoT Edge gateway device that this downstream device will connect through. This step enables [offline capabilities](offline-capabilities.md) for your downstream device. You can always change the parent later.
 
    ![Create device ID with symmetric key auth in portal](./media/how-to-authenticate-downstream-device/symmetric-key-portal.png)
 
@@ -196,7 +196,7 @@ Or:
 HostName=myiothub.azure-devices.net;DeviceId=myDownstreamDevice;x509=true;GatewayHostName=myGatewayDevice
 ```
 
-If you established a parent/child relationship for this downstream device, then you can simplify the connection string by calling the gateway directly as the connection host. Parent/child relationships are required for X.509 authentication but optional for symmetric key authentication. For example:
+Thanks to the parent/child relationship, you can simplify the connection string by calling the gateway directly as the connection host. For example:
 
 ```
 HostName=myGatewayDevice;DeviceId=myDownstreamDevice;SharedAccessKey=xxxyyyzzz