Skip to content

Commit c05f98c

Browse files
authored
Merge pull request #295225 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 0574dad + d2229f1 commit c05f98c

File tree

4 files changed

+7
-8
lines changed

4 files changed

+7
-8
lines changed

articles/azure-functions/functions-deployment-technologies.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ The Functions host also performs a background trigger sync after the application
8585
8686
You can request Azure Functions to perform a remote build of your code project during deployment. In these scenarios, you should request a remote build instead of building locally:
8787
88-
+ You're deploying an app to a Linux-based function app that was developed on a Windows computer. This is commonly the case for Python app development. You can end up with in incorrect libraries being used when building the deployment package locally on Windows.
88+
+ You're deploying an app to a Linux-based function app that was developed on a Windows computer. This is commonly the case for Python app development. You can end up with incorrect libraries being used when building the deployment package locally on Windows.
8989
+ Your project has dependencies on a [custom package index](functions-reference-python.md#remote-build-with-extra-index-url).
9090
+ You want to reduce the size of your deployment package.
9191

articles/iot-edge/includes/iot-edge-install-linux.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Run the following commands to add the package repository and then add the Micros
2424

2525
Installing can be done with a few commands. Open a terminal and run the following commands:
2626

27-
::: moniker range=">=iotedge-1.5"
27+
2828

2929
* **24.04**:
3030

@@ -34,7 +34,7 @@ Installing can be done with a few commands. Open a terminal and run the followi
3434
rm packages-microsoft-prod.deb
3535
```
3636

37-
::: moniker-end
37+
3838

3939
* **22.04**:
4040

@@ -56,7 +56,7 @@ Installing can be done with a few commands. Open a terminal and run the followi
5656

5757
Installing with APT can be done with a few commands. Open a terminal and run the following commands:
5858

59-
::: moniker range=">=iotedge-1.5"
59+
6060

6161
* **12 - Bookworm (arm32v7)**:
6262

@@ -65,7 +65,7 @@ Installing with APT can be done with a few commands. Open a terminal and run th
6565
sudo apt install ./packages-microsoft-prod.deb
6666
```
6767

68-
::: moniker-end
68+
6969

7070
* **11 - Bullseye (arm32v7)**:
7171

articles/iot-operations/connect-to-cloud/howto-configure-fabric-real-time-intelligence.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,7 @@ Azure Key Vault is the recommended way to sync the connection string to the Kube
6262
| Host | The hostname of the Event Stream Custom Endpoint in the format `*.servicebus.windows.net:9093`. Use the bootstrap server address noted previously. |
6363
| Authentication method | *SASL* is the currently the only supported authentication method. |
6464
| SASL type | Choose *Plain* |
65-
| Synced secret name | Name of secret that will be synced to the Kubernetes cluster. You can choose any name. |
66-
| Username reference of token secret | Create a new or choose an existing Key Vault reference. The secret value must be the literal string *$ConnectionString*. It isn't an environment variable. |
65+
| Synced secret name | Create or select a Key Vault secret where the secret's value is exactly the text **$ConnectionString** (literal string, not an environment variable reference). |
6766
| Password reference of token secret | Create a new or choose an existing Key Vault reference. The secret value must be the Custom Endpoint connection string noted earlier. |
6867

6968
1. Select **Apply** to provision the endpoint.

articles/virtual-network/how-to-multiple-prefixes-subnet.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Currently, Virtual Machine Scale Sets allows you to specify only one subnet. The
2020

2121
The following limitations apply during the public preview:
2222

23-
- The feature only supports virtual machines and virtual machine scale sets and doesn't support Bare Metal or SWIFT resources. Any delegated subnet can't use this feature.
23+
- The feature only supports virtual machines and virtual machine scale sets and doesn't support Bare Metal or PodSubnet scenario in AKS. Any delegated subnet can't use this feature.
2424

2525
- This feature doesn't support multiple customer address (CA) configurations. When using multiple prefixes on a subnet, you're only able to use a single customer address (CA) configuration. A single IPv4 (Internet Protocol version 4) and single IPv6 (Internet Protocol Version 6) address per NIC (network interface card) is supported.
2626

0 commit comments

Comments
 (0)