Skip to content

Commit 393d9c9

Browse files
Merge branch 'master' into patch-2
2 parents f8e3030 + 07761e3 commit 393d9c9

File tree

1 file changed

+4
-44
lines changed

1 file changed

+4
-44
lines changed

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

+4-44
Original file line numberDiff line numberDiff line change
@@ -123,51 +123,11 @@ The following list shows the supported values:
123123
<!--Policy-->
124124
<a href="" id="security-allowautomaticdeviceencryptionforazureadjoineddevices"></a>**Security/AllowAutomaticDeviceEncryptionForAzureADJoinedDevices**
125125

126-
<!--SupportedSKUs-->
127-
<table>
128-
<tr>
129-
<th>Edition</th>
130-
<th>Windows 10</th>
131-
<th>Windows 11</th>
132-
</tr>
133-
<tr>
134-
<td>Home</td>
135-
<td>No</td>
136-
<td>No</td>
137-
</tr>
138-
<tr>
139-
<td>Pro</td>
140-
<td>Yes</td>
141-
<td>Yes</td>
142-
</tr>
143-
<tr>
144-
<td>Business</td>
145-
146-
</tr>
147-
<tr>
148-
<td>Enterprise</td>
149-
<td>Yes</td>
150-
<td>Yes</td>
151-
</tr>
152-
<tr>
153-
<td>Education</td>
154-
<td>Yes</td>
155-
<td>Yes</td>
156-
</tr>
157-
</table>
158-
159-
<!--/SupportedSKUs-->
160-
<hr/>
161-
162126
<!--Description-->
163127
> [!NOTE]
164-
> This policy has been deprecated in Windows 10, version 1607
165-
166-
<br>
167-
168-
> [!NOTE]
169-
> This policy is only enforced in Windows 10 for desktop and not supported in Windows 10 Mobile.
170-
128+
>
129+
> - This policy is deprecated in Windows 10, version 1607.<br/>
130+
> - This policy is only enforced in Windows 10 for desktop.
171131
172132
Specifies whether to allow automatic [device encryption](/windows/security/information-protection/bitlocker/bitlocker-device-encryption-overview-windows-10#bitlocker-device-encryption) during OOBE when the device is Azure AD joined.
173133

@@ -764,4 +724,4 @@ The following list shows the supported values:
764724
<hr/>
765725

766726

767-
<!--/Policies-->
727+
<!--/Policies-->

0 commit comments

Comments
 (0)