Skip to content

Commit 50ae7eb

Browse files
authored
Merge pull request #293818 from MicrosoftDocs/main
Merge main to live, 4AM
2 parents 13b38f3 + af3f5a1 commit 50ae7eb

File tree

218 files changed

+934
-889
lines changed

Some content is hidden

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

218 files changed

+934
-889
lines changed

articles/azure-cache-for-redis/cache-managed-identity.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ Managed identity can be enabled either when you create a cache instance or after
3535
## Scope of availability
3636

3737
|Tier | Basic, Standard | Premium |Enterprise, Enterprise Flash |
38-
|---------|---------|---------|---------|
39-
|Available | No | Yes | No |
38+
|---------|:---------:|:---------:|:---------:|
39+
|Available | Yes | Yes | No |
4040

4141
## Prerequisites and limitations
4242

articles/azure-cache-for-redis/cache-overview-vector-similarity.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: About Vector Embeddings and Vector Search in Azure Cache for Redis
33
description: Learn about Azure Cache for Redis to store vector embeddings and provide similarity search.
44

55

6-
6+
ms.collection: ce-skilling-ai-copilot
77
ms.topic: overview
88
ms.custom:
99
- ignite-2024

articles/azure-cache-for-redis/cache-tutorial-semantic-cache.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: 'Tutorial: Use Azure Cache for Redis as a semantic cache'
33
description: In this tutorial, you learn how to use Azure Cache for Redis as a semantic cache.
44

55

6-
6+
ms.collection: ce-skilling-ai-copilot
77
ms.topic: tutorial
88
ms.date: 01/08/2024
99

articles/azure-cache-for-redis/cache-tutorial-vector-similarity.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ title: 'Tutorial: Conduct vector similarity search on Azure OpenAI embeddings us
33
description: In this tutorial, you learn how to use Azure Cache for Redis to store and search for vector embeddings.
44

55

6-
6+
ms.collection: ce-skilling-ai-copilot
77
ms.topic: tutorial
88
ms.custom:
99
- ignite-2024
1010
ms.date: 09/15/2023
1111

12-
#CustomerIntent: As a < type of user >, I want < what? > so that < why? >.
12+
#CustomerIntent: As a developer, I want to develop some code using a sample so that I see an example of a vector similarity with an AI-based large language model.
1313
---
1414

1515
# Tutorial: Conduct vector similarity search on Azure OpenAI embeddings using Azure Cache for Redis
@@ -40,8 +40,7 @@ In this tutorial, you learn how to:
4040
## Prerequisites
4141

