Skip to content

Commit fe125a8

Browse files
authored
Merge pull request #297080 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 80faa8f + 103499e commit fe125a8

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

articles/azure-resource-manager/bicep/add-template-to-azure-pipelines.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ You can use an Azure Resource Group deployment task or an Azure CLI task to depl
8181
- task: AzureResourceManagerTemplateDeployment@3
8282
inputs:
8383
deploymentScope: 'Resource Group'
84-
azureSubscription: '${{ parameters.azureServiceConnection }}'
8584
action: 'Create Or Update Resource Group'
8685
resourceGroupName: '$(resourceGroupName)'
8786
location: '$(location)'
@@ -91,6 +90,7 @@ You can use an Azure Resource Group deployment task or an Azure CLI task to depl
9190
overrideParameters: '-storageAccountType Standard_LRS'
9291
deploymentMode: 'Incremental'
9392
deploymentName: 'DeployPipelineTemplate'
93+
connectedServiceName: '${{ parameters.azureServiceConnection }}'
9494
```
9595
9696
1. Update the values of `azureServiceConnection` and `location`.

articles/azure-resource-manager/management/tag-resources.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ The following limitations apply to tags:
7474

7575
* Classic resources such as Cloud Services don't support tags.
7676

77-
* Azure IP Groups and Azure Firewall policies don't support PATCH operations. Therefore, PATCH API method operations can't update tags through the Azure portal. Instead, use the update commands for those resources. For example, you can update tags for an IP group with the [`az network ip-group update`](/cli/azure/network/ip-group?view=azure-cli-latest) command.
77+
* Azure IP Groups and Azure Firewall policies don't support PATCH operations. Therefore, PATCH API method operations can't update tags through the Azure portal. Instead, use the update commands for those resources. For example, you can update tags for an IP group with the [`az network ip-group update`](/cli/azure/network/ip-group) command.
7878

7979
* Tag names can't contain these characters: `<`, `>`, `%`, `&`, `\`, `?`, `/`
8080

@@ -88,7 +88,8 @@ The following limitations apply to tags:
8888
> * The following Azure resources only support 15 tags:
8989
> * Azure Automation
9090
> * Azure Content Delivery Network
91-
> * Azure DNS (Zone and A records)
91+
> * Azure Public DNS (Zone and A records)
92+
> * Azure Private DNS (Zone and A records)
9293
> * Azure Log Analytics saved search
9394
9495
## Next steps
@@ -100,4 +101,4 @@ For more information on how to work with tags, see:
100101
* [Azure PowerShell](tag-resources-powershell.md)
101102
* [Python](tag-resources-python.md)
102103
* [ARM templates](tag-resources-templates.md)
103-
* [Bicep](tag-resources-bicep.md)
104+
* [Bicep](tag-resources-bicep.md)

articles/cost-management-billing/scope-level/overview-azure-hybrid-benefit-scope.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
---
22
title: What is centrally managed Azure Hybrid Benefit for SQL Server?
33
description: Azure Hybrid Benefit an Azure discount that lets you allocate your on-premises core-based Windows Server and SQL Server licenses with active Software Assurance (or subscription) to Azure.
4-
author: bandersmsft
5-
ms.author: banders
4+
author: pri-mittal
5+
ms.author: primittal
66
ms.date: 11/21/2024
77
ms.topic: overview
88
ms.service: cost-management-billing
99
ms.subservice: ahb
10-
ms.reviewer: chrisrin
10+
ms.reviewer: primittal
11+
ms.custom: cpx
1112
---
1213

1314
# What is centrally managed Azure Hybrid Benefit for SQL Server?
@@ -132,4 +133,4 @@ We recommend that you establish a proactive rhythm when centrally managing Azure
132133

133134
- Follow the [Manage and optimize Azure Hybrid Benefit for SQL Server](tutorial-azure-hybrid-benefits-sql.md) tutorial.
134135
- Learn about how to [transition to centrally managed Azure Hybrid Benefit](transition-existing.md).
135-
- Review the [Centrally managed Azure Hybrid Benefit FAQ](faq-azure-hybrid-benefit-scope.yml).
136+
- Review the [Centrally managed Azure Hybrid Benefit FAQ](faq-azure-hybrid-benefit-scope.yml).

0 commit comments

Comments
 (0)