Skip to content

Commit dbde4ae

Browse files
authored
Merge pull request #96403 from MicrosoftDocs/master
Merge Master to Live, 3 AM
2 parents 4821b7b + c0fe5d2 commit dbde4ae

File tree

300 files changed

+4321
-7726
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

300 files changed

+4321
-7726
lines changed

.openpublishing.redirection.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12372,6 +12372,21 @@
1237212372
"redirect_url": "/azure/cosmos-db/sql-api-sdk-java",
1237312373
"redirect_document_id": true
1237412374
},
12375+
{
12376+
"source_path": "articles/cosmos-db/logging.md",
12377+
"redirect_url": "/azure/cosmos-db/monitor-cosmos-db.md",
12378+
"redirect_document_id": false
12379+
},
12380+
{
12381+
"source_path": "articles/cosmos-db/cosmos-db-azure-monitor-metrics.md",
12382+
"redirect_url": "/azure/cosmos-db/monitor-cosmos-db.md",
12383+
"redirect_document_id": false
12384+
},
12385+
{
12386+
"source_path": "articles/cosmos-db/monitor-accounts.md",
12387+
"redirect_url": "/azure/cosmos-db/monitor-cosmos-db.md",
12388+
"redirect_document_id": false
12389+
},
1237512390
{
1237612391
"source_path": "articles/iot-suite/iot-suite-v1-connecting-devices-linux.md",
1237712392
"redirect_url": "https://docs.microsoft.com/previous-versions/azure/iot-suite/iot-suite-v1-connecting-devices-linux",

articles/active-directory/devices/faq.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ See below on how these actions can be rectified.
117117

118118
### Q: Does Windows 10 device registration in Azure AD support TPMs in FIPS mode?
119119

120-
**A:** No, currently device registration on Windows 10 for all device states - Hybrid Azure AD join, Azure AD join, and Azure AD registered - does not support TPMs in FIPS mode. To successfully join or register to Azure AD, FIPS mode needs to be turned off for the TPMs on those devices
120+
**A:** Windows 10 device registration only supported for FIPS-compliant TPM 2.0 and not supported for TPM 1.2. If your devices have FIPS-compliant TPM 1.2, you must disable them before proceeding with Azure AD join or Hybrid Azure AD join. Note that Microsoft does not provide any tools for disabling FIPS mode for TPMs as it is dependent on the TPM manufacturer. Please contact your hardware OEM for support.
121121

122122
---
123123

articles/active-directory/managed-identities-azure-resources/how-to-manage-ua-identity-powershell.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: How to create, list and delete a user-assigned managed identity using Azure PowerShell
2+
title: Create, list & delete user-assigned managed identity using Azure PowerShell - Azure AD
33
description: Step by step instructions on how to create, list and delete user-assigned managed identity using Azure PowerShell.
44
services: active-directory
55
documentationcenter:

articles/active-directory/managed-identities-azure-resources/how-to-use-vm-sdk.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: How to use managed identities for Azure resources on an Azure VM with Azure SDKs
2+
title: Use managed identities on an Azure VM with Azure SDKs - Azure AD
33
description: Code samples for using Azure SDKs with an Azure VM that has managed identities for Azure resources.
44
services: active-directory
55
documentationcenter:

articles/active-directory/managed-identities-azure-resources/how-to-use-vm-sign-in.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: How to use managed identities for Azure resources on an Azure VM for sign in
2+
title: Use managed identities on an Azure VM for sign in - Azure AD
33
description: Step by step instructions and examples for using an Azure VM managed identities for Azure resources service principal for script client sign in and resource access.
44
services: active-directory
55
documentationcenter:

articles/active-directory/managed-identities-azure-resources/how-to-view-managed-identity-service-principal-portal.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: How to view the service principal of a managed identity in the Azure portal
2+
title: View service principal of a managed identity in the Azure portal - Azure AD
33
description: Step-by-step instructions for viewing the service principal of a managed identity in the Azure portal.
44
services: active-directory
55
documentationcenter: ''

articles/active-directory/managed-identities-azure-resources/how-to-view-managed-identity-service-principal-powershell.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: How to view the service principal of a managed identity using PowerShell
2+
title: View the service principal of a managed identity using PowerShell - Azure AD
33
description: Step-by-step instructions for viewing the service principal of a managed identity using PowerShell.
44
services: active-directory
55
documentationcenter: ''

articles/active-directory/managed-identities-azure-resources/howto-assign-access-cli.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: How to assign a managed identity access to an Azure resource using Azure CLI
2+
title: Assign a managed identity access to a resource using Azure CLI - Azure AD
33
description: Step by step instructions for assigning a managed identity on one resource, access to another resource, using Azure CLI.
44
services: active-directory
55
documentationcenter:

articles/active-directory/managed-identities-azure-resources/howto-assign-access-portal.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: How to assign a managed identity access to an Azure resource using the Azure portal
2+
title: Assign a managed identity access to a resource using the Azure portal - Azure AD
33
description: Step-by-step instructions for assigning a managed identity on one resource access to another resource, by using the Azure portal.
44
services: active-directory
55
documentationcenter:

articles/active-directory/managed-identities-azure-resources/howto-assign-access-powershell.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: How to assign a managed identity access to an Azure resource using PowerShell
2+
title: Assign a managed identity access to a resource using PowerShell - Azure AD
33
description: Step by step instructions for assigning a managed identity on one resource, access to another resource, using PowerShell.
44
services: active-directory
55
documentationcenter:

0 commit comments

Comments
 (0)