Merge branch 'main' into vmi-ama-policy

Author: guywi-ms

.openpublishing.redirection.active-directory.json

@@ -4351,6 +4351,21 @@
       "redirect_url": "/azure/active-directory/conditional-access/location-condition",
       "redirect_document_id": true
     },
+    {
+      "source_path_from_root": "/articles/active-directory/reports-monitoring/howto-find-activity-reports.md",
+      "redirect_url": "/azure/active-directory/reports-monitoring/howto-access-activity-logs",
+      "redirect_document_id": true
+    },
+    {
+      "source_path_from_root": "/articles/active-directory/reports-monitoring/troubleshoot-missing-data-download.md",
+      "redirect_url": "/azure/active-directory/reports-monitoring/reports-faq",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/active-directory/reports-monitoring/troubleshoot-missing-audit-data.md",
+      "redirect_url": "/azure/active-directory/reports-monitoring/reports-faq",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/active-directory/customize-branding.md",
       "redirect_url": "/azure/active-directory/fundamentals/customize-branding",

.openpublishing.redirection.azure-monitor.json

@@ -5532,6 +5532,11 @@
             "redirect_url": "/azure/azure-monitor/app/export-telemetry",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/auto-collect-dependencies.md",
+            "redirect_url": "/azure/azure-monitor/app/asp-net-dependencies",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/azure-monitor/app/custom-endpoints.md",
             "redirect_url": "/azure/azure-monitor/app/create-new-resource",
@@ -5581,6 +5586,11 @@
             "source_path_from_root": "/articles/azure-monitor/vm/tutorial-monitor-vm-enable.md",
             "redirect_url": "/azure/azure-monitor/vm/tutorial-monitor-vm-enable-insights",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/logs/collect-sccm.md",
+            "redirect_url": "/mem/configmgr/core/plan-design/changes/deprecated/removed-and-deprecated-cmfeatures",
+            "redirect_document_id": false
         }
     ]
 }

.openpublishing.redirection.healthcare-apis.json

@@ -577,6 +577,54 @@
         "redirect_url": "/azure/healthcare-apis/iot/deploy-new-bicep-powershell-cli",
         "redirect_document_id": false
     }, 
