Skip to content

Commit dcb5379

Browse files
authored
Merge pull request #199182 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 97b58eb + 196d96c commit dcb5379

File tree

12 files changed

+16
-14
lines changed

12 files changed

+16
-14
lines changed

articles/active-directory/fundamentals/add-custom-domain.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@ After you create your directory, you can add your custom domain name.
5656

5757
>[!IMPORTANT]
5858
>You must include *.com*, *.net*, or any other top-level extension for this to work properly.
59+
>
60+
>When adding a custom domain, the Password Policy values will be inherited from the initial domain.
5961
6062
The unverified domain is added. The **contoso.com** page appears showing your DNS information. Save this information. You need it later to create a TXT record to configure DNS.
6163

@@ -114,4 +116,4 @@ If Azure AD can't verify a custom domain name, try the following suggestions:
114116

115117
- Manage your domain name information in Azure AD. For more information, see [Managing custom domain names](../enterprise-users/domains-manage.md).
116118

117-
- If you have on-premises versions of Windows Server that you want to use alongside Azure Active Directory, see [Integrate your on-premises directories with Azure Active Directory](../hybrid/whatis-hybrid-identity.md).
119+
- If you have on-premises versions of Windows Server that you want to use alongside Azure Active Directory, see [Integrate your on-premises directories with Azure Active Directory](../hybrid/whatis-hybrid-identity.md).

articles/aks/node-auto-repair.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ If AKS identifies an unhealthy node that remains unhealthy for 10 minutes, AKS t
3535

3636
1. Reboot the node.
3737
1. If the reboot is unsuccessful, reimage the node.
38-
1. If the reimage is unsuccessful, redploy the node.
38+
1. If the reimage is unsuccessful, redeploy the node.
3939

4040
Alternative remediations are investigated by AKS engineers if auto-repair is unsuccessful.
4141

