Skip to content

Commit ed613f9

Browse files
authored
Merge branch 'main' into defender-criteria
2 parents 2fd1726 + 2f02cf4 commit ed613f9

File tree

1,592 files changed

+13578
-4898
lines changed

Some content is hidden

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

1,592 files changed

+13578
-4898
lines changed

.acrolinx-config.edn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{:changed-files-limit 30
22
:allowed-branchname-matches ["main" "release-.*"]
3-
:allowed-filename-matches ["defender-xdr/" "exposure-management/" "defender/" "defender-business/" "defender-vulnerability-management/" "defender-office-365/"] ;; Can be overridden in repo-specific edn file. This is an allow list that identifies which folders contain the files Acrolinx will check. Separate multiple folders as follows ["folder/" "folder2"]
3+
:allowed-filename-matches ["defender-xdr/" "exposure-management/" "defender/" "defender-business/" "defender-vulnerability-management/" "defender-office-365/" "defender-endpoint/"] ;; Can be overridden in repo-specific edn file. This is an allow list that identifies which folders contain the files Acrolinx will check. Separate multiple folders as follows ["folder/" "folder2"]
44

55
:use-gh-statuses true
66

.openpublishing.redirection.defender.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@
44
"source_path": "defender/advanced-hunting-overview.md",
55
"redirect_url": "/defender-xdr/advanced-hunting-overview",
66
"redirect_document_id": false
7+
},
8+
{
9+
"source_path": "defender-endpoint/microsoft-defender-antivirus-using-mde-security-set-mngmnt.md",
10+
"redirect_url": "/defender-endpoint/evaluate-mdav-using-gp",
11+
"redirect_document_id": true
712
}
813
]
914
}

README.md

