Skip to content

Commit 34299a9

Browse files
Merge pull request #30959 from kenwith/bulk-rebrand/terminology-phase1a
Update outdated Microsoft terminology
2 parents f57c67f + d7bc3f0 commit 34299a9

17 files changed

Lines changed: 20 additions & 20 deletions

copilot/microsoft-365-copilot-search-admin-experience.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ Add bookmarks one at a time or bulk import them using a .csv file. Upload a .csv
159159

160160
| Title | Url | Keywords | Match Similar Keywords | State | Description | Reserved Keywords | Categories | Last Modified By | ID |
161161
|--------|----------------------------------|--------------------------------|-------------------------------|-----------------------------------------------------------|----------------------------------------------------------|------------------------------------------|--------------------------------|------------------|-----|
162-
| Yammer | https://www.yammer.com/office365 | Yammer Online, Yammer login | Automatic or can manually add | Published, Draft, Scheduled, Excluded, Expired, Suggested | Yammer is a collaboration tool that helps you connect with colleagues. | Microsoft Suggests, Microsoft Recommends | Name of the admin | Unique ID | |
162+
| Viva Engage | https://www.yammer.com/office365 | Viva Engage Online, Viva Engage login | Automatic or can manually add | Published, Draft, Scheduled, Excluded, Expired, Suggested | Viva Engage is a collaboration tool that helps you connect with colleagues. | Microsoft Suggests, Microsoft Recommends | Name of the admin | Unique ID | |
163163

164164
### Prevent import errors
165165

microsoft-365/admin/security-and-compliance/gdpr-compliance.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ Microsoft 365 for business can help you with the GDPR process in the following w
238238

239239
- **Discover**: An important step to GDPR compliance is knowing what data you have.
240240

241-
- **Manage**: Controlling access to data and managing its use is an integral part of GDPR. Microsoft 365 for business protects business data based on policies you want to apply to devices. Device management is vital in an age where employees work remotely. Microsoft 365 for business includes device management features that make sure data is protected across all devices. For example, you can specify that all Windows 10 devices in your business are protected via Windows Defender.
241+
- **Manage**: Controlling access to data and managing its use is an integral part of GDPR. Microsoft 365 for business protects business data based on policies you want to apply to devices. Device management is vital in an age where employees work remotely. Microsoft 365 for business includes device management features that make sure data is protected across all devices. For example, you can specify that all Windows 10 devices in your business are protected via Microsoft Defender.
242242

243243
- **Protect**: Microsoft 365 for business is designed for security. Its device management and data protection controls work across your business network, including remote devices, to help keep data secure. Microsoft 365 for business offers controls such as privacy settings in Microsoft 365 productivity apps and encryption of documents. With Microsoft 365 for business, you can perform GDPR compliance monitoring to make sure you have the right level of protection set.
244244

microsoft-365/admin/security-and-compliance/m365b-devices-basic-mobility-security-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ The settings in the following table are available only on the **New-DeviceConfig
221221
|_WLANEnabled_|||||Disables Wi-Fi on devices.|
222222
|_WorkFoldersSyncUrl_|||||Specifies the Work Folders URL on a Windows Server that's used to synchronize company resources on devices. For more information about Work Folders, see [Work Folders overview](/windows-server/storage/work-folders/work-folders-overview).|
223223

224-
<!--- Do the SmartScreen/AV settings for Windows apply to Windows Defender? --->
224+
<!--- Do the SmartScreen/AV settings for Windows apply to Microsoft Defender? --->
225225

