Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into iot-feb-21-release

Author: batamig

.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.defender-for-iot.json

@@ -30,7 +30,17 @@
             "redirect_url": "/azure/defender-for-iot/organizations/getting-started",
             "redirect_document_id": false
         },
-	{
+        {
+            "source_path_from_root": "/articles/defender-for-iot/organizations/how-to-view-information-provided-in-alerts.md",
+            "redirect_url": "/azure/defender-for-iot/organizations/how-to-view-alerts",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/defender-for-iot/organizations/how-to-work-with-alerts-on-your-sensor.md",
+            "redirect_url": "/azure/defender-for-iot/organizations/concept-key-concepts#analytics-and-self-learning-engines",
+            "redirect_document_id": false
+        },
+	    {
             "source_path_from_root": "/azure/defender-for-iot/organizations/quickstart-system-prerequisites.md",
             "redirect_url": "/azure/defender-for-iot/organizations/getting-started",
             "redirect_document_id": false

.openpublishing.redirection.json

@@ -22644,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/app-provisioning/functions-for-customizing-application-data.md

@@ -908,85 +908,85 @@ Replaces values within a string in a case-sensitive manner. The function behaves
 #### Replace characters using a regular expression
 **Example 1:** Using **oldValue** and **replacementValue** to replace the entire source string with another string.
 
-Let’s say your HR system has an attribute `BusinessTitle`. As part of recent job title changes, your company wants to update anyone with the business title “Product Developer” to “Software Engineer”. 
+Let's say your HR system has an attribute `BusinessTitle`. As part of recent job title changes, your company wants to update anyone with the business title "Product Developer" to "Software Engineer". 
 Then in this case, you can use the following expression in your attribute mapping. 
 
 `Replace([BusinessTitle],"Product Developer", , , "Software Engineer", , )`
 
 * **source**: `[BusinessTitle]`
-* **oldValue**: “Product Developer”
-* **replacementValue**: “Software Engineer”
+* **oldValue**: "Product Developer"
+* **replacementValue**: "Software Engineer"
 * **Expression output**: Software Engineer
 
 **Example 2:** Using **oldValue** and **template** to insert the source string into another *templatized* string. 
 
 The parameter **oldValue** is a misnomer in this scenario. It is actually the value that will get replaced.  
-Let’s say you want to always generate login id in the format `<username>@contoso.com`. There is a source attribute called **UserID** and you want that value to be used for the `<username>` portion of the login id. 
+Let's say you want to always generate login id in the format `<username>@contoso.com`. There is a source attribute called **UserID** and you want that value to be used for the `<username>` portion of the login id. 
 Then in this case, you can use the following expression in your attribute mapping. 
 
 `Replace([UserID],"<username>", , , , , "<username>@contoso.com")`
 
-* **source:** `[UserID]` = “jsmith”
-* **oldValue:** “`<username>`”
-* **template:** “`<username>@contoso.com`”
-* **Expression output:** “[email protected]”
+* **source:** `[UserID]` = "jsmith"
+* **oldValue:** "`<username>`"
+* **template:** "`<username>@contoso.com`"
+* **Expression output:** "[email protected]"
 
 **Example 3:** Using **regexPattern** and **replacementValue** to extract a portion of the source string and replace it with an empty string or a custom value built using regex patterns or regex group names.
 
-Let’s say you have a source attribute `telephoneNumber` that has components `country code` and `phone number` separated by a space character. E.g. `+91 9998887777`
+Let's say you have a source attribute `telephoneNumber` that has components `country code` and `phone number` separated by a space character. E.g. `+91 9998887777`
 Then in this case, you can use the following expression in your attribute mapping to extract the 10 digit phone number. 
 
 `Replace([telephoneNumber], , "\\+(?<isdCode>\\d* )(?<phoneNumber>\\d{10})", , "${phoneNumber}", , )`
 
-* **source:** `[telephoneNumber]` = “+91 9998887777”
-* **regexPattern:** “`\\+(?<isdCode>\\d* )(?<phoneNumber>\\d{10})`”
-* **replacementValue:** “`${phoneNumber}`”
+* **source:** `[telephoneNumber]` = "+91 9998887777"
+* **regexPattern:** "`\\+(?<isdCode>\\d* )(?<phoneNumber>\\d{10})`"
+* **replacementValue:** "`${phoneNumber}`"
 * **Expression output:** 9998887777
 
 You can also use this pattern to remove characters and collapse a string. 
 For example, the expression below removes parenthesis, dashes and space characters in the mobile number string and returns only digits. 
 
 `Replace([mobile], , "[()\\s-]+", , "", , )`
 
-* **source:** `[mobile] = “+1 (999) 888-7777”`
-* **regexPattern:** “`[()\\s-]+`”
-* **replacementValue:** “” (empty string)
+* **source:** `[mobile] = "+1 (999) 888-7777"`
+* **regexPattern:** "`[()\\s-]+`"
+* **replacementValue:** "" (empty string)
 * **Expression output:** 19998887777
 
 **Example 4:** Using **regexPattern**, **regexGroupName** and **replacementValue** to extract a portion of the source string and replace it with another literal value or empty string.
 
-Let’s say your source system has an attribute AddressLineData with two components street number and street name. As part of a recent move, let’s say the street number of the address changed and you want to update only the street number portion of the address line. 
-Then in this case, you can use the following expression in your attribute mapping to extract the 10 digit phone number.
+Let's say your source system has an attribute AddressLineData with two components street number and street name. As part of a recent move, let's say the street number of the address changed and you want to update only the street number portion of the address line. 
+Then in this case, you can use the following expression in your attribute mapping to extract the street number.
 
 `Replace([AddressLineData], ,"(?<streetNumber>^\\d*)","streetNumber", "888", , )`
 
-* **source:** `[AddressLineData]` = “545 Tremont Street”
-* **regexPattern:** “`(?<streetNumber>^\\d*)`”
-* **regexGroupName:** “streetNumber”
-* **replacementValue:** “888”
+* **source:** `[AddressLineData]` = "545 Tremont Street"
+* **regexPattern:** "`(?<streetNumber>^\\d*)`"
+* **regexGroupName:** "streetNumber"
+* **replacementValue:** "888"
 * **Expression output:** 888 Tremont Street
 
 Here is another example where the domain suffix from a UPN is replaced with an empty string to generate login id without domain suffix. 
 
 `Replace([userPrincipalName], , "(?<Suffix>@(.)*)", "Suffix", "", , )`
 
-* **source:** `[userPrincipalName]` = “[email protected]”
-* **regexPattern:** “`(?<Suffix>@(.)*)`”
-* **regexGroupName:** “Suffix”
-* **replacementValue:** “” (empty string)
+* **source:** `[userPrincipalName]` = "[email protected]"
+* **regexPattern:** "`(?<Suffix>@(.)*)`"
+* **regexGroupName:** "Suffix"
+* **replacementValue:** "" (empty string)
 * **Expression output:** jsmith
 
-**Example 5:** Using **regexPattern**, **regexGroupName** and **replacementAttributeName** to handle scenarios when the source attribute is empty or doesn’t have a value.
+**Example 5:** Using **regexPattern**, **regexGroupName** and **replacementAttributeName** to handle scenarios when the source attribute is empty or doesn't have a value.
 
-Let’s say your source system has an attribute telephoneNumber. If telephoneNumber is empty, you want to extract the 10 digits of the mobile number attribute.
+Let's say your source system has an attribute telephoneNumber. If telephoneNumber is empty, you want to extract the 10 digits of the mobile number attribute.
 Then in this case, you can use the following expression in your attribute mapping. 
 
 `Replace([telephoneNumber], , "\\+(?<isdCode>\\d* )(?<phoneNumber>\\d{10})", "phoneNumber" , , [mobile], )`
 
-* **source:** `[telephoneNumber]` = “” (empty string)
-* **regexPattern:** “`\\+(?<isdCode>\\d* )(?<phoneNumber>\\d{10})`”
-* **regexGroupName:** “phoneNumber”
-* **replacementAttributeName:** `[mobile]` = “+91 8887779999”
+* **source:** `[telephoneNumber]` = "" (empty string)
+* **regexPattern:** "`\\+(?<isdCode>\\d* )(?<phoneNumber>\\d{10})`"
+* **regexGroupName:** "phoneNumber"
+* **replacementAttributeName:** `[mobile]` = "+91 8887779999"
 * **Expression output:** 8887779999
 
 **Example 6:** You need to find characters that match a regular expression value and remove them.
@@ -1106,6 +1106,10 @@ Switch(source, defaultValue, key1, value1, key2, value2, …)
 **Description:** 
 When **source** value matches a **key**, returns **value** for that **key**. If **source** value doesn't match any keys, returns **defaultValue**.  **Key** and **value** parameters must always come in pairs. The function always expects an even number of parameters. The function should not be used for referential attributes such as manager. 
 
+> [!NOTE] 
+> Switch function performs a case-sensitive string comparison of the **source** and **key** values. If you'd like to perform a case-insensitive comparison, normalize the **source** string before comparison using a nested ToLower function and ensure that all **key** strings use lowercase. 
+> Example: `Switch(ToLower([statusFlag]), "0", "true", "1", "false", "0")`. In this example, the **source** attribute `statusFlag` may have values ("True" / "true" / "TRUE"). However, the Switch function will always convert it to lowercase string "true" before comparison with **key** parameters. 
+
 **Parameters:** 
 
 | Name | Required/ Repeating | Type | Notes |

articles/active-directory/develop/zero-trust-for-developers.md

@@ -79,6 +79,5 @@ The Microsoft identity platform app registration portal is the primary entry poi
 
 ## Next steps
 
-- Zero Trust [Guidance Center](/security/zero-trust/)
-- Zero Trust for the Microsoft identity platform developer [whitepaper](https://www.microsoft.com/security/content-library/Search?SearchDataFor=OJZgGWbHnB3Ll5hblDBugaEMQAchNfvkzk5X5AmPM4tK43NHpbF5%2Bky%2Fnuivl7plZz89b%2FuLMMZsMqKeYbhPPw%3D%3D&IsKeywordSearch=evXIpssXVY6lIm6X2K9ieA%3D%3D) (downloadable PDF).
+- Zero Trust [Guidance Center](/security/zero-trust/)  
 - Microsoft identity platform [best practices and recommendations](./identity-platform-integration-checklist.md).

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