Skip to content

Commit 083ce87

Browse files
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into dmlib-toc
2 parents e948b25 + fff7870 commit 083ce87

File tree

56 files changed

+1372
-372
lines changed

Some content is hidden

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

56 files changed

+1372
-372
lines changed

articles/aks/howto-deploy-java-wls-app.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -554,7 +554,7 @@ In the previous steps, you created the auxiliary image including models and WDT.
554554
555555
| Variable | Description | Example |
556556
|------------------------|--------------------------------------------|-----------------------------------------------------------------------------------------------|
557-
| `DB_CONNECTION_STRING` | The connection string of SQL server. | `jdbc:sqlserver://sqlserverforwlsaks.database.windows.net:1433;database=wlsaksquickstart0125` |
557+
| `DB_CONNECTION_STRING` | The connection string of SQL server. | `jdbc:sqlserver://server-name.database.windows.net:1433;database=wlsaksquickstart0125` |
558558
| `DB_USER` | The username to sign in to the SQL server. | `welogic@sqlserverforwlsaks` |
559559
| `DB_PASSWORD` | The password to sign in to the sQL server. | `Secret123456` |
560560
@@ -577,7 +577,7 @@ In the previous steps, you created the auxiliary image including models and WDT.
577577
In the following commands, be sure to set the variables `DB_CONNECTION_STRING`, `DB_USER`, and `DB_PASSWORD` correctly by replacing the placeholder examples with the values described in the previous steps. Be sure to enclose the value of the `DB_` variables in single quotes to prevent the shell from interfering with the values.
578578
579579
```bash
580-
export DB_CONNECTION_STRING='<example-jdbc:sqlserver://sqlserverforwlsaks.database.windows.net:1433;database=wlsaksquickstart0125>'
580+
export DB_CONNECTION_STRING='<example-jdbc:sqlserver://server-name.database.windows.net:1433;database=wlsaksquickstart0125>'
581581
export DB_USER='<example-welogic@sqlserverforwlsaks>'
582582
export DB_PASSWORD='<example-Secret123456>'
583583
export WLS_DOMAIN_NS=sample-domain1-ns

articles/azure-functions/functions-bindings-openai-semanticsearch-input.md

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -14,35 +14,16 @@ zone_pivot_groups: programming-languages-set-functions
1414
The Azure OpenAI semantic search input binding allows you to use semantic search on your embeddings.
1515

1616
For information on setup and configuration details of the Azure OpenAI extension, see [Azure OpenAI extensions for Azure Functions](./functions-bindings-openai.md). To learn more about semantic ranking in Azure AI Search, see [Semantic ranking in Azure AI Search](../search/semantic-search-overview.md).
17-
::: zone pivot="programming-language-javascript,programming-language-typescript"
18-
> [!NOTE]
19-
> References and examples are only provided for the [Node.js v4 model](./functions-reference-node.md?pivots=nodejs-model-v4).
20-
::: zone-end
21-
::: zone pivot="programming-language-python"
22-
> [!NOTE]
23-
> References and examples are only provided for the [Python v2 model](functions-reference-python.md?pivots=python-mode-decorators#development-options).
24-
::: zone-end
17+
18+
[!INCLUDE [functions-support-notes-samples-openai](../../includes/functions-support-notes-samples-openai.md)]
2519

2620
## Example
2721

2822
::: zone pivot="programming-language-csharp"
29-
A C# function can be created using one of the following C# modes:
30-
31-
[!INCLUDE [dotnet-execution](../../includes/functions-dotnet-execution-model.md)]
32-
33-
### [Isolated process](#tab/isolated-process)
34-
3523
This example shows how to perform a semantic search on a file.
3624

3725
:::code language="csharp" source="~/functions-openai-extension/samples/rag-aisearch/csharp-ooproc/FilePrompt.cs" range="63-70":::
3826

39-
<!--
40-
### [In-process](#tab/in-process)
41-
42-
[!INCLUDE [functions-examples-not-available-note](../../includes/functions-examples-not-available-note.md)] -->
43-
44-
---
45-
4627
::: zone-end
4728
::: zone pivot="programming-language-java"
4829

articles/azure-functions/functions-bindings-openai-textcompletion-input.md

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Learn how to use the Azure OpenAI text completion input binding to
44
ms.topic: reference
55
ms.custom:
66
- build-2024
7-
ms.date: 05/08/2024
7+
ms.date: 05/23/2024
88
zone_pivot_groups: programming-languages-set-functions
99
---
1010

@@ -15,24 +15,12 @@ zone_pivot_groups: programming-languages-set-functions
1515
The Azure OpenAI text completion input binding allows you to bring the results text completion APIs into your code executions. You can define the binding to use both predefined prompts with parameters or pass through an entire prompt.
1616

1717
For information on setup and configuration details of the Azure OpenAI extension, see [Azure OpenAI extensions for Azure Functions](./functions-bindings-openai.md). To learn more about Azure OpenAI completions, see [Learn how to generate or manipulate text](../ai-services/openai/how-to/completions.md).
18-
::: zone pivot="programming-language-javascript,programming-language-typescript"
19-
> [!NOTE]
20-
> References and examples are only provided for the [Node.js v4 model](./functions-reference-node.md?pivots=nodejs-model-v4).
21-
::: zone-end
22-
::: zone pivot="programming-language-python"
23-
> [!NOTE]
24-
> References and examples are only provided for the [Python v2 model](functions-reference-python.md?pivots=python-mode-decorators#development-options).
25-
::: zone-end
18+
19+
[!INCLUDE [functions-support-notes-samples-openai](../../includes/functions-support-notes-samples-openai.md)]
2620

2721
## Example
2822

2923
::: zone pivot="programming-language-csharp"
30-
A C# function can be created using one of the following C# modes:
31-
32-
[!INCLUDE [dotnet-execution](../../includes/functions-dotnet-execution-model.md)]
33-
34-
### [Isolated process](#tab/isolated-process)
35-
3624
This example demonstrates the _templating_ pattern, where the HTTP trigger function takes a `name` parameter and embeds it into a text prompt, which is then sent to the Azure OpenAI completions API by the extension. The response to the prompt is returned in the HTTP response.
3725

3826
:::code language="csharp" source="~/functions-openai-extension/samples/textcompletion/csharp-ooproc/TextCompletions.cs" range="23-31":::
@@ -41,12 +29,6 @@ This example takes a prompt as input, sends it directly to the completions API,
4129

4230
:::code language="csharp" source="~/functions-openai-extension/samples/textcompletion/csharp-ooproc/TextCompletions.cs" range="37-46":::
4331

44-
### [In-process](#tab/in-process)
45-
46-
[!INCLUDE [functions-examples-not-available-note](../../includes/functions-examples-not-available-note.md)]
47-
48-
---
49-
5032
::: zone-end
5133
::: zone pivot="programming-language-java"
5234
This example demonstrates the _templating_ pattern, where the HTTP trigger function takes a `name` parameter and embeds it into a text prompt, which is then sent to the Azure OpenAI completions API by the extension. The response to the prompt is returned in the HTTP response.

articles/azure-vmware/architecture-private-clouds.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ Azure VMware Solution monitors the following conditions on the host:
153153
154154
## Backup and restore
155155

156-
Azure VMware Solution private cloud vCenter Server, NSX, and HCX Manager (if enabled) configurations are on a daily backup schedule. Open a [support request](https://rc.portal.azure.com/#create/Microsoft.Support) in the Azure portal to request restoration.
156+
Azure VMware Solution private cloud vCenter Server and HCX Manager (if enabled) configurations are on a daily backup schedule and NSX configuration is on hourly backup schedule. The backups are retained for a minimum of three days.Open a [support request](https://rc.portal.azure.com/#create/Microsoft.Support) in the Azure portal to request restoration.
157157

158158
> [!NOTE]
159159
> Restorations are intended for catastrophic situations only.

articles/container-apps/java-config-server-usage.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
---
2-
title: Configure settings for the Spring Cloud Configure Server component in Azure Container Apps (preview)
2+
title: Configure settings for the Spring Cloud Config Server component in Azure Container Apps (preview)
33
description: Learn how to configure a Spring Cloud Config Server component for your container app.
44
services: container-apps
55
author: craigshoemaker
66
ms.service: container-apps
77
ms.custom: devx-track-azurecli
88
ms.topic: how-to
9-
ms.date: 03/13/2024
9+
ms.date: 05/23/2024
1010
ms.author: cshoe
1111
---
1212

articles/container-registry/buffer-gate-public-content.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ Developers of application images should ensure that their code references local
121121

122122
## Automate application image updates
123123

124-
Expanding on image import, set up an [Azure Container Registry task](container-registry-tasks-overview.md) to automate application image builds when base images are updated. An automated build task can track both [base image updates](container-registry-tasks-base-images.md) and [source code updates](container-registry-tasks-overview.md#trigger-task-on-source-code-update).
124+
Expanding on image import, set up an [Azure Container Registry task](container-registry-tasks-overview.md) to automate application image builds when base images are updated. An automated build task can track both [base image updates](container-registry-tasks-base-images.md) and [source code updates](container-registry-tasks-overview.md#trigger-a-task-on-a-source-code-update).
125125

126126
For a detailed example, see [How to consume and maintain public content with Azure Container Registry Tasks](tasks-consume-public-content.md).
127127

0 commit comments

Comments
 (0)