4242
* An Azure subscription - [Create one for free](https://azure.microsoft.com/free/cognitive-services?azure-portal=true)
43-
* Access granted to Azure OpenAI in the desired Azure subscription
44-
Currently, you must apply for access to Azure OpenAI. You can apply for access to Azure OpenAI by completing the form at <a href="https://aka.ms/oai/access" target="_blank">https://aka.ms/oai/access</a>.
43+
* Access granted to Azure OpenAI in the desired Azure subscription. Currently, you must apply for access to Azure OpenAI. You can apply for access to Azure OpenAI by completing the form at <a href="https://aka.ms/oai/access" target="_blank">https://aka.ms/oai/access</a>.
4544
* <a href="https://www.python.org/" target="_blank">Python 3.8 or later version</a>
4645
* [Jupyter Notebooks](https://jupyter.org/) (optional)
4746
* An Azure OpenAI resource with the **text-embedding-ada-002 (Version 2)** model deployed. This model is currently only available in [certain regions](/azure/ai-services/openai/concepts/models#model-summary-table-and-region-availability). See the [resource deployment guide](/azure/ai-services/openai/how-to/create-resource) for instructions on how to deploy the model.
@@ -134,7 +133,7 @@ Next, you'll read the csv file into a pandas DataFrame.
134133
```
135134

136135
1. Execute code cell 3. You should see the following output:
137-
136+
138137
:::image type="content" source="media/cache-tutorial-vector-similarity/code-cell-3.png" alt-text="Screenshot of results from executing code cell 3, displaying eight columns and a sampling of 10 rows of data." lightbox="media/cache-tutorial-vector-similarity/code-cell-3.png":::
139138

140139
1. Next, process the data by adding an `id` index, removing spaces from the column titles, and filters the movies to take only movies made after 1970 and from English speaking countries or regions. This filtering step reduces the number of movies in the dataset, which lowers the cost and time required to generate embeddings. You're free to change or remove the filter parameters based on your preferences.

articles/azure-resource-manager/templates/deployment-tutorial-local-template.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Tutorial - Deploy a local Azure Resource Manager template
3-
description: Learn how to deploy an Azure Resource Manager template (ARM template) from your local computer
4-
ms.date: 09/26/2024
3+
description: Learn how to deploy an Azure Resource Manager template (ARM template) from your local computer.
4+
ms.date: 01/29/2025
55
ms.topic: tutorial
66
ms.custom: devx-track-arm-template
77
---
@@ -10,30 +10,30 @@ ms.custom: devx-track-arm-template
1010

1111
Learn how to deploy an Azure Resource Manager template (ARM template) from your local machine. It takes about **8 minutes** to complete.
1212

13-
This tutorial is the first of a series. As you progress through the series, you modularize the template by creating a linked template, you store the linked template in a storage account, and secure the linked template by using SAS token, and you learn how to create a DevOps pipeline to deploy templates. This series focuses on template deployment. If you want to learn template development, see the [beginner tutorials](./template-tutorial-create-first-template.md).
13+
This tutorial is the first of a series. As you progress through the series, you modularize the template by creating a linked template, store the linked template in a storage account, secure the linked template by using SAS token, and learn how to create a DevOps pipeline to deploy templates. This series focuses on template deployment. If you want to learn template development, see the [beginner tutorials](./template-tutorial-create-first-template.md).
1414

1515
## Get tools
1616

17-
Let's start by making sure you have the tools you need to deploy templates.
17+
Make sure you have the tools you need to deploy templates.
1818

1919
### Command-line deployment
2020

21-
You need either Azure PowerShell or Azure CLI to deploy the template. For the installation instructions, see:
21+
To deploy the template, you need either Azure PowerShell or Azure CLI. For the installation instructions, see:
2222

2323
- [Install Azure PowerShell](/powershell/azure/install-azure-powershell)
2424
- [Install Azure CLI on Windows](/cli/azure/install-azure-cli-windows)
2525
- [Install Azure CLI on Linux](/cli/azure/install-azure-cli-linux)
2626
- [Install Azure CLI on macOS](/cli/azure/install-azure-cli-macos)
2727

28-
After installing either Azure PowerShell or Azure CLI, make sure you sign in for the first time. For help, see [Sign in - PowerShell](/powershell/azure/install-az-ps#sign-in) or [Sign in - Azure CLI](/cli/azure/get-started-with-azure-cli#sign-in).
28+
After installing either Azure PowerShell or Azure CLI, sign in for the first time. For help, see [Sign in - PowerShell](/powershell/azure/install-az-ps#sign-in) or [Sign in - Azure CLI](/cli/azure/get-started-with-azure-cli#sign-in).
2929

3030
### Editor (Optional)
3131

32-
Templates are JSON files. To review/edit templates, you need a good JSON editor. We recommend Visual Studio Code with the Resource Manager Tools extension. If you need to install these tools, see [Quickstart: Create ARM templates with Visual Studio Code](quickstart-create-templates-use-visual-studio-code.md).
32+
Templates are JSON files. To review or edit templates, you need a good JSON editor. We recommend using Visual Studio Code with the Resource Manager Tools extension. If you need to install these tools, see [Quickstart: Create ARM templates with Visual Studio Code](quickstart-create-templates-use-visual-studio-code.md).
3333

3434
## Review template
3535

36-
The template deploys a storage account, app service plan, and web app. If you're interested in creating the template, you can go through [tutorial about Quickstart templates](template-tutorial-quickstart-template.md). However it's not required for completing this tutorial.
36+
The template deploys a storage account, app service plan, and web app. If you're interested in creating the template, see [Quickstart templates tutorial](template-tutorial-quickstart-template.md). However, you don't need to create the template to complete this tutorial.
3737

3838
:::code language="json" source="~/resourcemanager-templates/get-started-deployment/local-template/azuredeploy.json":::
3939

@@ -78,7 +78,7 @@ az account set --subscription [SubscriptionID/SubscriptionName]
7878

7979
## Create resource group
8080

81-
When you deploy a template, you specify a resource group that will contain the resources. Before running the deployment command, create the resource group with either Azure CLI or Azure PowerShell. Select the tabs in the following code section to choose between Azure PowerShell and Azure CLI. The CLI examples in this article are written for the Bash shell.
81+
When you deploy a template, you specify a resource group for the resources. Before running the deployment command, create the resource group with either Azure CLI or Azure PowerShell. To choose between Azure PowerShell and Azure CLI, select the tabs in the following code section. The CLI examples in this article are written for the Bash shell.
8282

8383
# [PowerShell](#tab/azure-powershell)
8484

@@ -149,7 +149,7 @@ To learn more about deploying template by using Azure CLI, see [Deploy resources
149149

150150
## Clean up resources
151151

152-
Clean up the resources you deployed by deleting the resource group.
152+
To clean up the resources you deployed, delete the resource group.
153153

154154
1. From the Azure portal, select **Resource group** from the left menu.
155155
2. Enter the resource group name in the **Filter by name** field.
@@ -158,7 +158,7 @@ Clean up the resources you deployed by deleting the resource group.
158158

159159
## Next steps
160160

161-
You learned how to deploy a local template. In the next tutorial, you separate the template into a main template and a linked template, and learn how to store and secure the linked template.
161+
You learned how to deploy a local template. In the next tutorial, you separate the template into a main template and a linked template. You also learn how to store and secure the linked template.
162162

163163
> [!div class="nextstepaction"]
164164
> [Deploy a linked template](./deployment-tutorial-linked-template.md)

0 commit comments

Comments
 (0)