Skip to content

Commit 54c81d4

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into rolyon-mto-configuration-delete-steps
2 parents 00c7f37 + fd3c317 commit 54c81d4

File tree

14 files changed

+20
-22
lines changed

14 files changed

+20
-22
lines changed

articles/aks/api-server-vnet-integration.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,7 @@ API Server VNet Integration is supported for public or private clusters, and pub
2323

2424
## Region availability
2525

26-
API Server VNet Integration is available in all global Azure regions except the following:
27-
28-
- Southcentralus
26+
API Server VNet Integration is available in all global Azure regions.
2927

3028
## Prerequisites
3129

@@ -248,4 +246,4 @@ For associated best practices, see [Best practices for network connectivity and
248246
[command-invoke]: command-invoke.md
249247
[container-registry-private-link]: ../container-registry/container-registry-private-link.md
250248
[virtual-networks-name-resolution]: ../virtual-network/virtual-networks-name-resolution-for-vms-and-role-instances.md#name-resolution-that-uses-your-own-dns-server
251-
[operator-best-practices-network]: operator-best-practices-network.md
249+
[operator-best-practices-network]: operator-best-practices-network.md

articles/app-service/manage-custom-dns-buy-domain.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ms.date: 01/31/2023
77
ms.custom: seodec18
88

99
---
10-
# By an App Service domain and configure an app with it
10+
# Buy an App Service domain and configure an app with it
1111

1212
App Service domains are custom domains that are managed directly in Azure. They make it easy to manage custom domains for [Azure App Service](overview.md). This article shows you how to buy an App Service domain and configure an App Service app with it.
1313

articles/azure-netapp-files/faq-smb.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ However, you can map multiple NetApp accounts that are under the same subscripti
2828

2929
## Does Azure NetApp Files support Azure Active Directory?
3030

31-
Both [Azure Active Directory (AD) Domain Services](../active-directory-domain-services/overview.md) and [Active Directory Domain Services (AD DS)](/windows-server/identity/ad-ds/get-started/virtual-dc/active-directory-domain-services-overview) are supported. You can use existing Active Directory domain controllers with Azure NetApp Files. Domain controllers can reside in Azure as virtual machines, or on premises via ExpressRoute or S2S VPN. Azure NetApp Files doesn't support AD join for [Azure Active Directory](https://azure.microsoft.com/resources/videos/azure-active-directory-overview/) at this time.
31+
Both [Azure Active Directory Domain Services (Azure AD DS)](../active-directory-domain-services/overview.md) and [Active Directory Domain Services (AD DS)](/windows-server/identity/ad-ds/get-started/virtual-dc/active-directory-domain-services-overview) are supported. You can use existing Active Directory domain controllers with Azure NetApp Files. Domain controllers can reside in Azure as virtual machines, or on premises via ExpressRoute or S2S VPN. Azure NetApp Files doesn't support AD join for [Azure Active Directory (Azure AD)](../active-directory/fundamentals/index.yml) at this time.
3232

3333
If you're using Azure NetApp Files with Azure Active Directory Domain Services, the organizational unit path is `OU=AADDC Computers` when you configure Active Directory for your NetApp account.
3434

articles/azure-resource-manager/management/delete-resource-group.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ az resource delete \
119119
To delete a resource group, you need access to the delete action for the **Microsoft.Resources/subscriptions/resourceGroups** resource.
120120

121121
> [!IMPORTANT]
122-
> The only permission required to delete a resource group is permission to the delete action for deleting resource groups. You do **not** need permission to delete individual resources within that resource group. Addtionally, delete actions that are specified in **notActions** for a roleAssignment are superseded by the resource group delete action. This is consistent with the scope heirarchy in the Azure role-based access control model.
122+
> The only permission required to delete a resource group is permission to the delete action for deleting resource groups. You do **not** need permission to delete individual resources within that resource group. Additionally, delete actions that are specified in **notActions** for a roleAssignment are superseded by the resource group delete action. This is consistent with the scope heirarchy in the Azure role-based access control model.
123123
124124
For a list of operations, see [Azure resource provider operations](../../role-based-access-control/resource-provider-operations.md). For a list of built-in roles, see [Azure built-in roles](../../role-based-access-control/built-in-roles.md).
125125

articles/bastion/vm-upload-download-native.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ The steps in this section apply when connecting to a target VM from a Windows lo
5454
## <a name="tunnel-command"></a>Upload files - SSH and RDP
5555
5656
The steps in this section apply to native clients other than Windows, as well as Windows native clients that want to connect over SSH to upload files.
57-
This section helps you upload files from your local computer to your target VM over SSH or RDP using the **az network bastion tunnel** command. This command doesn't support file download from the target VM to your local computer. To learn more about the tunnel command and how to connect, see [Connect to a VM using a native client](connect-native-client-windows.md).
57+
This section helps you upload files from your local computer to your target VM over SSH or RDP using the **az network bastion tunnel** command. To learn more about the tunnel command and how to connect, see [Connect to a VM using a native client](connect-native-client-windows.md).
5858
5959
> [!NOTE]
6060
> This command can be used to upload files from your local computer to the target VM. File download is not supported.

articles/cosmos-db/mongodb/how-to-dotnet-manage-databases.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,4 +78,4 @@ A database is removed from the server using the `DropDatabase` method on the DB
7878
## See also
7979

8080
- [Get started with Azure Cosmos DB for MongoDB and .NET](how-to-dotnet-get-started.md)
81-
- Work with a collection](how-to-dotnet-manage-collections.md)
81+
- [Work with a collection](how-to-dotnet-manage-collections.md)

