Skip to content

Commit 71db13e

Browse files
Merge pull request #265144 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 34029d5 + 6c8d6ce commit 71db13e

File tree

10 files changed

+17
-17
lines changed

10 files changed

+17
-17
lines changed

articles/ai-services/translator/reference/v3-0-translate.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -87,29 +87,29 @@ A successful response is a JSON array with one result for each string in the inp
8787

8888
* `score`: A float value indicating the confidence in the result. The score is between zero and one and a low score indicates a low confidence.
8989

90-
The `detectedLanguage` property is only present in the result object when language autodetection is requested.
90+
The `detectedLanguage` property is only present in the result object when language autodetection is requested.
9191

9292
* `translations`: An array of translation results. The size of the array matches the number of target languages specified through the `to` query parameter. Each element in the array includes:
9393

9494
* `to`: A string representing the language code of the target language.
9595

9696
* `text`: A string giving the translated text.
9797

98-
* `transliteration`: An object giving the translated text in the script specified by the `toScript` parameter.
98+
* `transliteration`: An object giving the translated text in the script specified by the `toScript` parameter.
9999

100-
* `script`: A string specifying the target script.
100+
* `script`: A string specifying the target script.
101101

102-
* `text`: A string giving the translated text in the target script.
102+
* `text`: A string giving the translated text in the target script.
103103

104104
The `transliteration` object isn't included if transliteration doesn't take place.
105105

