Merge pull request #279755 from MicrosoftDocs/repo_sync_working_branch

Taojunshen · web-flow · commit c4891c6850e4 · 2024-07-02T00:31:02.000+08:00
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
diff --git a/articles/ai-services/language-service/question-answering/tutorials/active-learning.md b/articles/ai-services/language-service/question-answering/tutorials/active-learning.md
@@ -24,7 +24,7 @@ This tutorial shows you how to enhance your custom question answering project wi
 
 These variations when added as alternate questions to the relevant question answer pair, help to optimize the project to answer real world user queries. You can manually add alternate questions to question answer pairs through the editor. At the same time, you can also use the active learning feature to generate active learning suggestions based on user queries. The active learning feature, however, requires that the project receives regular user traffic to generate suggestions.
 
-## Enable active learning
+## Use active learning
 
 Active learning is turned on by default for custom question answering enabled resources.
 
diff --git a/articles/defender-for-cloud/ai-threat-protection.md b/articles/defender-for-cloud/ai-threat-protection.md
@@ -21,7 +21,7 @@ Defender for Cloud's AI threat protection integrates with [Azure AI Content Safe
 :::image type="content" source="media/ai-threat-protection/threat-protection-ai.png" alt-text="Diagram that shows how enabling, detection, and response works for threat protection." lightbox="media/ai-threat-protection/threat-protection-ai.png":::
 
 > [!NOTE]
-> Threat protection for AI workloads relies on [Azure Open AI content filtering](../ai-services/openai/concepts/content-filter.md) for prompt-base triggered alert. If you opt out of prompt-based trigger alerts and removed that capability, it can affect Defender for Cloud's ability to monitor and detect such attacks.
+> Threat protection for AI workloads relies on [Azure OpenAI content filtering](../ai-services/openai/concepts/content-filter.md) for prompt-base triggered alert. If you opt out of prompt-based trigger alerts and removed that capability, it can affect Defender for Cloud's ability to monitor and detect such attacks.
 
 ## Defender XDR integration
 
diff --git a/articles/firewall/integrate-with-nat-gateway.md b/articles/firewall/integrate-with-nat-gateway.md
@@ -23,7 +23,7 @@ When a NAT gateway resource is associated with an Azure Firewall subnet, all out
 There’s no double NAT with this architecture. Azure Firewall instances send the traffic to NAT gateway using their private IP address rather than Azure Firewall public IP address.
 
 > [!NOTE]
-> Deploying NAT gateway with a [zone redundant firewall](deploy-availability-zone-powershell.md) is not recommended deployment option, as the NAT gateway does not support zonal redundant deployment at this time. In order to use NAT gateway with Azure Firewall, a zonal Firewall deployment is required. 
+> Deploying NAT gateway with a [zone redundant firewall](deploy-availability-zone-powershell.md) is not recommended deployment option, as a single instance of NAT gateway does not support zonal redundant deployment at this time. 
 >
 > In addition, Azure NAT Gateway integration is not currently supported in secured virtual hub network (vWAN) architectures. You must deploy using a hub virtual network architecture. For detailed guidance on integrating NAT gateway with Azure Firewall in a hub and spoke network architecture refer to the [NAT gateway and Azure Firewall integration tutorial](../virtual-network/nat-gateway/tutorial-hub-spoke-nat-firewall.md). For more information about Azure Firewall architecture options, see [What are the Azure Firewall Manager architecture options?](../firewall-manager/vhubs-and-vnets.md).
 
diff --git a/articles/stream-analytics/stream-analytics-introduction.md b/articles/stream-analytics/stream-analytics-introduction.md
@@ -75,6 +75,8 @@ Azure Stream Analytics guarantees exactly once event processing and at-least-onc
 
 Azure Stream Analytics has built-in recovery capabilities in case the delivery of an event fails. Stream Analytics also provides built-in checkpoints to maintain the state of your job and provides repeatable results.
 
+Azure Stream Analytics supports Availability Zones for all jobs. Any new dedicated cluster or new job will automatically benefit from Availability Zones, and, in case of disaster in a zone, will continue to run seamlessly by failing over to the other zones without the need of any user action. Availability Zones provide customers with the ability to withstand datacenter failures through redundancy and logical isolation of services. This will significantly reduce the risk of outage for your streaming pipelines. Note that Azure Stream Analytics jobs integrated with VNET don't currently support Availability Zones.
+
 As a managed service, Stream Analytics guarantees event processing with a 99.9% availability at a minute level of granularity. 
 
 ### Security
diff --git a/articles/virtual-network/virtual-network-tap-overview.md b/articles/virtual-network/virtual-network-tap-overview.md
@@ -47,6 +47,8 @@ The accounts you use to apply TAP configuration on network interfaces must be as
 
 - [Big Switch Big Monitoring Fabric](https://www.arista.com/en/bigswitch)
 
+- [Corelight, Inc.](https://corelight.com/)
+
 ### Security analytics, network/application performance management
 
 - [Awake Security](https://www.arista.com/partner/technology-partners)

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ When a NAT gateway resource is associated with an Azure Firewall subnet, all out`
`23`	`23`	`There’s no double NAT with this architecture. Azure Firewall instances send the traffic to NAT gateway using their private IP address rather than Azure Firewall public IP address.`
`24`	`24`
`25`	`25`	`> [!NOTE]`
`26`		`-> Deploying NAT gateway with a [zone redundant firewall](deploy-availability-zone-powershell.md) is not recommended deployment option, as the NAT gateway does not support zonal redundant deployment at this time. In order to use NAT gateway with Azure Firewall, a zonal Firewall deployment is required.`
	`26`	`+> Deploying NAT gateway with a [zone redundant firewall](deploy-availability-zone-powershell.md) is not recommended deployment option, as a single instance of NAT gateway does not support zonal redundant deployment at this time.`
`27`	`27`	`>`
`28`	`28`	> In addition, Azure NAT Gateway integration is not currently supported in secured virtual hub network (vWAN) architectures. You must deploy using a hub virtual network architecture. For detailed guidance on integrating NAT gateway with Azure Firewall in a hub and spoke network architecture refer to the [NAT gateway and Azure Firewall integration tutorial](../virtual-network/nat-gateway/tutorial-hub-spoke-nat-firewall.md). For more information about Azure Firewall architecture options, see [What are the Azure Firewall Manager architecture options?](../firewall-manager/vhubs-and-vnets.md).
`29`	`29`