Skip to content

Commit dec3b6d

Browse files
authored
Merge pull request #301426 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 4b72776 + 2aeb8df commit dec3b6d

10 files changed

+12
-12
lines changed

articles/application-gateway/ingress-controller-annotations.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ For AGIC to observe an ingress resource, the resource *must be annotated* with `
3737
| [appgw.ingress.kubernetes.io/use-private-ip](#use-private-ip) | `bool` | `false` ||
3838
| [appgw.ingress.kubernetes.io/override-frontend-port](#override-frontend-port) | `bool` | `false` ||
3939
| [appgw.ingress.kubernetes.io/cookie-based-affinity](#cookie-based-affinity) | `bool` | `false` ||
40-
| [appgw.ingress.kubernetes.io/request-timeout](#request-timeout) | `int32` (seconds) | `30` ||
40+
| [appgw.ingress.kubernetes.io/request-timeout]
41+
(#request-timeout) | `int32` (seconds) | `30` ||
4142
| [appgw.ingress.kubernetes.io/use-private-ip](#use-private-ip) | `bool` | `false` ||
4243
| [appgw.ingress.kubernetes.io/backend-protocol](#backend-protocol) | `string` | `http` | `http`, `https` |
4344
| [appgw.ingress.kubernetes.io/hostname-extension](#hostname-extension) | `string` | `nil` ||
@@ -121,7 +122,7 @@ spec:
121122

122123
## Custom Health Probe
123124

124-
You can [configure Application Gateway](./application-gateway-probe-overview.md) to send custom health probes to the backend address pool. When the following annotations are present, the Kubernetes ingress controller [creates a custom probe](./application-gateway-create-probe-portal.md) to monitor the backend application. The controller then applies the changes to Application Gateway.
125+
You can [configure Application Gateway](./application-gateway-probe-overview.md) to send custom health probe to the backend address pool. When the following annotations are present, the Kubernetes ingress controller [creates a custom probe](./application-gateway-create-probe-portal.md) to monitor the backend application. The controller then applies the changes to Application Gateway.
125126

126127
- `health-probe-hostname`: This annotation allows a custom hostname on the health probe.
127128
- `health-probe-port`: This annotation configures a custom port for the health probe.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ You can use FTP/S to directly transfer files to Azure Functions, although this d
210210
211211
>__When to use it:__ To reduce the chance of errors, you should avoid using deployment methods that require the additional step of [manually syncing triggers](#trigger-syncing). Use [zip deployment](run-functions-from-deployment-package.md) when possible.
212212
213-
>__Where app content is stored:__ App content is stored on the file system. FTP/FTPS deployments fail when your app's file system is backed by Azure Files in the default host storage account. FTP/FTPS fails with Azure Files as mounted storage bacause of [FTP limitations](../app-service/configure-connect-to-azure-storage.md#limitations).
213+
>__Where app content is stored:__ App content is stored on the file system. FTP/FTPS deployments fail when your app's file system is backed by Azure Files in the default host storage account. FTP/FTPS fails with Azure Files as mounted storage because of [FTP limitations](../app-service/configure-connect-to-azure-storage.md#limitations).
214214
215215
### Portal editing
216216

articles/azure-signalr/signalr-concept-azure-functions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Some common scenarios for real-time serverless messaging that you can implement
4040

4141
The SignalR Service bindings for Azure Functions allow an Azure Function app to publish messages to clients connected to SignalR Service. Clients can connect to the service using a SignalR client SDK that is available in .NET, JavaScript, and Java, with more languages coming soon.
4242

43-
<!-- Are there more lanaguages now? -->
43+
<!-- Are there more languages now? -->
4444

4545
### An example scenario
4646

articles/data-factory/connector-troubleshoot-guide.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ The following errors are general to the copy activity and could occur with any c
5454

5555
- **Cause**: This typically indicates an authentication failure during data transfer operations. This can occur when the remote party closes the transport stream.
5656

57-
- **Reccomendation**:
57+
- **Recommendation**:
5858
- Verify the source connection and test it to ensure it is functioning correctly.
5959
- Check the authentication method used for the connection.
6060
- Review firewall configuration settings for Azure Cosmos DB to ensure they allow the necessary traffic.

articles/data-factory/data-flow-troubleshoot-connector-format.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -596,7 +596,7 @@ The escape character either escapes the column delimiter or the escape the chara
596596
4. The quote character and the escape character both be empty and the column value contains column delimiters.<br/>
597597
`Column delimiter: \t`<br/>
598598
`column value: 111\t222\t33\t3`<br/>
599-
`It will be ambigious if it contains 3 columns 111,222,33\t3 or 4 columns 111,222,33,3.`<br/>
599+
`It will be ambiguous if it contains 3 columns 111,222,33\t3 or 4 columns 111,222,33,3.`<br/>
600600

601601
#### Recommendation
602602
The first symptom and the second symptom can't be solved currently. For the third and fourth symptoms, you can apply the following methods:

articles/operator-nexus/list-of-metrics-collected.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ Baremetal server metrics are collected and delivered to Azure Monitor per minute
321321
|NodeNetworkReceiveMulticastTotal|Network|Node Network Received Multicast Total|Bytes|Total amount of multicast traffic received by the node network interfaces. In the absence of data, this metric will retain the most recent value emitted|Device, Host|
322322
|NodeNetworkReceivePackets|Network|Node Network Received Packets|Count|Total number of packets received by the node network interfaces. In the absence of data, this metric will retain the most recent value emitted|Device, Host|
323323
|NodeNetworkSpeedBytes|Network|Node Network Speed Bytes|Bytes|Current network speed, in bytes per second, for the node network interfaces. In the absence of data, this metric will default to 0|Device, Host|
324-
|NodeNetworkTransmitPackets|Network|Node Network Transmited Packets|Count|Total number of packets transmitted by the node network interfaces. In the absence of data, this metric will retain the most recent value emitted|Device, Host|
324+
|NodeNetworkTransmitPackets|Network|Node Network Transmitted Packets|Count|Total number of packets transmitted by the node network interfaces. In the absence of data, this metric will retain the most recent value emitted|Device, Host|
325325
|NodeNetworkStatus|Network|Node Network Up|Count|Indicates the operational status of the nodes network interfaces. Value is 1 if operational state is 'up', 0 otherwise. In the absence of data, this metric will retain the most recent value emitted|Device, Host|
326326
|NodeNtpLeap|System|Node NTP Leap|Count|The raw leap flag value of the local NTP daemon. This indicates the status of leap seconds. Value is 0 if no adjustment is needed, 1 to add a leap second, 2 to delete a leap second, and 3 if the clock is unsynchronized. In the absence of data, this metric will retain the most recent value emitted|Host|
327327
|NodeNtpRootDelaySeconds|System|Node NTP Root Delay Seconds|Seconds|Indicates the delay to synchronize with the root server. In the absence of data, this metric will retain the most recent value emitted|Host|

articles/oracle/oracle-db/oracle-database-regions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ The list below mentions the Azure and corresponding OCI regions with the regiona
5353
| Azure region | OCI region | Oracle Exadata Database@Azure | Oracle Autonomous Database@Azure | Oracle Database Autonomous Recovery Service@Azure| Exadata Database Service on Exascale Infrastructure@Azure | BaseDB | Regional Availability|
5454
| -------------- | -------------------|------------------------|------------------ | ---- |-----|-----|----|
5555
| East US | US East (Ashburn) |||| | Preview available | Dual |
56-
| Canada Central | Canada Southeast (Toronto) ||| | | | Single |
56+
| Canada Central | Canada Southeast (Toronto) ||| | | | Dual |
5757
| West US | US West (San Jose) |||| | Preview available | Single |
5858
| Central US | US Midwest (Chicago) |||| | | Dual |
5959
| East US 2 | US East (Ashburn) || | | | | Dual |

articles/storage/blobs/storage-blob-javascript-get-started.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ If you're looking to start with a complete example, see the client library quick
2929
- [Node.js LTS](https://nodejs.org/)
3030
- [TypeScript](https://www.typescriptlang.org/download), if applicable
3131
- For client (browser) applications, you need [bundling tools](https://github.com/Azure/azure-sdk-for-js/blob/main/documentation/Bundling.md).
32-
-
3332

3433
## Set up your project
3534

@@ -174,4 +173,4 @@ The following guides show you how to access data and perform specific actions us
174173
| [Manage properties and metadata (containers)](storage-blob-container-properties-metadata-javascript.md) | Get and set properties and metadata for containers. |
175174
| [Performance tuning for data transfers](storage-blobs-tune-upload-download-javascript.md) | Optimize performance for data transfer operations. |
176175
| [Set or change a blob's access tier](storage-blob-use-access-tier-javascript.md) | Set or change the access tier for a block blob. |
177-
| [Upload blobs](storage-blob-upload-javascript.md) | Learn how to upload blobs by using strings, streams, file paths, and other methods. |
176+
| [Upload blobs](storage-blob-upload-javascript.md) | Learn how to upload blobs by using strings, streams, file paths, and other methods. |

articles/virtual-network/how-to-virtual-machine-mtu.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ The following resources are used as examples in this article. Replace these valu
6464

6565
## Precautions
6666

67-
- Virtual machines in Azure can support a larger MTU than the 1,500-byte default only for traffic that stays within the virtual network. A larger MTU isn't supported for scenarios outside of intra-virtual network VM-to-VM traffic. Traffic traversing through gateways, peering’s, or to the internet might not be supported. Configuration of a larger MTU can result in fragmentation and reduction in performance. For traffic utilizing these scenarios, utilize the default 1,500 byte MTU for testing to ensure that a larger MTU is supported across the entire network path.
67+
- Virtual machines in Azure can support a larger MTU than the 1,500-byte default only for traffic that stays within the virtual network and directly peered virtual networks within the same region. Traffic traversing through gateways, global peerings, or to the internet is not supported. Configuration of a larger MTU can result in fragmentation and reduction in performance. For traffic utilizing these scenarios, utilize the default 1,500 byte MTU for testing to ensure that a larger MTU is supported across the entire network path.
6868

6969
- Optimal MTU is operating system, network, and application specific. The maximal supported MTU might not be optimal for your use case.
7070

articles/virtual-network/ip-services/virtual-network-private-ip-address-blocks-portal.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ You can add a static private IP address prefix to a virtual machine by completin
100100
| **Private IP address settings** | |
101101
| Private IP Address Type | IP address prefix |
102102
| Allocation | Select **Static**. |
103-
| IP address | Enter an unused CIDR of size /28 from the subnet for your virtual machine.</br> For the 10.0.0.0/14 subnet in the example, an IP would be **10.0.0.0/80**. |
103+
| IP address | Enter an unused CIDR of size /28 from the subnet for your virtual machine.</br> For the 10.0.0.0/14 subnet in the example, an IP would be **10.0.0.0/28**. |
104104

105105
9. Select **OK**.
106106

0 commit comments

Comments
 (0)