Merge pull request #6222 from MicrosoftDocs/repo_sync_working_branch

Resolve syncing conflicts from repo_sync_working_branch to public

windows/client-management/mdm/policy-csp-update.md

@@ -1233,8 +1233,8 @@ The following list shows the supported values:
 
 <!--/Scope-->
 <!--Description-->
-Added in Windows 10, version 1709. Allows IT admins to specify the number of days a user has before feature updates are installed on their devices automatically. Updates and restarts will occur regardless of active hours and the user will not be able to reschedule.
 
+Added in Windows 10, version 1709. Allows IT admins to specify the number of days a user has before feature updates are installed on their devices automatically. Updates and restarts will occur regardless of active hours and the user will not be able to reschedule.
 <!--/Description-->
 <!--ADMXMapped-->
 ADMX Info:  
@@ -1304,6 +1304,7 @@ Default value is 7.
 
 <!--/Scope-->
 <!--Description-->
+
 Added in Windows 10, version 1709. Allows IT admins to specify the number of days a user has before quality updates are installed on their devices automatically. Updates and restarts will occur regardless of active hours and the user will not be able to reschedule.
 <!--/Description-->
 <!--ADMXMapped-->
@@ -1374,7 +1375,9 @@ Default value is 7.
 
 <!--/Scope-->
 <!--Description-->
