Skip to content

Commit 22bef37

Browse files
committed
Merge upstream/main and resolve conflict in secure-managed-hsm.md
2 parents 038504d + f889b15 commit 22bef37

76 files changed

Lines changed: 150 additions & 88 deletions

File tree

Some content is hidden

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

articles/attestation/secure-attestation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Learn how to secure Azure Attestation, with best practices for netw
44
author: msmbaldwin
55
ms.author: mbaldwin
66
ms.service: security
7-
ms.topic: conceptual
7+
ms.topic: best-practice
88
ms.custom: horz-security
99

1010
ms.date: 03/28/2025

articles/cloud-hsm/authentication.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Authentication in Azure Cloud HSM
33
description: Learn about various authentication methods and best practices for securing and optimizing your Azure Cloud HSM deployment.
44
author: msmbaldwin
55
ms.service: azure-cloud-hsm
6-
ms.topic: conceptual
6+
ms.topic: feature-guide
77
ms.date: 03/20/2025
88
ms.author: mbaldwin
99
#customer intent: As a Cloud HSM administrator, I want to learn how to secure and optimize my Cloud HSM deployment so that I can ensure the highest level of security and performance.

articles/cloud-hsm/backup-restore.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Back Up and Restore Azure Cloud HSM Resources
33
description: Learn how to back up and restore your Azure Cloud HSM resources, including prerequisites, configuration steps, and validation procedures.
44
author: msmbaldwin
55
ms.service: azure-cloud-hsm
6-
ms.topic: conceptual
6+
ms.topic: tutorial
77
ms.date: 03/20/2025
88
ms.author: mbaldwin
99

articles/cloud-hsm/key-management.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Comprehensive Guide to Key Management in Azure Cloud HSM
33
description: Learn best practices and recommendations for key management in Azure Cloud HSM, including storage limits, key wrapping security, and caching strategies.
44
author: msmbaldwin
55
ms.service: azure-cloud-hsm
6-
ms.topic: conceptual
6+
ms.topic: best-practice
77
ms.date: 03/20/2025
88
ms.author: mbaldwin
99

articles/cloud-hsm/network-security.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Network Security for Azure Cloud HSM
33
description: Learn how to secure your network configuration for Azure Cloud HSM to prevent unauthorized access and enhance overall security.
44
author: msmbaldwin
55
ms.service: azure-cloud-hsm
6-
ms.topic: conceptual
6+
ms.topic: best-practice
77
ms.date: 03/20/2025
88
ms.author: mbaldwin
99
#customer intent: As a security administrator, I need to understand how to secure my network configuration for Azure Cloud HSM so that I can prevent unauthorized access and enhance overall security.

articles/cloud-hsm/secure-cloud-hsm.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Best Practices for Securing Microsoft Azure Cloud HSM
33
description: Learn the best practices for securing and managing Microsoft Azure Cloud HSM to help protect cryptographic keys and sensitive workloads.
44
author: msmbaldwin
55
ms.service: azure-cloud-hsm
6-
ms.topic: conceptual
6+
ms.topic: best-practice
77
ms.date: 09/26/2025
88
ai-usage: ai-assisted
99
ms.custom: horz-security

articles/cloud-hsm/supported-algorithms.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Supported cryptographic algorithms in Azure Cloud HSM
33
description: Review the cryptographic algorithms, modes, and key sizes supported by Azure Cloud HSM hardware security modules.
44
author: msmbaldwin
55
ms.service: azure-cloud-hsm
6-
ms.topic: conceptual
6+
ms.topic: reference
77
ms.date: 08/14/2025
88
ms.author: mbaldwin
99
#customer intent: As a security architect or developer, I want to know which cryptographic algorithms are supported by Azure Cloud HSM so I can plan my application integration and compliance.

articles/cloud-hsm/user-management.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: User Management Best Practices in Azure Cloud HSM
33
description: Learn best practices for managing user identities, securing credentials, implementing redundancy, and restricting user permissions in Azure Cloud HSM.
44
author: msmbaldwin
55
ms.service: azure-cloud-hsm
6-
ms.topic: conceptual
6+
ms.topic: best-practice
77
ms.date: 03/20/2025
88
ms.author: mbaldwin
99

articles/confidential-ledger/data-organization.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: How to organize data in Azure Confidential Ledger.
44
author: musabbir
55
ms.author: musabbirkhan
66
ms.service: azure-confidential-ledger
7-
ms.topic: conceptual
7+
ms.topic: concept-article
88
ms.date: 06/15/2025
99
---
1010
# Data Organization

articles/confidential-ledger/data-residency.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services: confidential-ledger
55
author: tachou
66

77
ms.service: azure-confidential-ledger
8-
ms.topic: conceptual
8+
ms.topic: reliability-article
99
ms.date: 10/21/2025
1010
ms.author: tachou
1111
---

0 commit comments

Comments
 (0)