Skip to content

Commit 79a9867

Browse files
authored
Merge pull request #190388 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 ba20ccf + 1c2a2a6 commit 79a9867

21 files changed

+38
-38
lines changed

articles/active-directory/devices/assign-local-admin.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ ms.collection: M365-identity-device-management
2121

2222
To manage a Windows device, you need to be a member of the local administrators group. As part of the Azure Active Directory (Azure AD) join process, Azure AD updates the membership of this group on a device. You can customize the membership update to satisfy your business requirements. A membership update is, for example, helpful if you want to enable your helpdesk staff to do tasks requiring administrator rights on a device.
2323

24-
This article explains how the local administrators membership update works and how you can customize it during an Azure AD Join. The content of this article doesn't apply to a **hybrid Azure AD joined** devices.
24+
This article explains how the local administrators membership update works and how you can customize it during an Azure AD Join. The content of this article doesn't apply to **hybrid Azure AD joined** devices.
2525

2626
## How it works
2727

articles/azure-monitor/agents/azure-monitor-agent-manage.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ We strongly recommended to update to generally available versions listed as foll
3131
| August 2021 | Fixed issue allowing Azure Monitor Metrics as the only destination | 1.1.2.0 | 1.10.9.0<sup>Hotfix</sup> |
3232
| September 2021 | <ul><li>Fixed issue causing data loss on restarting the agent</li><li>Fixed issue for Arc Windows servers</li></ul> | 1.1.3.2<sup>Hotfix</sup> | 1.12.2.0 <sup>1</sup> |
3333
| December 2021 | <ul><li>Fixed issues impacting Linux Arc-enabled servers</li><li>'Heartbeat' table > 'Category' column reports "Azure Monitor Agent" in Log Analytics for Windows</li></ul> | 1.1.4.0 | 1.14.7.0<sup>2</sup> |
34-
| January 2021 | <ul><li>Syslog RFC compliance for Linux</li><li>Fixed issue for Linux perf counters not flowing on restart</li><li>Fixed installation failure on Windows Server 2008 R2 SP1</li></ul> | 1.1.5.1<sup>Hotfix</sup> | 1.15.2.0<sup>Hotfix</sup> |
34+
| January 2022 | <ul><li>Syslog RFC compliance for Linux</li><li>Fixed issue for Linux perf counters not flowing on restart</li><li>Fixed installation failure on Windows Server 2008 R2 SP1</li></ul> | 1.1.5.1<sup>Hotfix</sup> | 1.15.2.0<sup>Hotfix</sup> |
3535

3636
<sup>Hotfix</sup> Do not use AMA Linux versions v1.10.7, v1.15.1 and AMA Windows v1.1.3.1, v1.1.5.0. Please use hotfixed versions listed above.
3737
<sup>1</sup> Known issue: No data collected from Linux Arc-enabled servers

articles/azure-monitor/app/mobile-center-quickstart.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ To onboard your app, follow the App Center quickstart for each platform your app
4646

4747
## Track events in your app
4848

49-
After your app is onboarded to App Center, it needs to be modified to send custom event telemetry using the App Center SDK. Custom events are the only type of App Center telemetry that is exported to Application Insights.
49+
After your app is onboarded to App Center, it needs to be modified to send custom event telemetry using the App Center SDK.
5050

5151
To send custom events from iOS apps, use the `trackEvent` or `trackEvent:withProperties` methods in the App Center SDK. [Learn more about tracking events from iOS apps.](/mobile-center/sdk/analytics/ios)
5252

@@ -168,4 +168,4 @@ To delete the Application Insights resource:
168168
## Next steps
169169

170170
> [!div class="nextstepaction"]
171-
> [Understand how customers are using your app](../app/usage-overview.md)
171+
> [Understand how customers are using your app](../app/usage-overview.md)

articles/backup/manage-azure-file-share-rest-api.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Manage Azure File share backup with Rest API
2+
title: Manage Azure File share backup with REST API
33
description: Learn how to use REST API to manage and monitor Azure file shares that are backed up by Azure Backup.
44
ms.topic: conceptual
55
ms.date: 02/17/2020

