Merge branch 'main' into patch-1

This commit is contained in:
Stephanie Savell
2022-11-21 13:25:40 -06:00
committed by GitHub
3 changed files with 9 additions and 9 deletions

View File

@ -4426,7 +4426,7 @@ The following list shows the supported values:
ADMX Info: ADMX Info:
- GP Friendly name: *Enable extended hot keys in Internet Explorer mode* - GP Friendly name: *Enable extended hot keys in Internet Explorer mode*
- GP name: *EnableExtendedIEModeHotkeys* - GP name: *EnableExtendedIEModeHotkeys*
- GP path: *Windows Components/Internet Explorer/Security Features/Add-on Management* - GP path: *Windows Components/Internet Explorer/Main*
- GP ADMX file name: *inetres.admx* - GP ADMX file name: *inetres.admx*
<!--/ADMXBacked--> <!--/ADMXBacked-->

View File

@ -104,11 +104,11 @@ See [Use custom settings for Windows 10 devices in Intune](/mem/intune/configura
Example 1: Azure Active Directory focused. Example 1: Azure Active Directory focused.
The following example updates the built-in administrators group with Azure AD account "bob@contoso.com" and an Azure AD group with the SID **S-1-12-1-111111111-22222222222-3333333333-4444444444** on an AAD-joined machine. The following example updates the built-in administrators group with the SID **S-1-5-21-2222222222-3333333333-4444444444-500** with an Azure AD account "bob@contoso.com" and an Azure AD group with the SID **S-1-12-1-111111111-22222222222-3333333333-4444444444** on an AAD-joined machine.
```xml ```xml
<GroupConfiguration> <GroupConfiguration>
<accessgroup desc = "Administrators"> <accessgroup desc = "S-1-5-21-2222222222-3333333333-4444444444-500">
<group action = "U" /> <group action = "U" />
<add member = "AzureAD\bob@contoso.com"/> <add member = "AzureAD\bob@contoso.com"/>
<add member = "S-1-12-1-111111111-22222222222-3333333333-4444444444"/> <add member = "S-1-12-1-111111111-22222222222-3333333333-4444444444"/>
@ -119,12 +119,12 @@ The following example updates the built-in administrators group with Azure AD ac
Example 2: Replace / Restrict the built-in administrators group with an Azure AD user account. Example 2: Replace / Restrict the built-in administrators group with an Azure AD user account.
> [!NOTE] > [!NOTE]
> When using R replace option to configure the built-in Administrators group. It is required to always specify the administrator as a member + any other custom members. This is because the built-in administrator must always be a member of the administrators group. > When using the R replace option to configure the built-in Administrators group with the SID **S-1-5-21-2222222222-3333333333-4444444444-500** you should always specify the administrator as a member plus any other custom members. This is necessary because the built-in administrator must always be a member of the administrators group.
Example: Example:
```xml ```xml
<GroupConfiguration> <GroupConfiguration>
<accessgroup desc = "Administrators"> <accessgroup desc = "S-1-5-21-2222222222-3333333333-4444444444-500">
<group action = "R" /> <group action = "R" />
<add member = "AzureAD\bob@contoso.com"/> <add member = "AzureAD\bob@contoso.com"/>
<add member = "Administrator"/> <add member = "Administrator"/>
@ -134,11 +134,11 @@ Example:
Example 3: Update action for adding and removing group members on a hybrid joined machine. Example 3: Update action for adding and removing group members on a hybrid joined machine.
The following example shows how you can update a local group (**Administrators**)—add an AD domain group as a member using its name (**Contoso\ITAdmins**), add a Azure Active Directory group by its SID (**S-1-12-1-111111111-22222222222-3333333333-4444444444**), and remove a local account (**Guest**) if it exists. The following example shows how you can update a local group (**Administrators** with the SID **S-1-5-21-2222222222-3333333333-4444444444-500**)—add an AD domain group as a member using its name (**Contoso\ITAdmins**), add an Azure Active Directory group by its SID (**S-1-12-1-111111111-22222222222-3333333333-4444444444**), and remove a local account (**Guest**) if it exists.
```xml ```xml
<GroupConfiguration> <GroupConfiguration>
<accessgroup desc = "Administrators"> <accessgroup desc = "S-1-5-21-2222222222-3333333333-4444444444-500">
<group action = "U" /> <group action = "U" />
<add member = "Contoso\ITAdmins"/> <add member = "Contoso\ITAdmins"/>
<add member = "S-1-12-1-111111111-22222222222-3333333333-4444444444"/> <add member = "S-1-12-1-111111111-22222222222-3333333333-4444444444"/>

View File

@ -33,9 +33,9 @@ The **Microsoft network server: Amount of idle time required before suspending s
### Possible values ### Possible values
- A user-defined number of minutes from 0 through 99,999 - A user-defined number of minutes from 0 through 99,999.
For this policy setting, a value of 0 means to disconnect an idle session as quickly as is reasonably possible. The maximum value is 99999, which is 208 days. In effect, this value disables the policy. For this policy setting, a value of 0 means to disconnect an idle session as quickly as is reasonably possible. The maximum value is 99999 (8 business hours per day), which is 208 days. In effect, this value disables the policy.
- Not defined - Not defined