106-
* `alignment`: An object with a single string property named `proj`, which maps input text to translated text. The alignment information is only provided when the request parameter `includeAlignment` is `true`. Alignment is returned as a string value of the following format: `[[SourceTextStartIndex]:[SourceTextEndIndex]–[TgtTextStartIndex]:[TgtTextEndIndex]]`. The colon separates start and end index, the dash separates the languages, and space separates the words. One word may align with zero, one, or multiple words in the other language, and the aligned words may be noncontiguous. When no alignment information is available, the alignment element is empty. See [Obtain alignment information](#obtain-alignment-information) for an example and restrictions.
106+
* `alignment`: An object with a single string property named `proj`, which maps input text to translated text. The alignment information is only provided when the request parameter `includeAlignment` is `true`. Alignment is returned as a string value of the following format: `[[SourceTextStartIndex]:[SourceTextEndIndex]–[TgtTextStartIndex]:[TgtTextEndIndex]]`. The colon separates start and end index, the dash separates the languages, and space separates the words. One word may align with zero, one, or multiple words in the other language, and the aligned words may be noncontiguous. When no alignment information is available, the alignment element is empty. See [Obtain alignment information](#obtain-alignment-information) for an example and restrictions.
107107

108-
* `sentLen`: An object returning sentence boundaries in the input and output texts.
108+
* `sentLen`: An object returning sentence boundaries in the input and output texts.
109109

110-
* `srcSentLen`: An integer array representing the lengths of the sentences in the input text. The length of the array is the number of sentences, and the values are the length of each sentence.
110+
* `srcSentLen`: An integer array representing the lengths of the sentences in the input text. The length of the array is the number of sentences, and the values are the length of each sentence.
111111

112-
* `transSentLen`: An integer array representing the lengths of the sentences in the translated text. The length of the array is the number of sentences, and the values are the length of each sentence.
112+
* `transSentLen`: An integer array representing the lengths of the sentences in the translated text. The length of the array is the number of sentences, and the values are the length of each sentence.
113113

114114
Sentence boundaries are only included when the request parameter `includeSentenceLength` is `true`.
115115

articles/application-gateway/application-gateway-faq.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ sections:
202202

203203
- question: Can I change the virtual network or subnet for an existing application gateway?
204204
answer: |
205-
You can move an application gateway across subnets within the same virtual network only. It's supported with v1 with a public and private frontend and v2 with a public frontend only. The application gateway should be in a *Stopped* state to perform this action. Stopping or starting v1 changes the public IP. This operation can only be done by using Azure PowerShell and the Azure CLI by running the following commands:
205+
You can move an application gateway across subnets within the same virtual network only. It's supported with v1 with a public and private frontend (dynamic allocation) and v2 with a public frontend only. We cannot move the application gateway to another subnet if the private frontend IP configuration is statically allocated. The application gateway should be in a *Stopped* state to perform this action. Stopping or starting v1 changes the public IP. This operation can only be done by using Azure PowerShell and the Azure CLI by running the following commands:
206206
207207
**Azure PowerShell**
208208

articles/azure-monitor/containers/container-insights-prometheus-logs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.reviewer: aul
88
---
99

1010
# Send Prometheus metrics to Log Analytics workspace with Container insights
11-
This article describes how to send Prometheus metrics from your Kubernetes cluster monitored by Container insights to a Log Analytics workspace. Before you perform this configuration, you should first ensure that you're [scraping Prometheus metrics from your cluster using Azure Monitor managed service for Prometheus](), which is the recommended method for monitoring your clusters. Use the configuration described in this article only if you also want to send this same data to a Log Analytics workspace where you can analyze it using [log queries](../logs/log-query-overview.md) and [log alerts](../alerts/alerts-log-query.md).
11+
This article describes how to send Prometheus metrics from your Kubernetes cluster monitored by Container insights to a Log Analytics workspace. Before you perform this configuration, you should first ensure that you're [scraping Prometheus metrics from your cluster using Azure Monitor managed service for Prometheus](/azure/azure-monitor/containers/prometheus-metrics-scrape-configuration), which is the recommended method for monitoring your clusters. Use the configuration described in this article only if you also want to send this same data to a Log Analytics workspace where you can analyze it using [log queries](../logs/log-query-overview.md) and [log alerts](../alerts/alerts-log-query.md).
1212

1313
This configuration requires configuring the *monitoring addon* for the Azure Monitor agent, which is the same one used by Container insights to send data to a Log Analytics workspace. It requires exposing the Prometheus metrics endpoint through your exporters or pods and then configuring the monitoring addon for the Azure Monitor agent used by Container insights as shown the following diagram.
1414

articles/cdn/cdn-features.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ The following table compares the features available with each product.
4949
| [Token authentication](cdn-token-auth.md) | | |**✓**|
5050
| [DDOS protection](https://www.cisa.gov/news-events/news/understanding-denial-service-attacks) | **✓** |**✓** |**✓** |
5151
| [Bring your own certificate](cdn-custom-ssl.md?tabs=option-2-enable-https-with-your-own-certificate#tlsssl-certificates) |**✓** | **✓** | **✓** |
52-
| Supported TLS Versions | TLS 1.2, TLS 1.0/1.1 - [Configurable](/rest/api/cdn/custom-domains/enable-custom-https#usermanagedhttpsparameters) | TLS 1.2 | TLS 1.2 |
52+
| Supported TLS Versions | TLS 1.2, TLS 1.0/1.1 - [Configurable](/rest/api/cdn/custom-domains/enable-custom-https#usermanagedhttpsparameters) | TLS 1.2, TLS 1.3 | TLS 1.2, TLS 1.3 |
5353
||||
5454
| **Analytics and reporting** | **Standard Microsoft** | **Standard Edgio** | **Premium Edgio** |
5555
| [Azure diagnostic logs](cdn-azure-diagnostic-logs.md) | **✓** |**✓** |**✓** |

articles/logic-apps/edit-app-settings-host-settings.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ App settings integrate with Azure Key Vault. You can [directly reference secure
3131
>
3232
> If you use Key Vault, make sure that you store only secrets, such as passwords, credentials, and certificates.
3333
> In a logic app workflow, don't use Key Vault to store non-secret values, such as URL paths, that the workflow designer needs to make calls.
34-
> The designer can't deference an app setting that references a Key Vault resource type, which results in an
34+
> The designer can't dereference an app setting that references a Key Vault resource type, which results in an
3535
> error and a failed call. For non-secret values, store them directly in app settings.
3636
3737
For more information about setting up your logic apps for deployment, see the following documentation:

articles/migrate/tutorial-import-vmware-using-rvtools-xlsx.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ If you don't have an Azure subscription, create a [free account](https://azure.m
3232

3333
Before you begin this tutorial, ensure that you have the following prerequisites in place:
3434

35-
- 20,000 servers in a single XLSX file and 35,000 in an Azure Migrate project.
35+
- Less than 20,000 servers in a single RVTools XLSX file.
3636
- The file format should be XLSX.
3737
- File sensitivity is set to **General** or file protection is set to **Any user**.
3838
- [Operating system names](migrate-support-matrix.md) specified in the RVTools XLSX (preview) file contains and matches the supported names.

articles/mysql/flexible-server/concepts-backup-restore.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ You can choose between latest restore point, custom restore point and fastest re
123123
The estimated time of recovery depends on several factors including the database sizes, the transaction log backup size, the compute size of the SKU, and the time of the restore as well. The transaction log recovery is the most time consuming part of the restore process. If the restore time is chosen closer to the snapshot backup schedule, the restore operations are faster since transaction log application is minimal. To estimate the accurate recovery time for your server, we highly recommend testing it in your environment as it has too many environment-specific variables.
124124

125125
> [!IMPORTANT]
126-
> If you are restoring a Azure Database for MySQL flexible server instance configured with zone redundant high availability, the restored server is configured in the same region and zone as your primary server, and deployed as a single server in a non-HA mode. Refer to [zone redundant high availability](concepts-high-availability.md) for flexible server.
126+
> If you are restoring an Azure Database for MySQL flexible server instance configured with zone redundant high availability, the restored server is configured in the same region and zone as your primary server, and deployed as a single server in a non-HA mode. Refer to [zone redundant high availability](concepts-high-availability.md) for flexible server.
127127
128128
> [!IMPORTANT]
129129
> You can recover a deleted Azure Database for MySQL flexible server resource within 5 days from the time of server deletion. For a detailed guide on how to restore a deleted server, [refer documented steps](../flexible-server/how-to-restore-dropped-server.md). To protect server resources post deployment from accidental deletion or unexpected changes, administrators can leverage [management locks](../../azure-resource-manager/management/lock-resources.md).

articles/mysql/flexible-server/how-to-data-encryption-cli.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ This tutorial shows you how to set up and manage data encryption for Azure Datab
1919

2020
In this tutorial, you learn how to:
2121

22-
- Create a Azure Database for MySQL flexible server instance with data encryption
22+
- Create an Azure Database for MySQL flexible server instance with data encryption
2323
- Update an existing Azure Database for MySQL flexible server instance with data encryption
2424
- Using an Azure Resource Manager template to enable data encryption
2525

articles/mysql/flexible-server/how-to-manage-firewall-cli.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Azure Database for MySQL flexible server supports two mutually exclusive network
2121
- Public access (allowed IP addresses)
2222
- Private access (VNet Integration)
2323

24-
In this article, we focus on the creation of a Azure Database for MySQL flexible server instance with **Public access (allowed IP addresses)** using Azure CLI. This article provides an overview of Azure CLI commands you can use to create, update, delete, list, and show firewall rules after creating a server. With *Public access (allowed IP addresses)*, the connections to the Azure Database for MySQL flexible server instance are restricted to allowed IP addresses only. The client IP addresses need to be allowed in the firewall rules. To learn more about it, refer to [Public access (allowed IP addresses)](./concepts-networking-public.md#public-access-allowed-ip-addresses). The firewall rules can be defined at the time of server creation (recommended) but can be added later as well.
24+
In this article, we focus on the creation of an Azure Database for MySQL flexible server instance with **Public access (allowed IP addresses)** using Azure CLI. This article provides an overview of Azure CLI commands you can use to create, update, delete, list, and show firewall rules after creating a server. With *Public access (allowed IP addresses)*, the connections to the Azure Database for MySQL flexible server instance are restricted to allowed IP addresses only. The client IP addresses need to be allowed in the firewall rules. To learn more about it, refer to [Public access (allowed IP addresses)](./concepts-networking-public.md#public-access-allowed-ip-addresses). The firewall rules can be defined at the time of server creation (recommended) but can be added later as well.
2525

2626
## Launch Azure Cloud Shell
2727

articles/postgresql/single-server/how-to-configure-privatelink-cli.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ Note the public IP address of the VM. You will use this address to connect to
7676

7777
## Create an Azure Database for PostgreSQL - Single server
7878

79-
Create a Azure Database for PostgreSQL with the az postgres server create command. Remember that the name of your PostgreSQL Server must be unique across Azure, so replace the placeholder value with your own unique values that you used above:
79+
Create an Azure Database for PostgreSQL with the az postgres server create command. Remember that the name of your PostgreSQL Server must be unique across Azure, so replace the placeholder value with your own unique values that you used above:
8080

8181
```azurecli-interactive
8282
# Create a server in the resource group

0 commit comments

Comments
 (0)