articles/backup/quick-backup-vm-template.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ New-AzResourceGroup -Name $resourceGroupName -Location $location
5757
New-AzResourceGroupDeployment -ResourceGroupName $resourceGroupName -TemplateUri $templateUri -projectName $projectName -adminUsername $adminUsername -adminPassword $adminPassword -dnsLabelPrefix $dnsPrefix
5858
```
5959

60-
Azure PowerShell is used to deploy the ARM template in this quickstart. The [Azure portal](../azure-resource-manager/templates/deploy-portal.md), [Azure CLI](../azure-resource-manager/templates/deploy-cli.md), and [Rest API](../azure-resource-manager/templates/deploy-rest.md) can also be used to deploy templates.
60+
Azure PowerShell is used to deploy the ARM template in this quickstart. The [Azure portal](../azure-resource-manager/templates/deploy-portal.md), [Azure CLI](../azure-resource-manager/templates/deploy-cli.md), and [REST API](../azure-resource-manager/templates/deploy-rest.md) can also be used to deploy templates.
6161

6262
## Validate the deployment
6363

articles/backup/restore-azure-file-share-rest-api.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -430,4 +430,4 @@ The response should be handled in the same way as explained above for [full shar
430430

431431
## Next steps
432432

433-
* Learn how to [manage Azure file shares backup using Rest API](manage-azure-file-share-rest-api.md).
433+
* Learn how to [manage Azure file shares backup using REST API](manage-azure-file-share-rest-api.md).

articles/cloud-services-extended-support/in-place-migration-technical-details.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ This article discusses the technical details regarding the migration tool as per
3030
### Service Configuration and Service Definition files
3131
- The .cscfg and .csdef files needs to be updated for Cloud Services (extended support) with minor changes.
3232
- The names of resources like virtual network and VM SKU are different. See [Translation of resources and naming convention post migration](#translation-of-resources-and-naming-convention-post-migration)
33-
- Customers can retrieve their new deployments through [PowerShell](/powershell/module/az.cloudservice/?preserve-view=true&view=azps-5.4.0#cloudservice) and [Rest API](/rest/api/compute/cloudservices/get).
33+
- Customers can retrieve their new deployments through [PowerShell](/powershell/module/az.cloudservice/?preserve-view=true&view=azps-5.4.0#cloudservice) and [REST API](/rest/api/compute/cloudservices/get).
3434

3535
### Cloud Service and deployments
3636
- Each Cloud Services (extended support) deployment is an independent Cloud Service. Deployment are no longer grouped into a cloud service using slots.
@@ -124,7 +124,7 @@ As part of migration, the resource names are changed, and few Cloud Services fea
124124
### Portal refreshed after Prepare. Experience restarted and Commit or Abort not visible anymore.
125125
- Portal stores the migration information locally and therefore after refresh, it will start from validate phase even if the Cloud Service is in the prepare phase.
126126
- You can use portal to go through the validate and prepare steps again to expose the Abort and Commit button. It will not cause any failures.
127-
- Customers can use PowerShell or Rest API to abort or commit.
127+
- Customers can use PowerShell or REST API to abort or commit.
128128

129129
### How much time can the operations take?<br>
130130
Validate is designed to be quick. Prepare is longest running and takes some time depending on total number of role instances being migrated. Abort and commit can also take time but will take less time compared to prepare. All operations will time out after 24 hrs.

articles/cloud-services-extended-support/post-migration-changes.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ Minor changes are made to customer’s .csdef and .cscfg file to make the deploy
2323
- Classic sizes like Small, Large, ExtraLarge are replaced by their new size names, Standard_A*. The size names need to be changed to their new names in .csdef file. For more information, see [Cloud Services (extended support) deployment prerequisites](deploy-prerequisite.md#required-service-definition-file-csdef-updates)
2424

2525
- Use the Get API to get the latest copy of the deployment files.
26-
- Get the template using [Portal](../azure-resource-manager/templates/export-template-portal.md), [PowerShell](../azure-resource-manager/management/manage-resource-groups-powershell.md#export-resource-groups-to-templates), [CLI](../azure-resource-manager/management/manage-resource-groups-cli.md#export-resource-groups-to-templates), and [Rest API](/rest/api/resources/resourcegroups/exporttemplate)
27-
- Get the .csdef file using [PowerShell](/powershell/module/az.cloudservice/?preserve-view=true&view=azps-5.4.0#cloudservice) or [Rest API](/rest/api/compute/cloudservices/rest-get-package).
28-
- Get the .cscfg file using [PowerShell](/powershell/module/az.cloudservice/?preserve-view=true&view=azps-5.4.0#cloudservice) or [Rest API](/rest/api/compute/cloudservices/rest-get-package).
26+
- Get the template using [Portal](../azure-resource-manager/templates/export-template-portal.md), [PowerShell](../azure-resource-manager/management/manage-resource-groups-powershell.md#export-resource-groups-to-templates), [CLI](../azure-resource-manager/management/manage-resource-groups-cli.md#export-resource-groups-to-templates), and [REST API](/rest/api/resources/resourcegroups/exporttemplate)
27+
- Get the .csdef file using [PowerShell](/powershell/module/az.cloudservice/?preserve-view=true&view=azps-5.4.0#cloudservice) or [REST API](/rest/api/compute/cloudservices/rest-get-package).
28+
- Get the .cscfg file using [PowerShell](/powershell/module/az.cloudservice/?preserve-view=true&view=azps-5.4.0#cloudservice) or [REST API](/rest/api/compute/cloudservices/rest-get-package).
2929

3030

3131

@@ -44,7 +44,7 @@ Customers need to update their tooling and automation to start using the new API
4444

4545
## Changes to Certificate Management Post Migration
4646

47-
As a standard practice to manage your certificates, all the valid .pfx certificate files should be added to certificate store in Key Vault and update would work perfectly fine via any client - Portal, PowerShell or Rest API.
47+
As a standard practice to manage your certificates, all the valid .pfx certificate files should be added to certificate store in Key Vault and update would work perfectly fine via any client - Portal, PowerShell or REST API.
4848

4949
Currently, Azure Portal does a validation for you to check if all the required Certificates are uploaded in certificate store in Key Vault and warns if a certificate is not found. However, if you are planning to use Certificates as secrets, then these certificates cannot be validated for their thumbprint and any update operation which involves addition of secrets would fail via Portal. Customers are reccomended to use PowerShell or RestAPI to continue updates involving Secrets.
5050

articles/cognitive-services/Speech-Service/how-to-custom-speech-model-and-endpoint-lifecycle.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ What happens when a model expires and how to update the model depends on how it
9898
### Batch transcription
9999
If a model expires that is used with [batch transcription](batch-transcription.md) transcription requests will fail with a 4xx error. To prevent this update the `model` parameter in the JSON sent in the **Create Transcription** request body to either point to a more recent base model or more recent custom model. You can also remove the `model` entry from the JSON to always use the latest base model.
100100
### Custom speech endpoint
101-
If a model expires that is used by a [custom speech endpoint](how-to-custom-speech-train-model.md), then the service will automatically fall back to using the latest base model for the language you are using. To update a model you are using, you can select **Deployment** in the **Custom Speech** menu at the top of the page and then click on the endpoint name to see its details. At the top of the details page, you will see an **Update Model** button that lets you seamlessly update the model used by this endpoint without downtime. You can also make this change programmatically by using the [**Update Model**](https://westus.dev.cognitive.microsoft.com/docs/services/speech-to-text-api-v3-0/operations/UpdateModel) Rest API.
101+
If a model expires that is used by a [custom speech endpoint](how-to-custom-speech-train-model.md), then the service will automatically fall back to using the latest base model for the language you are using. To update a model you are using, you can select **Deployment** in the **Custom Speech** menu at the top of the page and then click on the endpoint name to see its details. At the top of the details page, you will see an **Update Model** button that lets you seamlessly update the model used by this endpoint without downtime. You can also make this change programmatically by using the [**Update Model**](https://westus.dev.cognitive.microsoft.com/docs/services/speech-to-text-api-v3-0/operations/UpdateModel) REST API.
102102

103103
## Next steps
104104

articles/cognitive-services/Translator/language-support.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ ms.author: lajanuar
3232
| Amharic | `am` ||||||
3333
| Arabic | `ar` ||||||
3434
| Armenian | `hy` ||||||
35-
| Assamese | `as` ||||||
35+
| Assamese | `as` ||||||
3636
| Azerbaijani | `az` ||||||
3737
| Bangla | `bn` ||||||
3838
| Bashkir | `ba` ||||||
@@ -88,7 +88,7 @@ ms.author: lajanuar
8888
| Macedonian | `mk` ||||||
8989
| Malagasy | `mg` ||||||
9090
| Malay | `ms` ||||||
91-
| Malayalam | `ml` ||||||
91+
| Malayalam | `ml` ||||||
9292
| Maltese | `mt` ||||||
9393
| Maori | `mi` ||||||
9494
| Marathi | `mr` ||||||
@@ -97,7 +97,7 @@ ms.author: lajanuar
9797
| Myanmar | `my` ||||||
9898
| Nepali | `ne` ||||||
9999
| Norwegian | `nb` ||||||
100-
| Odia | `or` ||||||
100+
| Odia | `or` ||||||
101101
| Pashto | `ps` ||||||
102102
| Persian | `fa` ||||||
103103
| Polish | `pl` ||||||
@@ -116,9 +116,9 @@ ms.author: lajanuar
116116
| Swahili | `sw` ||||||
117117
| Swedish | `sv` ||||||
118118
| Tahitian | `ty` || ||||
119-
| Tamil | `ta` ||||||
119+
| Tamil | `ta` ||||||
120120
| Tatar | `tt` ||||||
121-
| Telugu | `te` ||||||
121+
| Telugu | `te` ||||||
122122
| Thai | `th` || ||||
123123
| Tibetan | `bo` |||||
124124
| Tigrinya | `ti` ||||||

0 commit comments

Comments
 (0)