Skip to content

Commit cf600ea

Browse files
authored
Merge pull request #292165 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 554be0f + a4a9c03 commit cf600ea

File tree

48 files changed

+62
-59
lines changed

Some content is hidden

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

48 files changed

+62
-59
lines changed

articles/azure-functions/functions-machine-learning-tensorflow.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ In this article, you learn how to use Python, TensorFlow, and Azure Functions wi
2929
### Prerequisite check
3030

3131
1. In a terminal or command window, run `func --version` to check that the Azure Functions Core Tools are version 2.7.1846 or later.
32-
1. Run `python --version` (Linux/MacOS) or `py --version` (Windows) to check your Python version reports 3.7.x.
32+
1. Run `python --version` (Linux/macOS) or `py --version` (Windows) to check your Python version reports 3.7.x.
3333

3434
## Clone the tutorial repository
3535

articles/azure-functions/machine-learning-pytorch.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ In this article, you learn how to use Python, PyTorch, and Azure Functions to lo
2727
### Prerequisite check
2828

2929
1. In a terminal or command window, run `func --version` to check that the Azure Functions Core Tools are version 2.7.1846 or later.
30-
1. Run `python --version` (Linux/MacOS) or `py --version` (Windows) to check your Python version reports 3.7.x.
30+
1. Run `python --version` (Linux/macOS) or `py --version` (Windows) to check your Python version reports 3.7.x.
3131

3232
## Clone the tutorial repository
3333

