Skip to content

Commit 222c294

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into heidist-fix
2 parents b7fd7f5 + 0ec0925 commit 222c294

File tree

41 files changed

+537
-338
lines changed

Some content is hidden

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

41 files changed

+537
-338
lines changed

articles/ai-services/cognitive-services-container-support.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ Azure AI containers provide the following set of Docker containers, each of whic
6565
| [Speech Service API][sp-containers-stt] | **Speech to text** ([image](https://mcr.microsoft.com/product/azure-cognitive-services/speechservices/speech-to-text/about)) | Transcribes continuous real-time speech into text. | Generally available. <br> This container can also [run in disconnected environments](containers/disconnected-containers.md). |
6666
| [Speech Service API][sp-containers-cstt] | **Custom Speech to text** ([image](https://mcr.microsoft.com/product/azure-cognitive-services/speechservices/custom-speech-to-text/about)) | Transcribes continuous real-time speech into text using a custom model. | Generally available <br> This container can also [run in disconnected environments](containers/disconnected-containers.md). |
6767
| [Speech Service API][sp-containers-ntts] | **Neural Text to speech** ([image](https://mcr.microsoft.com/product/azure-cognitive-services/speechservices/neural-text-to-speech/about)) | Converts text to natural-sounding speech using deep neural network technology, allowing for more natural synthesized speech. | Generally available. <br> This container can also [run in disconnected environments](containers/disconnected-containers.md). |
68-
| [Speech Service API][sp-containers-lid] | **Speech language detection** ([image](https://mcr.microsoft.com/product/azure-cognitive-services/speechservices/language-detection/about)) | Determines the language of spoken audio. | Preview |
68+
| [Speech Service API][sp-containers-lid] | **Speech language identification** ([image](https://mcr.microsoft.com/product/azure-cognitive-services/speechservices/language-detection/about)) | Determines the language of spoken audio. | Preview |
6969

7070
### Vision containers
7171

articles/ai-services/cognitive-services-virtual-networks.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ You can manage default network access rules for Azure AI services resources thro
169169
170170
## Grant access from a virtual network
171171
172-
You can configure Azure AI services resources to allow access from specific subnets only. The allowed subnets might belong to a virtual network in the same subscription or in a different subscription. The other subscription can belong to a different Microsoft Entra tenant.
172+
You can configure Azure AI services resources to allow access from specific subnets only. The allowed subnets might belong to a virtual network in the same subscription or in a different subscription. The other subscription can belong to a different Microsoft Entra tenant. When the subnet belongs to a different subscription, the Microsoft.CognitiveServices resource provider needs to be also registered for that subscription.
173173
174174
Enable a *service endpoint* for Azure AI services within the virtual network. The service endpoint routes traffic from the virtual network through an optimal path to the Azure AI service. For more information, see [Virtual Network service endpoints](../virtual-network/virtual-network-service-endpoints-overview.md).
175175

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

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,22 @@ keywords:
1414

1515
# Content Credentials
1616

17-
With the improved quality of content from generative AI models, there is an increased need for transparency on the history of AI generated content. All AI-generated images from the Azure OpenAI service now include a digital credential that discloses the content as AI-generated. This is done in collaboration with The Coalition for Content Provenance and Authenticity (C2PA), a Joint Development Foundation project. Visit the [C2PA site](https://c2pa.org/) to learn more about this coalition and its initiatives.
17+
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.
1818

19-
## What are content credentials?
19+
## What are Content Credentials?
2020

21-
Content credentials in Azure OpenAI Service provides customers with basic, trustworthy information (detailed in the chart below) about the origin of an image generated by the DALL-E series models. This information is represented by a manifest embedded inside the image. This manifest is cryptographically signed by a certificate that customers can trace back to Azure OpenAI Service. This signature is also embedded into the manifest itself.
21+
Content Credentials in the Azure OpenAI Service provide customers with information about the origin of an image generated by the DALL-E series models. This information is represented by a manifest attached to the image. The manifest is cryptographically signed by a certificate that traces back to Azure OpenAI Service.
2222

23-
The JSON manifest contains several key pieces of information:
23+
The manifest contains several key pieces of information:
2424

2525
| Field name | Field content |
2626
| ---| ---|
2727
| `"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. |
2828
| `"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. |
29-
|`"when"` |The timestamp of when the image was generated. |
29+
|`"when"` |The timestamp of when the Content Credentials were created. |
3030

3131

32-
This digital signature can help people understand when visual content is AI-generated. It's important to keep in mind that image provenance can help establish the truth about the origin of digital content, but it alone can't tell you whether the digital content is true, accurate, or factual. Content credentials are designed to be used as one tool among others to help customers validate their media. 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)
32+
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).
3333

3434
## How do I leverage Content Credentials in my solution today?
3535

@@ -42,14 +42,11 @@ No additional set-up is necessary. Content Credentials are automatically applied
4242

4343
There are two recommended ways today to check the Credential of an image generated by Azure OpenAI DALL-E models:
4444

45-
1. **By the content credentials website (contentcredentials.org/verify)**: This web page provides a user interface that allows users to upload any image. If an image is generated by DALL-E in Azure OpenAI, the content credentials webpage shows that the image was issued by Microsoft Corporation alongside the date and time of image creation.
45+
1. **Content Credentials Verify webpage (contentcredentials.org/verify)**: This is a tool that allows users to inspect the Content Credentials of a piece of content. If an image was generated by DALL-E in Azure OpenAI, the tool will display that its Content Credentials were issued by Microsoft Corporation alongside the date and time of issuance.
4646

4747
:::image type="content" source="../media/encryption/credential-check.png" alt-text="Screenshot of the content credential verification website.":::
4848

49-
This page shows that an Azure OpenAI DALL-E generated image has been issued by Microsoft.
49+
This page shows that an image generated by Azure OpenAI DALL-E has Content Credentials issued by Microsoft.
5050

51-
2. **With the Content Authenticity Initiative (CAI) JavaScript SDK**: the Content Authenticity Initiative open-source tools and libraries can verify the provenance information embedded in DALL-E generated images and are recommended for web-based applications that display images generated with Azure OpenAI DALL-E models. Get started with the SDK [here](https://opensource.contentauthenticity.org/docs/js-sdk/getting-started/quick-start).
52-
53-
As a best practice, consider checking provenance information in images displayed in your application using the CAI SDK and embedding the results of the check in the application UI along with AI-generated images. Below is an example from Bing Image Creator.
54-
55-
:::image type="content" source="../media/encryption/image-with-credential.png" alt-text="Screenshot of an image with its content credential information displayed.":::
51+
2. **Content Authenticity Initiative (CAI) open-source tools**: The CAI provides multiple open-source tools that validate and display C2PA Content Credentials. Find the tool right for your application and [get started here](https://opensource.contentauthenticity.org/).
52+

articles/aks/artifact-streaming.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,14 +94,14 @@ Enablement on ACR is a prerequisite for Artifact Streaming on AKS. For more info
9494
9595
### Enable Artifact Streaming on a new node pool
9696
97-
* Create a new node pool with Artifact Streaming enabled using the [`az aks nodepool add`][az-aks-nodepool-add] command with the `--enable-artifact-streaming` flag set to `true`.
97+
* Create a new node pool with Artifact Streaming enabled using the [`az aks nodepool add`][az-aks-nodepool-add] command with the `--enable-artifact-streaming`.
9898
9999
```azurecli-interactive
100100
az aks nodepool add \
101101
--resource-group myResourceGroup \
102102
--cluster-name myAKSCluster \
103103
--name myNodePool \
104-
--enable-artifact-streaming true
104+
--enable-artifact-streaming
105105
```
106106
107107
## Check if Artifact Streaming is enabled

articles/aks/azure-cni-overlay.md

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ms.author: allensu
66
ms.subservice: aks-networking
77
ms.topic: how-to
88
ms.custom: references_regions, devx-track-azurecli
9-
ms.date: 11/03/2023
9+
ms.date: 11/04/2023
1010
---
1111

1212
# Configure Azure CNI Overlay networking in Azure Kubernetes Service (AKS)
@@ -147,6 +147,8 @@ az aks create -n $clusterName -g $resourceGroup \
147147
148148
The upgrade process triggers each node pool to be re-imaged simultaneously. Upgrading each node pool separately to Overlay isn't supported. Any disruptions to cluster networking are similar to a node image upgrade or Kubernetes version upgrade where each node in a node pool is re-imaged.
149149

150+
### Azure CNI Cluster Upgrade
151+
150152
Update an existing Azure CNI cluster to use Overlay using the [`az aks update`][az-aks-update] command.
151153

152154
```azurecli-interactive
@@ -162,6 +164,27 @@ az aks update --name $clusterName \
162164

163165
The `--pod-cidr` parameter is required when upgrading from legacy CNI because the pods need to get IPs from a new overlay space, which doesn't overlap with the existing node subnet. The pod CIDR also can't overlap with any VNet address of the node pools. For example, if your VNet address is *10.0.0.0/8*, and your nodes are in the subnet *10.240.0.0/16*, the `--pod-cidr` can't overlap with *10.0.0.0/8* or the existing service CIDR on the cluster.
164166

167+
168+
### Kubenet Cluster Upgrade
169+
170+
Update an existing Kubenet cluster to use Azure CNI Overlay using the [`az aks update`][az-aks-update] command.
171+
172+
```azurecli-interactive
173+
clusterName="myOverlayCluster"
174+
resourceGroup="myResourceGroup"
175+
location="westcentralus"
176+
177+
az aks update --name $clusterName \
178+
--resource-group $resourceGroup \
179+
--network-plugin azure \
180+
--network-plugin-mode overlay
181+
```
182+
183+
Since the cluster is already using a private CIDR for pods, you don't need to specify the `--pod-cidr` parameter and the Pod CIDR will remain the same.
184+
185+
> [NOTE!]
186+
> When upgrading from Kubenet to CNI Overlay, the route table will no longer be required for pod routing. If the cluster is using a customer provided route table, the routes which were being used to direct pod traffic to the correct node will automatically be deleted during the migration operation. If the cluster is using a managed route table (the route table was created by AKS and lives in the node resource group) then that route table will be deleted as part of the migration.
187+
165188
## Dual-stack Networking (Preview)
166189

167190
You can deploy your AKS clusters in a dual-stack mode when using Overlay networking and a dual-stack Azure virtual network. In this configuration, nodes receive both an IPv4 and IPv6 address from the Azure virtual network subnet. Pods receive both an IPv4 and IPv6 address from a logically different address space to the Azure virtual network subnet of the nodes. Network address translation (NAT) is then configured so that the pods can reach resources on the Azure virtual network. The source IP address of the traffic is NAT'd to the node's primary IP address of the same family (IPv4 to IPv4 and IPv6 to IPv6).

articles/application-gateway/ipv6-application-gateway-portal.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ You can also complete this quickstart using [Azure PowerShell](ipv6-application-
3737

3838
## Regions and availability
3939

40-
The IPv6 Application Gateway preview is available to all public cloud regions where Application Gateway v2 SKU is supported.
40+
The IPv6 Application Gateway preview is available to all public cloud regions where Application Gateway v2 SKU is supported. It's also available in [Microsoft Azure operated by 21Vianet](https://www.azure.cn/) and [Azure Government](https://azure.microsoft.com/overview/clouds/government/)
4141

4242
## Limitations
4343

articles/application-gateway/ipv6-application-gateway-powershell.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ If you choose to install and use PowerShell locally, this article requires the A
4242

4343
## Regions and availability
4444

45-
The IPv6 Application Gateway preview is available to all public cloud regions where Application Gateway v2 SKU is supported.
45+
The IPv6 Application Gateway preview is available to all public cloud regions where Application Gateway v2 SKU is supported. It's also available in [Microsoft Azure operated by 21Vianet](https://www.azure.cn/) and [Azure Government](https://azure.microsoft.com/overview/clouds/government/)
4646

4747
## Limitations
4848

articles/azure-arc/resource-bridge/overview.md

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Azure Arc resource bridge overview
33
description: Learn how to use Azure Arc resource bridge to support VM self-servicing on Azure Stack HCI, VMware, and System Center Virtual Machine Manager.
4-
ms.date: 11/15/2023
4+
ms.date: 11/27/2023
55
ms.topic: overview
66
ms.custom: references_regions
77
---
@@ -10,7 +10,7 @@ ms.custom: references_regions
1010

1111
Azure Arc resource bridge is a Microsoft managed product that is part of the core Azure Arc platform. It is designed to host other Azure Arc services. In this release, the resource bridge supports VM self-servicing and management from Azure, for virtualized Windows and Linux virtual machines hosted in an on-premises environment on [Azure Stack HCI](/azure-stack/hci/manage/azure-arc-vm-management-overview), VMware ([Arc-enabled VMware vSphere](../vmware-vsphere/index.yml)), and System Center Virtual Machine Manager (SCVMM) [Arc-enabled SCVMM](../system-center-virtual-machine-manager/index.yml).
1212

13-
Azure Arc resource bridge is a Kubernetes management cluster installed on the customer’s on-premises infrastructure. The resource bridge is provided credentials to the infrastructure control plane that allows it to apply guest management services on the on-premises resources. Arc resource bridge enables projection of on-premises resources as ARM resources and management from ARM as “arc-enabled Azure resources.
13+
Azure Arc resource bridge is a Kubernetes management cluster installed on the customer’s on-premises infrastructure. The resource bridge is provided credentials to the infrastructure control plane that allows it to apply guest management services on the on-premises resources. Arc resource bridge enables projection of on-premises resources as ARM resources and management from ARM as "Arc-enabled" Azure resources.
1414

1515
Arc resource bridge delivers the following benefits:
1616

@@ -65,12 +65,14 @@ By registering resource pools, networks, and VM templates, you can represent a s
6565

6666
### System Center Virtual Machine Manager (SCVMM)
6767

68-
You can connect an SCVMM management server to Azure by deploying Azure Arc resource bridge (preview) in the VMM environment. Azure Arc resource bridge enables you to represent the SCVMM resources (clouds, VMs, templates etc.) in Azure and perform various operations on them:
68+
You can connect an SCVMM management server to Azure by deploying Azure Arc resource bridge in the VMM environment. Azure Arc resource bridge enables you to represent the SCVMM resources (clouds, VMs, templates etc.) in Azure and perform various operations on them:
6969

7070
* Start, stop, and restart a virtual machine
7171
* Control access and add Azure tags
7272
* Add, remove, and update network interfaces
7373
* Add, remove, and update disks and update VM size (CPU cores and memory)
74+
* Enable guest management
75+
* Install extensions
7476

7577
## Example scenarios
7678

@@ -141,8 +143,7 @@ Arc resource bridge typically releases a new version on a monthly cadence, at th
141143

142144
## Next steps
143145

144-
* Learn more about [how Azure Arc-enabled VMware vSphere extends Azure's governance and management capabilities to VMware vSphere infrastructure](../vmware-vsphere/overview.md).
145-
* Learn more about [provisioning and managing on-premises Windows and Linux VMs running on Azure Stack HCI clusters](/azure-stack/hci/manage/azure-arc-enabled-virtual-machines).
146+
* Learn how [Azure Arc-enabled VMware vSphere extends Azure's governance and management capabilities to VMware vSphere infrastructure](../vmware-vsphere/overview.md).
147+
* Learn how [Azure Arc-enabled SCVMM extends Azure's governance and management capabilities to System Center managed infrastructure(../system-center-virtual-machine-manager/overview.md).
148+
* Learn about [provisioning and managing on-premises Windows and Linux VMs running on Azure Stack HCI clusters](/azure-stack/hci/manage/azure-arc-enabled-virtual-machines).
146149
* Review the [system requirements](system-requirements.md) for deploying and managing Arc resource bridge.
147-
148-

0 commit comments

Comments
 (0)