Skip to content

Commit 269d4af

Browse files
authored
Merge pull request #285218 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents 00204e2 + ae7a4af commit 269d4af

File tree

5 files changed

+11
-8
lines changed

5 files changed

+11
-8
lines changed

articles/ai-services/content-safety/quickstart-groundedness.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,9 @@ Create a new Python file named _quickstart.py_. Open the new file in your prefer
6969
```Python
7070
import http.client
7171
import json
72-
73-
conn = http.client.HTTPSConnection("<endpoint>/contentsafety/text:detectGroundedness?api-version=2024-02-15-preview")
72+
73+
endpoint = "<your_custom_subdomain>.cognitiveservices.azure.com"
74+
conn = http.client.HTTPSConnection(endpoint)
7475
payload = json.dumps({
7576
"domain": "Generic",
7677
"task": "QnA",

articles/ai-services/openai/concepts/content-credentials.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ manager: nitinme
1212

1313
# Content Credentials
1414

15-
With the improved quality of content from generative AI models, there is an increased need for more transparency on the origin of AI-generated content. All AI-generated images from the Azure OpenAI service now include Content Credentials, a tamper-evident way to disclose the origin and history of content. Content Credentials are based on an open technical specification from the [Coalition for Content Provenance and Authenticity (C2PA)](https://www.c2pa.org), a Joint Development Foundation project.
15+
With the improved quality of content from generative AI models, there is an increased need for more transparency on the origin of AI-generated content. All AI-generated images from Azure OpenAI Service now include Content Credentials, a tamper-evident way to disclose the origin and history of content. Content Credentials are based on an open technical specification from the [Coalition for Content Provenance and Authenticity (C2PA)](https://www.c2pa.org), a Joint Development Foundation project.
1616

1717
## What are Content Credentials?
1818

@@ -23,11 +23,11 @@ The manifest contains several key pieces of information:
2323
| Field name | Field content |
2424
| ---| ---|
2525
| `"description"` | This field has a value of `"AI Generated Image"` for all DALL-E model generated images, attesting to the AI-generated nature of the image. |
26-
| `"softwareAgent"` | This field has a value of `"Azure OpenAI DALL-E"` for all images generated by DALL-E series models in the Azure OpenAI service. |
26+
| `"softwareAgent"` | This field has a value of `"Azure OpenAI DALL-E"` for all images generated by DALL-E series models in Azure OpenAI Service. |
2727
|`"when"` |The timestamp of when the Content Credentials were created. |
2828

2929

30-
Content Credentials in the Azure OpenAI Service can help people understand when visual content is AI-generated. For more information on how to responsibly build solutions with Azure OpenAI service image-generation models, visit the [Azure OpenAI transparency note](/legal/cognitive-services/openai/transparency-note?tabs=text).
30+
Content Credentials in the Azure OpenAI Service can help people understand when visual content is AI-generated. For more information on how to responsibly build solutions with Azure OpenAI Service image-generation models, visit the [Azure OpenAI transparency note](/legal/cognitive-services/openai/transparency-note?tabs=text).
3131

3232
## How do I leverage Content Credentials in my solution today?
3333

articles/ai-services/openai/includes/use-your-data-dotnet.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ From the project directory, open the *Program.cs* file and replace its contents
1919
```csharp
2020
using Azure;
2121
using Azure.AI.OpenAI;
22+
using Azure.AI.OpenAI.Chat;
23+
using OpenAI.Chat;
2224
using System.Text.Json;
2325
using static System.Environment;
2426

articles/container-apps/sessions-custom-container.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,8 @@ az containerapp sessionpool create \
7070
--network-status EgressDisabled \
7171
--max-sessions 10 \
7272
--ready-sessions 5 \
73-
--env-vars "key1=value1" "key2=value2"
73+
--env-vars "key1=value1" "key2=value2" \
74+
--location <LOCATION>
7475
```
7576

7677
This command creates a session pool with the following settings:
@@ -93,6 +94,7 @@ This command creates a session pool with the following settings:
9394
| `--max-sessions` | `10` | The maximum number of sessions that can be allocated at the same time. |
9495
| `--ready-sessions` | `5` | The target number of sessions that are ready in the session pool all the time. Increase this number if sessions are allocated faster than the pool is being replenished. |
9596
| `--env-vars` | `"key1=value1" "key2=value2"` | The environment variables to set in the container. |
97+
| `--location` | `"Supported Location"` | The location of the session pool. |
9698

9799
To update the session pool, use the `az containerapp sessionpool update` command.
98100

articles/defender-for-iot/device-builders/concept-agent-portfolio-overview-os-support.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ Most of the Linux Operating Systems (OS) are covered by both agents. The agents
2424
| Ubuntu 20.04 ||||
2525
| Ubuntu 22.04 || | |
2626

27-
The Defender for IoT micro agent also supports Yocto as an open source.
28-
2927
For a more granular view of the micro agent-operating system dependencies, see [Linux dependencies](concept-micro-agent-linux-dependencies.md#linux-dependencies).
3028

3129
## Eclipse ThreadX micro agent

0 commit comments

Comments
 (0)