Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into 2022_linkfix

Author: MashaMSFT

.openpublishing.redirection.defender-for-cloud.json

@@ -60,6 +60,11 @@
             "redirect_url": "/azure/defender-for-cloud/os-coverage",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/defender-for-cloud/supported-machines-endpoint-solutions-clouds.md",
+            "redirect_url": "/articles/defender-for-cloud/supported-machines-endpoint-solutions-clouds-containers",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/security-center/security-center-just-in-time.md",
             "redirect_url": "/azure/defender-for-cloud/just-in-time-access-usage",
@@ -632,7 +637,7 @@
         },
         {
             "source_path_from_root": "/articles/security-center/supported-machines-endpoint-solutions-clouds.md",
-            "redirect_url": "/azure/defender-for-cloud/supported-machines-endpoint-solutions-clouds",
+            "redirect_url": "/azure/defender-for-cloud/supported-machines-endpoint-solutions-clouds-containers",
             "redirect_document_id": true
         },
         {

.openpublishing.redirection.media-services.json

@@ -639,7 +639,52 @@
             "source_path_from_root": "/articles/media-services/latest/job-create-cli-how-to.md",
             "redirect_url": "/azure/media-services/latest/job-create-how-to",
             "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/media-services/latest/transform-subclip-video-dotnet-how-to.md",
+            "redirect_url": "/azure/media-services/latest/transform-subclip-video-how-to",
+            "redirect_document_id": false
+          }, 
+          {
+            "source_path_from_root": "/articles/media-services/latest/transform-subclip-video-rest-how-to.md",
+            "redirect_url": "/azure/media-services/latest/transform-subclip-video-how-to",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/media-services/latest/transform-custom-presets-how-to.md",
+            "redirect_url": "/azure/media-services/latest/transform-custom-transform-how-to",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/media-services/latest/transform-generate-thumbnails-dotnet-how-to.md",
+            "redirect_url": "/azure/media-services/latest/transform-generate-thumbnails-how-to",
+            "redirect_document_id": false
           },   