Lines changed: 86 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,88 @@
1+
---
2+
ms.date: 4/30/2024
3+
---
4+
5+
# Overview
6+
7+
## Learn how to contribute
8+
9+
Anyone who is interested can contribute to the articles. When you contribute, your work goes into the content set after it's been reviewed and merged. It's then published to [Microsoft Learn](https://learn.microsoft.com/), and you're listed as a contributor at: <https://github.com/MicrosoftDocs/defender-docs/graphs/contributors>.
10+
11+
### Quickly update an article using GitHub.com
12+
13+
Contributors who make infrequent or small updates can edit the file directly on GitHub.com without installing any software. This article shows you how. [This two-minute video](https://www.microsoft.com/videoplayer/embed/RE1XQTG) also covers how to contribute.
14+
15+
> [!TIP]
16+
> To edit an article, you need to get to it on the GitHub.com backend. If you're already on the GitHub.com page of the article, you're starting at step 4.
17+
>
18+
> Your permissions in the repo determine what you see in step 5 and later. People with no special privileges see the steps as described. People with permissions to approve their own pull requests see a similar experience with different button and page titles (for example, **Commit changes** instead of **Propose changes**), extra options for creating a new branch, and fewer confirmation pages. The point is: click any green buttons that are presented to you until there are no more.
19+
20+
1. Verify that you're signed in to GitHub.com with your GitHub account.
21+
2. On learn.microsoft.com, find the article that you want to update.
22+
3. Above the title of the article, select ![Edit this document icon.](media/quick-update-learn-edit-icon.png) **Edit this document**.
23+
24+
![Screenshot of how to edit this document button on a learn.microsoft.com article.](media/quick-update-edit-button-on-learn-page.png)
25+
26+
4. The corresponding article file opens on GitHub. Select ![Fork this repository and edit this file icon.](media/quick-update-github-edit-icon.png) **Fork this repository and edit this file**.
27+
28+
![Screenshot of how to edit this document button on a GitHub article file.](media/quick-update-edit-button-on-github-page.png)
29+
30+
5. On the next page that opens, select **Fork this repository**.
31+
32+
![Screenshot of the You need to fork this repository to propose changes page.](media/quick-update-fork-this-repository-page.png)
33+
34+
6. The article file opens in a line-numbered editor page where you can make updates.
35+
36+
Articles on learn.microsoft.com are formatted using the Markdown language. For help on using Markdown, see [Mastering Markdown.](https://guides.github.com/features/mastering-markdown/).
37+
38+
Select **Preview** to view your changes as you go. Select **Edit** to go back to making updates.
39+
40+
When you're finished making changes, select the green **Commit changes** button.
41+
42+
![Screenshot of how to select the green Commit changes button on the article editor page.](media/quick-update-editor-page.png)
43+
44+
7. In the **Propose changes** dialog that opens, review and/or enter the following values:
45+
- **Commit message**: This value is required. You can accept the default value ("Update \<filename\>") or you can change it.
46+
- **Extended description**: This value is optional. For example:
47+
- An explanation of the changes.
48+
- @ include the GitHub alias of someone to review and merge your changes.
49+
50+
When you're finished on the **Propose changes** dialog, select the green **Propose changes** button.
51+
52+
![Screenshot of how to select the green Propose changes button in the Propose changes dialog.](media/quick-update-propose-changes-dialog.png)
53+
54+
8. On the **Comparing changes** page that opens, select the green **Create pull request** button.
55+
56+
![Screenshot of how to select the green Create pull request button on the Comparing changes page.](media/quick-update-comparing-changes-page.png)
57+
58+
9. On the **Open a pull request** page that opens, review the title and comments, and then select the green **Create pull request** button.
59+
60+
![Screenshot of how to select the green Create pull request button on the Open a pull request page.](media/quick-update-open-a-pull-request-page.png)
61+
62+
10. That's it. There's nothing more for you to do.
63+
64+
The article owner (identified in metadata) is notified about the changes to the article. Eventually, the article owner or another party will review, possibly edit, and approve your changes. After your pull request is merged, the article is updated on learn.microsoft.com.
65+
166
## Microsoft Open Source Code of Conduct
67+
268
This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/).
3-
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.
69+
70+
For more information, see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [[email protected]](mailto:[email protected]) with any questions or comments.
71+
72+
### Contributing
73+
74+
This project welcomes contributions and suggestions. Most contributions require you to agree to a Contributor License Agreement (CLA) declaring that you have the right to, and actually do, grant us the rights to use your contribution. For details, visit <https://cla.microsoft.com>.
75+
76+
When you submit a pull request, a CLA-bot automatically determines whether you need to provide a CLA and decorate the PR appropriately (for example, label, comment). Follow the instructions provided by the bot. You only need to do this step once across all repos using our CLA.
77+
78+
### Legal Notices
79+
80+
Microsoft and any contributors grant you a license to the Microsoft documentation and other content in this repository under the [Creative Commons Attribution 4.0 International Public License](https://creativecommons.org/licenses/by/4.0/legalcode), see the [LICENSE](LICENSE) file, and grant you a license to any code in the repository under the [MIT License](https://opensource.org/licenses/MIT), see the [LICENSE-CODE](LICENSE-CODE) file.
81+
82+
Microsoft, Windows, Microsoft Azure and/or other Microsoft products and services referenced in the documentation may be either trademarks or registered trademarks of Microsoft in the United States and/or other countries/regions.
83+
84+
The licenses for this project don't grant you rights to use any Microsoft names, logos, or trademarks. Microsoft's general trademark guidelines can be found at <https://go.microsoft.com/fwlink/?LinkID=254653>.
85+
86+
Privacy information can be found at <https://privacy.microsoft.com/>
87+
88+
Microsoft and any contributors reserve all others rights, whether under their respective copyrights, patents, or trademarks, whether by implication, estoppel or otherwise.

defender-business/get-defender-business.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ Microsoft 365 Business Premium includes Defender for Business, Microsoft Defende
8787

8888
Microsoft has a list of solution providers who are authorized to sell offerings, including Microsoft 365 Business Premium and Microsoft Defender for Business. If you'd prefer to work with a Microsoft partner, you can follow these steps to find a solution provider in your area:
8989

90-
1. Go to the [Browse Partners](https://appsource.microsoft.com/marketplace/partner-dir).
90+
1. Go to the [Browse Partners](https://appsource.microsoft.com/en-us/marketplace/partner-dir).
9191

9292
2. In the **Filters** pane, specify search criteria, such as:
9393

defender-business/mdb-configure-security-settings.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ If you're using Intune, and you attempt to view or edit security policies in the
6262

6363
:::image type="content" source="media/mdb-usingintune-switchquestion.png" alt-text="Screenshot showing a screen that prompts the user to keep using Intune or switch to the Microsoft Defender portal.":::
6464

65-
In the preceding image, **Use Defender for Business configuration instead** refers to using the Microsoft Defender portal, which provides a simplified configuration experience designed for small and medium-sized businesses. If you opt to use the Microsoft Defender portal, you must delete any existing security policies in Intune to avoid policy conflicts. For more details, see [I need to resolve a policy conflict](/defender-business/mdb-troubleshooting#i-need-to-resolve-a-policy-conflict).
65+
In the preceding image, **Use Defender for Business configuration instead** refers to using the Microsoft Defender portal, which provides a simplified configuration experience designed for small and medium-sized businesses. If you opt to use the Microsoft Defender portal, you must delete any existing security policies in Intune to avoid policy conflicts. For more details, see [I need to resolve a policy conflict](mdb-troubleshooting.yml#i-need-to-resolve-a-policy-conflict).
6666

6767
> [!NOTE]
6868
> If you're managing your security policies in the Microsoft Defender portal, you can view those policies in the Intune admin center, where they're listed as **Antivirus** or **Firewall** policies. When you view your firewall policies in the Intune admin center, you'll see two policies listed: one policy for firewall protection and another for custom rules.
@@ -77,4 +77,3 @@ In the preceding image, **Use Defender for Business configuration instead** refe
7777
4. [Set up your controlled folder access policy](mdb-controlled-folder-access.md) for ransomware protection.
7878
5. [Enable your attack surface reduction rules](mdb-asr.md).
7979
6. [Review settings for advanced features and the Microsoft Defender portal](mdb-portal-advanced-feature-settings.md).
80-

defender-business/mdb-faq.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,15 +129,15 @@ sections:
129129
130130
- question: What are the differences between Defender for Business and Defender for Endpoint Plans 1 and 2?
131131
answer: |
132-
Both [Defender for Business](/defender-business/mdb-overview) and [Defender for Endpoint](/defender-endpoint/microsoft-defender-endpoint) provide strong threat protection capabilities for your company's devices (computers, phones, and tablets, which are also referred to as endpoints). Defender for Business was designed for small and medium-sized businesses (up to 300 employees). With a [simplified configuration process](mdb-setup-configuration.md) and [device onboarding options](mdb-onboard-devices.md), Defender for Business enables customers who don't necessarily have a security background to set up, configure, and use Defender for Business to protect company devices.
132+
Both [Defender for Business](mdb-overview.md) and [Defender for Endpoint](/defender-endpoint/microsoft-defender-endpoint) provide strong threat protection capabilities for your company's devices (computers, phones, and tablets, which are also referred to as endpoints). Defender for Business was designed for small and medium-sized businesses (up to 300 employees). With a [simplified configuration process](mdb-setup-configuration.md) and [device onboarding options](mdb-onboard-devices.md), Defender for Business enables customers who don't necessarily have a security background to set up, configure, and use Defender for Business to protect company devices.
133133
134134
Defender for Endpoint is an enterprise endpoint security platform designed to help organizations like yours to prevent, detect, investigate, and respond to advanced threats. To learn more, see [Microsoft Defender for Endpoint](/defender-endpoint/microsoft-defender-endpoint).
135135
136136
- question: What happens if I have a mix of Microsoft endpoint security subscriptions?
137137
answer: |
138138
*Suppose you have assigned 10 users a Defender for Business license, 10 other users a Defender for Endpoint Plan 1 license, and 5 other users a Defender for Endpoint Plan 2 license. What happens if you have a mix of subscriptions like this example in your tenant?*
139139
140-
Depending on your subscription settings, your tenant can retain the Defender for Business experience, which includes a [simplified configuration process](mdb-setup-configuration.md). However, if you change your subscription settings to apply Microsoft Defender for Endpoint Plan 2 features and capabilities across devices, you're no longer using your Defender for Business licenses. In addition, the simplified configuration experience in Defender for Business changes to advanced settings in Defender for Endpoint. For more information, see [Manage your subscription settings](/defender-business/mdb-manage-subscription).
140+
Depending on your subscription settings, your tenant can retain the Defender for Business experience, which includes a [simplified configuration process](mdb-setup-configuration.md). However, if you change your subscription settings to apply Microsoft Defender for Endpoint Plan 2 features and capabilities across devices, you're no longer using your Defender for Business licenses. In addition, the simplified configuration experience in Defender for Business changes to advanced settings in Defender for Endpoint. For more information, see [Manage your subscription settings](mdb-manage-subscription.md).
141141
142142
For more information about licenses and product terms, see [Licensing and product terms for Microsoft 365 subscriptions](https://www.microsoft.com/licensing/terms/productoffering/Microsoft365/MCA).
143143

defender-business/mdb-manage-subscription.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,6 @@ To reduce management overhead, there's no requirement for device-to-user mapping
7979

8080
- [Licensing and product terms for Microsoft 365 subscriptions](https://www.microsoft.com/licensing/terms/productoffering/Microsoft365/MCA).
8181
- [Microsoft Defender for Endpoint](/defender-endpoint/microsoft-defender-endpoint)
82-
- [Microsoft Defender for Business](/defender-business/mdb-overview) (endpoint protection for small and medium-sized businesses)
82+
- [Microsoft Defender for Business](mdb-overview.md) (endpoint protection for small and medium-sized businesses)
8383

8484
[!INCLUDE [Microsoft Defender for Endpoint Tech Community](../includes/defender-mde-techcommunity.md)]

defender-business/mdb-troubleshooting.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ sections:
3535
3636
If devices are running a non-Microsoft antivirus/antimalware solution, real-time protection might be turned off when those devices are onboarded to Defender for Business. Real-time protection is turned on by default in Defender for Business, but a non-Microsoft antivirus/antimalware solution might affect your settings. When real-time protection is turned off, you'll see notifications in the Microsoft Defender portal ([https://security.microsoft.com](https://security.microsoft.com)) that some devices aren't protected. In these cases, make sure real-time protection is turned on.
3737
38-
To confirm that real-time protection is turned on, you can view, and if necessary, edit your next-generation protection policies. See [View or edit your next-generation protection policies](/defender-business/mdb-configure-security-settings?view=o365-worldwide#view-or-edit-your-next-generation-protection-policies).
38+
To confirm that real-time protection is turned on, you can view, and if necessary, edit your next-generation protection policies. See [View or edit your security policies and settings](mdb-configure-security-settings.md).
3939
4040
We recommend using Microsoft Defender Antivirus together with Defender for Business to get better protection that's coordinated across products and services. To learn more, see [Better together - Microsoft Defender Antivirus and Microsoft Defender for Endpoint](/defender-endpoint/why-use-microsoft-defender-antivirus).
4141

defender-endpoint/TOC.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,10 @@
6565
items:
6666
- name: Overview
6767
href: evaluate-microsoft-defender-antivirus.md
68-
- name: Evaluate Microsoft Defender Antivirus using Powershell
68+
- name: Evaluate Microsoft Defender Antivirus using PowerShell
6969
href: microsoft-defender-antivirus-using-powershell.md
70+
- name: Evaluate Microsoft Defender Antivirus using Group Policy
71+
href: evaluate-mdav-using-gp.md
7072
- name: Microsoft Defender for Endpoint demonstration scenarios
7173
href: defender-endpoint-demonstrations.md
7274
- name: App reputation demonstration
@@ -184,8 +186,8 @@
184186
href: mac-jamfpro-policies.md
185187
- name: Enroll devices
186188
href: mac-jamfpro-enroll-devices.md
187-
- name: Deployment with Mobile Device Management (MDM) systems
188-
href: mac-install-with-other-mdm.md
189+
- name: Deployment with other Mobile Device Management (MDM) systems
190+
href: mac-install-with-other-mdm.md
189191
- name: Manual deployment
190192
href: mac-install-manually.md
191193
- name: Configure Defender for Endpoint on macOS
@@ -363,7 +365,7 @@
363365
- name: General
364366
items:
365367
- name: Configure alert notifications
366-
href: /defender/configure-email-notifications
368+
href: /defender-xdr/configure-email-notifications
367369
- name: Configure vulnerability email notifications
368370
href: configure-vulnerability-email-notifications.md
369371
- name: Configure advanced features
@@ -454,6 +456,8 @@
454456
href: machines-view-overview.md
455457
- name: Exclude devices
456458
href: exclude-devices.md
459+
- name: Identifying transient devices
460+
href: transient-device-tagging.md
457461
- name: Internet facing devices
458462
href: internet-facing-devices.md
459463
- name: Device timeline

defender-endpoint/admin-submissions-mde.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
title: Submit files in Microsoft Defender for Endpoint
33
description: Learn how to use the unified submissions feature in Microsoft Defender XDR to submit suspicious emails, URLs, email attachments, and files to Microsoft for scanning.
44
search.appverid: met150
5-
ms.date: 02/15/2024
5+
ms.date: 05/06/2024
66
ms.service: defender-endpoint
77
ms.author: siosulli
88
author: siosulli
99
manager: deniseb
10-
localization_priority: Normal
10+
ms.localizationpriority: medium
1111
audience: ITPro
1212
ms.topic: how-to
1313
ms.collection:

0 commit comments

Comments
 (0)