+
 Added in Windows 10, version 1709. Allows the IT admin (when used with [Update/ConfigureDeadlineForFeatureUpdates](#update-configuredeadlineforfeatureupdates) or [Update/ConfigureDeadlineForQualityUpdates](#update-configuredeadlineforqualityupdates)) to specify a minimum number of days until restarts occur automatically. Setting the grace period may extend the effective deadline set by the deadline policies.
+
 <!--/Description-->
 <!--ADMXMapped-->
 ADMX Info:  
@@ -1444,6 +1447,7 @@ Default value is 2.
 
 <!--/Scope-->
 <!--Description-->
+
 Added in Windows 10, version 1709. If enabled (when used with [Update/ConfigureDeadlineForFeatureUpdates](#update-configuredeadlineforfeatureupdates) or [Update/ConfigureDeadlineForQualityUpdates](#update-configuredeadlineforqualityupdates)), devices will not automatically restart outside of active hours until the deadline is reached, even if applicable updates are already installed and pending a restart.
 
 When disabled, if the device has installed the required updates and is outside of active hours, it may attempt an automatic restart before the deadline.
@@ -4170,7 +4174,7 @@ The following list shows the supported values:
 
 <!--/Scope-->
 <!--Description-->
-Display options for update notifications. This policy allows you to define what Windows Update notifications users see. This policy doesn’t control how and when updates are downloaded and installed.
+Display options for update notifications. This policy allows you to define what Windows Update notifications users see. This policy doesn't control how and when updates are downloaded and installed.
 
 Options: 
 
@@ -4179,7 +4183,7 @@ Options:
 -  2 – Turn off all notifications, including restart warnings
 
 > [!IMPORTANT]
-> If you choose not to get update notifications and also define other Group policies so that devices aren’t automatically getting updates, neither you nor device users will be aware of critical security, quality, or feature updates, and your devices may be at risk.
+> If you choose not to get update notifications and also define other Group policies so that devices aren't automatically getting updates, neither you nor device users will be aware of critical security, quality, or feature updates, and your devices may be at risk.
 
 <!--/Description-->
 <!--ADMXMapped-->

windows/deployment/planning/windows-10-deprecated-features.md

@@ -64,3 +64,4 @@ The features described below are no longer being actively developed, and might b
 |TLS DHE_DSS ciphers DisabledByDefault| [TLS RC4 Ciphers](https://docs.microsoft.com/windows-server/security/tls/tls-schannel-ssp-changes-in-windows-10-and-windows-server) will be disabled by default in this release. | 1703 |
 |TCPChimney | TCP Chimney Offload is no longer being developed.  See [Performance Tuning Network Adapters](https://docs.microsoft.com/windows-server/networking/technologies/network-subsystem/net-sub-performance-tuning-nics). | 1703 |
 |IPsec Task Offload| [IPsec Task Offload](https://docs.microsoft.com/windows-hardware/drivers/network/task-offload) versions 1 and 2 are no longer being developed and should not be used. | 1703 |
+|wusa.exe /uninstall /kb:####### /quiet|The wusa usage to quietly uninstall an update has been deprecated. The uninstall command with /quite switch fails with event ID 8 in the Setup event log. Uninstalling updates quietly could be a security risk because malicious software could quietly uninstall an update in the background without user intervention.|1507 <br /> Applies to Windows Server 2016 and Windows Server 2019 as well.|

windows/security/threat-protection/microsoft-defender-atp/linux-install-manually.md

@@ -43,14 +43,14 @@ The choice of the channel determines the type and frequency of updates that are
 
 In order to preview new features and provide early feedback, it is recommended that you configure some devices in your enterprise to use either *insiders-fast* or *insiders-slow*.
 
-### RHEL and variants (CentOS and Oracle EL)
+### RHEL and variants (CentOS and Oracle Linux)
 
 - Note your distribution and version, and identify the closest entry for it under `https://packages.microsoft.com/config/`.
 
     In the below commands, replace *[distro]* and *[version]* with the information you've identified:
 
     > [!NOTE]
-    > In case of Oracle EL and CentOS 8, replace *[distro]* with “rhel”.
+    > In case of Oracle Linux, replace *[distro]* with “rhel”.
 
     ```bash
     sudo yum-config-manager --add-repo=https://packages.microsoft.com/config/[distro]/[version]/[channel].repo
@@ -170,7 +170,7 @@ In order to preview new features and provide early feedback, it is recommended t
 
 ## Application installation
 
-- RHEL and variants (CentOS and Oracle EL):
+- RHEL and variants (CentOS and Oracle Linux):
 
     ```bash
     sudo yum install mdatp

windows/security/threat-protection/microsoft-defender-atp/linux-install-with-ansible.md

@@ -140,7 +140,7 @@ Create subtask or role files that contribute to an actual task. Create the follo
     In the following commands, replace *[distro]* and *[version]* with the information you've identified.
 
     > [!NOTE]
-    > In case of Oracle EL and CentOS 8, replace *[distro]* with “rhel”.
+    > In case of Oracle Linux, replace *[distro]* with “rhel”.
 
     - For apt-based distributions use the following YAML file:
 

windows/security/threat-protection/microsoft-defender-atp/linux-install-with-puppet.md

@@ -89,7 +89,7 @@ Note your distribution and version and identify the closest entry for it under `
 In the below commands, replace *[distro]* and *[version]* with the information you've identified:
 
 > [!NOTE]
-> In case of Oracle EL and CentOS 8, replace *[distro]* with “rhel”.
+> In case of Oracle Linux, replace *[distro]* with “rhel”.
 
 ```puppet
 class install_mdatp {

windows/security/threat-protection/microsoft-defender-atp/linux-resources.md

@@ -68,7 +68,7 @@ There are several ways to uninstall Microsoft Defender ATP for Linux. If you are
 
 ### Manual uninstallation
 
-- ```sudo yum remove mdatp``` for RHEL and variants(CentOS and Oracle EL).
+- ```sudo yum remove mdatp``` for RHEL and variants(CentOS and Oracle Linux).
 - ```sudo zypper remove mdatp``` for SLES and variants.
 - ```sudo apt-get purge mdatp``` for Ubuntu and Debian systems.
 

windows/security/threat-protection/microsoft-defender-atp/linux-updates.md

@@ -28,7 +28,7 @@ Microsoft regularly publishes software updates to improve performance, security,
 
 To update Microsoft Defender ATP for Linux manually, execute one of the following commands:
 
-## RHEL and variants (CentOS and Oracle EL)
+## RHEL and variants (CentOS and Oracle Linux)
 
 ```bash
 sudo yum update mdatp

windows/security/threat-protection/microsoft-defender-atp/microsoft-defender-atp-linux.md

@@ -82,7 +82,7 @@ In general you need to take the following steps:
   - Ubuntu 16.04 LTS or higher LTS
   - Debian 9 or higher
   - SUSE Linux Enterprise Server 12 or higher
-  - Oracle Enterprise Linux 7
+  - Oracle Linux 7
 
 - Minimum kernel version 2.6.38
 - The `fanotify` kernel option must be enabled

windows/security/threat-protection/microsoft-defender-atp/microsoft-threat-experts.md

@@ -27,7 +27,7 @@ Microsoft Threat Experts is a managed threat hunting service that provides Secur
 This new capability provides expert-driven insights and data through targeted attack notification and access to experts on demand.
 
 Watch this video for a quick overview of Microsoft Threat Experts.
-<p></p>
+
 >[!VIDEO https://www.microsoft.com/en-us/videoplayer/embed/RE4qZ0B]