+    {   "source_path_from_root": "/articles/healthcare-apis/iot/iot-connector-overview.md",
+        "redirect_url": "/azure/healthcare-apis/iot/overview",
+        "redirect_document_id": false
+    },
+    {   "source_path_from_root": "/articles/healthcare-apis/iot/get-started-with-iot.md",
+        "redirect_url": "/azure/healthcare-apis/iot/get-started",
+        "redirect_document_id": false
+    },
+    {   "source_path_from_root": "/articles/healthcare-apis/iot/iot-data-flow.md",
+        "redirect_url": "/azure/healthcare-apis/iot/data-flow",
+        "redirect_document_id": false
+    },
+    {   "source_path_from_root": "/articles/healthcare-apis/iot/how-to-use-device-mappings.md",
+        "redirect_url": "/azure/healthcare-apis/iot/how-to-configure-device-mappings",
+        "redirect_document_id": false
+    },
+    {   "source_path_from_root": "/articles/healthcare-apis/iot/how-to-use-fhir-mappings.md",
+        "redirect_url": "/azure/healthcare-apis/iot/how-to-configure-fhir-mappings",
+        "redirect_document_id": false
+    },
+    {   "source_path_from_root": "/articles/healthcare-apis/iot/iot-connector-machine-learning.md",
+        "redirect_url": "/azure/healthcare-apis/iot/concepts-machine-learning",
+        "redirect_document_id": false
+    },
+    {   "source_path_from_root": "/articles/healthcare-apis/iot/iot-connector-power-bi.md",
+        "redirect_url": "/azure/healthcare-apis/iot/concepts-power-bi",
+        "redirect_document_id": false
+    },
+    {   "source_path_from_root": "/articles/healthcare-apis/iot/iot-connector-teams.md",
+        "redirect_url": "/azure/healthcare-apis/iot/concepts-teams",
+        "redirect_document_id": false
+    },
+    {   "source_path_from_root": "/articles/healthcare-apis/iot/iot-troubleshoot-error-messages-and-conditions.md",
+        "redirect_url": "/azure/healthcare-apis/iot/troubleshoot-error-messages-and-conditions",
+        "redirect_document_id": false
+    },
+    {   "source_path_from_root": "/articles/healthcare-apis/iot/iot-troubleshoot-mappings.md",
+        "redirect_url": "/azure/healthcare-apis/iot/troubleshoot-mappings",
+        "redirect_document_id": false
+    },
+    {   "source_path_from_root": "/articles/healthcare-apis/iot/iot-connector-faqs.md",
+        "redirect_url": "/azure/healthcare-apis/iot/frequently-asked-questions",
+        "redirect_document_id": false
+    },
+    {   "source_path_from_root": "/articles/healthcare-apis/iot/iot-git-projects.md",
+        "redirect_url": "/azure/healthcare-apis/iot/git-projects",
+        "redirect_document_id": false
+    },
     {   "source_path_from_root": "/articles/healthcare-apis/events/events-display-metrics.md",
         "redirect_url": "/azure/healthcare-apis/events/events-use-metrics",
         "redirect_document_id": false

.openpublishing.redirection.json

@@ -1,5 +1,15 @@
 {
     "redirections": [
+        {
+            "source_path_from_root": "/articles/backup/backup-afs.md",
+            "redirect_url": "/azure/backup/backup-azure-files",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/backup/backup-create-rs-vault.md",
+            "redirect_url": "/azure/backup/backup-create-recovery-services-vault",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/storage/queues/storage-quickstart-queues-dotnet-legacy.md",
             "redirect_url": "/azure/storage/queues/storage-quickstart-queues-dotnet",
@@ -9808,11 +9818,6 @@
             "redirect_url": "/azure/baremetal-infrastructure/concepts-baremetal-infrastructure-overview",
             "redirect_document_id": false
         },
-        {
-            "source_path_from_root": "/articles/backup/backup-azure-files.md",
-            "redirect_url": "/azure/backup/backup-afs",
-            "redirect_document_id": false
-        },
         {
             "source_path_from_root": "/articles/backup/tutorial-backup-azure-files.md",
             "redirect_url": "/azure/backup/backup-afs",
@@ -13233,6 +13238,11 @@
             "redirect_url": "/azure/expressroute/work-remotely-support",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/expressroute/howto-linkvnet-cli.md",
+            "redirect_url": "/azure/expressroute/expressroute-howto-linkvnet-cli",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/firewall/tutorial-diagnostics.md",
             "redirect_url": "/azure/firewall/firewall-diagnostics",
@@ -27718,6 +27728,26 @@
             "redirect_url": "/azure/backup/sap-hana-db-about",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/virtual-machines/workloads/sap/high-availability-guide.md",
+            "redirect_url": "/azure/virtual-machines/workloads/sap/sap-high-availability-guide-wsfc-shared-disk",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/virtual-machines/workloads/sap/sap-high-availability-guide.md",
+            "redirect_url": "/azure/virtual-machines/workloads/sap/sap-high-availability-guide-wsfc-shared-disk",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/virtual-machines/workloads/sap/high-availability-multi-sid.md",
+            "redirect_url": "/azure/virtual-machines/workloads/sap/sap-ascs-ha-multi-sid-wsfc-shared-disk",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/virtual-machines/workloads/sap/sap-high-availability-multi-sid.md",
+            "redirect_url": "/azure/virtual-machines/workloads/sap/sap-ascs-ha-multi-sid-wsfc-shared-disk",
+            "redirect_document_id": false
+        },    
         {
             "source_path_from_root": "/articles/migrate/how-to-scale-assessment.md",
             "redirect_url": "scale-hyper-v-assessment",
@@ -29499,6 +29529,16 @@
             "redirect_url": "/azure/aks/intro-kubernetes",
             "redirect_document_id": "false"
         },
+        {
+            "source_path_from_root": "/articles/azure-arc/servers/onboard-group-policy-service-principal-encryption.md",
+            "redirect_url": "/azure/azure-arc/servers/onboard-group-policy-powershell",
+            "redirect_document_id": "false"
+        },
+        {
+            "source_path_from_root": "/articles/azure-arc/servers/onboard-group-policy.md",
+            "redirect_url": "/azure/azure-arc/servers/onboard-group-policy-powershell",
+            "redirect_document_id": "false"
+        },
         {
           "source_path": "articles/azure-cache-for-redis/redis-cache-insights-overview.md",
           "redirect_url": "/azure/azure-cache-for-redis/cache-insights-overview",

README.md

@@ -10,7 +10,7 @@ Contributing to open source is more than just providing updates, it's also about
 
 You've decided to contribute, that's great! To contribute to the documentation, you need a few tools.
 
-#### Github
+#### GitHub
 
 Contributing to the documentation requires a GitHub account. If you don't have an account, follow the instructions for [GitHub account setup](https://learn.microsoft.com/contribute/get-started-setup-github) from our contributor guide.
 

articles/active-directory-b2c/TOC.yml

@@ -66,6 +66,18 @@
     - name: Authentication library
       href: ../active-directory/develop/msal-overview.md?bc=%2fazure%2factive-directory-b2c%2fbread%2ftoc.json&toc=%2fazure%2factive-directory-b2c%2fTOC.json
       displayName: MSAL, client library, Microsoft Authentication Library
+  - name: Azure AD B2C global identitiy framework
+    items:
+      - name: Global identity solutions
+        href: azure-ad-b2c-global-identity-solutions.md
+      - name: Funnel-based design considerations
+        href: azure-ad-b2c-global-identity-funnel-based-design.md
+      - name: Region-based design considerations
+        href: azure-ad-b2c-global-identity-region-based-design.md
+      - name: Funnel-based proof of concept 
+        href: azure-ad-b2c-global-identity-proof-of-concept-funnel.md
+      - name: Regional-based proof of concept 
+        href: azure-ad-b2c-global-identity-proof-of-concept-regional.md
   - name: Azure AD B2C best practices
     href: best-practices.md
   - name: Application types

articles/active-directory-b2c/add-ropc-policy.md

@@ -9,7 +9,7 @@ manager: CelesteDG
 ms.service: active-directory
 ms.workload: identity
 ms.topic: how-to
-ms.date: 09/12/2021
+ms.date: 12/16/2022
 ms.custom: project-no-code
 ms.author: kengaderdus
 ms.subservice: B2C
@@ -27,19 +27,19 @@ In Azure Active Directory B2C (Azure AD B2C), the resource owner password creden
 In Azure Active Directory B2C (Azure AD B2C), the following options are supported:
 
 - **Native Client**: User interaction during authentication happens when code runs on a user-side device. The device can be a mobile application that's running in a native operating system, such as Android and iOS.
-- **Public client flow**: Only user credentials, gathered by an application, are sent in the API call. The credentials of the application are not sent.
+- **Public client flow**: Only user credentials, gathered by an application, are sent in the API call. The credentials of the application aren't sent.
 - **Add new claims**: The ID token contents can be changed to add new claims.
 
-The following flows are not supported:
+The following flows aren't supported:
 
 - **Server-to-server**: The identity protection system needs a reliable IP address gathered from the caller (the native client) as part of the interaction. In a server-side API call, only the server’s IP address is used. If a dynamic threshold of failed authentications is exceeded, the identity protection system may identify a repeated IP address as an attacker.
-- **Confidential client flow**: The application client ID is validated, but the application secret is not validated.
+- **Confidential client flow**: The application client ID is validated, but the application secret isn't validated.
 
 When using the ROPC flow, consider the following:
 
-- ROPC doesn’t work when there is any interruption to the authentication flow that needs user interaction. For example, when a password has expired or needs to be changed, [multifactor authentication](multi-factor-authentication.md) is required, or when more information needs to be collected during sign-in (for example, user consent).
+- ROPC doesn’t work when there's any interruption to the authentication flow that needs user interaction. For example, when a password has expired or needs to be changed, [multifactor authentication](multi-factor-authentication.md) is required, or when more information needs to be collected during sign-in (for example, user consent).
 - ROPC supports local accounts only. Users can’t sign in with [federated identity providers](add-identity-provider.md) like Microsoft, Google+, Twitter, AD-FS, or Facebook.
-- [Session Management](session-behavior.md), including [keep me signed-in (KMSI)](session-behavior.md#enable-keep-me-signed-in-kmsi), is not applicable.
+- [Session Management](session-behavior.md), including [keep me signed-in (KMSI)](session-behavior.md#enable-keep-me-signed-in-kmsi), isn't applicable.
 
 
 ## Register an application
@@ -59,7 +59,7 @@ When using the ROPC flow, consider the following:
 1. Select **Sign in using resource owner password credentials (ROPC)**.
 1. Under **Version**, make sure **Preview** is selected, and then select **Create**.
 1. Provide a name for the user flow, such as *ROPC_Auth*.
-1. Under **Application claims**, click **Show more**.
+1. Under **Application claims**, select **Show more**.
 1. Select the application claims that you need for your application, such as Display Name, Email Address, and Identity Provider.
 1. Select **OK**, and then select **Create**.
 
@@ -256,7 +256,7 @@ If you've not done so, learn about custom policy starter pack in [Get started wi
 
 7. On the **Custom Policies** page in your Azure AD B2C tenant, select **Upload Policy**.
 8. Enable **Overwrite the policy if it exists**, and then browse to and select the *TrustFrameworkExtensions.xml* file.
-9. Click **Upload**.
+9. Select **Upload**.
 
 ## Create a relying party file
 
@@ -277,7 +277,7 @@ Next, update the relying party file that initiates the user journey that you cre
 
 5. On the **Custom Policies** page in your Azure AD B2C tenant, select **Upload Policy**.
 6. Enable **Overwrite the policy if it exists**, and then browse to and select the *ROPC_Auth.xml* file.
-7. Click **Upload**.
+7. Select **Upload**.
 
 
 ::: zone-end
@@ -367,10 +367,10 @@ A successful response looks like the following example:
 
 ## Troubleshooting
 
-### The provided application is not configured to allow the 'OAuth' Implicit flow
+### The provided application isn't configured to allow the 'OAuth' Implicit flow
 
-* **Symptom** - You run the ROPC flow, and get the following message: *AADB2C90057: The provided application is not configured to allow the 'OAuth' Implicit flow*.
-* **Possible causes** - The implicit flow is not allowed for your application.
+* **Symptom** - You run the ROPC flow, and get the following message: *AADB2C90057: The provided application isn't configured to allow the 'OAuth' Implicit flow*.
+* **Possible causes** - The implicit flow isn't allowed for your application.
 * **Resolution**: When creating your [app registration](#register-an-application) in Azure AD B2C, you need to manually edit the application manifest and set the value of the `oauth2AllowImplicitFlow` property to `true`. After you configure the `oauth2AllowImplicitFlow` property, it can take a few minutes (typically no more than five) for the change to take affect. 
 
 ## Use a native SDK or App-Auth

articles/active-directory-b2c/add-sign-up-and-sign-in-policy.md

@@ -79,8 +79,8 @@ The sign-up and sign-in user flow handles both sign-up and sign-in experiences w
 1. Follow the steps to [handle the flow for "Forgot your password?"](add-password-reset-policy.md?pivots=b2c-user-flow.md#self-service-password-reset-recommended) within the sign-up or sign-in policy.
 
 
-### Re-order the sign up form
-Learn [how to re-order user flow input fields for local accounts](customize-ui.md#re-order-input-fields-in-the-sign-up-form)
+### Rearrange the sign up form
+Learn [how to rearrange user flow input fields for local accounts](customize-ui.md#rearrange-input-fields-in-the-sign-up-form)
 
 ### Test the user flow