Skip to content

Commit f9ab554

Browse files
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into perf-js
2 parents f6cb0da + fe7076d commit f9ab554

File tree

103 files changed

+427
-268
lines changed

Some content is hidden

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

103 files changed

+427
-268
lines changed

articles/ai-services/openai/concepts/use-your-data.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ It's possible for the model to return `"TYPE":"UNCITED_REFERENCE"` instead of `"
347347

348348
You can define a system message to steer the model's reply when using Azure OpenAI On Your Data. This message allows you to customize your replies on top of the retrieval augmented generation (RAG) pattern that Azure OpenAI On Your Data uses. The system message is used in addition to an internal base prompt to provide the experience. To support this, we truncate the system message after a specific [number of tokens](#token-usage-estimation-for-azure-openai-on-your-data) to ensure the model can answer questions using your data. If you are defining extra behavior on top of the default experience, ensure that your system prompt is detailed and explains the exact expected customization.
349349

350-
Once you select add your dataset, you can use the **System message** section in the Azure OpenAI Studio, or the `roleInformation` [parameter in the API](../references/on-your-data.md).
350+
Once you select add your dataset, you can use the **System message** section in the Azure OpenAI Studio, or the `role_information` [parameter in the API](../references/on-your-data.md).
351351

352352
:::image type="content" source="../media/use-your-data/system-message.png" alt-text="A screenshot showing the system message option in Azure OpenAI Studio." lightbox="../media/use-your-data/system-message.png":::
353353

articles/ai-services/openai/how-to/file-search.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services: cognitive-services
66
manager: nitinme
77
ms.service: azure-ai-openai
88
ms.topic: how-to
9-
ms.date: 05/20/2024
9+
ms.date: 06/03/2024
1010
author: aahill
1111
ms.author: aahi
1212
recommendations: false
@@ -92,7 +92,7 @@ assistant = client.beta.assistants.create(
9292
> With Azure OpenAI the `model` parameter requires model deployment name. If your model deployment name is different than the underlying model name then you would adjust your code to ` "model": "{your-custom-model-deployment-name}"`.
9393
9494
```console
95-
curl https://YOUR_RESOURCE_NAME.openai.azure.com/openai/assistants?api-version=2024-02-15-preview \
95+
curl https://YOUR_RESOURCE_NAME.openai.azure.com/openai/assistants?api-version=2024-05-01-preview \
9696
-H "api-key: $AZURE_OPENAI_API_KEY" \
9797
-H 'Content-Type: application/json' \
9898
-d '{

articles/ai-studio/how-to/configure-managed-network.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@ Before following the steps in this article, make sure you have the following pre
149149
* The managed virtual network is deleted when the Azure AI is deleted.
150150
* Data exfiltration protection is automatically enabled for the only approved outbound mode. If you add other outbound rules, such as to FQDNs, Microsoft can't guarantee that you're protected from data exfiltration to those outbound destinations.
151151
* Using FQDN outbound rules increases the cost of the managed virtual network because FQDN rules use Azure Firewall. For more information, see [Pricing](#pricing).
152+
* FQDN outbound rules only support ports 80 and 443.
152153
* When using a compute instance with a managed network, use the `az ml compute connect-ssh` command to connect to the compute using SSH.
153154

154155
### Connectivity to other services

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -253,8 +253,7 @@ Response:
253253

254254
| **Sample Type** | **Sample Notebook** |
255255
|----------------|----------------------------------------|
256-
| CLI using CURL and Python web requests | [webrequests.ipynb](
257-
https://aka.ms/jais/webrequests-sample) |
256+
| CLI using CURL and Python web requests | [webrequests.ipynb](https://aka.ms/jais/webrequests-sample) |
258257
| OpenAI SDK (experimental) | [openaisdk.ipynb](https://aka.ms/jais/openaisdk) |
259258
| LiteLLM | [litellm.ipynb](https://aka.ms/jais/litellm-sample) |
260259

articles/ai-studio/how-to/develop/ai-template-get-started.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ author: eric-urban
1818
Streamline your code-first development with prebuilt, task-specific Azure AI templates. Benefit from using the latest features and best practices from Microsoft Azure AI, with popular frameworks like LangChain, prompt flow, and Semantic Kernel in multiple languages.
1919

2020
> [!TIP]
21-
> Discover the latest templates in our curated [AZD templates collection](https://aka.ms/azd-ai-templates). Deploy them with a single command ```azd up``` using the [Azure Developer CLI](/developer/azure-developer-cli/overview).
21+
> Discover the latest templates in our curated [AZD templates collection](https://aka.ms/azd-ai-templates). Deploy them with a single command ```azd up``` using the [Azure Developer CLI](/azure/developer/azure-developer-cli/).
2222
2323
## Start with a sample application
2424

articles/app-service/includes/quickstart-java/quickstart-java-javase.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ If Maven isn't your preferred development tool, check out our similar tutorials
4444

4545
### [Spring Boot](#tab/springboot)
4646

47-
1. Download and extract the [default Spring Boot web application template](https://github.com/rd-1-2022/rest-service). This repository is cloned for you when you run the [Spring CLI](https://docs.spring.io/spring-cli/reference/creating-new-projects.html) command `spring boot new my-webapp`.
47+
1. Download and extract the [default Spring Boot web application template](https://github.com/rd-1-2022/rest-service). This repository is cloned for you when you run the [Spring CLI](https://docs.spring.io/spring-cli/reference/getting-started.html) command `spring boot new my-webapp`.
4848

4949
```bash
5050
git clone https://github.com/rd-1-2022/rest-service my-webapp

articles/app-service/overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ If you need to create another web app with an outdated runtime version that is n
6565
Create your first web app.
6666

6767
> [!div class="nextstepaction"]
68-
> [Getting started)](getting-started.md)
68+
> [Getting started](getting-started.md)
6969
7070
> [!div class="nextstepaction"]
7171
> [ASP.NET Core (on Windows or Linux)](quickstart-dotnetcore.md)

articles/app-spaces/how-to-add-components.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,15 @@ zone_pivot_groups: app-spaces-add-component
1212

1313
# Add App Spaces components
1414

15+
[!include [preview note](./includes/preview-note.md)]
16+
1517
[App Spaces](https://go.microsoft.com/fwlink/?linkid=2234200) is an intelligent service for developers that reduces the complexity of creating and managing web apps. This guide shows you how to add components to an existing App Spaces app. Components can be a back-end app (Azure Container App), a front-end app (Static Web App), or a database (MariaDB, PostgreSQL, Qdrant).
1618

1719
[!include [component types](./includes/component-types-table.md)]
1820

1921
## Add components
2022

21-
To add a component to your App Space, select **+ Add component** on the _App Space_ page.
23+
To add a component to your App Space, on the _App Space_ page, select **+ Add component**.
2224

2325
::: zone pivot="custom"
2426

articles/app-spaces/how-to-manage-components.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ zone_pivot_groups: app-spaces-component-types
1111

1212
# Manage components in App Spaces
1313

14+
[!include [preview note](./includes/preview-note.md)]
15+
1416
You can manage the components of your App Spaces by selecting the component on the __App Space__ page.
1517

1618
[!include [component types](./includes/component-types-table.md)]
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
---
2+
author: msangapu-msft
3+
ms.author: msangapu
4+
ms.topic: include
5+
ms.date: 06/03/2024
6+
---
7+
8+
> [!NOTE]
9+
> App Spaces is in preview.
10+
>

0 commit comments

Comments
 (0)