Merge branch 'main' into live

Author: VesaJuvonen

.openpublishing.publish.config.json

@@ -27,23 +27,24 @@
     "[email protected]",
     "[email protected]"
   ],
+  "sync_notification_subscribers": null,
   "branches_to_filter": [],
   "git_repository_url_open_to_public_contributors": "https://github.com/SharePoint/sp-dev-docs",
-  "git_repository_branch_open_to_public_contributors": "master",
+  "git_repository_branch_open_to_public_contributors": "main",
   "skip_source_output_uploading": false,
   "need_preview_pull_request": true,
   "contribution_branch_mappings": {},
   "dependent_repositories": [
     {
       "path_to_root": "_themes",
       "url": "https://github.com/Microsoft/templates.docs.msft",
-      "branch": "master",
+      "branch": "main",
       "branch_mapping": {}
     },
     {
       "path_to_root": "_themes.pdf",
       "url": "https://github.com/Microsoft/templates.docs.msft.pdf",
-      "branch": "master",
+      "branch": "main",
       "branch_mapping": {}
     },
     {
@@ -60,11 +61,11 @@
     ]
   },
   "need_generate_pdf_url_template": true,
-  "Targets": {  
-    "Pdf": {  
-    "template_folder": "_themes.pdf"  
-    }  
-   },
+  "Targets": {
+    "Pdf": {
+      "template_folder": "_themes.pdf"
+    }
+  },
   "JoinTOCPlugin": [
     {
       "ConceptualTOC": "/docs/toc.yml",
@@ -80,4 +81,4 @@
       "nuget_feed": "https://www.myget.org/F/op/api/v2"
     }
   ]
-}
+}

docs/apis/sp-migration-api-and-sensitivity-labels.md

@@ -1,7 +1,7 @@
 ---
 title: "Sensitivity labels and the SharePoint Migration API"
 description: Learn how to have sensitivity labels applied to content before migration with the SharePoint Migration API.
-ms.date: 02/01/2021
+ms.date: 05/24/2022
 ms.author: jhendr
 author: JoanneHendrickson
 manager: serdars
@@ -11,17 +11,17 @@ ms.prod: sharepoint
 ---
 # Sensitivity Labels and the SharePoint Migration API
 
-Sensitivity labels cannot be applied to files and folders using the SharePoint Migration API.  If you want to have sensitivity labels applied to your content being migrated to Microsoft 365, we recommend using the Microsoft Information Protection (MIP) SDK.  There currently isn't a parameter in the API to apply sensitivity labels to files.
+Sensitivity labels cannot be applied to files and folders using the SharePoint Migration API.  If you want to have sensitivity labels applied to your content being migrated to Microsoft 365, we recommend using the Microsoft Purview Information Protection SDK.  There currently isn't a parameter in the API to apply sensitivity labels to files.
 
 **Step 1:**
 
-Before you migrate your content with the Migration API, become familiar with how sensitivity labels work in Microsoft 365 and learn about the Microsoft Information Protection (MIP) SDK:
+Before you migrate your content with the Migration API, become familiar with how sensitivity labels work in Microsoft 365 and learn about the Microsoft Purview Information Protection SDK:
 
 - [Enable sensitivity labels for Offices files in SharePoint and OneDrive](/microsoft-365/compliance/sensitivity-labels-sharepoint-onedrive-files)
 - [Microsoft Information Protection SDK](/information-protection/develop/overview)
 
 **Step 2:**
-Download and configure the Microsoft Information Protection (MIP) SDK. The article listed here shows you how to set up and configure your Microsoft 365 subscription and client workstation, in preparation for using the SDK.
+Download and configure the Microsoft Purview Information Protection SDK. The article listed here shows you how to set up and configure your Microsoft 365 subscription and client workstation, in preparation for using the SDK.
 
 - [Microsoft Information Projection (MIP) SDK setup and configuration](/information-protection/develop/setup-configure-mip)
 
@@ -30,4 +30,5 @@ Apply sensitivity labels using the MIP SDK.
 
 If you're currently using Azure Information Protection, you must migrate your labels to Office 365 Security and Compliance Center. For more information on the process, see [How to migrate Azure Information Protection labels to the Office 365 Security & Compliance Center](/azure/information-protection/configure-policy-migrate-labels).
 
-**Step 4:** Migrate content using the [SharePoint Import Migration API (CreationMigrationJob)](migration-api-overview.md)
+**Step 4:**
+Migrate content using the [SharePoint Import Migration API (CreationMigrationJob)](migration-api-overview.md)

docs/apis/webhooks/webhooks-reference-implementation.md

@@ -13,7 +13,7 @@ The SharePoint Patterns and Practices (PnP) reference implementation shows how y
 
 The reference implementation only works with [SharePoint list webhooks](./lists/overview-sharepoint-list-webhooks.md). 
 
-You can also follow these steps by watching the video on the SharePoint PnP YouTube Channel:
+You can also follow these steps by watching the video on the Microsoft 365 Platform Communtiy (PnP) YouTube Channel:
 
 <br/>
 

docs/community/community.md

@@ -6,9 +6,9 @@ ms.prod: sharepoint
 ms.localizationpriority: high
 ---
 
-# SharePoint Developer Community (SharePoint PnP) resources
+# Microsoft 365 Platform Community (PnP) resources around SharePoint Framework
 
-The SharePoint Development Community (also known as the SharePoint PnP community) is an open-source initiative coordinated by SharePoint engineering. This community controls SharePoint development documentation, samples, reusable controls, and other relevant open-source initiatives related to SharePoint development.
+The Microsoft 365 Platform Community (also known as M365 PnP community) is an open-source initiative coordinated by Microsoft 365 engineering. This community controls SharePoint development documentation, samples, reusable controls, and other relevant open-source initiatives related to SharePoint development.
 
 ## Blog posts, videos, and social media
 

docs/docfx.json

@@ -42,7 +42,7 @@
       "author": "VesaJuvonen",
       "ms.topic": "conceptual",
       "ms.suite": "office",
-      "ms.prod": "sharepoint",
+      "ms.service": "sharepoint",
       "feedback_system": "GitHub",
       "feedback_github_repo": "SharePoint/sp-dev-docs",
       "feedback_product_url": "https://aka.ms/spdev-uservoice",