Merge branch 'master' of https://github.com/microsoftdocs/windows-itpro-docs

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

@@ -114,8 +114,8 @@ Here is an example:
 ```
 <groupmembership>
  <accessgroup desc="Administrators">
-    <member name="Contoso\Alice" />
-    <member name = "S-188-5-5666-5-688" / >
+    <member name="Contoso\Alice">
+    <member name = "S-188-5-5666-5-688">
   </accessgroup>
 </groupmembership>
 ```

windows/deployment/upgrade/windows-10-upgrade-paths.md

@@ -142,7 +142,7 @@ D = Edition downgrade; personal data is maintained, applications and settings ar
         <td></td>
     </tr>
     <tr>
-        <td>Professional</td>
+        <td>Pro</td>
         <td>D</td>
         <td>✔</td>
         <td>✔</td>
@@ -153,7 +153,7 @@ D = Edition downgrade; personal data is maintained, applications and settings ar
         <td></td>
     </tr>
     <tr>
-        <td>Professional Student</td>
+        <td>Pro Student</td>
         <td>D</td>
         <td>✔</td>
         <td>✔</td>
@@ -164,7 +164,7 @@ D = Edition downgrade; personal data is maintained, applications and settings ar
         <td></td>
     </tr>
     <tr>
-        <td>Professional WMC</td>
+        <td>Pro WMC</td>
         <td>D</td>
         <td>✔</td>
         <td>✔</td>
@@ -233,7 +233,7 @@ D = Edition downgrade; personal data is maintained, applications and settings ar
         <td></td>
     </tr>
     <tr>
-        <td>Professional</td>
+        <td>Pro</td>
         <td>D</td>
         <td>✔</td>
         <td>✔</td>

windows/deployment/windows-autopilot/windows-autopilot-requirements-licensing.md

@@ -18,22 +18,19 @@ ms.date: 06/01/2018
 
 Windows Autopilot depends on specific capabilities available in Windows 10 and Azure Active Directory; it also requires an MDM service such as Microsoft Intune. These capabilities can be obtained through various editions and subscription programs:
 
--   Windows 10 version 1703 or higher must be used. The Professional, Professional for Education, Business, Enterprise, and Education editions are supported.
-
+-   Windows 10 version 1703 or higher must be used. Supported editions are the following:
+    -   Pro
+    -   Pro Education
+    -   Pro for Workstations
+    -   Enterprise
+    -   Education
 -   One of the following, to provide needed Azure Active Directory (automatic MDM enrollment and company branding features) and MDM functionality:
-
     -   Microsoft 365 Business subscriptions
-    
     -   Microsoft 365 F1 subscriptions
-
     -   Microsoft 365 Enterprise E3 or E5 subscriptions, which include all Windows 10, Office 365, and EM+S features (Azure AD and Intune)
-
     -   Enterprise Mobility + Security E3 or E5 subscriptions, which include all needed Azure AD and Intune features
-
     -   Azure Active Directory Premium P1 or P2 and Intune subscriptions (or an alternative MDM service)
 
 Additionally, the following are also recommended but not required:
-
 -   Office 365 ProPlus, which can be deployed easily via Intune (or other MDM services)
-
 -   [Windows Subscription Activation](https://docs.microsoft.com/en-us/windows/deployment/windows-10-enterprise-subscription-activation), to automatically step up devices from Windows 10 Pro to Windows 10 Enterprise

windows/security/threat-protection/security-policy-settings/network-security-lan-manager-authentication-level.md

@@ -56,10 +56,14 @@ authentication level that servers accept. The following table identifies the pol
 
 -   Best practices are dependent on your specific security and authentication requirements.
 
-### Location
+### Policy Location
 
 Computer Configuration\\Windows Settings\\Security Settings\\Local Policies\\Security Options
 
+### Registry Location
+
+HKLM\System\CurrentControlSet\Control\Lsa\LmCompatibilityLevel
+
 ### Default values
 
 The following table lists the actual and effective default values for this policy. Default values are also listed on the policy’s property page.