Skip to content

Commit 52ea54b

Browse files
authored
Merge branch 'public' into patch-2
2 parents 01e4546 + e0c4e29 commit 52ea54b

165 files changed

Lines changed: 2810 additions & 1635 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.

.openpublishing.redirection.json

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10920,6 +10920,11 @@
1092010920
"redirect_url": "/microsoft-365/security/office-365-security/tenant-allow-block-list-urls-configure",
1092110921
"redirect_document_id": false
1092210922
},
10923+
{
10924+
"source_path": "microsoft-365/security/office-365-security/recover-from-ransomware.md",
10925+
"redirect_url": "/security/ransomware/",
10926+
"redirect_document_id": false
10927+
},
1092310928
{
1092410929
"source_path": "microsoft-365/business-premium/m365bp-secure-users.md",
1092510930
"redirect_url": "/microsoft-365/business-premium/why-choose-microsoft-365-business-premium",
@@ -11019,6 +11024,31 @@
1101911024
"source_path": "microsoft-365/business-premium/m365bp-remove-company-data.md",
1102011025
"redirect_url": "/microsoft-365/admin/add-users/remove-former-employee",
1102111026
"redirect_document_id": false
11027+
},
11028+
{
11029+
"source_path": "microsoft-365/business-premium/m365bp-map-protection-features-to-intune-settings.md",
11030+
"redirect_url": "/mem/intune/protect/endpoint-security-policy",
11031+
"redirect_document_id": false
11032+
},
11033+
{
11034+
"source_path": "microsoft-365/business-premium/m365bp-setup.md",
11035+
"redirect_url": "/microsoft-365/business-premium/m365-business-premium-setup",
11036+
"redirect_document_id": true
11037+
},
11038+
{
11039+
"source_path": "microsoft-365/business-premium/get-microsoft-365-business-premium.md",
11040+
"redirect_url": "/microsoft-365/business-premium/m365-business-premium-setup",
11041+
"redirect_document_id": false
11042+
},
11043+
{
11044+
"source_path": "microsoft-365/business-premium/get-microsoft-365-campaigns.md",
11045+
"redirect_url": "/microsoft-365/business-premium/m365-campaigns-setup",
11046+
"redirect_document_id": false
11047+
},
11048+
{
11049+
"source_path": "microsoft-365/security/defender-business/get-defender-business-servers.md",
11050+
"redirect_url": "/microsoft-365/security/defender-business/get-defender-business",
11051+
"redirect_document_id": true
1102211052
}
1102311053
]
1102411054
}

microsoft-365/admin/create-groups/restore-deleted-group.md

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ search.appverid:
2424
- MET150
2525
- MOE150
2626
ms.assetid: b7c66b59-657a-4e1a-8aa0-8163b1f4eb54
27-
description: "A deleted group is retained for 30 days and you can still restore the group. After 30 days, the group and its content is permanently deleted."
27+
description: "A deleted group is retained for 30 days and you can still restore the group. After 30 days, the group and its content are permanently deleted."
2828
---
2929

3030
# Restore a deleted Microsoft 365 group
@@ -83,9 +83,14 @@ If you are a global administrator or a groups administrator, you can restore a d
8383

