Merge pull request #1425 from MicrosoftDocs/master

10/29 AM Publish

WindowsServerDocs/storage/file-server/Troubleshoot/detect-enable-and-disable-smbv1-v2-v3.md

@@ -3,19 +3,31 @@ title: How to detect, enable and disable SMBv1, SMBv2, and SMBv3 in Windows
 description: Describes how to enable and disable the Server Message Block protocol (SMBv1, SMBv2, and SMBv3) in Windows client and server environments. 
 author: Deland-Han
 manager: dcscontentpm
-ms.topic: article
+ms.topic: how-to
 ms.author: delhan
-ms.date: 09/29/2020
+ms.date: 10/29/2020
 ---
-
 # How to detect, enable and disable SMBv1, SMBv2, and SMBv3 in Windows
 
-## Summary
+>Applies to: Windows 10, Windows 8.1, Windows 8, Windows Server 2019, Windows Server 2016, Windows Server 2012 R2, Windows Server 2012
 
-This article describes how to enable and disable Server Message Block (SMB) version 1 (SMBv1), SMB version 2 (SMBv2), and SMB version 3 (SMBv3) on the SMB client and server components. 
+This article describes how to enable and disable Server Message Block (SMB) version 1 (SMBv1), SMB version 2 (SMBv2), and SMB version 3 (SMBv3) on the SMB client and server components.
 
-> [!IMPORTANT]
-> We recommend that you **do not** disable SMBv2 or SMBv3. Disable SMBv2 or SMBv3 only as a temporary troubleshooting measure. Do not leave SMBv2 or SMBv3 disabled.  
+While disabling or removing SMBv1 might cause some compatibility issues with old computers or software, SMBv1 has significant security vulnerabilities and [we strongly encourage you not to use it](https://techcommunity.microsoft.com/t5/storage-at-microsoft/stop-using-smb1/ba-p/425858).
+
+## Disabling SMBv2 or SMBv3 for troubleshooting
+
+While we recommend that you keep SMBv2 and SMBv3 enabled, you might find it useful to disable one temporarily for troubleshooting, as described in [How to detect status, enable, and disable SMB protocols on the SMB Server](detect-enable-and-disable-smbv1-v2-v3.md#how-to-detect-status-enable-and-disable-smb-protocols-on-the-smb-server).
+
+In Windows 10, Windows 8.1, and Windows 8, Windows Server 2019, Windows Server 2016, Windows Server 2012 R2, and Windows Server 2012, disabling SMBv3 deactivates the following functionality (and also the SMBv2 functionality that's described in the previous list):
+
+- Transparent Failover - clients reconnect without interruption to cluster nodes during maintenance or failover    
+- Scale Out – concurrent access to shared data on all file cluster nodes     
+- Multichannel - aggregation of network bandwidth and fault tolerance if multiple paths are available between client and server  
+- SMB Direct – adds RDMA networking support for very high performance, with low latency and low CPU utilization    
+- Encryption – Provides end-to-end encryption and protects from eavesdropping on untrustworthy networks    
+- Directory Leasing - Improves application response times in branch offices through caching    
+- Performance Optimizations - optimizations for small random read/write I/O
 
 In Windows 7 and Windows Server 2008 R2, disabling SMBv2 deactivates the following functionality: 
 
@@ -30,23 +42,7 @@ In Windows 7 and Windows Server 2008 R2, disabling SMBv2 deactivates the follow
 - Large MTU support - for full use of 10-gigabye (GB) Ethernet    
 - Improved energy efficiency - clients that have open files to a server can sleep    
 
-In Windows 8, Windows 8.1, Windows 10, Windows Server 2012, Windows Server 2012 R2, Windows Server 2016, and Windows Server 2019, disabling SMBv3 deactivates the following functionality (and also the SMBv2 functionality that's described in the previous list): 
-
-- Transparent Failover - clients reconnect without interruption to cluster nodes during maintenance or failover    
-- Scale Out – concurrent access to shared data on all file cluster nodes     
-- Multichannel - aggregation of network bandwidth and fault tolerance if multiple paths are available between client and server  
-- SMB Direct – adds RDMA networking support for very high performance, with low latency and low CPU utilization    
-- Encryption – Provides end-to-end encryption and protects from eavesdropping on untrustworthy networks    
-- Directory Leasing - Improves application response times in branch offices through caching    
-- Performance Optimizations - optimizations for small random read/write I/O
-
-##  More Information
-
-The SMBv2 protocol was introduced in Windows Vista and Windows Server 2008.
-
-The SMBv3 protocol was introduced in Windows 8 and Windows Server 2012.
-
-For more information about the capabilities of SMBv2 and SMBv3 capabilities, see the following articles:
+The SMBv2 protocol was introduced in Windows Vista and Windows Server 2008, while the SMBv3 protocol was introduced in Windows 8 and Windows Server 2012. For more information about the capabilities of SMBv2 and SMBv3 capabilities, see the following articles:
 
 [Server Message Block overview](/previous-versions/windows/it-pro/windows-server-2012-r2-and-2012/hh831795(v=ws.11))
 
@@ -364,7 +360,7 @@ This disables the SMBv1 Server components. This Group Policy must be applied to
 
 To disable the SMBv1 client, the services registry key needs to be updated to disable the start of **MRxSMB10** and then the dependency on **MRxSMB10** needs to be removed from the entry for **LanmanWorkstation** so that it can start normally without requiring **MRxSMB10** to first start.
 
-This will update and replace the default values in the following 2 items in the registry: 
+This will update and replace the default values in the following two items in the registry: 
 
 **HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\mrxsmb10** 
 

WindowsServerDocs/storage/storage-migration-service/faq.md

@@ -85,6 +85,8 @@ The Storage Migration Service contains a multi-threaded read and copy engine cal
 
 - **Use Windows Server 2019 for the destination operating system.** Windows Server 2019 contains the Storage Migration Service Proxy service. When you install this feature and migrate to Windows Server 2019 destinations, all transfers operate as direct line of sight between source and destination. This service runs on the orchestrator during transfer if the destination computers are Windows Server 2012 R2 or Windows Server 2016, which means the transfers double-hop and will be much slower. If there are multiple jobs running with Windows Server 2012 R2 or Windows Server 2016 destinations, the orchestrator will become a bottleneck.
 
+- **Install latest monthly Cumulative Update.** We have improved the Storage Migration Service Proxy service in several updates for better transfer and re-transfer performance, as well as Inventory performance. Install [KB4580390 October 2020 Cumulative Update](https://support.microsoft.com/help/4580390/windows-10-update-kb4580390) or later to gain significant speed improvements.
+
 - **Alter default transfer threads.** The Storage Migration Service Proxy service copies 8 files simultaneously in a given job. You can increase the number of simultaneous copy threads by adjusting the following registry REG_DWORD value name in decimal on every node running the Storage Migration Service Proxy:
 
     HKEY_Local_Machine\Software\Microsoft\SMSProxy
@@ -180,4 +182,4 @@ To get support:
 
 ## Additional References
 
-- [Storage Migration Service overview](overview.md)
+- [Storage Migration Service overview](overview.md)