Merge branch 'public' into patch-1

Author: tiburd

.github/pull_request_template.md

@@ -0,0 +1,7 @@
+<!--
+Microsoft Entra rebrand: Please do not submit pull requests containing branding updates from Azure Active Directory, Azure AD, AAD, etc, to their respective Microsoft Entra equivalents at this time. 
+
+Microsoft Entra rebranding is being coordinated across the Learn platform and will be applied to this repo automatically when we receive confirmation that product UIs have been updated. If you have questions regarding the rebrand project, contact dstrome.
+
+This text can be deleted.
+-->

.openpublishing.redirection.commerce.json

@@ -1,6 +1,11 @@
 {
   "redirections":[
-     {
+   {
+      "source_path":"microsoft-365/commerce/licenses/license-summary-faq.yml",
+      "redirect_url":"/microsoft-365/commerce/licenses/contracts-faq",
+      "redirect_document_id":false         
+   },
+   {
         "source_path":"microsoft-365/commerce/billing-and-payments/psd2.md",
         "redirect_url":"https://support.microsoft.com/account-billing/payment-services-directive-2-and-strong-customer-authentication-3527fa95-9c6a-5f6f-d8e6-f27f33aba50e",
         "redirect_document_id":false

.openpublishing.redirection.security.json

@@ -117,7 +117,7 @@
       },
       {
          "source_path":"microsoft-365/security/mtp/index.md",
-         "redirect_url":"microsoft-threat-protection",
+         "redirect_url":"/microsoft-365/security/defender/microsoft-365-defender",
          "redirect_document_id":false
       },
       {
@@ -1827,7 +1827,7 @@
       },
       {
          "source_path":"microsoft-365/security/defender-endpoint/get-user-information.md",
-         "redirect_url":"microsoft-365/security/defender-endpoint/management-apis",
+         "redirect_url":"/microsoft-365/security/defender-endpoint/management-apis",
          "redirect_document_id":false
       },
       {

defender/threat-intelligence/gathering-threat-intelligence-and-infrastructure-chaining.md

@@ -118,7 +118,9 @@ But because our virtual users capture the DOM and find all the dynamic links and
 
             ![Tutorial Infra Chain My Piltowcom 2 Whois](media/tutorialInfraChainMyPiltowcom2Whois.png)
         2. mypiltow[.]com
+
         3. If you select the Whois record from October of 2018, you will find that mypiltow[.]com was registered in Hong Kong SAR, China and is privacy protected by Domain ID Shield Service CO.
+
         4. mypiltow[.]com’s registrar is OnlineNIC, Inc.
 
             ![Tutorial Infra Chain My Piltowcom 2 Whois](media/tutorialInfraChainMyPiltowcom2Whois.png)

defender/threat-intelligence/what-is-microsoft-defender-threat-intelligence-defender-ti.md

@@ -77,7 +77,7 @@ Vulnerability Articles also include a Defender TI Priority Score and severity in
 
 ## Reputation scoring
 
-Defender TI provides proprietary reputation scores for any Host, Domain, or IP Address. Whether validating the reputation of a known or unknown entity, this score helps users quickly understand any detected ties to malicious or suspicious infrastructure. The platform provides quick information about the activity of these entities, such as First and Last Seen timestamps, ASN, country, associated infrastructure, and a list of rules that impact the reputation score when applicable.
+Defender TI provides proprietary reputation scores for any Host, Domain, or IP Address. Whether validating the reputation of a known or unknown entity, this score helps users quickly understand any detected ties to malicious or suspicious infrastructure. The platform provides quick information about the activity of these entities, such as First and Last Seen timestamps, ASN, country/region, associated infrastructure, and a list of rules that impact the reputation score when applicable.
 
 ![Reputation Summary Card](media/reputationSummaryCard.png)
 

microsoft-365/admin/TOC.yml

@@ -99,8 +99,6 @@
           href: multi-tenant/manage.md
     - name: Office 365 operated by 21Vianet
       items: 
-        - name: About Office 365 operated by 21Vianet
-          href: services-in-china/services-in-china.md
         - name: Download the Office app for Android for Office 365 operated by 21Vianet
           href: services-in-china/download-office-app-for-Android.md
         - name: Download the Office app for iOS for Office 365 operated by 21Vianet

microsoft-365/admin/activity-reports/microsoft-teams-usage-activity.md

@@ -114,6 +114,9 @@ Data for following metrics are available for individual teams.
 |Channel messages|The number of unique messages that the user posted in a team chat during the specified time period.|
 |Last activity date|The latest date that any member of the team has committed an action.|
 
+> [!NOTE]
+> Metric counts include Teams client built-in features, but don't include changes to chat and channel through service integration, such as Teams app posts or replies and emails in the channel.
+
 ## Make the user-specific data anonymous
 
 To make the data in Teams user activity report anonymous, you have to be a global administrator. This will hide identifiable information (using MD5 hashes) such as display name, email, and Azure Active Directory Object ID in report and their export.

microsoft-365/admin/activity-reports/microsoft-teams-user-activity-preview.md

@@ -26,7 +26,7 @@ description: "Learn how to get the Microsoft Teams user activity report and gain
 # Microsoft 365 Reports in the admin center - Microsoft Teams user activity
 
 The Microsoft 365 Reports dashboard shows you the activity overview across the products in your organization. It enables you to drill in to individual product level reports to give you more granular insight about the activities within each product. Check out [the Reports overview topic](activity-reports.md). In the Microsoft Teams user activity report, you can gain insights into the Microsoft Teams activity in your organization.
- 
+
 ## How to get to the Microsoft Teams user activity report
 
 1. In the admin center, go to the **Reports**, then select **Usage**.
@@ -35,44 +35,53 @@ The Microsoft 365 Reports dashboard shows you the activity overview across the p
 
 ## Interpret the Microsoft Teams user activity report
 
-You can view the user activity in the Teams report by choosing the **User activity** tab. <br/>![Microsoft 365 reports - Microsoft Teams user activity.](../../media/user-activity-charts.png)
+You can view the user activity in the Teams report by choosing the **User activity** tab.
+
+![Microsoft 365 reports - Microsoft Teams user activity.](../../media/user-activity-charts.png)
 
 Select **Choose columns** to add or remove columns from the report.  
 
-![Teams user activity report - choose columns.](../../media/user-activity-columns.png)
+:::image type="content" alt-text="Teams user activity report - choose columns." source="../../media/user-activity-columns.png":::
 
 You can also export the report data into an Excel .csv file by selecting the **Export** link. This exports data of all users and enables you to do simple sorting and filtering for further analysis. The exported format for **audio time**, **video time**, and **screen share time** follows ISO8601 duration format.
 
 The **Microsoft Teams user activity** report can be viewed for trends over the last 7 days, 30 days, 90 days, or 180 days. However, if you select a particular day in the report, the table will show data for up to 28 days from the current date (not the date the report was generated).
 
 To ensure data quality, we perform daily data validation checks for the past three days and will be filling any gaps detected. You may notice differences in historical data during the process.
 
-|Item|Description|
-|:-----|:-----|
-|**Metric**|**Definition**|
-|User name  <br/> |The email address of the user. You can display the actual email address or make this field anonymous.   <br/> |
-|Tenant name  <br/> |The name of an internal or external tenant where a user belongs.   <br/> <br/> If a user belongs to an external tenant, corresponding data metrics (for example, post messages, reply messages,  etc.) are calculated based on their interactions in shared channels of the admin’s tenant. Interactions done by the user in their own tenant (outside of shared channels of the given tenant) are not considered for the admin usage report of given tenant.  |
-|Is external   <br/> |Indicates if the user is an external user or not.   <br/> |
-|Shared channel tenant names   <br/> |The names of internal or external tenants of shared channels where the user participated.   <br/> |
-|Channel messages   <br/> |The number of unique messages that the user posted in a team chat during the specified time period. This includes original posts and replies.   <br/> |
-|Posts   <br/> |The number of post messages in all channels during the specified time period. A post is the original message in a teams chat.<br/> |
-|Replies   <br/> |The number of replied messages in all channels during the specified time period. <br/> |
-|Urgent messages    <br/> |The number of urgent messages during the specified time period. <br/> |
-|Chat messages   <br/> |The number of unique messages that the user posted in a private chat during the specified time period.  <br/> |
-|Total meetings   <br/> |The number of online meetings that the user participated in during the specified time period.  <br/> |
-|1:1 calls   <br/> | The number of 1:1 calls that the user participated in during the specified time period.  <br/> |
-|Last activity date (UTC)  <br/> |The last date that the user participated in a Microsoft Teams activity.<br/> |
-|Meetings participated ad hoc   <br/> | The number of ad hoc meetings a user participated in during the specified time period.  <br/> |
-|Meetings organized ad hoc <br/> |The number of ad hoc meetings a user organized during the specified time period. <br/>|
-|Total organized meetings  <br/> |The sum of one-time scheduled, Recurring, ad hoc and unclassified meetings a user organized during the specified time period.  <br/> |
-|Total participated meetings  <br/> |The sum of the one-time scheduled, recurring, ad hoc and unclassified meetings a user participated in during the specified time period.  <br/> |
-|Meetings organized scheduled one-time  <br/> |The number of one-time scheduled meetings a user organized during the specified time period.  <br/> |
-|Meetings organized scheduled recurring  <br/> |The number of recurring meetings a user organized during the specified time period.  <br/> |
-|Meetings participated scheduled one-time  <br/> |The number of the one-time scheduled meetings a user participated in during the specified time period.  <br/> |
-|Meetings participated scheduled recurring  <br/> |The number of the recurring meetings a user participated in during the specified time period.  <br/> |
-|Is licensed  <br/> |Selected if the user is licensed to use Teams. <br/>|
-|Other activity  <br/>|The User is active but has performed other activities than exposed action types offered in the report (sending or replying to channel messages and chat messages, scheduling or participating in 1:1 calls and meetings). Examples actions are when a user changes the Teams status or the Teams status message or opens a Channel Message post but does not reply.  <br/>|
-
+|Metric|Mapped metric in Export|Definition|
+|:-----|:-----|:-----|
+|User name  <br/> |User Principal Name|The email address of the user. You can display the actual email address or make this field anonymous.   <br/> |
+|Tenant name  <br/> |Tenant Display Name|The name of an internal or external tenant where a user belongs.   <br/> <br/> If a user belongs to an external tenant, corresponding data metrics (for example, post messages, reply messages,  etc.) are calculated based on their interactions in shared channels of the admin’s tenant. Interactions done by the user in their own tenant (outside of shared channels of the given tenant) are not considered for the admin usage report of given tenant.  |
+|Is external   <br/> |Is External|Indicates if the user is an external user or not.   <br/> |
+|Shared channel tenant names   <br/> |Shared Channel Tenant Display Names|The names of internal or external tenants of shared channels where the user participated.   <br/> |
+|Channel messages   <br/> |Team Chat Message Count|The number of unique messages that the user posted in a team chat during the specified time period. This includes original posts and replies.   <br/> |
+|Posts   <br/> |Post Messages|The number of post messages in all channels during the specified time period. A post is the original message in a teams chat.<br/> |
+|Replies   <br/> |Reply Messages|The number of replied messages in all channels during the specified time period. <br/> |
+|Urgent messages    <br/> |Urgent Messages|The number of urgent messages during the specified time period. <br/> |
+|Chat messages   <br/> |Private Chat Message Count|The number of unique messages that the user posted in a private chat during the specified time period.  <br/> |
+|Total meetings   <br/> |Meeting Count|The number of online meetings that the user participated in during the specified time period.  <br/> |
+|1:1 calls   <br/> |Call Count|The number of 1:1 calls that the user participated in during the specified time period.  <br/> |
+|Last activity date (UTC)  <br/> |Last Activity Date|The last date that the user participated in a Microsoft Teams activity.<br/> |
+|Meetings participated ad hoc   <br/> |Ad Hoc Meetings Attended Count|The number of ad hoc meetings a user participated in during the specified time period.  <br/> |
+|Meetings organized ad hoc <br/> |Ad Hoc Meetings Organized Count|The number of ad hoc meetings a user organized during the specified time period. <br/>|
+|Total organized meetings  <br/> |Meetings Organized Count|The sum of one-time scheduled, Recurring, ad hoc and unclassified meetings a user organized during the specified time period.  <br/> |
+|Total participated meetings  <br/> |Meetings Attended Count|The sum of the one-time scheduled, recurring, ad hoc and unclassified meetings a user participated in during the specified time period.  <br/> |
+|Meetings organized scheduled one-time  <br/> |Scheduled One-time Meetings Organized Count|The number of one-time scheduled meetings a user organized during the specified time period.  <br/> |
+|Meetings organized scheduled recurring  <br/> |Scheduled Recurring Meetings Organized Count|The number of recurring meetings a user organized during the specified time period.  <br/> |
+|Meetings participated scheduled one-time  <br/> |Scheduled One-time Meetings Attended Count|The number of the one-time scheduled meetings a user participated in during the specified time period.  <br/> |
+|Meetings participated scheduled recurring  <br/> |Scheduled Recurring Meetings Attended Count|The number of the recurring meetings a user participated in during the specified time period.  <br/> |
+|Is licensed  <br/> |Is Licensed|Selected if the user is licensed to use Teams. <br/>|
+|Other activity  <br/>|Has Other Action|The User is active but has performed other activities than exposed action types offered in the report (sending or replying to channel messages and chat messages, scheduling or participating in 1:1 calls and meetings). Examples actions are when a user changes the Teams status or the Teams status message or opens a Channel Message post but does not reply.  <br/>|
+|Audio Duration| - |The sum of the audio duration of a user used during the specified time period and formatted by ISO 8601 - Wikipedia |
+|Video Duration| - |The sum of the video duration of a user used during the specified time period and formatted by ISO 8601 - Wikipedia |
+|Screen Share Duration| - |The sum of the screen share duration of a user used during the specified time period and formatted by ISO 8601 - Wikipedia |
+|Audio Duration In Seconds|Audio Time (Min)|The sum of the audio duration of a user used during the specified time period |
+|Video Duration In Seconds|Video Time (Min)|The sum of the video duration of a user used during the specified time period |
+|Screen Share Duration In Seconds|Screen Share Time (Min)|The sum of the screen share duration of a user used during the specified time period |
+
+> [!NOTE]
+> Metric counts include Teams client built-in features, but don't include changes to chat and channel through service integration, such as Teams app posts or replies and emails in the channel.
 
 ## Make the user-specific data anonymous
 
@@ -88,4 +97,4 @@ To make the data in Teams user activity report anonymous, you have to be a globa
 
 [Microsoft Teams device usage report](../activity-reports/microsoft-teams-device-usage-preview.md)
 
-[Microsoft Teams usage activity report](../activity-reports/microsoft-teams-usage-activity.md) 
+[Microsoft Teams usage activity report](../activity-reports/microsoft-teams-usage-activity.md)

microsoft-365/admin/admin-overview/sign-up-for-office-365.md

@@ -98,7 +98,7 @@ You don't need to cancel your trial. If you don't buy the trial subscription, it
 
 - **The address and contact information for your subscription:**
 
-  - **Country** where the services will be used. You **won't** be able to change the country later, even during the sign-up process; you'll have to restart the sign-up wizard.
+  - **Country** where the services will be used. You **won't** be able to change the country/region later, even during the sign-up process; you'll have to restart the sign-up wizard.
 
   - **Email** and **phone number** so we can contact you if needed about your subscription. For example, if you forget your password, we would use this information to send you a temporary one. We also send your billing information to the email address you specify.
 

microsoft-365/admin/create-groups/compare-groups.md

@@ -109,7 +109,7 @@ Shared mailboxes can receive external emails if the administrator has enabled th
 
 Shared mailboxes include a calendar that can be used for collaboration.
 
-Users with permissions to the group mailbox can send as or send on behalf of the mailbox email address, if the administrator has given that user permissions to do that. This is especially useful for help and support mailboxes because users can send emails from "Contoso Support" or "Building A Reception Desk."
+Users with permissions to the shared mailbox can send as or send on behalf of the mailbox email address, if the administrator has given that user permissions to do that. This is especially useful for help and support mailboxes because users can send emails from "Contoso Support" or "Building A Reception Desk."
 
 It's not possible to migrate a shared mailbox to a Microsoft 365 group.