Merge pull request #189207 from MicrosoftDocs/main

Merge main to live, 4 AM

Author: ttorble

.openpublishing.redirection.active-directory.json

@@ -800,6 +800,11 @@
             "redirect_url": "/azure/active-directory/external-identities/external-identities-overview",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/active-directory/external-identities/o365-external-user.md",
+            "redirect_url": "/azure/active-directory/external-identities/what-is-b2b",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/active-directory/active-directory-b2b-current-preview-limitations.md",
             "redirect_url": "/azure/active-directory/active-directory-b2b-current-limitations",

.openpublishing.redirection.json

@@ -15901,8 +15901,13 @@
     },
     {
       "source_path_from_root": "/articles/lab-services/devtest-lab-developer-lab.md",
-      "redirect_url": "/azure/devtest-labs/devtest-lab-developer-lab",
-      "redirect_document_id": true
+      "redirect_url": "/azure/devtest-labs/devtest-lab-guidance-get-started",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/devtest-labs/devtest-lab-developer-lab.md",
+      "redirect_url": "/azure/devtest-labs/devtest-lab-guidance-get-started",
+      "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/lab-services/devtest-lab-dev-ops.md",
@@ -16036,13 +16041,23 @@
     },
     {
       "source_path_from_root": "/articles/lab-services/devtest-lab-test-env.md",
-      "redirect_url": "/azure/devtest-labs/devtest-lab-test-env",
-      "redirect_document_id": true
+      "redirect_url": "/azure/devtest-labs/devtest-lab-guidance-get-started",
+      "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/lab-services/devtest-lab-training-lab.md",
-      "redirect_url": "/azure/devtest-labs/devtest-lab-training-lab",
-      "redirect_document_id": true
+      "redirect_url": "/azure/devtest-labs/devtest-lab-guidance-get-started",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/devtest-labs/devtest-lab-test-env.md",
+      "redirect_url": "/azure/devtest-labs/devtest-lab-guidance-get-started",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/devtest-labs/devtest-lab-training-lab.md",
+      "redirect_url": "/azure/devtest-labs/devtest-lab-guidance-get-started",
+      "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/lab-services/devtest-lab-troubleshoot-apply-artifacts.md",
@@ -22629,6 +22644,11 @@
       "redirect_url": "/azure/active-directory/conditional-access/concept-conditional-access-cloud-apps",
       "redirect_document_id": true
     },
+    {
+      "source_path_from_root": "/articles/scheduler/scheduler-intro.md",
+      "redirect_url": "/azure/scheduler/migrate-from-scheduler-to-logic-apps",
+      "redirect_document_id": ""
+    },
     {
       "source_path_from_root": "/articles/scheduler/scheduler-advanced-complexity.md",
       "redirect_url": "/azure/scheduler/migrate-from-scheduler-to-logic-apps",

articles/active-directory/external-identities/media/cross-tenant-access-settings-b2b-collaboration/cross-tenant-defaults.png

@@ -51,8 +51,6 @@
       href: claims-mapping.md
     - name: B2B user token
       href: user-token.md
-    - name: B2B collaboration and Office 365 external sharing
-      href: o365-external-user.md
     - name: B2B collaboration for hybrid organizations
       href: hybrid-organizations.md
   - name: Self-service sign-up

articles/active-directory/external-identities/media/o365-external-user/odsp-sharing-setting.png

@@ -6,7 +6,7 @@ services: active-directory
 ms.service: active-directory
 ms.subservice: B2B
 ms.topic: overview
-ms.date: 02/14/2022
+ms.date: 02/18/2022
 
 ms.author: mimart
 author: msmimart
@@ -101,6 +101,13 @@ Azure AD supports external identity providers like Facebook, Microsoft accounts,
 
 ![Screenshot showing the Identity providers page](media/what-is-b2b/identity-providers.png)
 
+## Integrate with SharePoint and OneDrive
+
+You can [enable integration with SharePoint and OneDrive](/sharepoint/sharepoint-azureb2b-integration) to share files, folders, list items, document libraries, and sites with people outside your organization, while using Azure B2B for authentication and management. The users you share resources with are typically added to your directory as guests, and permissions and groups work the same for these guests as they do for internal users. When enabling integration with SharePoint and OneDrive, you'll also enable the [email one-time passcode](one-time-passcode.md) feature in Azure AD B2B to serve as a fallback authentication method. 
+
+![Screenshot of the email one-time-passcode setting.](media/what-is-b2b/enable-email-otp-options.png)
+
+
 ## Next steps
 
 - [External Identities pricing](external-identities-pricing.md)