Skip to content

Commit 85f5495

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into upState
2 parents da85165 + 08ef180 commit 85f5495

File tree

5 files changed

+26
-47
lines changed

5 files changed

+26
-47
lines changed

articles/azure-resource-manager/templates/deploy-to-management-group.md

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,12 @@
22
title: Deploy resources to management group
33
description: Describes how to deploy resources at the management group scope in an Azure Resource Manager template.
44
ms.topic: conceptual
5-
ms.date: 03/06/2020
5+
ms.date: 03/09/2020
66
---
77

88
# Create resources at the management group level
99

10-
Typically, you deploy Azure resources to a resource group in your Azure subscription. However, you can also create resources at the:
11-
12-
* [subscription level](deploy-to-subscription.md)
13-
* management group level (covered in this article)
14-
* [tenant level](deploy-to-tenant.md)
15-
16-
You use management group level deployments to take actions that make sense at that level, such as assigning [role-based access control](../../role-based-access-control/overview.md) or applying [policies](../../governance/policy/overview.md).
10+
As your organization matures, you may need to define and assign [policies](../../governance/policy/overview.md) or [role-based access controls](../../role-based-access-control/overview.md) for a management group. With management group level templates, you can declaratively apply policies and assign roles at the management group level.
1711

1812
## Supported resources
1913

@@ -36,10 +30,10 @@ For templates, use:
3630
https://schema.management.azure.com/schemas/2019-08-01/managementGroupDeploymentTemplate.json#
3731
```
3832

39-
For parameter files, use:
33+
The schema for a parameter file is the same for all deployment scopes. For parameter files, use:
4034

4135
```json
42-
https://schema.management.azure.com/schemas/2019-08-01/managementGroupDeploymentParameters.json#
36+
https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#
4337
```
4438

4539
## Deployment commands
@@ -158,11 +152,10 @@ The following example assigns an existing policy definition to the management gr
158152

159153
## Template sample
160154

161-
* [Create a resource group, a policy and a policy assignment](https://github.com/Azure/azure-docs-json-samples/blob/master/management-level-deployment/azuredeploy.json).
155+
* [Create a resource group, a policy, and a policy assignment](https://github.com/Azure/azure-docs-json-samples/blob/master/management-level-deployment/azuredeploy.json).
162156

163157
## Next steps
164158

165159
* To learn about assigning roles, see [Manage access to Azure resources using RBAC and Azure Resource Manager templates](../../role-based-access-control/role-assignments-template.md).
166160
* For an example of deploying workspace settings for Azure Security Center, see [deployASCwithWorkspaceSettings.json](https://github.com/krnese/AzureDeploy/blob/master/ARM/deployments/deployASCwithWorkspaceSettings.json).
167-
* To learn about creating Azure Resource Manager templates, see [Authoring templates](template-syntax.md).
168-
* For a list of the available functions in a template, see [Template functions](template-functions.md).
161+
* You can also deploy templates at [subscription level](deploy-to-subscription.md) and [tenant level](deploy-to-tenant.md).

articles/azure-resource-manager/templates/deploy-to-subscription.md

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,12 @@
22
title: Deploy resources to subscription
33
description: Describes how to create a resource group in an Azure Resource Manager template. It also shows how to deploy resources at the Azure subscription scope.
44
ms.topic: conceptual
5-
ms.date: 03/06/2020
5+
ms.date: 03/09/2020
66
---
77

88
# Create resource groups and resources at the subscription level
99

10-
Typically, you deploy Azure resources to a resource group in your Azure subscription. However, you can also create resources at the:
11-
12-
* subscription level (covered in this article)
13-
* [management group level](deploy-to-management-group.md)
14-
* [tenant level](deploy-to-tenant.md)
15-
16-
You use subscription level deployments to take actions that make sense at that level, such as creating resource groups, or assigning [role-based access control](../../role-based-access-control/overview.md).
10+
To simplify the management of resources in your Azure subscription, you can define and assign [policies](../../governance/policy/overview.md) or [role-based access controls](../../role-based-access-control/overview.md) across the subscription. With subscription level templates, you declaratively apply policies and assign roles at the subscription. You can also create resource groups and deploy resources.
1711

1812
To deploy templates at the subscription level, use Azure CLI, PowerShell, or REST API. The Azure portal doesn't support deployment in the subscription level.
1913

@@ -41,10 +35,10 @@ For templates, use:
4135
https://schema.management.azure.com/schemas/2018-05-01/subscriptionDeploymentTemplate.json#
4236
```
4337

44-
For parameter files, use:
38+
The schema for a parameter file is the same for all deployment scopes. For parameter files, use:
4539

4640
```json
47-
https://schema.management.azure.com/schemas/2018-05-01/subscriptionDeploymentParameters.json#
41+
https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#
4842
```
4943

