Skip to content

Commit f0aea99

Browse files
authored
Merge pull request #294924 from MicrosoftDocs/main
2/19/2025 AM Publish
2 parents 4d6ea57 + 5aedf5d commit f0aea99

File tree

38 files changed

+321
-173
lines changed

38 files changed

+321
-173
lines changed

articles/automation/extension-based-hybrid-runbook-worker-install.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,8 @@ If extension-based Hybrid Worker is using custom Hybrid Worker credentials, then
7777
| Arc-enabled Server | C:\ProgramData\AzureConnectedMachineAgent\Tokens (read) </br> C:\Packages\Plugins\Microsoft.Azure.Automation.HybridWorker.HybridWorkerForWindows (read and execute).
7878

7979
> [!NOTE]
80-
> When a system has UAC/LUA in place, permissions must be granted directly and not through any group membership. [Learn more](troubleshoot/extension-based-hybrid-runbook-worker.md#scenario-runbooks-go-into-a-suspended-state-on-a-hybrid-runbook-worker-when-using-a-custom-account-on-a-server-with-user-account-control-uac-enabled).
80+
> - When a system has UAC/LUA in place, permissions must be granted directly and not through any group membership. [Learn more](troubleshoot/extension-based-hybrid-runbook-worker.md#scenario-runbooks-go-into-a-suspended-state-on-a-hybrid-runbook-worker-when-using-a-custom-account-on-a-server-with-user-account-control-uac-enabled).
81+
> - Due to a current limitation, these folder permissions are removed from the C:\ProgramData\AzureConnectedMachineAgent\Tokens folder on Azure Arc-enabled machines when the Azure Connected Machine agent is updated. The current resolution is to reapply these permissions to the folder. [Learn more](troubleshoot/extension-based-hybrid-runbook-worker.md#scenario-hybrid-runbook-worker-job-execution-on-azure-arc-enabled-windows-server-that-uses-a-custom-credential-is-unexpectedly-suspended).
8182
8283

8384

articles/azure-app-configuration/concept-config-file.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ The rest of this document discusses both file content profiles in detail and use
1919

2020
## File content profile: default
2121

22-
The default file content profile in App Configuration tools refers to the conventional configuration file schema widely adopted by existing programming frameworks or systems. App Configuration supports JSON, Yaml, or Properties file formats.
22+
The default file content profile in App Configuration tools refers to the conventional configuration file schema widely adopted by existing programming frameworks or systems. App Configuration supports JSON, YAML, or Properties file formats.
2323

2424
The following example is a configuration file named `appsettings.json` containing one configuration setting and one feature flag.
2525

articles/azure-app-configuration/howto-import-export-data.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Import brings configuration data into an App Configuration store from an existin
2222

2323
This guide shows how to import App Configuration data:
2424

25-
- [from a configuration file in Json, Yaml or Properties](#import-data-from-a-configuration-file)
25+
- [from a configuration file in JSON, YAML or Properties](#import-data-from-a-configuration-file)
2626
- [from an App Configuration store](#import-data-from-an-app-configuration-store)
2727
- [from Azure App Service](#import-data-from-azure-app-service)
2828

@@ -44,7 +44,7 @@ From the Azure portal, follow these steps:
4444

4545
| Parameter | Description | Example |
4646
|--------------|-----------------------------------------------------------------------------------------|----------|
47-
| File type | Select the file type for import: YAML, Properties, or JSON. | *Json* |
47+
| File type | Select the file type for import: YAML, Properties, or JSON. | *JSON* |
4848

4949
1. Click the **Browse** button, and select the file to import.
5050

@@ -53,7 +53,7 @@ From the Azure portal, follow these steps:
5353

5454
| Parameter | Description | Example |
5555
|--------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------|
56-
| File content profile | Select a content profile: Default or KVSet. The *Default* file content profile refers to the conventional configuration file schema widely adopted by existing programming frameworks or systems, supports JSON, Yaml, or Properties file formats. The *KVSet* file content profile refers to a file schema that contains all properties of an App Configuration key-value, including key, value, label, content type, and tags. | *Default* |
56+
| File content profile | Select a content profile: Default or KVSet. The *Default* file content profile refers to the conventional configuration file schema widely adopted by existing programming frameworks or systems, supports JSON, YAML, or Properties file formats. The *KVSet* file content profile refers to a file schema that contains all properties of an App Configuration key-value, including key, value, label, content type, and tags. | *Default* |
5757
| Import mode | The import mode is used to determine whether to ignore identical key-values. With the *Ignore match* option, any key-values in the store that are the same as those in the configuration file are ignored. With the *All* option, all key-values in the configuration file are updated. | *Ignore match* |
5858
| Exclude feature flag | If checked, feature flags will not be imported. | *Unchecked* |
5959
| Strict | If the box is checked, any key-values in the store with the specified prefix and label that are not included in the configuration file are deleted when the File content profile is set to Default. When the File content profile is set to KVSet, any key-values in the store that are not included in the configuration file are deleted. If the box is unchecked, no key-values in the store will be deleted. | *Unchecked* |
@@ -85,7 +85,7 @@ From the Azure CLI, follow the steps below. If you don't have the Azure CLI inst
8585

8686
| Parameter | Description | Example |
8787
|------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------|
88-
| `--separator` | Optional. The separator is the delimiter for flattening the key-values to Json/Yaml. It's required for exporting hierarchical structure and will be ignored for property files and feature flags. Select one of the following options: `.`, `,`, `:`, `;`, `/`, `-`, `_`, ``. | `;` |
88+
| `--separator` | Optional. The separator is the delimiter for flattening the key-values to JSON/YAML. It's required for exporting hierarchical structure and will be ignored for property files and feature flags. Select one of the following options: `.`, `,`, `:`, `;`, `/`, `-`, `_`, ``. | `;` |
8989
| `--prefix` | Optional. A key prefix is the beginning part of a key. Prefixes can be used to manage groups of key-values in a configuration store. This prefix will be appended to the front of the "key" property of each imported key-value. | `TestApp:` |
9090
| `--label` | Optional. Enter a label that will be assigned to your imported key-values. | `prod` |
9191
| `--content-type` | Optional. Enter `appconfig/kvset` or `application/json` to state that the imported content consists of a Key Vault reference or a JSON file. | `application/json` |
@@ -265,7 +265,7 @@ Export writes configuration data stored in App Configuration to another destinat
265265
266266
This guide shows how to export App Configuration data:
267267
268-
- [to a configuration file in Json, Yaml or Properties](#export-data-to-a-configuration-file)
268+
- [to a configuration file in JSON, YAML or Properties](#export-data-to-a-configuration-file)
269269
- [to an App Configuration store](#export-data-to-an-app-configuration-store)
270270
- [to an Azure App Service resource](#export-data-to-azure-app-service)
271271
@@ -289,7 +289,7 @@ From the [Azure portal](https://portal.azure.com), follow these steps:
289289
| Parameter | Description | Example |
290290
|--------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------|
291291
| File type | Select the file type for export: YAML, Properties, or JSON. | *JSON* |
292-
| File content profile | Select a content profile: Default or KVSet. The *Default* file content profile refers to the conventional configuration file schema widely adopted by existing programming frameworks or systems, supports JSON, Yaml, or Properties file formats. The *KVSet* file content profile refers to a file schema that contains all properties of an App Configuration key-value, including key, value, label, content type, and tags. | *Default* |
292+
| File content profile | Select a content profile: Default or KVSet. The *Default* file content profile refers to the conventional configuration file schema widely adopted by existing programming frameworks or systems, supports JSON, YAML, or Properties file formats. The *KVSet* file content profile refers to a file schema that contains all properties of an App Configuration key-value, including key, value, label, content type, and tags. | *Default* |
293293
| Selection mode | Select whether to export from regular key-values, which is the default option, or from a snapshot. | *Default* |
294294
| Key filter | Used to filter key-values based on the key name for export. If no keys are specified, all keys are eligible. | Starts with *TestApp:* |
295295
| At a specific time | Optional. Fill out this field to export key-values from a specific point in time in the selected configuration store. If left empty, it defaults to the current point in time of the key-values. | *07/28/2022 12:00:00 AM* |
@@ -323,7 +323,7 @@ From the Azure CLI, follow the steps below. If you don't have the Azure CLI inst
323323
324324
| Parameter | Description | Example |
325325
|------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------|
326-
| `--separator` | Optional. The separator is the delimiter for flattening the key-values to Json/Yaml. It's required for exporting hierarchical structure and will be ignored for property files and feature flags. Select one of the following options: `.`, `,`, `:`, `;`, `/`, `-`, `_`, `—`. | `;` |
326+
| `--separator` | Optional. The separator is the delimiter for flattening the key-values to JSON/YAML. It's required for exporting hierarchical structure and will be ignored for property files and feature flags. Select one of the following options: `.`, `,`, `:`, `;`, `/`, `-`, `_`, `—`. | `;` |
327327
| `--prefix` | Optional. Prefix to be trimmed from each key-value's "key" property. A key prefix is the beginning part of a key. Prefixes can be used to manage groups of key-values in a configuration store. Prefix will be ignored for feature flags. | `TestApp:` |
328328
329329
Example: export all key-values and feature flags with label "prod" to a JSON file.

articles/azure-netapp-files/TOC.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,16 @@
5151
href: understand-guidelines-active-directory-domain-service-site.md
5252
- name: Understand DNS
5353
href: domain-name-system-concept.md
54-
- name: Understand the use of LDAP
55-
href: lightweight-directory-access-protocol.md
54+
- name: Understand LDAP
55+
items:
56+
- name: Understand LDAP basics
57+
href: lightweight-directory-access-protocol.md
58+
- name: Understand name mapping using LDAP
59+
href: lightweight-directory-access-protocol-name-mapping.md
60+
- name: Understand the allow local NFS users with LDAP option
61+
href: lightweight-directory-access-protocol-local-users.md
62+
- name: Understand LDAP schemas
63+
href: lightweight-directory-access-protocol-schemas.md
5664
- name: Understand NFS group memberships and supplemental groups
5765
href: network-file-system-group-memberships.md
5866
- name: Understand file locking

articles/azure-netapp-files/azure-netapp-files-configure-export-policy.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ author: b-hchen
66
ms.author: anfdocs
77
ms.service: azure-netapp-files
88
ms.topic: how-to
9-
ms.date: 07/28/2021
9+
ms.date: 01/28/2025
1010
---
1111
# Configure export policy for NFS or dual-protocol volumes
1212

@@ -17,7 +17,7 @@ You can create up to five export policy rules.
1717
Once created, you can modify details of the export policy rule. The modifiable fields are:
1818

1919
- IP address (For example, x.x.x.x)
20-
- CIDR range (A subnet range; for example, 0.0.0.0/0)
20+
- Classless Inter-Domain Routing (CIDR) range (A subnet range; for example, 0.0.0.0/0)
2121
- IP address comma separated list (For example, x.x.x.x, y.y.y.y)
2222
- Access level
2323
- [Export policy rule order](network-attached-storage-permissions.md#export-policy-rule-ordering)

articles/azure-netapp-files/azure-netapp-files-create-netapp-account.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services: azure-netapp-files
55
author: b-hchen
66
ms.service: azure-netapp-files
77
ms.topic: how-to
8-
ms.date: 10/04/2021
8+
ms.date: 02/04/2025
99
ms.author: anfdocs
1010
---
1111

@@ -19,7 +19,7 @@ You must register your subscription for using the NetApp Resource Provider. For
1919

2020
## Steps
2121

22-
1. Sign in to the Azure portal.
22+
1. Log into the Azure portal.
2323
1. Access the Azure NetApp Files pane by using one of the following methods:
2424
* Search for **Azure NetApp Files** in the Azure portal search box.
2525
* Select **All services** in the navigation, and then filter to Azure NetApp Files.

articles/azure-netapp-files/azure-netapp-files-manage-snapshots.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services: azure-netapp-files
55
author: b-hchen
66
ms.service: azure-netapp-files
77
ms.topic: how-to
8-
ms.date: 10/25/2021
8+
ms.date: 10/25/2024
99
ms.author: anfdocs
1010
---
1111
# Create an on-demand snapshot for a volume

articles/azure-netapp-files/large-volumes-requirements-considerations.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ The following requirements and considerations apply to large volumes. For perfor
7373

7474
## About 64-bit file IDs
7575

76-
Whereas regular volume use 32-bit file IDs, large volumes employ 64-bit file IDs. File IDs are unique identifiers that allow Azure NetApp Files to keep track of files in the file system. 64-bit IDs are utilized to increase the number of files allowed in a single volume, enabling a large volume able to hold more files than a regular volume.
76+
Whereas regular volumes use 32-bit file IDs, large volumes employ 64-bit file IDs. File IDs are unique identifiers that allow Azure NetApp Files to keep track of files in the file system. 64-bit IDs are utilized to increase the number of files allowed in a single volume, enabling a large volume able to hold more files than a regular volume.
7777

7878
## Supported regions
7979

0 commit comments

Comments
 (0)