articles/azure-app-configuration/concept-github-action.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ A GitHub Actions [workflow](https://docs.github.com/en/actions/learn-github-acti
2020
The GitHub [documentation](https://docs.github.com/en/actions/learn-github-actions/introduction-to-github-actions) provides in-depth view of GitHub workflows and actions.
2121

2222
## Enable GitHub Actions in your repository
23-
To start using this GitHub action, go to your repository and select the **Actions** tab. Select **New workflow**, then **Set up a workflow yourself**. Finally, search the marketplace for “Azure App Configuration Sync.”
23+
To start using this GitHub Action, go to your repository and select the **Actions** tab. Select **New workflow**, then **Set up a workflow yourself**. Finally, search the marketplace for “Azure App Configuration Sync.”
2424
> [!div class="mx-imgBorder"]
2525
> ![Select the Action tab](media/find-github-action.png)
2626
@@ -57,7 +57,7 @@ jobs:
5757
```
5858

5959
## Use strict sync
60-
By default the GitHub action does not enable strict mode, meaning that the sync will only add key-values from the configuration file to the App Configuration instance (no key-value pairs will be deleted). Enabling strict mode will mean key-value pairs that aren't in the configuration file are deleted from the App Configuration instance, so that it matches the configuration file. If you are syncing from multiple sources or using Azure Key Vault with App Configuration, you'll want to use different prefixes or labels with strict sync to avoid wiping out configuration settings from other files (see samples below).
60+
By default the GitHub Action does not enable strict mode, meaning that the sync will only add key-values from the configuration file to the App Configuration instance (no key-value pairs will be deleted). Enabling strict mode will mean key-value pairs that aren't in the configuration file are deleted from the App Configuration instance, so that it matches the configuration file. If you are syncing from multiple sources or using Azure Key Vault with App Configuration, you'll want to use different prefixes or labels with strict sync to avoid wiping out configuration settings from other files (see samples below).
6161

6262
```json
6363
on:

articles/frontdoor/standard-premium/how-to-configure-https-custom-domain.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ If you want to change the secret version from ‘Latest’ to a specified versio
142142

143143
> [!NOTE]
144144
> * It may take up to an hour for the new certificate to be deployed when you switch between certificate types.
145-
> * If your domain state is Approved, switching the certificate type between BYOC and managed certificate won't have any downtime. Whhen switching to managed certificate, unless the domain ownership is re-validated and the domain state becomes Approved, you will continue to be served by the previous certificate.
145+
> * If your domain state is Approved, switching the certificate type between BYOC and managed certificate won't have any downtime. When switching to managed certificate, unless the domain ownership is re-validated and the domain state becomes Approved, you will continue to be served by the previous certificate.
146146
> * If you switch from BYOC to managed certificate, domain re-validation is required. If you switch from managed certificate to BYOC, you're not required to re-validate the domain.
147147
>
148148

articles/healthcare-apis/authentication-authorization.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ You can use online tools such as [https://jwt.ms](https://jwt.ms/) to view the t
102102

103103
**The access token is valid for one hour by default. You can obtain a new token or renew it using the refresh token before it expires.**
104104

105-
To obtain an access token, you can use tools such as Postman, the Rest Client extension in Visual Studio Code, PowerShell, CLI, curl, and the [Azure AD authentication libraries](../active-directory/develop/reference-v2-libraries.md).
105+
To obtain an access token, you can use tools such as Postman, the REST Client extension in Visual Studio Code, PowerShell, CLI, curl, and the [Azure AD authentication libraries](../active-directory/develop/reference-v2-libraries.md).
106106

107107
## Encryption
108108

articles/healthcare-apis/fhir/using-curl.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ In this article, you'll learn how to access Azure Health Data Services with cURL
1919

2020
* An Azure account with an active subscription. [Create one for free](https://azure.microsoft.com/free/).
2121
* If you want to run the code locally, install [PowerShell](/powershell/module/powershellget/) and [Azure Az PowerShell](/powershell/azure/install-az-ps).
22-
* Optionally, you can run the scripts in Visual Studio Code with the Rest Client extension. For more information, see [Make a link to the Rest Client doc](using-rest-client.md).
22+
* Optionally, you can run the scripts in Visual Studio Code with the REST Client extension. For more information, see [Make a link to the REST Client doc](using-rest-client.md).
2323
* Download and install [cURL](https://curl.se/download.html).
2424

2525
### CLI
2626

2727
* An Azure account with an active subscription. [Create one for free](https://azure.microsoft.com/free/).
2828
* If you want to run the code locally, install [Azure CLI](/cli/azure/install-azure-cli).
2929
* Optionally, install a Bash shell, such as Git Bash, which it's included in [Git for Windows](https://gitforwindows.org/).
30-
* Optionally, run the scripts in Visual Studio Code with the Rest Client extension. For more information, see [Make a link to the Rest Client doc](using-rest-client.md).
30+
* Optionally, run the scripts in Visual Studio Code with the REST Client extension. For more information, see [Make a link to the REST Client doc](using-rest-client.md).
3131
* Download and install [cURL](https://curl.se/download.html).
3232

3333
## Obtain Azure Access Token

articles/healthcare-apis/get-access-token.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ In this article, you learned how to obtain an access token for the FHIR service
6565
>[Access FHIR service using Postman](./fhir/use-postman.md)
6666
6767
>[!div class="nextstepaction"]
68-
>[Access FHIR service using Rest Client](./fhir/using-rest-client.md)
68+
>[Access FHIR service using REST Client](./fhir/using-rest-client.md)
6969
7070
>[!div class="nextstepaction"]
7171
>[Access DICOM service using cURL](dicom/dicomweb-standard-apis-curl.md)

articles/healthcare-apis/register-application.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ The following steps are required for the DICOM service, but optional for the FHI
8888
[ ![Select permissions scopes.](dicom/media/dicom-select-scopes.png) ](dicom/media/dicom-select-scopes.png#lightbox)
8989

9090
>[!NOTE]
91-
>Use grant_type of client_credentials when trying to otain an access token for the FHIR service using tools such as Postman or Rest Client. For more details, visit [Access using Postman](./fhir/use-postman.md) and [Accessing Azure Health Data Services using the REST Client Extension in Visual Studio Code](./fhir/using-rest-client.md).
91+
>Use grant_type of client_credentials when trying to otain an access token for the FHIR service using tools such as Postman or REST Client. For more details, visit [Access using Postman](./fhir/use-postman.md) and [Accessing Azure Health Data Services using the REST Client Extension in Visual Studio Code](./fhir/using-rest-client.md).
9292
>>Use grant_type of client_credentials or authentication_doe when trying to obtain an access token for the DICOM service. For more details, visit [Using DICOM with cURL](dicom/dicomweb-standard-apis-curl.md).
9393
9494
Your application registration is now complete.

articles/logic-apps/logic-apps-securing-a-logic-app.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@ For more information about security in Azure, review these topics:
3535

3636
## Access to logic app operations
3737

38-
For Consumption logic apps only, before you can create or manage logic apps and their connections, you need specific permissions, which are provided through roles using [Azure role-based access control (Azure RBAC)](../role-based-access-control/role-assignments-portal.md). You can also
39-
you can set up permissions so that only specific users or groups can run specific tasks, such as managing, editing, and viewing logic apps. To control their permissions, you can assign built-in or customized roles to members who have access to your Azure subscription. Azure Logic Apps has the following specific roles:
38+
For Consumption logic apps only, before you can create or manage logic apps and their connections, you need specific permissions, which are provided through roles using [Azure role-based access control (Azure RBAC)](../role-based-access-control/role-assignments-portal.md). You can also set up permissions so that only specific users or groups can run specific tasks, such as managing, editing, and viewing logic apps. To control their permissions, you can assign built-in or customized roles to members who have access to your Azure subscription. Azure Logic Apps has the following specific roles:
4039

4140
* [Logic App Contributor](../role-based-access-control/built-in-roles.md#logic-app-contributor): Lets you manage logic apps, but you can't change access to them.
4241

articles/role-based-access-control/resource-provider-operations.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5080,7 +5080,7 @@ Azure service: [Azure SQL Database](/azure/azure-sql/database/index), [Azure SQL
50805080
> | --- | --- |
50815081
> | Microsoft.Sql/checkNameAvailability/action | Verify whether given server name is available for provisioning worldwide for a given subscription. |
50825082
> | Microsoft.Sql/register/action | Registers the subscription for the Microsoft SQL Database resource provider and enables the creation of Microsoft SQL Databases. |
5083-
> | Microsoft.Sql/unregister/action | UnRegisters the subscription for the Microsoft SQL Database resource provider and enables the creation of Microsoft SQL Databases. |
5083+
> | Microsoft.Sql/unregister/action | UnRegisters the subscription for the Microsoft SQL Database resource provider and disables the creation of Microsoft SQL Databases. |
50845084
> | Microsoft.Sql/privateEndpointConnectionsApproval/action | Determines if user is allowed to approve a private endpoint connection |
50855085
> | Microsoft.Sql/instancePools/read | Gets an instance pool |
50865086
> | Microsoft.Sql/instancePools/write | Creates or updates an instance pool |

0 commit comments

Comments
 (0)