articles/cosmos-db/nosql/quickstart-java.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.topic: quickstart
99
ms.date: 08/26/2021
1010
ms.author: sidandrews
1111
ms.reviewer: mjbrown
12-
ms.custom: seo-java-august2019, seo-java-september2019, devx-track-java, mode-api, ignite-2022
12+
ms.custom: seo-java-august2019, seo-java-september2019, devx-track-java, mode-api, ignite-2022, passwordless-java
1313
---
1414

1515
# Quickstart: Build a Java app to manage Azure Cosmos DB for NoSQL data

articles/mysql/flexible-server/concepts-networking-vnet.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ Here are some concepts to be familiar with when using virtual networks with MySQ
7676
- If you use Azure API, an Azure Resource Manager template (ARM template), or Terraform, create private DNS zones that end with `mysql.database.azure.com` and use them while configuring flexible servers with private access. For more information, see the [private DNS zone overview](../../dns/private-dns-overview.md).
7777

7878
> [!IMPORTANT]
79-
> Private DNS zone names must end with `mysql.database.azure.com`. If you are connecting to an Azure Database for MySQL flexible sever with SSL and you're using an option to perform full verification (sslmode=VERTIFY_IDENTITY) with certificate subject name, use \<servername\>.mysql.database.azure.com in your connection string.
79+
> Private DNS zone names must end with `mysql.database.azure.com`. If you are connecting to an Azure Database for MySQL flexible server with SSL and you're using an option to perform full verification (sslmode=VERTIFY_IDENTITY) with certificate subject name, use \<servername\>.mysql.database.azure.com in your connection string.
8080
8181
Learn how to create a flexible server with private access (VNet integration) in [the Azure portal](how-to-manage-virtual-network-portal.md) or [the Azure CLI](how-to-manage-virtual-network-cli.md).
8282

articles/mysql/flexible-server/how-to-azure-ad.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ mysql -h mydb.mysql.database.azure.com \
160160

161161
- Launch MySQL Workbench and Select the Database option, then select **Connect to database**.
162162
- In the hostname field, enter the MySQL FQDN for example, mysql.database.azure.com.
163-
- In the username field, enter the MySQL Azure Active Directory administrator name and append this with the MySQL server name, not the FQDN for example, [email protected].
163+
- In the username field, enter the MySQL Azure Active Directory administrator name. For example, [email protected].
164164
- In the password field, select **Store in Vault** and paste in the access token from the file for example, C:\temp\MySQLAccessToken.txt.
165165
- Select the advanced tab and ensure that you check **Enable Cleartext Authentication Plugin**.
166166
- Select OK to connect to the database.

articles/postgresql/flexible-server/how-to-configure-sign-in-azure-ad-authentication.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,11 @@ ObjectId AppId Displa
6262
```
6363

6464
> [!IMPORTANT]
65-
> If you are not a **Global Administrator**, **Privileged Role Administrator**, **Tenant Creator**,**Application Owner** you can't proceed past this step.
65+
> If you are not a **Global Administrator**, **Tenant Creator**, or **Application Owner**, you can't proceed past this step.
6666
67-
### Grant read access
67+
### Create Azure Database for PostgreSQL Flexible Server service principal and grant read access
6868

69-
Grant Azure Database for PostgreSQL - Flexible Server Service Principal read access to a customer tenant to request Graph API tokens for Azure AD validation tasks:
69+
If the Azure Database for PostgreSQL Flexible Server service principal doesn't exist, the following command creates it and grants it read access to your customer tenant to request Graph API tokens for Azure AD validation tasks:
7070

7171
```powershell
7272
New-AzureADServicePrincipal -AppId 5657e26c-cc92-45d9-bc47-9da6cfdb4ed9

0 commit comments

Comments
 (0)