5044
## Deployment commands
@@ -382,5 +376,4 @@ New-AzSubscriptionDeployment `
382376
* To learn about assigning roles, see [Manage access to Azure resources using RBAC and Azure Resource Manager templates](../../role-based-access-control/role-assignments-template.md).
383377
* For an example of deploying workspace settings for Azure Security Center, see [deployASCwithWorkspaceSettings.json](https://github.com/krnese/AzureDeploy/blob/master/ARM/deployments/deployASCwithWorkspaceSettings.json).
384378
* Sample templates can be found at [GitHub](https://github.com/Azure/azure-quickstart-templates/tree/master/subscription-level-deployments).
385-
* To learn about creating Azure Resource Manager templates, see [Authoring templates](template-syntax.md).
386-
* For a list of the available functions in a template, see [Template functions](template-functions.md).
379+
* You can also deploy templates at [management group level](deploy-to-management-group.md) and [tenant level](deploy-to-tenant.md).

articles/azure-resource-manager/templates/deploy-to-tenant.md

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,12 @@
22
title: Deploy resources to tenant
33
description: Describes how to deploy resources at the tenant scope in an Azure Resource Manager template.
44
ms.topic: conceptual
5-
ms.date: 03/06/2020
5+
ms.date: 03/09/2020
66
---
77

88
# Create resources at the tenant level
99

10-
Typically, you deploy Azure resources to a resource group in your Azure subscription. However, you can also create resources at the:
11-
12-
* [subscription level](deploy-to-subscription.md)
13-
* [management group level](deploy-to-management-group.md)
14-
* tenant level (covered in this article)
15-
16-
You use tenant level deployments to take actions that make sense at that level, such as assigning [role-based access control](../../role-based-access-control/overview.md) or applying [policies](../../governance/policy/overview.md).
10+
As your organization matures, you may need to define and assign [policies](../../governance/policy/overview.md) or [role-based access controls](../../role-based-access-control/overview.md) across your Azure AD tenant. With tenant level templates, you can declaratively apply policies and assign roles at a global level.
1711

1812
## Supported resources
1913

@@ -36,10 +30,10 @@ For templates, use:
3630
https://schema.management.azure.com/schemas/2019-08-01/tenantDeploymentTemplate.json#
3731
```
3832

39-
For parameter files, use:
33+
The schema for a parameter file is the same for all deployment scopes. For parameter files, use:
4034

4135
```json
42-
https://schema.management.azure.com/schemas/2019-08-01/tenantDeploymentParameters.json#
36+
https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#
4337
```
4438

4539
## Required access
@@ -176,5 +170,4 @@ The [following template](https://github.com/Azure/azure-quickstart-templates/tre
176170
## Next steps
177171

178172
* To learn about assigning roles, see [Manage access to Azure resources using RBAC and Azure Resource Manager templates](../../role-based-access-control/role-assignments-template.md).
179-
* To learn about creating Azure Resource Manager templates, see [Authoring templates](template-syntax.md).
180-
* For a list of the available functions in a template, see [Template functions](template-functions.md).
173+
* You can also deploy templates at [subscription level](deploy-to-subscription.md) or [management group level](deploy-to-management-group.md).

articles/cognitive-services/Speech-Service/index.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ metadata:
1313
manager: nitinme
1414
ms.service: speech-service
1515
ms.topic: hub-page
16-
ms.date: 02/11/2020
16+
ms.date: 03/04/2020
1717
ms.author: dapine
1818

1919
highlightedContent:
@@ -37,14 +37,14 @@ conceptualContent:
3737
- title: Speech-to-text
3838
links:
3939
- itemType: quickstart
40-
text: Recognize speech with microphone input
40+
text: Recognize speech from a microphone
4141
url: quickstarts/speech-to-text-from-microphone.md
4242
- itemType: quickstart
43-
text: Recognize speech from an audio file
44-
url: quickstarts/speech-to-text-from-file.md
45-
- itemType: quickstart
46-
text: Recognize speech stored in blob storage
47-
url: quickstarts/from-blob.md
43+
text: Recognize speech in batch mode
44+
url: batch-transcription.md
45+
- itemType: how-to-guide
46+
text: Customize speech recognition for your apps
47+
url: how-to-custom-speech.md
4848
footerLink:
4949
text: See more
5050
url: index-speech-to-text.yml
@@ -57,8 +57,8 @@ conceptualContent:
5757
text: Synthesize speech into an audio file
5858
url: quickstarts/text-to-speech-audio-file.md
5959
- itemType: quickstart
60-
text: Synthesize speech with long-form audio
61-
url: quickstarts/text-to-speech/async-synthesis-long-form-audio.md
60+
text: Customize speech synthesis for your apps
61+
url: how-to-custom-voice.md
6262
footerLink:
6363
text: See more
6464
url: index-text-to-speech.yml

articles/hdinsight/security-baseline.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ https://docs.microsoft.com/azure/security-center/security-center-alerts-service-
8888

8989
### 1.5: Record network packets and flow logs
9090

91-
**Guidance**: Enable network security group (NSG) flog logs for the NSG attached to the subnet being used to protect your Azure HDInsight cluster. Record the NSG flow logs into a Azure Storage Account to generate flow records. If required for investigating anomalous activity, enable Azure Network Watcher packet capture.
91+
**Guidance**: Enable network security group (NSG) flow logs for the NSG attached to the subnet being used to protect your Azure HDInsight cluster. Record the NSG flow logs into a Azure Storage Account to generate flow records. If required for investigating anomalous activity, enable Azure Network Watcher packet capture.
9292

9393

9494
How to Enable NSG Flow Logs:

0 commit comments

Comments
 (0)