8484
Visit the [Microsoft Tech Community](https://techcommunity.microsoft.com/t5/microsoft-365-groups/bd-p/Microsoft365Groups) to post questions and participate in conversations about Microsoft 365 groups.
8585

86-
## Related content
86+
## Related topics
8787

88-
[Manage Microsoft 365 Groups with PowerShell](../../enterprise/manage-microsoft-365-groups-with-powershell.md) (article)\
89-
[Delete groups using the Remove-UnifiedGroup cmdlet](/powershell/module/exchange/remove-unifiedgroup) (article)\
90-
[Manage your group-connected team site settings](https://support.microsoft.com/office/8376034d-d0c7-446e-9178-6ab51c58df42) (article)\
91-
[Delete a group in Outlook](https://support.microsoft.com/office/ca7f5a9e-ae4f-4cbe-a4bc-89c469d1726f) (article)
88+
[Restore deleted items](/Exchange/recipients-in-exchange-online/restore-deleted-items-group)
89+
90+
[Manage Microsoft 365 Groups with PowerShell](../../enterprise/manage-microsoft-365-groups-with-powershell.md)
91+
92+
[Delete groups using the Remove-UnifiedGroup cmdlet](/powershell/module/exchange/remove-unifiedgroup)
93+
94+
[Manage your group-connected team site settings](https://support.microsoft.com/office/8376034d-d0c7-446e-9178-6ab51c58df42)
95+
96+
[Delete a group in Outlook](https://support.microsoft.com/office/ca7f5a9e-ae4f-4cbe-a4bc-89c469d1726f)

microsoft-365/admin/security-and-compliance/increase-threat-protection.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ For additional details about securing data and managed devices in Microsoft 365
5858
| 2 | **[Protect your administrator accounts](../../business-premium/m365bp-protect-admin-accounts.md)**. | Administrator accounts (also called admins) have elevated privileges, making these accounts more susceptible to cyberattacks. You'll need to set up and manage the right number of admin and user accounts for your business. We also recommend adhering to the information security principle of least privilege, which means that users and applications should be granted access only to the data and operations they require to perform their jobs. <br/><br/>See [Protect your administrator accounts](../../business-premium/m365bp-protect-admin-accounts.md). |
5959
| 3 | **[Use preset security policies](../../business-premium/m365bp-protect-against-malware-cyberthreats.md)** | Your subscription includes [preset security policies](../../security/office-365-security/preset-security-policies.md) that use recommended settings for anti-spam, anti-malware, and anti-phishing protection. Set your policies in the [Microsoft 365 Defender portal](https://security.microsoft.com) to at least **Standard** protection. <br/><br/>See [Protect against malware and other cyberthreats](../../business-premium/m365bp-protect-against-malware-cyberthreats.md). |
6060
| 4 | **[Protect all devices](../../business-premium/m365bp-set-up-unmanaged-devices.md)**. | Every device is a possible attack avenue into your network and must be configured properly, even devices that are owned personally but also used for work. <br/><br/>See these articles: <br/>- [Help users set up MFA on their devices](https://support.microsoft.com/office/set-up-your-microsoft-365-sign-in-for-multi-factor-authentication-ace1d096-61e5-449b-a875-58eb3d74de14)<br/>- [Protect unmanaged Windows and Mac computers](../../business-premium/m365bp-protect-pcs-macs.md) <br/>- [Set up managed devices](../../business-premium/m365bp-managed-devices-setup.md) (requires Microsoft 365 Business Premium or Microsoft Defender for Business) |
61-
| 5 | **[Set sharing settings for SharePoint and OneDrive files and folders](../../business-premium/m365bp-protect-against-malware-cyberthreats.md)**. | Default sharing settings for SharePoint and OneDrive are set to the most permissive level, which might be a more permissive level than you should use. We recommend reviewing, and if necessary changing, the settings to better protect your business. Grant member of your organization only the access they need to do their jobs. <br/><br/>See [Set sharing settings for SharePoint and OneDrive files and folders](../../business-premium/m365bp-protect-against-malware-cyberthreats.md#set-sharing-settings-for-sharepoint-and-onedrive-files-and-folders). |
61+
| 5 | **[Adjust sharing settings for SharePoint and OneDrive files and folders](../../business-premium/m365bp-protect-against-malware-cyberthreats.md#3-adjust-sharing-settings-for-sharepoint-and-onedrive-files-and-folders)**. | Default sharing settings for SharePoint and OneDrive are set to the most permissive level, which might be a more permissive level than you should use. We recommend reviewing, and if necessary changing, the settings to better protect your business. Grant member of your organization only the access they need to do their jobs. <br/><br/>See [Set sharing settings for SharePoint and OneDrive files and folders](../../business-premium/m365bp-protect-against-malware-cyberthreats.md#3-adjust-sharing-settings-for-sharepoint-and-onedrive-files-and-folders). |
6262

6363
## Related content
6464

microsoft-365/admin/setup/setup-business-standard.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ When you purchase Microsoft 365 Business Standard, you have the option of adding
4343
In this article, we'll walk you through the steps of adding an existing domain you already own or buying a new one. If you purchased a new domain when you signed up, your domain is all set up and you can move to [Add users and assign licenses](#add-users-and-assign-licenses).
4444

4545
> [!Tip]
46-
> If you have a Microsoft 365 Business Premium subscription, please see [Set up Microsoft 365 Business Premium](../../business-premium/m365bp-setup.md).
46+
> If you have a Microsoft 365 Business Premium subscription, please see [Set up Microsoft 365 Business Premium](../../business-premium/m365-business-premium-setup.md).
4747
4848
## Set up Microsoft 365 for business
4949

microsoft-365/bookings/bookings-in-outlook.md

Lines changed: 5 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ description: "Use Bookings with me to let others schedule meetings with you in O
1717

1818
# Bookings with me
1919

20-
**Bookings with me** in Outlook is a web-based personal scheduling page that integrates with the free/busy information from your Outlook calendar. Bookings with me lets people schedule a meeting or appointment with you. You can create custom meeting types to share with others so they can easily schedule time with you based on your availability and preferences. You both get an email confirmation and attendees can update or cancel scheduled meetings with you from your Bookings with me page.
20+
**Bookings with me** in Outlook is a web-based personal time management solution that provides a simple and powerful scheduling page with seamless integration with outlook. Bookings with me lets people schedule a meeting or appointment with you through a personal scheduling page that integrates with the free/busy information from your Outlook calendar. You can create custom meeting types to share with others so they can easily schedule time with you based on your availability and preferences. You both get an email confirmation and attendees can update or cancel scheduled meetings with you from your Bookings with me page.
2121

2222
Bookings with me has two different views:
2323

24-
- [Bookings with me: setup and sharing](https://support.microsoft.com/office/bookings-with-me-setup-and-sharing-ad2e28c4-4abd-45c7-9439-27a789d254a2) A personal booking page where you can create meeting types that others can book with you. Custom meeting types give you the ability to customize when you want to meet and how that meeting type is shared with others. You control whether each meeting type is public to your scheduling page or is private and can only be accessed by a select group of people. You can also choose to add a Teams meeting to all meetings booked through your Bookings with me page. You can access your Bookings with me page through Outlook on the web. After you set up your page and publish it, you can share it with others. For example, you can add it to your Outlook signature.
24+
- **Organizer view**: An organizer is someone who creates meeting types and shares the booking page with others so that they can easily schedule meetings with them. A personal booking page where you can create meeting types that others can book with you. Custom meeting types give you the ability to customize when you want to meet and how that meeting type is shared with others. You control whether each meeting type is public to your scheduling page or is private and can only be accessed by a select group of people. You can also choose to add a Teams meeting to all meetings booked through your Bookings with me page. You can access your Bookings with me page through Outlook on the web. After you set up your page and publish it, you can share it with others. For example, you can add it to your Outlook signature. [Learn more about setup and sharing in Bookings with me](https://support.microsoft.com/office/bookings-with-me-setup-and-sharing-ad2e28c4-4abd-45c7-9439-27a789d254a2).
2525

26-
- [Attendee view](https://support.microsoft.com/office/select-a-meeting-time-in-bookings-with-me-8f3bbe5b-4bc6-4073-bf61-57383c00b43a) When you share your Bookings with me page with others, they'll see the attendee view. If the organizer has shared their Bookings with me page link with you, you'll be able to see all of their public meeting types. If the organizer has shared a meeting link, you'll only be able to view that meeting.
26+
- **Attendee view**: An attendee is someone who uses the booking page to create or attend a meeting scheduled by an organizer. After the organizer shares their Bookings with me page with others, those visitors will see the attendee view. If the organizer has shared their Bookings with me page link with you, you'll be able to see all of their public meeting types. If the organizer has shared a meeting link, you'll only be able to view that meeting. [Learn more about selecting a booking time in Bookings with me](https://support.microsoft.com/office/select-a-meeting-time-in-bookings-with-me-8f3bbe5b-4bc6-4073-bf61-57383c00b43a).
2727
- Public meetings can be viewed and scheduled by anyone that has your Bookings with me page link. You are in control of who you share that link with. All public meeting types will be visible to anyone that has your Bookings with me page link.
2828
- Private meetings can only be viewed by people who have the link for that meeting type. The difference between public meetings and private meetings is private meetings can have different links and the links expire after 90 days. You can also set private links to expire after a one-time booking. When accessing the scheduling view for a private meeting, only that meeting type will be visible.
2929

@@ -34,7 +34,7 @@ Bookings with me is an ideal solution for enterprise, small business, and users
3434
- Schedule interviews with external candidates
3535
- Set up customer and client meetings
3636
- Schedule tech support
37-
- Set up office hours
37+
- Set up office/consultation hours
3838
- Set up mentoring hours
3939
- 1:1 meetings with direct reports
4040
- Lunch and coffee breaks
@@ -60,24 +60,6 @@ For more information, see the [Bookings with me Microsoft 365 Roadmap item](http
6060

6161
To turn on Bookings with me without access to Bookings, block access to Microsoft Bookings using the [OWA Mailbox policy PowerShell command](/powershell/module/exchange/set-owamailboxpolicy) or follow the instructions here: [Turn Microsoft Bookings on or off](turn-bookings-on-or-off.md).
6262

63-
2. For mailboxes that get assigned a customized SharingPolicy, the policy must have Anonymous:SharingPolicyAction as one of the domains.
64-
65-
```Powershell:
66-
get-mailbox [email protected] | Format-List SharingPolicy
67-
```
68-
69-
If the command returns:
70-
71-
`SharingPolicy : "contoso.onmicrosoft.com\Default Sharing (CONTOSO)"`
72-
73-
You must update the policy with one of the required domains:
74-
75-
```Powershell
76-
Set-SharingPolicy "Default Sharing (CONTOSO)" -Domains @{Add="Anonymous:CalendarSharingFreeBusySimple"}
77-
```
78-
79-
For more information, see [Set-SharingPolicy](/powershell/module/exchange/set-sharingpolicy).
80-
8163
## Turn Bookings with me on or off
8264

8365
Bookings with me can be turned on or off for your entire organization or specific users. When Bookings with me is turned on, users can create a Bookings with me page and share links with others inside or outside your organization.
@@ -225,10 +207,6 @@ Bookings with me integrates with your Outlook calendar and can only be used for
225207

226208
Also, Bookings with me won't create a new mailbox for each Bookings with me page.
227209

228-
### Why is Bookings with me in preview?
229-
230-
Bookings with me is in preview for all enterprise users worldwide. We're collecting feedback and making improvement while it is being integrated into scheduling experiences in Bookings and Outlook.
231-
232210
### Who can access my public Bookings page?
233211

234212
Public meeting types can be accessed by anyone that has your Bookings with me page address. You decide who you share your Bookings with me page address with. For more information, see [Select a meeting time in Bookings with me](https://support.microsoft.com/office/select-a-meeting-time-in-bookings-with-me-8f3bbe5b-4bc6-4073-bf61-57383c00b43a).
@@ -241,7 +219,7 @@ Private meeting types can also generate single use links. Single use links expir
241219

242220
### Do people need to have a Microsoft account or Bookings license to schedule time with me?
243221

244-
No. Anyone can schedule time with you using your Bookings with me page, even if they don't have a Microsoft account. You need a Bookings license to create a Bookings with me page.
222+
No. Anyone or any attendee can schedule time with you using your Bookings with me page, even if they don't have a Microsoft account. You, as an organizer, need a Bookings license to create a Bookings with me page.
245223

246224
## Privacy
247225

microsoft-365/business-premium/TOC.yml

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
href: index.md
55
- name: What's new
66
href: m365bp-mdb-whats-new.md
7-
- name: Productivity and security
7+
- name: Why choose Microsoft 365 Business Premium?
88
href: why-choose-microsoft-365-business-premium.md
99
- name: Trial user guide - Microsoft 365 Business Premium
1010
href: m365bp-trial-playbook-microsoft-business-premium.md
@@ -16,13 +16,9 @@
1616
items:
1717
- name: Overview
1818
href: m365bp-setup-overview.md
19-
- name: Get Microsoft 365 Business Premium
20-
href: get-microsoft-365-business-premium.md
21-
- name: Set up Microsoft 365 Business Premium
22-
href: m365bp-setup.md
23-
- name: Get Microsoft 365 for Campaigns
24-
href: get-microsoft-365-campaigns.md
25-
- name: Set up Microsoft 365 Business for Campaigns
19+
- name: Microsoft 365 Business Premium
20+
href: m365-business-premium-setup.md
21+
- name: Microsoft 365 for Campaigns
2622
href: m365-campaigns-setup.md
2723
- name: Boost your security protection
2824
items:
@@ -50,7 +46,7 @@
5046
- name: Install Microsoft 365 Apps on devices
5147
href: m365bp-users-install-m365-apps.md
5248
- name: Protect unmanaged devices
53-
href: m365bp-protect-pcs-macs.md
49+
href: m365bp-users-protect-unmanaged-devices.md
5450
- name: Use email securely
5551
items:
5652
- name: Overview
@@ -111,6 +107,8 @@
111107
href: m365bp-maintain-environment.md
112108
- name: Administration guide
113109
href: m365bp-admin-guide.md
110+
- name: Security administration guide
111+
href: m365bp-security-admin-guide.md
114112
- name: Security operations guide
115113
href: m365bp-security-operations-guide.md
116114
- name: Reference
@@ -129,10 +127,10 @@
129127
href: ../lighthouse/m365-lighthouse-overview.md
130128
- name: Threat protection by Microsoft Defender Antivirus
131129
href: m365bp-threats-detected-defender-av.md
130+
- name: Endpoint security in Microsoft Intune
131+
href: /mem/intune/protect/endpoint-security-policy
132132
- name: Intune admin roles
133133
href: m365bp-intune-admin-roles-in-the-mac.md
134-
- name: Map protection features to Intune settings
135-
href: m365bp-map-protection-features-to-intune-settings.md
136134
- name: Windows Autopilot scenarios and capabilities
137135
href: /mem/autopilot/windows-autopilot-scenarios
138136

0 commit comments

Comments
 (0)