+          {
+            "source_path_from_root": "/articles/media-services/latest/crop-howto.md",
+            "redirect_url": "/azure/media-services/latest/transform-crop-how-to",
+            "redirect_document_id": false
+          },  
+          {
+            "source_path_from_root": "/articles/media-services/latest/transform-custom-preset-cli-how-to.md",
+            "redirect_url": "/azure/media-services/latest/transform-custom-transform-how-to",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/media-services/latest/transform-custom-preset-rest-how-to.md",
+            "redirect_url": "/azure/media-services/latest/transform-custom-transform-how-to",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/media-services/latest/transform-generate-thumbnails-rest-how-to.md",
+            "redirect_url": "/azure/media-services/latest/transform-generate-thumbnails-how-to",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/media-services/latest/media-reserved-units-cli-how-to.md",
+            "redirect_url": "/azure/media-services/latest/media-reserved-units-how-to",
+            "redirect_document_id": false
+          },
         {
             "source_path_from_root": "/articles/media-services/latest/latest/asset-publish-cli-how-to.md",
             "redirect_url": "/azure/media-services/latest/video-on-demand-simple-portal-quickstart",

articles/active-directory/app-provisioning/use-scim-to-build-users-and-groups-endpoints.md

@@ -99,7 +99,7 @@ The default token validation code is configured to use an Azure AD token and req
 
 After you deploy the SCIM endpoint, you can test to ensure that it's compliant with SCIM RFC. This example provides a set of tests in Postman that validate CRUD (create, read, update, and delete) operations on users and groups, filtering, updates to group membership, and disabling users.
 
-The endpoints are in the `{host}/scim/` directory, and you can use standard HTTP requests to interact with them. To modify the `/scim/` route, see *ControllerConstant.cs* in **AzureADProvisioningSCIMreference** > **ScimReferenceApi** > **Controllers**.
+The endpoints are in the `{host}/scim/` directory, and you can use standard HTTP requests to interact with them. To modify the `/scim/` route, see *TokenController.cs* in **SCIMReferenceCode** > **Microsoft.SCIM.WebHostSample** > **Controllers**.
 
 > [!NOTE]
 > You can only use HTTP endpoints for local tests. The Azure AD provisioning service requires that your endpoint support HTTPS.
@@ -141,4 +141,4 @@ To develop a SCIM-compliant user and group endpoint with interoperability for a
 
 > [!div class="nextstepaction"]
 > [Tutorial: Develop and plan provisioning for a SCIM endpoint](use-scim-to-provision-users-and-groups.md)
-> [Tutorial: Configure provisioning for a gallery app](configure-automatic-user-provisioning-portal.md)
+> [Tutorial: Configure provisioning for a gallery app](configure-automatic-user-provisioning-portal.md)

articles/active-directory/authentication/concept-authentication-passwordless.md

@@ -117,6 +117,7 @@ The following providers offer FIDO2 security keys of different form factors that
 | Excelsecu                 | ![y]              | ![y]| ![y]| ![y]| ![n]           | https://www.excelsecu.com/productdetail/esecufido2secu.html                                         |
 | Feitian                   | ![y]              | ![y]| ![y]| ![y]| ![y]           | https://shop.ftsafe.us/pages/microsoft                                                              |
 | Fortinet                  | ![n]              | ![y]| ![n]| ![n]| ![n]           | https://www.fortinet.com/                                                                           |
+| Giesecke + Devrient (G+D) | ![y]              | ![y]| ![y]| ![y]| ![n]           | https://www.gi-de.com/en/identities/enterprise-security/hardware-based-authentication               |
 | GoTrustID Inc.            | ![n]              | ![y]| ![y]| ![y]| ![n]           | https://www.gotrustid.com/idem-key                                                                  |
 | HID                       | ![n]              | ![y]| ![y]| ![n]| ![n]           | https://www.hidglobal.com/contact-us                                                                |
 | Hypersecu                 | ![n]              | ![y]| ![n]| ![n]| ![n]           | https://www.hypersecu.com/hyperfido                                                                 |

articles/active-directory/authentication/howto-sspr-windows.md

@@ -45,6 +45,7 @@ The following limitations apply to using SSPR from the Windows sign-in screen:
     - *BlockNonAdminUserInstall* is set to enabled or 1
     - *EnableLostMode* is set on the device
     - Explorer.exe is replaced with a custom shell
+    - Interactive logon: Require smart card is set to enabled or 1
 - The combination of the following specific three settings can cause this feature to not work.
     - Interactive logon: Do not require CTRL+ALT+DEL = Disabled
     - *DisableLockScreenAppNotifications* = 1 or Enabled

articles/active-directory/cloud-infrastructure-entitlement-management/TOC.yml

@@ -4,7 +4,7 @@
     expanded: true
     items:
       - name: What's CloudKnox Permissions Management?
-        href: cloudknox-overview.md
+        href: cloudknox-overview.md       
   - name: How-to guides
     expanded: true
     items:

articles/active-directory/cloud-infrastructure-entitlement-management/cloudknox-onboard-aws.md

@@ -8,7 +8,7 @@ ms.service: active-directory
 ms.subservice: ciem
 ms.workload: identity
 ms.topic: how-to
-ms.date: 02/24/2022
+ms.date: 03/09/2022
 ms.author: v-ydequadros
 ---
 
@@ -31,6 +31,10 @@ This article describes how to onboard an Amazon Web Services (AWS) account on Cl
 - To enable the CloudKnox **Feature highlights** tile in the Azure AD portal, [select this link to run the script in your browser](https://aka.ms/ciem-prod).
 - To use the CloudKnox public preview, we encourage you to fill out a consent form that provides other terms and conditions for the public preview product. To open the form, select [CloudKnox Permissions Management Public Preview: Terms and Conditions](https://aka.ms/ciem-terms).
 
+## View a training video on configuring and onboarding an AWS account
+
+To view a video on how to configure and onboard AWS accounts in CloudKnox, select [Configure and onboard AWS accounts](https://www.youtube.com/watch?v=R6K21wiWYmE).
+
 ## Onboard an AWS account
 
 1. If the **Data Collectors** dashboard isn't displayed when CloudKnox launches: 

articles/active-directory/cloud-infrastructure-entitlement-management/cloudknox-onboard-azure.md

@@ -8,7 +8,7 @@ ms.service: active-directory
 ms.subservice: ciem
 ms.workload: identity
 ms.topic: how-to
-ms.date: 02/24/2022
+ms.date: 03/09/2022
 ms.author: v-ydequadros
 ---
 
@@ -34,10 +34,9 @@ To add CloudKnox to your Azure AD tenant:
 - To enable the CloudKnox **Feature highlights** tile in the Azure AD portal, [select this link to run the script in your browser](https://aka.ms/ciem-prod).
 - To use the CloudKnox public preview, we encourage you to fill out a consent form that provides other terms and conditions for the public preview product. To open the form, select [CloudKnox Permissions Management Public Preview: Terms and Conditions](https://aka.ms/ciem-terms).
 
-## View a training video on enabling CloudKnox
+## View a training video on enabling CloudKnox in your Azure AD tenant
 
-To view a video on how to enable CloudKnox in your Azure AD tenant, select
-[Enable CloudKnox in your Azure AD tenant](https://www.youtube.com/watch?v=-fkfeZyevoo).
+To view a video on how to enable CloudKnox in your Azure AD tenant, select [Enable CloudKnox in your Azure AD tenant](https://www.youtube.com/watch?v=-fkfeZyevoo).
 
 ## How to onboard an Azure subscription
 

articles/active-directory/cloud-infrastructure-entitlement-management/cloudknox-onboard-enable-tenant.md

@@ -8,7 +8,7 @@ ms.service: active-directory
 ms.subservice: ciem
 ms.workload: identity
 ms.topic: how-to
-ms.date: 02/24/2022
+ms.date: 03/09/2022
 ms.author: v-ydequadros
 ---
 
@@ -40,8 +40,8 @@ To enable CloudKnox in your organization:
 
 ## View a training video on enabling CloudKnox
 
-To view a video on how to enable CloudKnox in your Azure AD tenant, select
-[Enable CloudKnox in your Azure AD tenant](https://www.youtube.com/watch?v=-fkfeZyevoo).
+- To view a video on how to enable CloudKnox in your Azure AD tenant, select [Enable CloudKnox in your Azure AD tenant](https://www.youtube.com/watch?v=-fkfeZyevoo).
+- To view a video on how to configure and onboard AWS accounts in CloudKnox, select [Configure and onboard AWS accounts](https://www.youtube.com/watch?v=R6K21wiWYmE).
 
 ## How to enable CloudKnox on your Azure AD tenant
 

articles/active-directory/cloud-infrastructure-entitlement-management/cloudknox-training-videos.md

@@ -8,7 +8,7 @@ ms.service: active-directory
 ms.subservice: ciem
 ms.workload: identity
 ms.topic: how-to
-ms.date: 02/24/2022
+ms.date: 03/09/2022
 ms.author: v-ydequadros
 ---
 
@@ -21,6 +21,11 @@ To view step-by-step training videos on how to use CloudKnox Permissions Managem
 To view a video on how to enable CloudKnox in your Azure AD tenant, select
 [Enable CloudKnox in your Azure AD tenant](https://www.youtube.com/watch?v=-fkfeZyevoo).
 
+## Configure and onboard Amazon Web Services (AWS) accounts
+
+To view a video on how to configure and onboard Amazon Web Services (AWS) accounts in CloudKnox Permissions Management, select [Configure and onboard AWS accounts](https://www.youtube.com/watch?v=R6K21wiWYmE).
+
+
 <!---## Privilege on demand (POD) work flows
 
 - View a step-by-step video on the [privilege on demand (POD) work flow from the Just Enough Permissions (JEP) Controller](https://vimeo.com/461508166/3d88107f41).