Skip to content

Commit 2188c71

Browse files
author
Angela Fleischmann
authored
Merge branch 'main' into repo_sync_working_branch
2 parents 33219a9 + e21e781 commit 2188c71

23 files changed

Lines changed: 279 additions & 105 deletions

microsoft-365/admin/TOC.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,11 +145,11 @@
145145
href: add-users/remove-former-employee-step-1.md
146146
- name: Step 2. Save the contents of a former employee's mailbox
147147
href: add-users/remove-former-employee-step-2.md
148-
- name: Step 3. Forward a former employee's email to another employee or convert to a shared mailbox
148+
- name: Step 3. Wipe and block a former employee's mobile device
149149
href: add-users/remove-former-employee-step-3.md
150-
- name: Step 4. Give another employee access to OneDrive and Outlook data
150+
- name: Step 4. Forward a former employee's email to another employee or convert to a shared mailbox
151151
href: add-users/remove-former-employee-step-4.md
152-
- name: Step 5. Wipe and block a former employee's mobile device
152+
- name: Step 5. Give another employee access to OneDrive and Outlook data
153153
href: add-users/remove-former-employee-step-5.md
154154
- name: Step 6. Remove the Microsoft 365 license from a former employee
155155
href: add-users/remove-former-employee-step-6.md

microsoft-365/business-premium/index.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@ description: "Learn how to collaborate securely in your small business or campai
3131

3232
In our current world, keeping data and communications secure is a priority, particularly for medical and legal practices, political campaigns, and many other smaller businesses. Take advantage of the security features in Microsoft 365 Business Premium to collaborate safely within your small business. This solution provides a set of recommendations designed to help protect you and your data. This library includes help for setting up and using this recommended environment, no matter your business type.
3333

