Skip to content

Commit dab2e3d

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into rolyon-aadroles-roles-march
2 parents bdce69b + da267c1 commit dab2e3d

File tree

81 files changed

+1122
-216
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+1122
-216
lines changed

articles/active-directory/conditional-access/howto-conditional-access-policy-location.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ More information about the location condition in Conditional Access can be found
5252
1. Under **Include**, select **Selected locations**
5353
1. Select the blocked location you created for your organization.
5454
1. Click **Select**.
55-
1. Under **Access controls** > select **Block Access**, and select **Select**.
55+
1. Under **Access controls** > select **Block Access**, and click **Select**.
5656
1. Confirm your settings and set **Enable policy** to **Report-only**.
5757
1. Select **Create** to create to enable your policy.
5858

articles/api-management/api-management-advanced-policies.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -900,7 +900,7 @@ This example shows how to return a 401 response if the authorization token is in
900900

901901
This policy can be used in the following policy [sections](./api-management-howto-policies.md#sections) and [scopes](./api-management-howto-policies.md#scopes).
902902

903-
- **Policy sections:** outbound, backend, on-error
903+
- **Policy sections:** inbound, outbound, backend, on-error
904904
- **Policy scopes:** all scopes
905905

906906
## <a name="set-variable"></a> Set variable

articles/azure-netapp-files/create-active-directory-connections.md

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -194,13 +194,6 @@ This setting is configured in the **Active Directory Connections** under **NetAp
194194

195195
![Active Directory AES encryption](../media/azure-netapp-files/active-directory-aes-encryption.png)
196196

197-
198-
* <a name="encrypted-smb-connection"></a>**Encrypted SMB connection to domain controller**
199-
200-
Select this checkbox to enable SMB encryption for communication between the Azure NetApp Files service and the domain controller (DC). When you enable this functionality, SMB3 protocol will be used for encrypted DC connections, because encryption is supported only by SMB3. SMB, Kerberos, and LDAP enabled volume creation will fail if the DC doesn't support the SMB3 protocol.
201-
202-
![Snapshot that shows the option for encrypted SMB connection to domain controller.](../media/azure-netapp-files/encrypted-smb-domain-controller.png)
203-
204197
* **LDAP Signing**
205198
Select this checkbox to enable LDAP signing. This functionality enables secure LDAP lookups between the Azure NetApp Files service and the user-specified [Active Directory Domain Services domain controllers](/windows/win32/ad/active-directory-domain-services). For more information, see [ADV190023 | Microsoft Guidance for Enabling LDAP Channel Binding and LDAP Signing](https://portal.msrc.microsoft.com/en-us/security-guidance/advisory/ADV190023).
206199

articles/azure-netapp-files/troubleshoot-volumes.md

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,13 @@ ms.service: azure-netapp-files
1212
ms.workload: storage
1313
ms.tgt_pltfrm: na
1414
ms.topic: troubleshooting
15-
ms.date: 03/15/2022
15+
ms.date: 03/17/2022
1616
ms.author: anfdocs
1717
---
1818
# Troubleshoot volume errors for Azure NetApp Files
1919

2020
This article describes error messages and resolutions that can help you troubleshoot Azure NetApp Files volumes.
2121

22-
## General errors for volume creation or management
23-
24-
| Error conditions | Resolutions |
25-
|-|-|
26-
| Error during SMB, LDAP, or Kerberos volume creation: <br> `Failed to create the Active Directory machine account "PAKA-5755". Reason: SecD Error: no server available Details: Error: Machine account creation procedure failed [ 34] Loaded the preliminary configuration. [ 80] Created a machine account in the domain [ 81] Successfully connected to ip 10.193.169.25, port 445 using TCP [ 83] Unable to connect to LSA service on win-2bovaekb44b.harikrb.com (Error: RESULT_ERROR_SPINCLIENT_SOCKET_RECEIVE_ERROR) [ 83] No servers available for MS_LSA, vserver: 251, domain: http://contoso.com/. **[ 83] FAILURE: Unable to make a connection (LSA:CONTOSO.COM), ** result: 6940 [ 85] Could not find Windows SID 'S-1-5-21-192389270-1514950320-2551433173-512' [ 133] Deleted existing account 'CN=PAKA-5755,CN=Computers,DC=contoso,DC=com' .` | SMB3 is disabled on the domain controller. <br> Enable SMB3 on the domain controller and then try creating the volume. See [How to detect, enable and disable SMBv1, SMBv2, and SMBv3 in Windows](/windows-server/storage/file-server/troubleshoot/detect-enable-and-disable-smbv1-v2-v3) for details about enabling SMB3. |
27-
2822
## Errors for SMB and dual-protocol volumes
2923

3024
| Error conditions | Resolutions |

articles/azure-netapp-files/whats-new.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ms.service: azure-netapp-files
1212
ms.workload: storage
1313
ms.tgt_pltfrm: na
1414
ms.topic: overview
15-
ms.date: 03/15/2022
15+
ms.date: 03/17/2022
1616
ms.author: anfdocs
1717
---
1818

@@ -22,10 +22,6 @@ Azure NetApp Files is updated regularly. This article provides a summary about t
2222

2323
## March 2022
2424

25-
* [Encrypted SMB connection to domain controller](create-active-directory-connections.md#encrypted-smb-connection)
26-
27-
You can now enable SMB encryption for communication between the Azure NetApp Files service and the Active Directory Domain Services domain controller (DC). When you enable this functionality, SMB3 protocol will be used for encrypted DC connections.
28-
2925
* Features that are now generally available (GA)
3026

3127
The following features are now GA. You no longer need to register the features before using them.

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ You apply tags to your Azure resources, resource groups, and subscriptions to lo
1212

1313
For recommendations on how to implement a tagging strategy, see [Resource naming and tagging decision guide](/azure/cloud-adoption-framework/decision-guides/resource-tagging/?toc=/azure/azure-resource-manager/management/toc.json).
1414

15+
Resource tags support all cost-accruing services. You can use Azure Policy to ensure that cost-accruing services are provisioned with a tag by using one of the many different [tag policies](/azure/azure-resource-manager/management/tag-policies).
16+
1517
> [!WARNING]
1618
> Tags are stored as plain text. Never add sensitive values to tags. Sensitive values could be exposed through many methods, including cost reports, tag taxonomies, deployment histories, exported templates, and monitoring logs.
1719

articles/azure-resource-manager/templates/copy-outputs.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ This article shows you how to create more than one value for an output in your A
1111

1212
You can also use copy loop with [resources](copy-resources.md), [properties in a resource](copy-properties.md), and [variables](copy-variables.md).
1313

14+
> [!TIP]
15+
> We recommend [Bicep](../bicep/overview.md) because it offers the same capabilities as ARM templates and the syntax is easier to use. To learn more, see [loops](../bicep/loops.md).
16+
1417
## Syntax
1518

1619
Add the `copy` element to the output section of your template to return a number of items. The copy element has the following general format:
@@ -167,4 +170,4 @@ The preceding example returns an array with the following values:
167170
- [Property iteration in ARM templates](copy-properties.md)
168171
- [Variable iteration in ARM templates](copy-variables.md)
169172
- If you want to learn about the sections of a template, see [Understand the structure and syntax of ARM templates](./syntax.md).
170-
- To learn how to deploy your template, see [Deploy resources with ARM templates and Azure PowerShell](deploy-powershell.md).
173+
- To learn how to deploy your template, see [Deploy resources with ARM templates and Azure PowerShell](deploy-powershell.md).

articles/azure-resource-manager/templates/copy-properties.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ You can only use copy loop with top-level resources, even when applying copy loo
1313

1414
You can also use copy loop with [resources](copy-resources.md), [variables](copy-variables.md), and [outputs](copy-outputs.md).
1515

16+
> [!TIP]
17+
> We recommend [Bicep](../bicep/overview.md) because it offers the same capabilities as ARM templates and the syntax is easier to use. To learn more, see [loops](../bicep/loops.md).
18+
1619
## Syntax
1720

1821
Add the `copy` element to the resources section of your template to set the number of items for a property. The copy element has the following general format:

articles/azure-resource-manager/templates/copy-resources.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ You can also use copy loop with [properties](copy-properties.md), [variables](co
1313

1414
If you need to specify whether a resource is deployed at all, see [condition element](conditional-resource-deployment.md).
1515

16+
17+
> [!TIP]
18+
> We recommend [Bicep](../bicep/overview.md) because it offers the same capabilities as ARM templates and the syntax is easier to use. To learn more, see [loops](../bicep/loops.md).
19+
1620
## Syntax
1721

1822
Add the `copy` element to the resources section of your template to deploy multiple instances of the resource. The `copy` element has the following general format:

articles/azure-resource-manager/templates/copy-variables.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ This article shows you how to create more than one value for a variable in your
1010

1111
You can also use copy with [resources](copy-resources.md), [properties in a resource](copy-properties.md), and [outputs](copy-outputs.md).
1212

13+
> [!TIP]
14+
> We recommend [Bicep](../bicep/overview.md) because it offers the same capabilities as ARM templates and the syntax is easier to use. To learn more, see [loops](../bicep/loops.md).
15+
1316
## Syntax
1417

1518
The copy element has the following general format:

0 commit comments

Comments
 (0)