226226
For information about configuring policies in PowerShell, see [Use PowerShell to create policies in Basic Mobility and Security](m365b-devices-basic-mobility-security-policies-configure.md#use-powershell-to-create-policies-in-basic-mobility-and-security).
227227

microsoft-365/admin/security-and-compliance/m365bp-devices-protection.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ The following types of device protection policies are available in Business Prem
5555
- Linux
5656
- **[App Control for Business policies](/intune/intune-service/protect/endpoint-security-app-control-policy#get-started-with-app-control-for-business-policies)**: Manage approved apps for Windows devices with App Control for Business policies and Managed Installers. Supported platforms:
5757
- Windows
58-
- **[Attack surface reduction](/intune/intune-service/protect/endpoint-security-asr-policy)**: Targets behavior typically used to infect computers, and helps secure removable devices. Uses Windows Defender antivirus on Windows devices. Supported platforms:
58+
- **[Attack surface reduction](/intune/intune-service/protect/endpoint-security-asr-policy)**: Targets behavior typically used to infect computers, and helps secure removable devices. Uses Microsoft Defender Antivirus on Windows devices. Supported platforms:
5959
- Windows and [Configuration Manager](/intune/configmgr/core/understand/introduction) on Windows.
6060
- **[Disk encryption policies](/intune/intune-service/protect/endpoint-security-disk-encryption-policy)**: Manage built-in disk and folder-level encryption on Windows and macOS devices. Supported platforms:
6161
- Windows

microsoft-365/enterprise/additional-office365-ip-addresses-and-urls.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ Apart from DNS, these instances are all optional for most customers unless you n
6464
|15|**Authentication and identity FQDNs** <p> The FQDN `secure.aadcdn.microsoftonline-p.com` needs to be in your client's Internet Explorer (IE) or Edge Trusted Sites Zone to function.||Trusted Sites|
6565
|16|**Microsoft Teams FQDNs** <p> If you are using Internet Explorer or Microsoft Edge, you need to enable first, and third-party cookies and add the FQDNs for Teams to your Trusted Sites. This is in addition to the suite-wide FQDNs, CDNs, and telemetry listed in row 14. See [Known issues for Microsoft Teams](/microsoftteams/known-issues) for more information.||Trusted Sites|
6666
|17|**SharePoint Online and OneDrive for Business FQDNs** <p> All '.sharepoint.com' FQDNs with '\<tenant\>' in the FQDN need to be in your client's IE or Edge Trusted Sites Zone to function. In addition to the suite-wide FQDNs, CDNs, and telemetry listed in row 14, you need to also add these endpoints.||Trusted Sites|
67-
|18|**Yammer** <br> Yammer is only available in the browser and requires the authenticated user to be passed through a proxy. All Yammer FQDNs need to be in your client's IE or Edge Trusted Sites Zone to function.||Trusted Sites|
67+
|18|**Viva Engage** <br> Viva Engage is only available in the browser and requires the authenticated user to be passed through a proxy. All Viva Engage FQDNs need to be in your client's IE or Edge Trusted Sites Zone to function.||Trusted Sites|
6868
|19|Use **[Microsoft Entra Connect](/azure/active-directory/hybrid/)** to sync on-premises user accounts to Microsoft Entra ID.|See [Hybrid Identity Required Ports and Protocols](/azure/active-directory/hybrid/reference-connect-ports), [Troubleshoot Microsoft Entra connectivity](/azure/active-directory/hybrid/tshoot-connect-connectivity), and [Microsoft Entra Connect Health Agent Installation](/azure/active-directory/hybrid/how-to-connect-health-agent-install#outbound-connectivity-to-the-azure-service-endpoints).|Outbound server-only traffic|
6969
|20|**[Microsoft Entra Connect](/azure/active-directory/hybrid/)** with 21 ViaNet in China to sync on-premises user accounts to Microsoft Entra ID.|`*.digicert.com:80` <BR> `*.entrust.net:80` <BR> `*.chinacloudapi.cn:443` <br> `secure.aadcdn.partner.microsoftonline-p.cn:443` <br> `*.partner.microsoftonline.cn:443` <p> Also see [Troubleshoot ingress with Microsoft Entra connectivity issues](https://docs.azure.cn/zh-cn/active-directory/hybrid/tshoot-connect-connectivity).|Outbound server-only traffic|
7070
|21|**Microsoft Stream** (needs the Microsoft Entra user token). <br> Microsoft 365 Worldwide (including GCC)|`*.cloudapp.net` <br> `*.api.microsoftstream.com` <br> `*.notification.api.microsoftstream.com` <br> `amp.azure.net` <br> `api.microsoftstream.com` <br> `az416426.vo.msecnd.net` <br> `s0.assets-yammer.com` <br> `vortex.data.microsoft.com` <br> `web.microsoftstream.com` <br> TCP port 443|Inbound server traffic|

microsoft-365/enterprise/contoso-mdm.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ This is how Contoso set up their mobile device management infrastructure:
5757
- Device encryption to help prevent unauthorized access.
5858
- A six-digit PIN or password.
5959
- An inactivity-timeout period.
60-
- Antivirus and malware protection, and signature updates with Windows Defender on Windows 11 devices.
60+
- Antivirus and malware protection, and signature updates with Microsoft Defender on Windows 11 devices.
6161
- Automatic updates on Windows 11 devices that include the latest security updates.
6262
- Pushing certificates to managed devices.
6363
- A clear separation of business and personal data. Users or admins can selectively wipe corporate data from the device, while leaving personal data such as pictures, personal email accounts, and personal files untouched.

microsoft-365/enterprise/cross-tenant-identity-mapping.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@ The CTIMwrite command writes the following attributes from the mapped source mai
390390
This command updates MailUser attributes in the on-premises Active Directory (AD).
391391
392392
4. Sync changes to Microsoft 365:
393-
1. Wait for Microsoft Entra Connect (Azure AD Connect) to synchronize changes to the cloud.
393+
1. Wait for Microsoft Entra Connect (formerly Azure AD Connect) to synchronize changes to the cloud.
394394
1. You may manually trigger a sync for faster results.
395395
5. Confirm attributes are correctly written:
396396

microsoft-365/enterprise/m365-dr-commitments.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,12 +83,12 @@ The following customer data is stored at rest in the _Local Region Geography_:
8383
- Microsoft 365 Groups
8484
- Exchange public folders
8585
- Microsoft Teams chats and channel messages
86-
- Yammer user and community messages
86+
- Viva Engage user and community messages
8787
- Customer Data copied and stored in Exchange Online hidden mailboxes
8888
- Teams channel messages
8989
- Teams chats
9090
- Teams private channel messages
91-
- Yammer user and community messages
91+
- Viva Engage user and community messages
9292
- SharePoint, OneDrive, Exchange Online and Microsoft Teams follow the data residency commitments for those services. Refer to [Exchange Online](m365-dr-service-exo.md), [SharePoint](m365-dr-service-spo.md), and [Microsoft Teams](m365-dr-service-teams.md) workload data residency pages for more details.
9393
- Training classifiers
9494
- Disposition data

microsoft-365/enterprise/microsoft-365-network-connectivity-principles.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ For more information on using PAC files to optimize network connectivity on clie
140140
#### Microsoft 365 security features
141141
<a name="BKMK_WebSvc"> </a>
142142

143-
Microsoft is transparent about datacenter security, operational security, and risk reduction around Microsoft 365 servers and the network endpoints that they represent. Microsoft 365 built-in security features are available for reducing network security risk, such as Microsoft Purview Data Loss Prevention, antivirus, Multifactor Authentication, Customer Lockbox, Defender for Microsoft 365, Microsoft 365 Threat Intelligence, Microsoft 365 Secure Score, [the built-in security features for all cloud mailboxes](/defender-office-365/eop-about), and Network DDOS Security.
143+
Microsoft is transparent about datacenter security, operational security, and risk reduction around Microsoft 365 servers and the network endpoints that they represent. Microsoft 365 built-in security features are available for reducing network security risk, such as Microsoft Purview Data Loss Prevention, antivirus, Multifactor Authentication, Customer Lockbox, Defender for Office 365, Microsoft 365 Threat Intelligence, Microsoft 365 Secure Score, [the built-in security features for all cloud mailboxes](/defender-office-365/eop-about), and Network DDOS Security.
144144

145145
For more information on Microsoft datacenter and Global Network security, see the [Microsoft Trust Center](https://www.microsoft.com/trustcenter/security).
146146

microsoft-365/enterprise/microsoft-365-vpn-split-tunnel.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ We can then trigger policy such as approve, trigger MFA, or block authentication
149149

150150
Again, Microsoft 365 provides protection for the Optimize marked endpoints in various layers in the service itself, [outlined in this document](/office365/Enterprise/office-365-malware-and-ransomware-protection). As noted, it's vastly more efficient to provide these security elements in the service itself rather than try to do it in line with devices that may not fully understand the protocols/traffic. By default, SharePoint [automatically scans file uploads](../security/office-365-security/anti-malware-protection-for-spo-odfb-teams-about.md) for known malware
151151

152-
For the previously described Exchange endpoints, [the built-in security features for all cloud mailboxes](/defender-office-365/eop-about) and [Microsoft Defender for Microsoft 365](/defender-office-365/mdo-about) do an excellent job of providing security of the traffic to the service.
152+
For the previously described Exchange endpoints, [the built-in security features for all cloud mailboxes](/defender-office-365/eop-about) and [Microsoft Defender for Office 365](/defender-office-365/mdo-about) do an excellent job of providing security of the traffic to the service.
153153

154154
### Can I send more than just the Optimize traffic direct?
155155

0 commit comments

Comments
 (0)