34-
35-
![Microsoft 365 Business Premium protects your productivity tools, collaboration tools, file storage, email, devices, and identity.](../media/M365-WhatIsIt-SecurityFocus.png#lightbox)
34+
:::image type="content" source="media/m365-whatisit-securityfocus2.png" alt-text="Microsoft 365 Business Premium protects your apps, file storage, email, devices, and identities.":::
3635

3736
This configuration includes the following guidance for productivity, collaboration, file storage, email, devices, and identity to protect your business:
3837

45.5 KB
Loading

microsoft-365/security/office-365-security/attack-simulation-training-simulation-automations.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ To create a simulation automation, do the following steps:
2727

2828
To go directly to the **Simulation automations** tab, use <https://security.microsoft.com/attacksimulator?viewid=simulationautomation>.
2929

30-
2. On the **Simulation automations** tab, select ![Create simulation icon.](../../media/m365-cc-sc-create-icon.png) **Create simulation**.
30+
2. On the **Simulation automations** tab, select ![Create automation icon.](../../media/m365-cc-sc-create-icon.png) **Create automation**.
3131

32-
![Create simulation button on the Simulation automations tab in Attack simulation training in the Microsoft 365 Defender portal.](../../media/attack-sim-training-sim-automations-create.png)
32+
![Create automation button on the Simulation automations tab in Attack simulation training in the Microsoft 365 Defender portal.](../../media/attack-sim-training-sim-automations-create.png)
3333

3434
3. The creation wizard opens. The rest of this article describes the pages and the settings they contain.
3535

microsoft-365/security/office-365-security/preset-security-policies.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,7 @@ A profile determines the level of protection. The following profiles are availab
5858

5959
You can only use a condition or exception once, but you can specify multiple values for the condition or exception. Multiple values of the same condition or exception use OR logic (for example, _\<recipient1\>_ or _\<recipient2\>_). Different conditions or exceptions use AND logic (for example, _\<recipient1\>_ and _\<member of group 1\>_).
6060

61-
- **Built-in protection** (Defender for Office 365 only): A profile that enables Safe Links and Safe Attachments protection only. This setting effectively provide default policies for Safe Links and Safe Attachments, which never had default policies.
62-
63-
> [!NOTE]
64-
> The **Built-in protection** preset security policy is currently in General Availability, available to all organizations.
61+
- **Built-in protection** (Defender for Office 365 only): A profile that enables Safe Links and Safe Attachments protection only. This profile effectively provides default policies for Safe Links and Safe Attachments, which never had default policies.
6562

6663
For **Built-in protection**, the preset security policy is on by default for all Defender for Office 365 customers. Although we don't recommend it, you can also configure exceptions based on **Users**, **Groups**, and **Domains** so the protection isn't applied to specific users.
6764

microsoft-365/solutions/empower-people-to-work-remotely-manage-endpoints.md

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,17 @@ With hybrid workers, you need to support a growing number of personal devices. E
2525

2626
[Microsoft Endpoint Manager](/mem/endpoint-manager-overview) provides services and tools for managing mobile devices, desktop computers, virtual machines, embedded devices, and servers by combining the following services you may already know and be using.
2727

28-
![The components of endpoint management for Microsoft 365.](../media/empower-people-to-work-remotely/endpoint-managment-step-grid.png)
28+
:::image type="content" source="../media/empower-people-to-work-remotely/endpoint-managment-step-grid.png" alt-text="The components of endpoint management for Microsoft 365" lightbox="../media/empower-people-to-work-remotely/endpoint-managment-step-grid.png":::
2929

3030
## Microsoft Intune
3131

3232
Microsoft Intune is a cloud-based service that focuses on mobile device management (MDM) and mobile application management (MAM) that is included with Microsoft 365.
3333

3434
- **MDM:** For organization-owned devices, you can exercise full control including settings, features, and security. Devices are "enrolled" in Intune where they receive Intune policies with rules and settings. For example, you can set password and PIN requirements, create a VPN connection, set up threat protection, and more.
3535

36-
- **MAM:** Remote workers might not want you to have full control on their personal devices, also known as bring-your-own device (BYOD) devices. You can give your hybrid workers options and still protect your organization. For example, hybrid workers can enroll their devices if they want full access to your organization resources. Or, if these users only want access to email or Microsoft Teams, then use app protection policies that require multi-factor authentication (MFA) to use these apps.
36+
- **MAM:** Remote workers might not want you to have full control of their personal devices, also known as bring-your-own device (BYOD) devices. You can give your hybrid workers options and still protect your organization. For example, hybrid workers can enroll their devices if they want full access to your organization resources. Or, if these users only want access to email or Microsoft Teams, then use app protection policies that require multi-factor authentication (MFA) to use these apps.
3737

38-
For more information, see the [Manage endpoints with Intune and Microsoft 365](manage-devices-with-intune-overview.md) foundation solution.
38+
For more information, see the [Manage devices with Intune](manage-devices-with-intune-overview.md) foundation solution.
3939

4040
## Configuration Manager
4141

@@ -53,17 +53,9 @@ For more information, see this [overview of co-management](/mem/configmgr/comana
5353

5454
## Endpoint Analytics
5555

56-
Endpoint Analytics is a cloud-based service that integrates with Configuration Manager and provides you with insight and intelligence so you can make informed decisions about your Windows clients. It combines data from your organization with data aggregated from millions of other devices connected to Microsoft cloud services.
56+
Endpoint analytics aims to improve user productivity and reduce IT support costs by providing insights into the user experience. The insights enable IT to optimize the end-user experience with proactive support and to detect regressions to the user experience by assessing user impact of configuration changes.
5757

58-
With Endpoint Analytics, you can:
59-
60-
- Create an inventory of apps running in your organization.
61-
- Assess app compatibility with the latest Windows 10 feature updates.
62-
- Identify compatibility issues and receive mitigation suggestions based on cloud-enabled data insights.
63-
- Create pilot groups that represent the entire application and driver estate across a minimal set of devices.
64-
- Deploy Windows 10 to pilot and production-managed devices.
65-
66-
For more information, see this [overview of Endpoint Analytics](/mem/configmgr/desktop-analytics/overview)
58+
For more information, see this [overview of Endpoint Analytics](/mem/analytics/overview)
6759

6860
## Windows Autopilot
6961

microsoft-365/solutions/empower-people-to-work-remotely-remote-access.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ With split tunneling, you can configure your VPN client to exclude specific type
5252

5353
To optimize access to Microsoft 365 cloud resources, configure your split tunneling VPN clients to exclude traffic to the **Optimize** category Microsoft 365 endpoints over the VPN connection. For more information, see [Office 365 endpoint categories](../enterprise/microsoft-365-network-connectivity-principles.md#new-office-365-endpoint-categories). See [this list](../enterprise/urls-and-ip-address-ranges.md) of Optimize category endpoints.
5454

55-
Here is the resulting traffic flow, in which most of the traffic to Microsoft 365 cloud apps bypass the VPN connection.
55+
Here is the resulting traffic flow, in which most of the traffic to Microsoft 365 cloud apps bypasses the VPN connection.
5656

5757
:::image type="content" source="../media/empower-people-to-work-remotely-remote-access/empower-people-to-work-remotely-remote-access-after-tunneling.png" alt-text="Network traffic from VPN clients with tunneling." lightbox="../media/empower-people-to-work-remotely-remote-access/empower-people-to-work-remotely-remote-access-after-tunneling.png":::
5858

microsoft-365/solutions/empower-people-to-work-remotely-security-compliance.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Remote work needs these elements of security and compliance:
3636

3737
Here are the features of Microsoft 365 that provide security and compliance services for hybrid workers.
3838

39-
![Use these Microsoft 365 services to stay secure and compliant.](../media/empower-people-to-work-remotely/remote-workers-security-compliance-grid.png)
39+
:::image type="content" source="../media/empower-people-to-work-remotely/remote-workers-security-compliance-grid.png" alt-text="Use these Microsoft 365 services to stay secure and compliant" lightbox="../media/empower-people-to-work-remotely/remote-workers-security-compliance-grid.png":::
4040

4141
## Security
4242

@@ -85,7 +85,7 @@ For your hybrid workers, you have implemented:
8585
- Malware protection for cloud service data, email, and Windows 11 or 10 devices
8686
- Compliance
8787
- Consistent labeling for levels of sensitivity and protection
88-
- Policies to prevention information leakage
88+
- Policies to prevent information leakage
8989
- Adherence to regional data regulations
9090

9191
## Next step

microsoft-365/solutions/empower-people-to-work-remotely-teams-productivity-apps.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,23 +35,23 @@ To be productive, people need to communicate and collaborate with one another. T
3535

3636
## Keep people connected with Microsoft Teams
3737

38-
Teams allows you to chat, meet, call, and collaborate all in one place. Millions of people get their work done in Teams every day because it brings together everything you need to work on-site or remotely into a hub for teamwork.
38+
Teams with Microsoft Teams allows your organization to chat, meet, call, and collaborate all in one place. Millions of people get their work done with teams every day because it brings together everything you need to work on-site or remotely into a hub for teamwork.
3939

4040
For detailed guidance, see [Support remote workers using Microsoft Teams](/microsoftteams/support-remote-work-with-teams).
4141

4242
Watch the [Enabling hybrid work with Microsoft Teams webcasts](https://resources.techcommunity.microsoft.com/enabling-hybrid-work/) for guidance and demos on using Teams for hybrid work.
4343

4444
### Chat and conversations
4545

46-
Chat and threaded conversations are at the center of Teams with support for individual 1:1 chats and group chats and conversations. Remote workers can share information, opinions, and personality by using gifs, stickers, and emojis in group chats or one-to-one messages.
46+
Chat and threaded conversations are at the center of Teams with support for individual 1:1 chats and group chats and conversations. Remote workers can share information, opinions, and personality by using pictures, stickers, and emojis in group chats or one-to-one messages.
4747

4848
### Meetings and conferencing
4949

5050
Teams can certainly help maintain communications and information sharing with hybrid workers, especially with meetings that support up to 250 people. Teams meetings enable interactive, collaborative meetings with people inside and outside your organization. Remote workers can use Teams meetings for day-to-day activities including recurring project checkpoints, catching-up with colleagues, brainstorming sessions, and facilitating conversations with customers.
5151

5252
### Calling
5353

54-
Teams supports direct VoIP calling between users and even other organizations using federation. It uses the same codecs as meetings and provide great audio world-wide without additional PSTN charges. However, some users may need a dedicated phone number to take external calls when working on-site or remotely. Teams can quickly provide cloud phone service for these users to make and receive phone calls.
54+
Teams supports direct VoIP calling between users and even other organizations using federation. It uses the same codecs as meetings and provides great audio world-wide without additional PSTN charges. However, some users may need a dedicated phone number to take external calls when working on-site or remotely. Teams can quickly provide cloud phone service for these users to make and receive phone calls.
5555

5656
### Apps and workflows
5757

microsoft-365/solutions/empower-people-to-work-remotely.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ description: Step through the layers of infrastructure so your hybrid workers ca
2323

2424
# Set up your infrastructure for hybrid work with Microsoft 365
2525

26-
To secure and optimize your worker’s productivity and collaboration, you need to allow on-site and remote workers to easily and securely access your organization's on-premises and cloud-based information, tools, and resources. This solution steps through the deployment of key layers of infrastructure that empower your workers to do their best work, wherever they are.
26+
To secure and optimize your worker’s productivity and collaboration, you need to allow on-site and remote workers to access your organization's on-premises and cloud-based information, tools, and resources easily and securely. This solution steps through the deployment of key layers of infrastructure that empower your workers to do their best work, wherever they are.
2727

2828
Hybrid workers can work on-site or remotely in a combination of locations. Allowing workers to work away from a traditional office is important for many organizations to:
2929

3030
- Hire and retain workers who are unwilling to relocate or require a flexible work environment.
3131
- Reduce worker commuting, leaving workers with more time to be productive and for stress-reducing activities outside of work.
32-
- Save on office space.
32+
- Save office space.
3333

3434
Microsoft 365 has the capabilities to empower your hybrid workers to work either on-site or remotely.
3535

0 commit comments

Comments
 (0)