Skip to content

Commit c69eed3

Browse files
authored
Merge branch 'MicrosoftDocs:main' into main
2 parents 18b8f45 + 0317c13 commit c69eed3

134 files changed

Lines changed: 855 additions & 469 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

README.md

Lines changed: 28 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,48 +3,54 @@
33
This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/).
44
For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [[email protected]](mailto:[email protected]) with any additional questions or comments.
55

6-
# Docs.microsoft.com GitHub repository
6+
# GitHub repository for Microsoft technical documentation
77

8-
You've found one of the GitHub repositories that houses the source for content published to [https://docs.microsoft.com](https://docs.microsoft.com/.), home of all technical content for Microsoft's Cloud and Enterprise Division.
8+
You've found one of the GitHub repositories that houses the source for content published to [Microsoft Docs](https://docs.microsoft.com/), home of all technical content for Microsoft's Cloud and Enterprise Division.
99

1010
## Contribute to your documentation
11+
1112
We **want and encourage contributions** from our community (users, customers, partners, friends on other planets) and Microsoft employees to improve your documentation. Here are some tips:
1213

13-
* **Create a GitHub account**: Sign up is free at [GitHub.com](https://www.github.com).
14+
* **Create a GitHub account**: Sign up for free at [GitHub](https://www.github.com).
15+
16+
* **Use your browser**: There are two options:
1417

15-
* **Use your browser**: There are two options:
18+
**Option 1: Edit directly from Microsoft Docs**
1619

17-
**Option 1: Edit directly from docs.microsoft.com**
18-
1. Go to the topic, such as [https://docs.microsoft.com/mem/intune/protect/troubleshoot-policies-in-microsoft-intune](mem/intune/protect/troubleshoot-policies-in-microsoft-intune.md).
20+
1. Browse to the [InTune](/mem/intune) article you want to edit.
1921
2. Select **Edit** (top right). This shows the markdown file in the GitHub repository.
20-
3. Select the pencil icon. When you hover over the pencil icon, you'll see the **Edit this file** tooltip.
21-
4. Make your changes, and then **commit** your changes.
22+
3. Select the pencil icon. When you hover over the pencil icon, you'll see the **Edit this file** tooltip.
23+
4. Make your changes, and then **commit** your changes.
2224
5. Create the pull request.
23-
24-
**Option 2: Find the article in this repository, and update**
25-
1. Most topics are in `https://github.com/MicrosoftDocs/memdocs/tree/master/memdocs/intune`. In this folder, search for the topic name, such as `troubleshoot-policies-in-microsoft-intune`.
26-
2. Select the link, and click the pencil icon. When you hover over the pencil icon, you'll see the **Edit this file** tooltip.
27-
3. Make your changes, and then **commit** your changes.
28-
4. Create the pull request.
25+
26+
**Option 2: Find the article in this repository, and update**
27+
28+
1. Most topics are in `https://github.com/MicrosoftDocs/memdocs/tree/master/memdocs/intune`. In this folder, search for the topic name, such as `troubleshoot-policies-in-microsoft-intune`.
29+
2. Select the link, and click the pencil icon. When you hover over the pencil icon, you'll see the **Edit this file** tooltip.
30+
3. Make your changes, and then **commit** your changes.
31+
4. Create the pull request.
2932

3033
When you make an update, you may be prompted to sign a license agreement. This is a one-time task. So any future updates by your GitHub username won't need to sign again.
3134

3235
The value in the `author` metadata (at the top of every topic) lists the GitHub author. In the `troubleshoot-policies-in-microsoft-intune` example, you'll see `MandiOhlinger`. In your pull request, you can also mention (@*authorValue*) the author if you like.
3336

34-
* **MSFT Employees**: After you create a GitHub account, link it to your Microsoft email address. When your account is linked, you don't have to sign a license agreement to make an update. Steps:
37+
* **MSFT Employees**: After you create a GitHub account, link it to your Microsoft email address. When your account is linked, you don't have to sign a license agreement to make an update. Follow these steps:
3538

36-
1. On a device with corpnet, go to [GitHub account setup](https://review.docs.microsoft.com/en-us/help/contribute/contribute-get-started-setup-github?branch=master). If you're not on corpnet, this link returns a 404.
39+
1. On a device with access to corpnet, go to [GitHub account setup](https://review.docs.microsoft.com/en-us/help/contribute/contribute-get-started-setup-github?branch=master). If you're not on corpnet, this link returns a 404.
3740

38-
Creating a GitHub account, and linking to your Microsoft account is a one-time thing. When your account is linked, you don't have to sign a license agreement to make an update.
41+
Creating a GitHub account, and linking to your Microsoft account is a one-time thing. When your account is linked, you don't have to sign a license agreement to make an update.
3942

40-
2. In your browser, go to the article, and select **Edit**. Switch to the private repo (IntuneDocs-pr):
41-
**From**: https://github.com/MicrosoftDocs/memdocs/...
42-
**To**: https://github.com/MicrosoftDocs/memdocs-pr/...
43+
2. In your browser, go to the article, and select **Edit**. Switch to the private repo (`IntuneDocs-pr`):
44+
45+
**From**: `https://github.com/MicrosoftDocs/memdocs/...`
46+
47+
**To**: `https://github.com/MicrosoftDocs/memdocs-pr/...`
4348

44-
3. Select the pencil icon, and make your changes.
49+
3. Select the pencil icon, and make your changes.
4550

4651
## Use markdown to format your topic
47-
All the articles in this repository use GitHub-flavored markdown. Here's a list of resources to get started:
52+
53+
All the articles in this repository use GitHub-flavored Markdown. Here's a list of resources to get started:
4854

4955
* [Markdown basics](https://help.github.com/articles/basic-writing-and-formatting-syntax/)
5056
* [Printable markdown cheatsheet](https://guides.github.com/pdfs/markdown-cheatsheet-online.pdf)

memdocs/cloud-native-windows-endpoints.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ author: scottbreenmsft
99

1010
ms.author: brenduns
1111
manager: dougeby
12-
ms.date: 06/01/2022
12+
ms.date: 09/07/2022
1313
ms.topic: conceptual
1414
ms.service: mem
1515
ms.subservice: fundamentals
@@ -28,6 +28,7 @@ ms.custom: intune-azure
2828
ms.collection:
2929
- M365-identity-device-management
3030
- highpri
31+
- highseo
3132
---
3233

3334
# Tutorial: Set up and configure a cloud-native Windows endpoint with Microsoft Endpoint Manager
@@ -560,6 +561,12 @@ Following are some settings available in the settings catalog that might be rele
560561
- Microsoft App Store
561562
- Require Private Store Only - **Only Private store is enabled**
562563

564+
> [!NOTE]
565+
> This setting applies to Windows 10. On Windows 11, this setting blocks access to the public Microsoft store. A private store is coming to Windows 11. For more information, go to:
566+
>
567+
> - [Update to Endpoint Manager integration with the Microsoft Store on Windows](https://techcommunity.microsoft.com/t5/windows-it-pro-blog/update-to-endpoint-manager-integration-with-the-microsoft-store/ba-p/3585077)
568+
> - [FAQ: Supporting Microsoft Store experiences on managed devices](https://techcommunity.microsoft.com/t5/windows-management/faq-supporting-microsoft-store-experiences-on-managed-devices/m-p/3585286)
569+
563570
- **Block Gaming**
564571
Organizations might prefer that corporate endpoints can't be used to play games. The Gaming page within the Settings app can be hidden entirely using the following setting.
565572
For additional information on the settings page visibility, go to the [CSP documentation](/windows/client-management/mdm/policy-csp-settings#settings-pagevisibilitylist) and the ms-settings [URI scheme reference](/windows/uwp/launch-resume/launch-settings-app#ms-settings-uri-scheme-reference).

memdocs/configmgr/cloud-attach/use-intune-rbac.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ To use Intune role-based access control for tenant attach rather than Configurat
5959

6060
To enable Intune to manage user permissions for cloud-attached devices, use the following steps:
6161

62-
1. Open the [Microsoft Endpoint admin center](https://endpoint.microsoft.com) and sign in.
62+
1. Open the [Microsoft Endpoint admin center](https://endpoint.microsoft.com) and sign in as a user that has the **Roles/Update** permission. For more information about the permission, see [custom role permissions in Intune](../../intune/fundamentals/create-custom-role.md).
6363
1. Select **Tenant administration** > **Connectors and tokens** > **Microsoft Endpoint Configuration Manager**.
6464
1. In the banner, select **You can also manage user permissions from Intune. Click here to learn more about this option.**
6565
1. The **Use Intune RBAC** flyout appears.

memdocs/configmgr/comanage/workloads.md

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ ms.collection: highpri
1515

1616
# Co-management workloads
1717

18-
You don't have to switch the workloads, or you can do them individually when you're ready. Configuration Manager continues to manage all other workloads, including those workloads that you don't switch to Intune, and all other features of Configuration Manager that co-management doesn't support.
18+
You don't have to switch any of the workloads. When you're ready, you can switch them individually, several at once, or all at the same time. However, until you switch the workloads over to Intune, Configuration Manager continues to manage the workloads that you don't switch to Intune, along with all other features of Configuration Manager that co-management doesn't support.
1919

20-
If you switch a workload to Intune, but later change your mind, you can switch it back to Configuration Manager.
20+
If you switch a workload to Intune, but later change your mind, you can switch it back to Configuration Manager, although there might be an impact. For example, Windows and Office versions will remain at a later version if installed by Intune.
2121

2222
Co-management supports the following workloads:
2323

@@ -45,6 +45,9 @@ For more information on the Intune feature, see [Use compliance policies to set
4545

4646
Windows Update for Business policies let you configure deferral policies for Windows 10 or later feature updates or quality updates for Windows 10 or later devices managed directly by Windows Update for Business.
4747

48+
> [!NOTE]
49+
> To use Windows Autopatch with these devices, this workload needs to be managed by Intune. For more information, see [Prerequisites for Windows Autopatch](/windows/deployment/windows-autopatch/prepare/windows-autopatch-prerequisites).
50+
4851
For more information on the Intune feature, see [Manage Windows software updates in Intune](../../intune/protect/windows-update-for-business-configure.md).
4952

5053
## Resource access policies
@@ -96,6 +99,8 @@ The device configuration workload includes settings that you manage for devices
9699

97100
You can still deploy settings from Configuration Manager to co-managed devices even though Intune is the device configuration authority. This exception might be used to configure settings that your organization requires but aren't yet available in Intune. Specify this exception on a [Configuration Manager configuration baseline](../compliance/deploy-use/create-configuration-baselines.md). Enable the option to **Always apply this baseline even for co-managed clients** when creating the baseline. You can change it later on the **General** tab of the properties of an existing baseline.
98101

102+
To use Windows Autopatch with these devices, this workload needs to be managed by Intune. For more information, see [Prerequisites for Windows Autopatch](/windows/deployment/windows-autopatch/prepare/windows-autopatch-prerequisites).
103+
99104
For more information on the Intune feature, see [Create a device profile in Microsoft Intune](../../intune/configuration/device-profile-create.md).
100105

101106
> [!NOTE]
@@ -125,6 +130,9 @@ Updates can be managed using either of the following features:
125130
- [Use Update Channel and Target Version settings to update Microsoft 365 with Microsoft Intune Administrative Templates](../../intune/configuration/administrative-templates-update-office.md)
126131
- [Manage Microsoft 365 Apps with Configuration Manager](../sum/deploy-use/manage-office-365-proplus-updates.md).
127132

133+
> [!NOTE]
134+
> To use Windows Autopatch with these devices, this workload needs to be managed by Intune. For more information, see [Prerequisites for Windows Autopatch](/windows/deployment/windows-autopatch/prepare/windows-autopatch-prerequisites).
135+
128136
For more information on the Intune feature, see [Add Microsoft 365 apps to Windows devices with Microsoft Intune](../../intune/apps/apps-add-office365.md).
129137

130138
## Client apps

memdocs/configmgr/core/TOC.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -285,16 +285,16 @@ items:
285285
items:
286286
- name: Technical Preview overview
287287
href: get-started/technical-preview.md
288+
- name: 2208 features
289+
href: get-started/2022/technical-preview-2208.md
288290
- name: 2207 features
289291
href: get-started/2022/technical-preview-2207.md
290292
- name: 2206 features
291293
href: get-started/2022/technical-preview-2206.md
292294
- name: 2205 features
293295
href: get-started/2022/technical-preview-2205.md
294296
- name: 2204 features
295-
href: get-started/2022/technical-preview-2204.md
296-
- name: 2203 features
297-
href: get-started/2022/technical-preview-2203.md
297+
href: get-started/2022/technical-preview-2204.md
298298
- name: Migrate data between hierarchies
299299
items:
300300
- name: Migration overview

memdocs/configmgr/core/clients/deploy/about-client-installation-properties.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -404,6 +404,10 @@ Example: `CCMCERTISSUERS="CN=Contoso Root CA; OU=Servers; O=Contoso, Ltd; C=US |
404404
405405
For more information about the certificate issuers list and how clients use it during the certificate selection process, see [Planning for PKI client certificate selection](../../plan-design/security/plan-for-certificates.md#pki-client-certificate-selection).
406406
407+
### `CCMCERTNAMECHECK`
408+
<!--14846212-->
409+
Starting in version 2207, this property can be used to skip checking the subject name for the certificate.`CCMCERTNAMECHECK=0` skips checking the subject name of the certificate.
410+
407411
### `CCMCERTSEL`
408412
409413
If the client has more than one certificate for HTTPS communication, this property specifies the criteria for it to select a valid client authentication certificate.

memdocs/configmgr/core/get-started/2020/includes/2011/7774961.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ms.date: 11/23/2020
1111

1212
<!--7774961-->
1313

14-
You can now use the [Update-Help](/powershell/module/microsoft.powershell.core/update-help) cmdlet to get the latest information for the Configuration Manager PowerShell module. This content is the same as what's published on docs.microsoft.com for the [ConfigurationManager module](/powershell/module/configurationmanager/).
14+
You can now use the [Update-Help](/powershell/module/microsoft.powershell.core/update-help) cmdlet to get the latest information for the Configuration Manager PowerShell module. This content is the same as what's published for the [ConfigurationManager module](/powershell/module/configurationmanager/).
1515

1616
The computer on which you run this cmdlet needs internet access, specifically `pshelpprod.blob.core.windows.net`. Then run the following command:
1717

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
---
2+
author: Banreet
3+
ms.author: banreetkaur
4+
ms.prod: configuration-manager
5+
ms.technology: configmgr-core
6+
ms.topic: include
7+
ms.date: 08/29/2022
8+
ms.localizationpriority: medium
9+
---
10+
11+
## <a name="bkmk_fixedIssues "></a> Issues that are fixed
12+
13+
<!--13879970 -->
14+
15+
If the osdinjection.xml file is directly modified, it isn't correctly preserved updating to a new Configuration Manager version.
16+
Example modifications include adding support for more binaries or for an alternate content provider (ACP). When this issue occurs, operating system deployment task sequences fail to resolve required dependencies. The smsts.log file contains the following error.
17+
18+
```Failed to load TSCore.dll Code (0x8007007E).```
19+
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
---
2+
author: Banreet
3+
ms.author: banreetkaur
4+
ms.prod: configuration-manager
5+
ms.technology: configmgr-core
6+
ms.topic: include
7+
ms.date: 08/29/2022
8+
ms.localizationpriority: medium
9+
---
10+
11+
## <a name="bkmk_improvements-to-the-dark-theme"></a> Dark theme is now extended to more dashboards
12+
13+
<!--14917369, 14959592, 14969236-->
14+
15+
In this release we've extended the dark theme to more dashboards, which previously didn't display the dark theme correctly. For example, the O365 Updates Dashboard, PCM Dashboard, and Health Attestation dashboard will now display according to the dark theme, when it's enabled.
16+
17+
Enable this pre-release feature to experience the dark theme. For more information, see [Dark theme for the console.](../../../../../core/servers/manage/admin-console.md)
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
---
2+
author: Banreet
3+
ms.author: banreetkaur
4+
ms.prod: configuration-manager
5+
ms.technology: configmgr-core
6+
ms.topic: include
7+
ms.date: 08/29/2022
8+
ms.localizationpriority: medium
9+
---
10+
11+
## <a name="bkmk_enable-intune"></a> Intune role-based access control (RBAC) for tenant attached devices
12+
13+
<!--8126836-->
14+
15+
You can now use Intune role-based access control (RBAC) when interacting with tenant attached devices from the Microsoft Endpoint Manager admin center.
16+
For example, when using Intune as the role-based access control authority, a user with Intune's [Help Desk Operator role](../../../../../../intune/fundamentals/role-based-access-control.md#built-in-roles) doesn't need an assigned security role or additional permissions from Configuration Manager.
17+
For more information, see [Intune role-based access control for tenant attached clients.](../../../../../cloud-attach/use-intune-rbac.md)

0 commit comments

Comments
 (0)