Skip to content

Commit 40fac65

Browse files
Merge branch 'MicrosoftDocs:main' into patch-2
2 parents de8c9e8 + c1e84d8 commit 40fac65

File tree

24 files changed

+572
-111
lines changed

24 files changed

+572
-111
lines changed

articles/ai-services/openai/how-to/use-your-data-securely.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.service: azure-ai-openai
88
ms.topic: how-to
99
author: aahill
1010
ms.author: aahi
11-
ms.date: 04/05/2024
11+
ms.date: 04/18/2024
1212
recommendations: false
1313
---
1414

@@ -215,7 +215,7 @@ You can disable public network access of your Azure AI Search resource in the Az
215215
To allow access to your Azure AI Search resource from your client machines, like using Azure OpenAI Studio, you need to create [private endpoint connections](/azure/search/service-create-private-endpoint) that connect to your Azure AI Search resource.
216216

217217
> [!NOTE]
218-
> To allow access to your Azure AI Search resource from Azure OpenAI resource, you need to submit an [application form](https://aka.ms/applyacsvpnaoaioyd). The application will be reviewed in 10 business days and you will be contacted via email about the results. If you are eligible, we will provision the private endpoint in Microsoft managed virtual network, and send a private endpoint connection request to your search service, and you will need to approve the request.
218+
> To allow access to your Azure AI Search resource from Azure OpenAI resource, you need to submit an [application form](https://aka.ms/applyacsvpnaoaioyd). The application will be reviewed in 5 business days and you will be contacted via email about the results. If you are eligible, we will provision the private endpoint in Microsoft managed virtual network, and send a private endpoint connection request to your search service, and you will need to approve the request.
219219
220220
:::image type="content" source="../media/use-your-data/approve-private-endpoint.png" alt-text="A screenshot showing private endpoint approval screen." lightbox="../media/use-your-data/approve-private-endpoint.png":::
221221

articles/ai-studio/how-to/deploy-models-llama.md

Lines changed: 192 additions & 32 deletions
Large diffs are not rendered by default.

articles/ai-studio/toc.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,12 @@ items:
4747
href: how-to/deploy-models-cohere-command.md
4848
- name: Deploy Cohere Embed models
4949
href: how-to/deploy-models-cohere-embed.md
50-
- name: Llama 2 family models
50+
- name: Deploy Llama models
5151
items:
52-
- name: Deploy Llama 2 family models
52+
- name: Deploy Llama family models
5353
href: how-to/deploy-models-llama.md
5454
- name: Fine-tune Llama 2 family models
5555
href: how-to/fine-tune-model-llama.md
56-
displayName: maas
5756
- name: Deploy Mistral family models
5857
href: how-to/deploy-models-mistral.md
5958
displayName: maas

articles/confidential-ledger/toc.yml

Lines changed: 39 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
items:
12
- name: Azure confidential ledger
23
href: index.yml
34
- name: Overview
@@ -23,35 +24,48 @@
2324
items:
2425
- name: Architecture
2526
href: architecture.md
26-
- name: Authentication with Microsoft Entra ID
27-
href: authentication-azure-ad.md
28-
- name: Authenticating ledger nodes
29-
href: authenticate-ledger-nodes.md
30-
- name: Write transaction receipts
31-
href: write-transaction-receipts.md
27+
- name: User Authentication and authorization
28+
items:
29+
- name: Authentication with Microsoft Entra ID
30+
href: authentication-azure-ad.md
31+
- name: Verifying your Ledger Data
32+
items:
33+
- name: Authenticating ledger nodes
34+
href: authenticate-ledger-nodes.md
35+
- name: Write transaction receipts
36+
href: write-transaction-receipts.md
3237
- name: How To Guides
3338
items:
34-
- name: Create a client certificate
35-
href: create-client-certificate.md
36-
- name: Create a managed application to store blob digests
37-
href: create-blob-managed-app.md
38-
- name: Register the confidential ledger resource provider
39-
href: register-ledger-resource-provider.md
40-
- name: Register an ACL app with Microsoft Entra ID
41-
href: register-application.md
42-
- name: Verify write transaction receipts
43-
href: verify-write-transaction-receipts.md
44-
- name: Establish trust on Azure confidential ledger
45-
href: verify-node-quotes.md
46-
- name: Manage Microsoft Entra token-based users
47-
href: manage-azure-ad-token-based-users.md
48-
- name: Manage certificate-based users
49-
href: manage-certificate-based-users.md
50-
- name: Upload, view and list ledger data with the Azure ledger explorer
51-
href: quickstart-ledger-explorer.md
39+
- name: Manage your Ledger
40+
items:
41+
- name: Register the confidential ledger resource provider
42+
href: register-ledger-resource-provider.md
43+
- name: Register an ACL app with Microsoft Entra ID
44+
href: register-application.md
45+
- name: Manage users
46+
items:
47+
- name: Manage Microsoft Entra token-based users
48+
href: manage-azure-ad-token-based-users.md
49+
- name: Manage certificate-based users
50+
href: manage-certificate-based-users.md
51+
- name: Create a client certificate
52+
href: create-client-certificate.md
53+
- name: Verifying your data with Confidential Ledger
54+
items:
55+
- name: Verify write transaction receipts
56+
href: verify-write-transaction-receipts.md
57+
- name: Establish trust on Azure confidential ledger
58+
href: verify-node-quotes.md
59+
- name: Upload, view and list ledger data with the Azure ledger explorer
60+
href: quickstart-ledger-explorer.md
61+
- name: Applications using Confidential Ledger
62+
items:
63+
- name: Store your data securely in SQL Server with Ledger
64+
href: /sql/relational-databases/security/ledger/ledger-overview?branch=sql
65+
- name: Create a managed application to store blob digests
66+
href: create-blob-managed-app.md
5267
- name: References
5368
items:
54-
5569
- name: FAQ
5670
href: faq.yml
5771
- name: Azure confidential ledger REST API reference

articles/key-vault/general/alert.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,9 @@ If you followed all of the preceding steps, you'll receive email alerts when you
162162

163163
### Example: Log query alert for near expiry certificates
164164

165-
You can set an alert to notify you about certificates which are about to expire.
165+
You can set an alert to notify you about certificates which are about to expire.
166+
> [!NOTE]
167+
> Near expiry events for certificates are logged 30 days before expiration.
166168
167169
1. Go to **Logs** and paste below query in query window
168170

0 commit comments

Comments
 (0)