Skip to content

Commit 73de16b

Browse files
authored
Merge branch 'main' into US544916_FIM
2 parents d705966 + fde7c48 commit 73de16b

216 files changed

Lines changed: 3456 additions & 2155 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.

.github/copilot-instructions.md

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
# Copilot Instructions for Microsoft Learn
2+
3+
These instructions define a unified style and process standard for authoring and maintaining learn.microsoft.com documentation with GitHub Copilot or other AI assistance.
4+
5+
## Learn-wide Instructions
6+
7+
Below are instructions that apply to all Microsoft Learn documentation authored with AI assistance. Learn product team will update this periodically as needed. Each repository SHOULD NOT update this to avoid being overwritten, but update the repository-specific instructions below as needed.
8+
9+
### AI Usage & Disclosure
10+
All Markdown content created or substantially modified with AI assistance must include an `ai-usage` front matter entry:
11+
- `ai-usage: ai-generated` – AI produced the initial draft with minimal human authorship
12+
- `ai-usage: ai-assisted` – Human-directed, reviewed, and edited with AI support
13+
- Omit only for purely human-authored legacy content
14+
15+
If missing, **add it**. However, do not add or update the ai-usage tag if the changes proposed are confined solely to:
16+
- Links (link text and/or URLs)
17+
- Single words or short phrases, such as entries in table cells
18+
- Less than 5% of the article's word count
19+
20+
### Writing Style
21+
22+
Follow [Microsoft Writing Style Guide](https://learn.microsoft.com/style-guide/welcome/) with these specifics:
23+
24+
#### Voice and Tone
25+
26+
- Active voice, second person addressing reader directly
27+
- Conversational tone with contractions
28+
- Present tense for instructions/descriptions
29+
- Imperative mood for instructions ("Call the method" not "You should call the method")
30+
- Use "might" instead of "may" for possibility
31+
- Avoid "we"/"our" referring to documentation authors
32+
33+
#### Structure and Format
34+
35+
- Sentence case headings (no gerunds in titles)
36+
- Be concise, break up long sentences
37+
- Oxford comma in lists
38+
- Number all ordered list items as "1." (not sequential numbering like "1.", "2.", "3.", etc.)
39+
- Complete sentences with proper punctuation in all list items
40+
- Avoid "etc." or "and so on" - provide complete lists or use "for example"
41+
- No consecutive headings without content between them
42+
43+
#### Formatting Conventions
44+
45+
- **Bold** for UI elements
46+
- `Code style` for file names, folders, custom types, non-localizable text
47+
- Raw URLs in angle brackets
48+
- Use relative links for files in this repo
49+
- Remove `https://learn.microsoft.com/en-us` from learn.microsoft.com links
50+
51+
## Repository-Specific Instructions
52+
53+
Below are instructions specific to this repository. These may be updated by repository maintainers as needed.
54+
55+
<!--- Add additional repository level instructions below. Do NOT update this line or above. --->
56+
57+

.openpublishing.redirection.key-vault.json

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"redirections": [
3+
{
4+
"source_path_from_root": "/articles/key-vault/general/how-to-azure-key-vault-network-security.md",
5+
"redirect_url": "/azure/key-vault/general/network-security",
6+
"redirect_document_id": false
7+
},
38
{
49
"source_path_from_root": "/articles/key-vault/general/soft-delete-change.md",
510
"redirect_url": "/azure/key-vault/general/soft-delete-overview",
@@ -42,7 +47,12 @@
4247
},
4348
{
4449
"source_path_from_root": "/articles/key-vault/common-parameters-and-headers.md",
45-
"redirect_url": "/azure/key-vault/general/common-parameters-and-headers",
50+
"redirect_url": "/azure/key-vault/general/authentication-requests-and-responses",
51+
"redirect_document_id": false
52+
},
53+
{
54+
"source_path_from_root": "/articles/key-vault/general/common-parameters-and-headers.md",
55+
"redirect_url": "/azure/key-vault/general/authentication-requests-and-responses",
4656
"redirect_document_id": false
4757
},
4858
{
@@ -247,12 +257,17 @@
247257
},
248258
{
249259
"source_path_from_root": "/articles/key-vault/key-vault-manage-with-cli.md",
250-
"redirect_url": "/azure/key-vault/key-vault-manage-with-cli2",
260+
"redirect_url": "/azure/key-vault/general/quick-create-cli",
251261
"redirect_document_id": false
252262
},
253263
{
254264
"source_path_from_root": "/articles/key-vault/key-vault-manage-with-cli2.md",
255-
"redirect_url": "/azure/key-vault/general/manage-with-cli2",
265+
"redirect_url": "/azure/key-vault/general/quick-create-cli",
266+
"redirect_document_id": false
267+
},
268+
{
269+
"source_path_from_root": "/articles/key-vault/general/manage-with-cli2.md",
270+
"redirect_url": "/azure/key-vault/general/quick-create-cli",
256271
"redirect_document_id": false
257272
},
258273
{
@@ -332,7 +347,12 @@
332347
},
333348
{
334349
"source_path_from_root": "/articles/key-vault/key-vault-versions.md",
335-
"redirect_url": "/azure/key-vault",
350+
"redirect_url": "/azure/key-vault/general/whats-new",
351+
"redirect_document_id": false
352+
},
353+
{
354+
"source_path_from_root": "/articles/key-vault/general/versions.md",
355+
"redirect_url": "/azure/key-vault/general/whats-new",
336356
"redirect_document_id": false
337357
},
338358
{

articles/attestation/azure-tpm-vbs-attestation-usage.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Service endpoint setup is the first step for any attestation to be performed. Se
3030

3131
Here's how you can set up an attestation endpoint using Portal
3232

33-
1. Prerequisite: Access to the Microsoft Entra tenant and subscription under which you want to create the attestation endpoint. For more information, see [Microsoft Entra tenant](/azure/active-directory/develop/quickstart-create-new-tenant).
33+
1. Prerequisite: Access to the Microsoft Entra tenant and subscription under which you want to create the attestation endpoint. For more information, see [Microsoft Entra tenant](/entra/identity-platform/quickstart-create-new-tenant).
3434
1. Create an endpoint under the desired resource group, with the desired name.
3535
> [!VIDEO https://learn-video.azurefd.net/vod/player?id=8d3c6aa5-7712-4b47-b3ea-23c49539cd31]
3636
1. Add Attestation Contributor Role to the Identity who will be responsible to update the attestation policy.
@@ -48,7 +48,7 @@ Sample policies can be found in the [policy section](tpm-attestation-sample-poli
4848

4949
A client to communicate with the attestation service endpoint needs to ensure it's following the protocol as described in the [protocol documentation](virtualization-based-security-protocol.md). Use the [Attestation Client NuGet](https://www.nuget.org/packages/Microsoft.Attestation.Client) to ease the integration.
5050

51-
1. Prerequisite: a Microsoft Entra identity is needed to access the TPM endpoint. For more information, see [Microsoft Entra identity tokens](/azure/active-directory/develop/v2-overview).
51+
1. Prerequisite: a Microsoft Entra identity is needed to access the TPM endpoint. For more information, see [Microsoft Entra identity tokens](/entra/identity-platform/v2-overview).
5252
2. Add Attestation Reader Role to the identity that will be need for authentication against the endpoint.
5353
> [!VIDEO https://learn-video.azurefd.net/vod/player?id=1c70f4b2-e3e7-4b64-9fb1-ceb2810c669c]
5454

articles/attestation/basic-concepts.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ This article defines some basic concepts related to Microsoft Azure Attestation.
1616

1717
## JSON Web Token (JWTs)
1818

19-
[JSON Web Token (JWT)](/azure/active-directory/develop/security-tokens#json-web-tokens-and-claims) is an open standard [RFC7519](https://tools.ietf.org/html/rfc7519) method for securely transmitting information between parties as a JavaScript Object Notation (JSON) object. This information can be verified and trusted because it is digitally signed. JWTs can be signed using a secret or a public/private key pair.
19+
[JSON Web Token (JWT)](/entra/identity-platform/security-tokens#json-web-tokens-and-claims) is an open standard [RFC7519](https://tools.ietf.org/html/rfc7519) method for securely transmitting information between parties as a JavaScript Object Notation (JSON) object. This information can be verified and trusted because it is digitally signed. JWTs can be signed using a secret or a public/private key pair.
2020

2121
## JSON Web Key (JWK)
2222

articles/cloud-hsm/overview.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,14 +78,11 @@ Azure Cloud HSM doesn't integrate with other platform as a service (PaaS) or sof
7878

7979
Azure Cloud HSM is not a good fit for Microsoft cloud services that require support for encryption with customer-managed keys. These services include Azure Information Protection, Azure Disk Encryption, Azure Data Lake Storage, Azure Storage, and Microsoft Purview Customer Key. For those scenarios, customers should use [Azure Key Vault Managed HSM](../key-vault/managed-hsm/overview.md).
8080

81-
## Related content
81+
## Next steps
8282

8383
These resources are available to help you facilitate the provisioning and configuration of HSMs into your existing virtual network environment:
8484

8585
- [Azure Cloud HSM SDK](https://github.com/microsoft/MicrosoftAzureCloudHSM)
8686
- [Key management in Azure](/azure/security/fundamentals/key-management)
8787
- [Deploy Azure Cloud HSM by using the Azure portal](quickstart-portal.md)
8888
- [Deploy Azure Cloud HSM by using Azure PowerShell](quickstart-powershell.md)
89-
- [Key management in Azure](/azure/security/fundamentals/key-management)
90-
- [Deploy Azure Cloud HSM by using the Azure portal](quickstart-portal.md)
91-
- [Deploy Azure Cloud HSM by using Azure PowerShell](quickstart-powershell.md)

articles/confidential-ledger/authentication-azure-ad.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ The Microsoft Entra service endpoint used for authentication is also called *Mic
7676

7777
The easiest way to access Azure confidential ledger with user authentication is to use the Azure confidential ledger SDK and set the `Federated Authentication` property of the Azure confidential ledger connection string to `true`. The first time the SDK is used to send a request to the service the user will be presented with a sign-in form to enter the Microsoft Entra credentials. Following a successful authentication the request will be sent to Azure confidential ledger.
7878

79-
Applications that don't use the Azure confidential ledger SDK can still use the [Microsoft Authentication Library (MSAL)](/azure/active-directory/develop/msal-overview) instead of implementing the Microsoft Entra service security protocol client. See [Enable your Web Apps to sign-in users and call APIs with the Microsoft identity platform for developers](https://github.com/Azure-Samples/active-directory-aspnetcore-webapp-openidconnect-v2).
79+
Applications that don't use the Azure confidential ledger SDK can still use the [Microsoft Authentication Library (MSAL)](/entra/identity-platform/msal-overview) instead of implementing the Microsoft Entra service security protocol client. See [Enable your Web Apps to sign-in users and call APIs with the Microsoft identity platform for developers](https://github.com/Azure-Samples/active-directory-aspnetcore-webapp-openidconnect-v2).
8080

8181
If your application is intended to serve as front-end and authenticate users for an Azure confidential ledger cluster, the application must be granted delegated permissions on Azure confidential ledger.
8282

@@ -87,7 +87,7 @@ Applications that use Azure confidential ledger authenticate by using a token fr
8787
For detailed steps on registering an Azure confidential ledger application with Microsoft Entra ID, review these articles:
8888

8989
- [How to register an Azure confidential ledger application with Microsoft Entra ID](register-application.md)
90-
- [Use portal to create a Microsoft Entra application and service principal that can access resources](/azure/active-directory/develop/howto-create-service-principal-portal)
90+
- [Use portal to create a Microsoft Entra application and service principal that can access resources](/entra/identity-platform/howto-create-service-principal-portal)
9191
- [Create an Azure service principal with the Azure CLI](/cli/azure/create-an-azure-service-principal-azure-cli).
9292

9393
At the end of registration, the application owner gets the following values:
@@ -113,8 +113,8 @@ This flow is called the[OAuth2 token exchange flow](https://tools.ietf.org/html/
113113

114114
- [How to register an Azure confidential ledger application with Microsoft Entra ID](register-application.md)
115115
- [Overview of Microsoft Azure confidential ledger](overview.md)
116-
- [Integrating applications with Microsoft Entra ID](/azure/active-directory/develop/quickstart-register-app)
117-
- [Use portal to create a Microsoft Entra application and service principal that can access resources](/azure/active-directory/develop/howto-create-service-principal-portal)
116+
- [Integrating applications with Microsoft Entra ID](/entra/identity-platform/quickstart-register-app)
117+
- [Use portal to create a Microsoft Entra application and service principal that can access resources](/entra/identity-platform/howto-create-service-principal-portal)
118118
- [Create an Azure service principal with the Azure CLI](/cli/azure/create-an-azure-service-principal-azure-cli).
119119
- [Authenticating Azure confidential ledger nodes](authenticate-ledger-nodes.md)
120120
- [User defined functions in Azure confidential ledger](server-side-programming.md)

articles/confidential-ledger/register-application.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ ms.custom: sfi-image-nochange
1515

1616
In this article you'll learn how to integrate your Azure confidential ledger application with Microsoft Entra ID, by registering it with the Microsoft identity platform.
1717

18-
The Microsoft identity platform performs identity and access management (IAM) only for registered applications. Whether it's a client application like a web or mobile app, or it's a web API that backs a client app, registering it establishes a trust relationship between your application and the identity provider, the Microsoft identity platform. [Learn more about the Microsoft identity platform](/azure/active-directory/develop/v2-overview).
18+
The Microsoft identity platform performs identity and access management (IAM) only for registered applications. Whether it's a client application like a web or mobile app, or it's a web API that backs a client app, registering it establishes a trust relationship between your application and the identity provider, the Microsoft identity platform. [Learn more about the Microsoft identity platform](/entra/identity-platform/v2-overview).
1919

2020
## Prerequisites
2121

2222
- An Azure account with an active subscription and permission to manage applications in Microsoft Entra ID. [Create an account for free](https://azure.microsoft.com/pricing/purchase-options/azure-account?cid=msft_learn).
23-
- A Microsoft Entra tenant. [Learn how to set up a tenant](/azure/active-directory/develop/quickstart-create-new-tenant).
23+
- A Microsoft Entra tenant. [Learn how to set up a tenant](/entra/identity-platform/quickstart-create-new-tenant).
2424
- An application that calls Azure confidential ledger.
2525

2626
## Register an application
@@ -90,19 +90,19 @@ To configure application settings based on the platform or device you're targeti
9090

9191
### Redirect URI restrictions
9292

93-
There are some restrictions on the format of the redirect URIs you add to an app registration. For details about these restrictions, see [Redirect URI (reply URL) restrictions and limitations](/azure/active-directory/develop/reply-url).
93+
There are some restrictions on the format of the redirect URIs you add to an app registration. For details about these restrictions, see [Redirect URI (reply URL) restrictions and limitations](/entra/identity-platform/reply-url).
9494

9595
## Add credentials
9696

97-
Credentials are used by [confidential client applications](/azure/active-directory/develop/msal-client-applications) that access a web API. Examples of confidential clients are web apps, other web APIs, or service-type and daemon-type applications. Credentials allow your application to authenticate as itself, requiring no interaction from a user at runtime.
97+
Credentials are used by [confidential client applications](/entra/identity-platform/msal-client-applications) that access a web API. Examples of confidential clients are web apps, other web APIs, or service-type and daemon-type applications. Credentials allow your application to authenticate as itself, requiring no interaction from a user at runtime.
9898

9999
You can add both certificates and client secrets (a string) as credentials to your confidential client app registration.
100100

101101
:::image type="content" source="./media/portal-05-app-reg-04-credentials.png" alt-text="Screenshot of the Azure portal, showing the Certificates and secrets pane in an app registration.":::
102102

103103
### Add a certificate
104104

105-
Sometimes called a _public key_, a certificate is the recommended credential type because they're considered more secure than client secrets. For more information about using a certificate as an authentication method in your application, see [Microsoft identity platform application authentication certificate credentials](/azure/active-directory/develop/active-directory-certificate-credentials).
105+
Sometimes called a _public key_, a certificate is the recommended credential type because they're considered more secure than client secrets. For more information about using a certificate as an authentication method in your application, see [Microsoft identity platform application authentication certificate credentials](/entra/identity-platform/certificate-credentials).
106106

107107
1. In the Azure portal, in **App registrations**, select your application.
108108
1. Select **Certificates & secrets** > **Certificates** > **Upload certificate**.
@@ -124,14 +124,14 @@ Client secrets are considered less secure than certificate credentials. Applicat
124124
1. Select **Add**.
125125
1. _Record the secret's value_ for use in your client application code. This secret value is _never displayed again_ after you leave this page.
126126

127-
For application security recommendations, see [Microsoft identity platform best practices and recommendations](/azure/active-directory/develop/identity-platform-integration-checklist#security).
127+
For application security recommendations, see [Microsoft identity platform best practices and recommendations](/entra/identity-platform/identity-platform-integration-checklist#security).
128128

129129
## Next steps
130130

131131
- [Azure confidential ledger authentication with Microsoft Entra ID](authentication-azure-ad.md)
132132
- [Overview of Microsoft Azure confidential ledger](overview.md)
133-
- [Integrating applications with Microsoft Entra ID](/azure/active-directory/develop/quickstart-register-app)
134-
- [Use portal to create a Microsoft Entra application and service principal that can access resources](/azure/active-directory/develop/howto-create-service-principal-portal)
133+
- [Integrating applications with Microsoft Entra ID](/entra/identity-platform/quickstart-register-app)
134+
- [Use portal to create a Microsoft Entra application and service principal that can access resources](/entra/identity-platform/howto-create-service-principal-portal)
135135
- [Create an Azure service principal with the Azure CLI](/cli/azure/create-an-azure-service-principal-azure-cli).
136136
- [Authenticating Azure confidential ledger nodes](authenticate-ledger-nodes.md)
137137
- [User defined functions in Azure confidential ledger](server-side-programming.md)

articles/dedicated-hsm/migration-guide.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ ms.service: azure-dedicated-hsm
1111

1212
# Migrate from Azure Dedicated HSM to Azure Managed HSM or Azure Cloud HSM
1313

14-
Azure Dedicated HSM customers who want to transition to [Azure Cloud HSM](../cloud-hsm/overview.md) or [Azure Managed HSM](../key-vault/managed-hsm/overview.md) can find guidance in this article. This transition involves creating new keys and updating applications to use the new services.
14+
[Azure Dedicated HSM is being retired](https://azure.microsoft.com/updates?id=499214). Microsoft will fully support existing Dedicated HSM customers until July 31, 2028, but no new customer onboardings are accepted. Customers must transition to [Azure Cloud HSM](../cloud-hsm/overview.md) or [Azure Managed HSM](../key-vault/managed-hsm/overview.md).
15+
16+
This article provides guidance for Azure Dedicated HSM customers who need to transition to Azure Cloud HSM or Azure Managed HSM. This transition involves creating new keys and updating applications to use the new services.
1517

1618
> [!WARNING]
1719
> Customers cannot migrate existing key materials from Azure Dedicated HSM to Azure Cloud HSM or Azure Managed HSM due to known restrictions of the Thales Luna HSM. You must create new keys in Azure Cloud HSM or Azure Managed HSM when transitioning off Azure Dedicated HSM.

0 commit comments

Comments
 (0)