articles/communication-services/concepts/voice-video-calling/includes/known-issues/known-issues-safari-browser.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ ___
6767
### Web calling participants hearing PSTN call audio when answered on macOS with iPhone integration
6868
**Browser version:** All.<br>
6969
**Azure Communication Service calling SDK version:** All.<br>
70-
**Description:** When a MacOS user, who is in an active ACS call using a browser, accepts an incoming PSTN call on their MacBook that is linked to their iPhone (using the same iCloud account), audio from the PSTN call is shared among web call participants. This results in participants of the call hearing the PSTN call audio.<br>
70+
**Description:** When a macOS user, who is in an active ACS call using a browser, accepts an incoming PSTN call on their MacBook that is linked to their iPhone (using the same iCloud account), audio from the PSTN call is shared among web call participants. This results in participants of the call hearing the PSTN call audio.<br>
7171
**Known issue reference:** This is a known issue on [macOS](https://bugs.webkit.org/show_bug.cgi?id=256593).<br>
7272
**Recommended workaround:** Currently, no direct workaround is available. Users are advised to use separate devices for PSTN and web calls to prevent that audio shared with other call participants in a separate call.<br>
7373

articles/container-apps/networking.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
title: Networking in Azure Container Apps environment
33
description: Learn how to configure virtual networks in Azure Container Apps.
44
services: container-apps
5-
author: cachai
5+
author: craigshoemaker
66
ms.service: azure-container-apps
77
ms.custom:
88
- ignite-2024
99
ms.topic: conceptual
1010
ms.date: 08/29/2023
11-
ms.author: cachai
11+
ms.author: cshoe
1212
---
1313

1414
# Networking in Azure Container Apps environment
@@ -393,7 +393,7 @@ You can enable mTLS in the ARM template for Container Apps environments using th
393393

394394
- **VNet-scope ingress**: If you plan to use VNet-scope [ingress](ingress-overview.md) in an internal environment, configure your domains in one of the following ways:
395395

396-
1. **Non-custom domains**: If you don't plan to use a custom domain, create a private DNS zone that resolves the Container Apps environment's default domain to the static IP address of the Container Apps environment. You can use [Azure Private DNS](../dns/private-dns-overview.md) or your own DNS server. If you use Azure Private DNS, create a private DNS Zone named as the Container App environment’s default domain (`<UNIQUE_IDENTIFIER>.<REGION_NAME>.azurecontainerapps.io`), with an `A` record. The `A` record contains the name `*<DNS Suffix>` and the static IP address of the Container Apps environment.
396+
1. **Non-custom domains**: If you don't plan to use a custom domain, create a private DNS zone that resolves the Container Apps environment's default domain to the static IP address of the Container Apps environment. You can use [Azure Private DNS](../dns/private-dns-overview.md) or your own DNS server. If you use Azure Private DNS, create a private DNS Zone named as the Container App environment’s default domain (`<UNIQUE_IDENTIFIER>.<REGION_NAME>.azurecontainerapps.io`), with an `A` record. The `A` record contains the name `*<DNS Suffix>` and the static IP address of the Container Apps environment. For more information see [Create and configure an Azure Private DNS zone](waf-app-gateway.md#create-and-configure-an-azure-private-dns-zone).
397397

398398
1. **Custom domains**: If you plan to use custom domains and are using an external Container Apps environment, use a publicly resolvable domain to [add a custom domain and certificate](./custom-domains-certificates.md#add-a-custom-domain-and-certificate) to the container app. If you are using an internal Container Apps environment, there is no validation for the DNS binding, as the cluster can only be accessed from within the virtual network. Additionally, create a private DNS zone that resolves the apex domain to the static IP address of the Container Apps environment. You can use [Azure Private DNS](../dns/private-dns-overview.md) or your own DNS server. If you use Azure Private DNS, create a Private DNS Zone named as the apex domain, with an `A` record that points to the static IP address of the Container Apps environment.
399399

articles/event-hubs/event-hubs-kafka-connect-debezium.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ In this tutorial, you take the following steps:
2727
To complete this walk through, you require:
2828

2929
- Azure subscription. If you don't have one, [create a free account](https://azure.microsoft.com/free/).
30-
- Linux/MacOS
30+
- Linux/macOS
3131
- Kafka release (version 1.1.1, Scala version 2.11), available from [kafka.apache.org](https://kafka.apache.org/downloads#1.1.1)
3232
- Read through the [Event Hubs for Apache Kafka](./azure-event-hubs-apache-kafka-overview.md) introduction article
3333

articles/event-hubs/event-hubs-kafka-connect-tutorial.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ To complete this walkthrough, make sure you have the following prerequisites:
1919

2020
- Azure subscription. If you don't have one, [create a free account](https://azure.microsoft.com/free/).
2121
- [Git](https://www.git-scm.com/downloads)
22-
- Linux/MacOS
22+
- Linux/macOS
2323
- Latest Kafka release available from [kafka.apache.org](https://kafka.apache.org/downloads)
2424
- Read through the [Event Hubs for Apache Kafka](./azure-event-hubs-apache-kafka-overview.md) introduction article
2525

articles/hdinsight/hadoop/hdinsight-use-mapreduce.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,8 @@ HDInsight can run HiveQL jobs by using various methods. Use the following table
101101

102102
| **Use this**... | **...to do this** | ...from this **client operating system** |
103103
|:--- |:--- |:--- |:--- |
104-
| [SSH](apache-hadoop-use-mapreduce-ssh.md) |Use the Hadoop command through **SSH** |Linux, Unix, `MacOS X`, or Windows |
105-
| [Curl](apache-hadoop-use-mapreduce-curl.md) |Submit the job remotely by using **REST** |Linux, Unix, `MacOS X`, or Windows |
104+
| [SSH](apache-hadoop-use-mapreduce-ssh.md) |Use the Hadoop command through **SSH** |Linux, Unix, `macOS X`, or Windows |
105+
| [Curl](apache-hadoop-use-mapreduce-curl.md) |Submit the job remotely by using **REST** |Linux, Unix, `macOS X`, or Windows |
106106
| [Windows PowerShell](apache-hadoop-use-mapreduce-powershell.md) |Submit the job remotely by using **Windows PowerShell** |Windows |
107107

108108
## Next steps

articles/hdinsight/kafka/apache-kafka-connect-vpn-gateway.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ HDInsight does not allow direct connection to Kafka over the public internet. In
3535
* Connect individual machines to the virtual network using a VPN gateway and VPN client. To enable this configuration, perform the following tasks:
3636

3737
1. Create a virtual network.
38-
2. Create a VPN gateway that uses a point-to-site configuration. This configuration can be used with both Windows and MacOS clients.
38+
2. Create a VPN gateway that uses a point-to-site configuration. This configuration can be used with both Windows and macOS clients.
3939
3. Create a Kafka on HDInsight cluster in the virtual network.
4040
4. Configure Kafka for IP advertising. This configuration allows the client to connect using broker IP addresses instead of domain names.
4141
5. Download and use the VPN client on the development system.

articles/hdinsight/spark/apache-spark-intellij-tool-debug-remotely-through-ssh.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ This article provides step-by-step guidance on how to use HDInsight Tools in [Az
7373

7474
- [Environment variables](#prerequisites): If you already set the system environment variable **HADOOP_HOME** to **C:\WinUtils**, it can auto detect that no need to manually add.
7575
- [WinUtils.exe Location](#prerequisites): If you have not set the system environment variable, you can find the location by clicking its button.
76-
- Just choose either of two options and, they are not needed on MacOS and Linux.
76+
- Just choose either of two options and, they are not needed on macOS and Linux.
7777

7878
1. You can also set the configuration manually before performing local run and local debug. In the preceding screenshot, select the plus sign (**+**). Then select the **Apache Spark on HDInsight** option. Enter information for **Name**, **Main class name** to save, then click the local run button.
7979

articles/logic-apps/create-single-tenant-workflows-visual-studio-code.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,7 @@ If you created your logic app project when assemblies support wasn't available f
429429

430430
> [!IMPORTANT]
431431
>
432-
> For a project that runs on Linux or MacOS, make sure to update the directory separator. For example,
432+
> For a project that runs on Linux or macOS, make sure to update the directory separator. For example,
433433
> review the following image that shows the previous code added to the **<*project-name*>.csproj** file.
434434
>
435435
> :::image type="content" source="media/create-single-tenant-workflows-visual-studio-code/migrate-projects-assemblies-visual-studio-code.png" alt-text="Screenshot shows migrated assemblies and added code in the CSPROJ file." lightbox="media/create-single-tenant-workflows-visual-studio-code/migrate-projects-assemblies-visual-studio-code.png":::

0 commit comments

Comments
 (0)