Skip to content

Commit 773c098

Browse files
author
Angela Fleischmann
authored
Merge pull request #12523 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/MicrosoftDocs/microsoft-365-docs (branch public)
2 parents 9818ac7 + 207a296 commit 773c098

12 files changed

Lines changed: 23 additions & 16 deletions

microsoft-365/commerce/subscriptions/cancel-your-subscription.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ ms.date: 01/20/2022
2525

2626
# Cancel your subscription
2727

28-
You can cancel your subscription at any time in the <a href="https://go.microsoft.com/fwlink/p/?linkid=2024339" target="_blank">Microsoft 356 admin center</a>. However, to receive a refund, you must meet certain refund eligibility requirements. For more information, see [Understand refund eligibility](#understand-refund-eligibility).
28+
You can cancel your subscription at any time in the <a href="https://go.microsoft.com/fwlink/p/?linkid=2024339" target="_blank">Microsoft 365 admin center</a>. However, to receive a refund, you must meet certain refund eligibility requirements. For more information, see [Understand refund eligibility](#understand-refund-eligibility).
2929

3030
If you have multiple subscriptions to the same product, such as Microsoft 365 Business Premium, canceling one subscription won’t impact the purchased licenses or services inside the others.
3131

microsoft-365/compliance/create-info-mgmt-policies.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,12 +97,12 @@ Adding an information management policy to a content type makes it easy to assoc
9797
9898
3. The **Start a workflow** option is available only if you are defining a policy for a list, library, or content type that already has a workflow associated with it. You will then be given a choice of workflows to choose from.
9999

100-
4. In the **Recurrence** section, select **Repeat this stage's action…**and enter how often you want the action to reoccur.
100+
4. In the **Recurrence** section, select **Repeat this stage's action…**, and then enter how often you want the action to reoccur.
101101

102102
> [!NOTE]
103103
> This option is only available if the action you selected can be repeated. For example, you cannot set recurrence for the action **Permanently Delete**.
104104
105-
5. Chose **OK**.
105+
5. Choose **OK**.
106106

107107
8. To enable auditing for the documents and items that are subject to this policy, choose **Enable Auditing**, and then specify the events you want to audit.
108108

@@ -211,7 +211,7 @@ You need at least the Manage Lists permission to change the information manageme
211211

212212
8. The **Start a workflow** option is available only if you are defining a policy for a list, library, or content type that already has a workflow associated with it. You will then be given a choice of workflows to choose from.
213213

214-
9. Under **Recurrence**, choose **Repeat this stage's action…**and enter how often you want the action to reoccur.
214+
9. Under **Recurrence**, choose **Repeat this stage's action…** and enter how often you want the action to reoccur.
215215

216216
> [!NOTE]
217217
> This option is only available if the action you selected can be repeated. For example, you cannot set recurrence for the action **Permanently Delete**.
@@ -223,7 +223,7 @@ You need at least the Manage Lists permission to change the information manageme
223223

224224
If information management policies have already been created for your site as site collection policies, you can apply one of the policies to a content type. By doing this, you can apply the same policy to multiple content types in a site collection that do not share the same parent content type.
225225

226-
If you want to apply policies to multiple content types in a site collection, and you have a Managed Metadata Service configured, you can use Content Type Publishing to publish out information management polices to multiple site collections. See the section [Apply a policy across site collections](#apply-a-policy-across-site-collections) for more information.
226+
If you want to apply policies to multiple content types in a site collection, and you have a Managed Metadata Service configured, you can use Content Type Publishing to publish out information management policies to multiple site collections. See the section [Apply a policy across site collections](#apply-a-policy-across-site-collections) for more information.
227227

228228
1. Navigate to the list or library that contains the content type to which you want to apply a policy.
229229

microsoft-365/security/defender-endpoint/automated-investigations.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,8 @@ Your organization must have Defender for Endpoint (see [Minimum requirements for
8383

8484
Currently, AIR only supports the following OS versions:
8585

86+
- Windows Server 2012 R2 (Preview)
87+
- Windows Server 2016 (Preview)
8688
- Windows Server 2019
8789
- Windows Server 2022
8890
- Windows 10, version 1709 (OS Build 16299.1085 with [KB4493441](https://support.microsoft.com/help/4493441/windows-10-update-kb4493441)) or later

microsoft-365/security/defender-endpoint/deployment-vdi-microsoft-defender-antivirus.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ To do this:
123123
124124
For this example, the file share is:
125125
126-
\\fileserver.fqdn\mdatp$\wdav-update
126+
\\\fileserver.fqdn\mdatp$\wdav-update
127127
128128
### Set a scheduled task to run the PowerShell script
129129

microsoft-365/security/defender-endpoint/device-discovery-faq.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,23 +48,23 @@ In this mode endpoints onboarded to Microsoft Defender for Endpoint can actively
4848

4949
## Can I control which devices perform Standard discovery?
5050

51-
You can customize the list of devices that are used to perform Standard discovery. You can either enable Standard discovery on all the onboarded devices that also support this capability (currently Windows 10 devices only) or select a subset or subsets of your devices by specifying their device tags. In this case, all other devices will be configured to run Basic discovery only. The configuration is available in the device discovery settings page.
51+
You can customize the list of devices that are used to perform Standard discovery. You can either enable Standard discovery on all the onboarded devices that also support this capability (currently Windows 10 or later and Windows Server 2019 or later devices only) or select a subset or subsets of your devices by specifying their device tags. In this case, all other devices will be configured to run Basic discovery only. The configuration is available in the device discovery settings page.
5252

5353
## Can I exclude unmanaged devices from the device inventory list?
5454

5555
Yes, you can apply filters to exclude unmanaged devices from the device inventory list. You can also use the onboarding status column on API queries to filter out unmanaged devices.
5656

5757
## Which onboarded devices can perform discovery?
5858

59-
Onboarded devices running on Windows 10 version 1809 or later, or Windows 11 can perform discovery. Servers cannot perform discovery at this point.
59+
Onboarded devices running on Windows 10 version 1809 or later, Windows 11, Windows Server 2019, or Windows Server 2022 can perform discovery.
6060

6161
## What happens if my onboarded devices is connected to my home network, or to public access point?
6262

6363
The discovery engine distinguishes between network events that are received in the corporate network versus outside of the corporate network. By correlating network identifiers across all tenant's clients, events are differentiated between ones that were received from private networks and corporate networks. For example, if the majority of the devices in the organization report that they are connected to the same network name, with the same default gateway and DHCP server address, it can be assumed that this network is likely a corporate network. Private network devices will not be listed in the inventory and will not be actively probed.
6464

6565
## What protocols are you capturing and analyzing?
6666

67-
By default, all onboarded devices running on Windows 10 version 1809 or later, or Windows 11 are capturing and analyzing the following protocols:
67+
By default, all onboarded devices running on Windows 10 version 1809 or later, Windows 11, Windows Server 2019, or Windows Server 2022 are capturing and analyzing the following protocols:
6868
ARP, CDP, DHCP, DHCPv6, IP (headers), LLDP, LLMNR, mDNS, MNDP, NBNS, SSDP, TCP (SYN headers), UDP (headers), WSD
6969

7070
## Which protocols do you use for active probing in Standard discovery?

microsoft-365/security/defender-endpoint/enable-attack-surface-reduction.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ You can use Microsoft Endpoint Manager (MEM) OMA-URI to configure custom ASR rul
153153

154154
- In **Name**, type a name for the rule.
155155
- In **Description**, type a brief description.
156-
- In **OMA-URI**, type or paste the specific OMA-URI link for the rule that you are adding. Refer to the MEM section earlier in this article for the OMA-URI to use for this example rule. For attack surface reduction rule GUIDS, see [Per rule descriptions](attack-surface-reduction-rules-reference.md#per-rule-descriptions) in the topic: Attack surface reduction rules.
156+
- In **OMA-URI**, type or paste the specific OMA-URI link for the rule that you are adding. Refer to the MDM section in this article for the OMA-URI to use for this example rule. For attack surface reduction rule GUIDS, see [Per rule descriptions](attack-surface-reduction-rules-reference.md#per-rule-descriptions) in the topic: Attack surface reduction rules.
157157
- In **Data type**, select **String**.
158158
- In **Value**, type or paste the GUID value, the \= sign and the State value with no spaces (_GUID=StateValue_). Where:
159159

-107 KB
Loading

microsoft-365/security/defender-endpoint/linux-install-manually.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -377,6 +377,12 @@ Download the onboarding package from Microsoft 365 Defender portal.
377377
```bash
378378
mdatp health --field real_time_protection_enabled
379379
```
380+
381+
If it is not enabled, execute the following command:
382+
383+
```bash
384+
mdatp config real-time-protection --value enabled
385+
```
380386
381387
- Open a Terminal window and execute the following command:
382388

microsoft-365/security/defender-endpoint/offboard-machine-api.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,8 @@ Delegated (work or school account)|Machine.Offboard|'Offboard machine'
6868
POST https://api.securitycenter.microsoft.com/api/machines/{id}/offboard
6969
```
7070

71+
The machine ID can be found in the URL when you select the device. Generally, it is a 40 digit alphanumeric number that can be found in the URL.
72+
7173
## Request headers
7274

7375
Name|Type|Description

microsoft-365/security/defender-endpoint/portal-overview.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,7 @@ You can use <a href="https://go.microsoft.com/fwlink/p/?linkid=2077139" target="
4141

4242
## Microsoft 365 Defender
4343

44-
When you open the portal, you'll see:
45-
46-
- (1) Navigation pane (select the horizontal lines at the top of the navigation pane to show or hide it)
47-
- (2) Search, Community center, Localization, Help and support, Feedback
44+
When you open the portal, you'll see the Navigation pane (select the horizontal lines at the top of the navigation pane to show or hide it).
4845

4946
![Microsoft Defender for Endpoint portal.](images/mdatp-portal-overview.png)
5047

0 commit comments

Comments
 (0)