Skip to content

Commit 224adc6

Browse files
committed
Merge branch 'main' into release-mua-for-backup-vault
2 parents 0de2176 + 08e6d54 commit 224adc6

File tree

831 files changed

+10416
-8025
lines changed

Some content is hidden

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

831 files changed

+10416
-8025
lines changed

.openpublishing.publish.config.json

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1189,11 +1189,14 @@
11891189
"articles/data-catalog/.openpublishing.redirection.data-catalog.json",
11901190
"articles/data-factory/.openpublishing.redirection.data-factory.json",
11911191
"articles/data-lake-analytics/.openpublishing.redirection.data-lake-analytics.json",
1192+
"articles/deployment-environments/.openpublishing.redirection.deployment-environments.json",
1193+
"articles/dev-box/.openpublishing.redirection.dev-box.json",
11921194
"articles/digital-twins/.openpublishing.redirection.digital-twins.json",
11931195
"articles/event-grid/.openpublishing.redirection.event-grid.json",
11941196
"articles/event-hubs/.openpublishing.redirection.event-hubs.json",
11951197
"articles/hdinsight/.openpublishing.redirection.hdinsight.json",
11961198
"articles/healthcare-apis/.openpublishing.redirection.healthcare-apis.json",
1199+
"articles/internet-peering/.openpublishing.redirection.internet-peering.json",
11971200
"articles/iot-accelerators/.openpublishing.redirection.iot-accelerators.json",
11981201
"articles/iot-central/.openpublishing.redirection.iot-central.json",
11991202
"articles/iot-develop/.openpublishing.redirection.iot-develop.json",
@@ -1208,9 +1211,12 @@
12081211
"articles/mariadb/.openpublishing.redirection.mariadb.json",
12091212
"articles/marketplace/.openpublishing.redirection.marketplace.json",
12101213
"articles/mysql/.openpublishing.redirection.mysql.json",
1214+
"articles/network-watcher/.openpublishing.redirection.network-watcher.json",
12111215
"articles/object-anchors/.openpublishing.redirection.object-anchors.json",
1216+
"articles/peering-service/.openpublishing.redirection.peering-service.json",
12121217
"articles/postgresql/.openpublishing.redirection.postgresql.json",
12131218
"articles/purview/.openpublishing.redirection.purview.json",
1219+
"articles/route-server/.openpublishing.redirection.route-server.json",
12141220
"articles/sap/.openpublishing.redirection.sap.json",
12151221
"articles/service-bus-messaging/.openpublishing.redirection.service-bus-messaging.json",
12161222
"articles/spatial-anchors/.openpublishing.redirection.spatial-anchors.json",
@@ -1220,9 +1226,6 @@
12201226
"articles/stream-analytics/.openpublishing.redirection.stream-analytics.json",
12211227
"articles/synapse-analytics/.openpublishing.redirection.synapse-analytics.json",
12221228
"articles/virtual-machine-scale-sets/.openpublishing.redirection.virtual-machine-scale-sets.json",
1223-
"articles/virtual-machines/.openpublishing.redirection.virtual-machines.json",
1224-
"articles/dev-box/.openpublishing.redirection.dev-box.json",
1225-
"articles/deployment-environments/.openpublishing.redirection.deployment-environments.json",
1226-
"articles/network-watcher/.openpublishing.redirection.network-watcher.json"
1229+
"articles/virtual-machines/.openpublishing.redirection.virtual-machines.json"
12271230
]
12281231
}

.openpublishing.redirection.active-directory.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5460,6 +5460,11 @@
54605460
"redirect_url": "/azure/active-directory/fundamentals/concept-fundamentals-security-defaults",
54615461
"redirect_document_id": true
54625462
},
5463+
{
5464+
"source_path_from_root": "/articles/active-directory/reports-monitoring/reference-azure-ad-sla-performance.md",
5465+
"redirect_url": "/azure/active-directory/reports-monitoring/reference-sla-performance",
5466+
"redirect_document_id": true
5467+
},
54635468
{
54645469
"source_path_from_root": "/articles/active-directory/reports-monitoring/quickstart-filter-audit-log.md",
54655470
"redirect_url": "/azure/active-directory/reports-monitoring/howto-customize-filter-logs",

.openpublishing.redirection.json

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,6 @@
2020
"redirect_URL": "tutorial-assess-webapps",
2121
"redirect_document_id": false
2222
},
23-
{
24-
"source_path": "articles/route-server/tutorial-protect-route-server.md",
25-
"redirect_URL": "/azure/route-server/tutorial-protect-route-server-ddos",
26-
"redirect_document_id": false
27-
},
28-
{
29-
"source_path": "articles/route-server/routing-preference.md",
30-
"redirect_url": "/azure/route-server/overview",
31-
"redirect_document_id": false
32-
},
3323
{
3424
"source_path": "articles/cloud-services-extended-support/deploy-visual-studio.md",
3525
"redirect_url": "/visualstudio/azure/cloud-services-extended-support?context=%2Fazure%2Fcloud-services-extended-support%2Fcontext%2Fcontext",
@@ -24553,22 +24543,22 @@
2455324543
},
2455424544
{
2455524545
"source_path_from_root": "/articles/active-directory/develop/single-page-app-tutorial-01-register-app.md",
24556-
"redirect_url": "/azure/active-directory/develop/tutorial-single-page-app-react-register-app.md",
24546+
"redirect_url": "/azure/active-directory/develop/tutorial-single-page-app-react-register-app",
2455724547
"redirect_document_id": false
2455824548
},
2455924549
{
2456024550
"source_path_from_root": "/articles/active-directory/develop/single-page-app-tutorial-02-prepare-spa.md",
24561-
"redirect_url": "/azure/active-directory/develop/tutorial-single-page-app-react-prepare-spa.md",
24551+
"redirect_url": "/azure/active-directory/develop/tutorial-single-page-app-react-prepare-spa",
2456224552
"redirect_document_id": false
2456324553
},
2456424554
{
2456524555
"source_path_from_root": "/articles/active-directory/develop/single-page-app-tutorial-03-sign-in-users.md",
24566-
"redirect_url": "/azure/active-directory/develop/tutorial-single-page-app-react-sign-in-users.md",
24556+
"redirect_url": "/azure/active-directory/develop/tutorial-single-page-app-react-sign-in-users",
2456724557
"redirect_document_id": false
2456824558
},
2456924559
{
2457024560
"source_path_from_root": "/articles/active-directory/develop/single-page-app-tutorial-04-call-api.md",
24571-
"redirect_url": "/azure/active-directory/develop/tutorial-single-page-app-react-call-api.md",
24561+
"redirect_url": "/azure/active-directory/develop/tutorial-single-page-app-react-call-api",
2457224562
"redirect_document_id": false
2457324563
}
2457424564
]

articles/active-directory-domain-services/network-considerations.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -80,15 +80,15 @@ Virtual network peering is a mechanism that connects two virtual networks in the
8080

8181
![Virtual network connectivity using peering](./media/active-directory-domain-services-design-guide/vnet-peering.png)
8282

83-
For more information, see [Azure virtual network peering overview](../virtual-network/virtual-network-peering-overview.md).
83+
For more information, see [Azure virtual network peering overview](/azure/virtual-network/virtual-network-peering-overview).
8484

8585
### Virtual Private Networking (VPN)
8686

8787
You can connect a virtual network to another virtual network (VNet-to-VNet) in the same way that you can configure a virtual network to an on-premises site location. Both connections use a VPN gateway to create a secure tunnel using IPsec/IKE. This connection model lets you deploy the managed domain into an Azure virtual network and then connect on-premises locations or other clouds.
8888

8989
![Virtual network connectivity using a VPN Gateway](./media/active-directory-domain-services-design-guide/vnet-connection-vpn-gateway.jpg)
9090

91-
For more information on using virtual private networking, read [Configure a VNet-to-VNet VPN gateway connection by using the Microsoft Entra admin center](../vpn-gateway/vpn-gateway-howto-vnet-vnet-resource-manager-portal.md).
91+
For more information on using virtual private networking, read [Configure a VNet-to-VNet VPN gateway connection by using the Microsoft Entra admin center](/azure/vpn-gateway/vpn-gateway-howto-vnet-vnet-resource-manager-portal).
9292

9393
## Name resolution when connecting virtual networks
9494

@@ -107,8 +107,8 @@ Don't lock the networking resources used by Domain Services. If networking resou
107107
| Azure resource | Description |
108108
|:----------------------------------------|:---|
109109
| Network interface card | Domain Services hosts the managed domain on two domain controllers (DCs) that run on Windows Server as Azure VMs. Each VM has a virtual network interface that connects to your virtual network subnet. |
110-
| Dynamic standard public IP address | Domain Services communicates with the synchronization and management service using a Standard SKU public IP address. For more information about public IP addresses, see [IP address types and allocation methods in Azure](../virtual-network/ip-services/public-ip-addresses.md). |
111-
| Azure standard load balancer | Domain Services uses a Standard SKU load balancer for network address translation (NAT) and load balancing (when used with secure LDAP). For more information about Azure load balancers, see [What is Azure Load Balancer?](../load-balancer/load-balancer-overview.md) |
110+
| Dynamic standard public IP address | Domain Services communicates with the synchronization and management service using a Standard SKU public IP address. For more information about public IP addresses, see [IP address types and allocation methods in Azure](/azure/virtual-network/ip-services/public-ip-addresses). |
111+
| Azure standard load balancer | Domain Services uses a Standard SKU load balancer for network address translation (NAT) and load balancing (when used with secure LDAP). For more information about Azure load balancers, see [What is Azure Load Balancer?](/azure/load-balancer/load-balancer-overview) |
112112
| Network address translation (NAT) rules | Domain Services creates and uses two Inbound NAT rules on the load balancer for secure PowerShell remoting. If a Standard SKU load balancer is used, it will have an Outbound NAT Rule too. For the Basic SKU load balancer, no Outbound NAT rule is required. |
113113
| Load balancer rules | When a managed domain is configured for secure LDAP on TCP port 636, three rules are created and used on a load balancer to distribute the traffic. |
114114

@@ -117,7 +117,7 @@ Don't lock the networking resources used by Domain Services. If networking resou
117117
118118
## Network security groups and required ports
119119

120-
A [network security group (NSG)](../virtual-network/network-security-groups-overview.md) contains a list of rules that allow or deny network traffic in an Azure virtual network. When you deploy a managed domain, a network security group is created with a set of rules that let the service provide authentication and management functions. This default network security group is associated with the virtual network subnet your managed domain is deployed into.
120+
A [network security group (NSG)](/azure/virtual-network/network-security-groups-overview) contains a list of rules that allow or deny network traffic in an Azure virtual network. When you deploy a managed domain, a network security group is created with a set of rules that let the service provide authentication and management functions. This default network security group is associated with the virtual network subnet your managed domain is deployed into.
121121

122122
The following sections cover network security groups and Inbound and Outbound port requirements.
123123

@@ -203,6 +203,6 @@ You must also route inbound traffic from the IP addresses included in the respec
203203

204204
For more information about some of the network resources and connection options used by Domain Services, see the following articles:
205205

206-
* [Azure virtual network peering](../virtual-network/virtual-network-peering-overview.md)
207-
* [Azure VPN gateways](../vpn-gateway/vpn-gateway-about-vpn-gateway-settings.md)
208-
* [Azure network security groups](../virtual-network/network-security-groups-overview.md)
206+
* [Azure virtual network peering](/azure/virtual-network/virtual-network-peering-overview)
207+
* [Azure VPN gateways](/azure/vpn-gateway/vpn-gateway-about-vpn-gateway-settings)
208+
* [Azure network security groups](/azure/virtual-network/network-security-groups-overview)

articles/active-directory-domain-services/notifications.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ You can also choose to have all *Global Administrators* of the Microsoft Entra d
5353

5454
To review the existing email notification recipients, or add recipients, complete the following steps:
5555

56-
1. Sign in to the [Microsoft Entra admin center](https://entra.microsoft.com) as a [Global Administrator](../active-directory/roles/permissions-reference.md#authentication-policy-administrator).
56+
1. Sign in to the [Microsoft Entra admin center](https://entra.microsoft.com) as a [Global Administrator](/azure/active-directory/roles/permissions-reference#authentication-policy-administrator).
5757
1. Search for and select **Microsoft Entra Domain Services**.
5858
1. Select your managed domain, such as *aaddscontoso.com*.
5959
1. On the left-hand side of the Domain Services resource window, select **Notification settings**. The existing recipients for email notifications are shown.

articles/active-directory-domain-services/overview.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,10 @@ To get started, [create a managed domain using the Microsoft Entra admin center]
105105
[compare]: compare-identity-solutions.md
106106
[synchronization]: synchronization.md
107107
[tutorial-create]: tutorial-create-instance.md
108-
[azure-ad-connect]: ../active-directory/hybrid/whatis-azure-ad-connect.md
109-
[password-hash-sync]: ../active-directory/hybrid/how-to-connect-password-hash-synchronization.md
110-
[availability-zones]: ../reliability/availability-zones-overview.md
111-
[forest-trusts]: concepts-resource-forest.md
108+
[azure-ad-connect]: /azure/active-directory/hybrid/connect/whatis-azure-ad-connect
109+
[password-hash-sync]: /azure/active-directory/hybrid/connect/how-to-connect-password-hash-synchronization
110+
[availability-zones]: /azure/reliability/availability-zones-overview
111+
[forest-trusts]: ./concepts-forest-trust.md
112112
[administration-concepts]: administration-concepts.md
113113
[synchronization]: synchronization.md
114114
[concepts-replica-sets]: concepts-replica-sets.md

articles/active-directory-domain-services/password-policy.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ For more information about password policies and using the Active Directory Admi
128128
* [Configure fine-grained password policies using AD Administration Center](/windows-server/identity/ad-ds/get-started/adac/introduction-to-active-directory-administrative-center-enhancements--level-100-#fine_grained_pswd_policy_mgmt)
129129

130130
<!-- INTERNAL LINKS -->
131-
[create-azure-ad-tenant]: ../active-directory/fundamentals/sign-up-organization.md
132-
[associate-azure-ad-tenant]: ../active-directory/fundamentals/active-directory-how-subscriptions-associated-directory.md
131+
[create-azure-ad-tenant]: /azure/active-directory/fundamentals/sign-up-organization
132+
[associate-azure-ad-tenant]: /azure/active-directory/fundamentals/how-subscriptions-associated-directory
133133
[create-azure-ad-ds-instance]: tutorial-create-instance.md
134134
[tutorial-create-management-vm]: tutorial-create-management-vm.md

articles/active-directory-domain-services/powershell-create-instance.md

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -379,24 +379,24 @@ To see the managed domain in action, you can [domain-join a Windows VM][windows-
379379
[windows-join]: join-windows-vm.md
380380
[tutorial-ldaps]: tutorial-configure-ldaps.md
381381
[tutorial-phs]: tutorial-configure-password-hash-sync.md
382-
[nsg-overview]: ../virtual-network/network-security-groups-overview.md
382+
[nsg-overview]: /azure/virtual-network/network-security-groups-overview
383383
[network-ports]: network-considerations.md#network-security-groups-and-required-ports
384384

385385
<!-- EXTERNAL LINKS -->
386-
[Connect-AzAccount]: /powershell/module/Az.Accounts/Connect-AzAccount
387-
[Connect-AzureAD]: /powershell/module/AzureAD/Connect-AzureAD
386+
[Connect-AzAccount]: /powershell/module/az.accounts/connect-azaccount
387+
[Connect-AzureAD]: /powershell/module/azuread/connect-azuread
388388
[New-AzureADServicePrincipal]: /powershell/module/AzureAD/New-AzureADServicePrincipal
389-
[New-AzureADGroup]: /powershell/module/AzureAD/New-AzureADGroup
390-
[Add-AzureADGroupMember]: /powershell/module/AzureAD/Add-AzureADGroupMember
391-
[Get-AzureADGroup]: /powershell/module/AzureAD/Get-AzureADGroup
392-
[Get-AzureADUser]: /powershell/module/AzureAD/Get-AzureADUser
393-
[Register-AzResourceProvider]: /powershell/module/Az.Resources/Register-AzResourceProvider
394-
[New-AzResourceGroup]: /powershell/module/Az.Resources/New-AzResourceGroup
395-
[New-AzVirtualNetworkSubnetConfig]: /powershell/module/Az.Network/New-AzVirtualNetworkSubnetConfig
396-
[New-AzVirtualNetwork]: /powershell/module/Az.Network/New-AzVirtualNetwork
397-
[Get-AzSubscription]: /powershell/module/Az.Accounts/Get-AzSubscription
398-
[cloud-shell]: ../cloud-shell/cloud-shell-windows-users.md
399-
[availability-zones]: ../reliability/availability-zones-overview.md
389+
[New-AzureADGroup]: /powershell/module/azuread/new-azureadgroup
390+
[Add-AzureADGroupMember]: /powershell/module/azuread/add-azureadgroupmember
391+
[Get-AzureADGroup]: /powershell/module/azuread/get-azureadgroup
392+
[Get-AzureADUser]: /powershell/module/azuread/get-azureaduser
393+
[Register-AzResourceProvider]: /powershell/module/az.resources/register-azresourceprovider
394+
[New-AzResourceGroup]: /powershell/module/az.resources/new-azresourcegroup
395+
[New-AzVirtualNetworkSubnetConfig]: /powershell/module/az.network/new-azvirtualnetworksubnetconfig
396+
[New-AzVirtualNetwork]: /powershell/module/az.network/new-azvirtualnetwork
397+
[Get-AzSubscription]: /powershell/module/az.accounts/get-azsubscription
398+
[cloud-shell]: /azure/active-directory/develop/configure-app-multi-instancing
399+
[availability-zones]: /azure/reliability/availability-zones-overview
400400
[New-AzNetworkSecurityRuleConfig]: /powershell/module/az.network/new-aznetworksecurityruleconfig
401401
[New-AzNetworkSecurityGroup]: /powershell/module/az.network/new-aznetworksecuritygroup
402402
[Set-AzVirtualNetworkSubnetConfig]: /powershell/module/az.network/set-azvirtualnetworksubnetconfig

articles/active-directory-domain-services/powershell-scoped-synchronization.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ To complete this article, you need the following resources and privileges:
3131
* If needed, [create a Microsoft Entra tenant][create-azure-ad-tenant] or [associate an Azure subscription with your account][associate-azure-ad-tenant].
3232
* A Microsoft Entra Domain Services managed domain enabled and configured in your Microsoft Entra tenant.
3333
* If needed, complete the tutorial to [create and configure a Microsoft Entra Domain Services managed domain][tutorial-create-instance].
34-
* You need [Application Administrator](../active-directory/roles/permissions-reference.md#application-administrator) and [Groups Administrator](../active-directory/roles/permissions-reference.md#groups-administrator) Microsoft Entra roles in your tenant to change the Domain Services synchronization scope.
34+
* You need [Application Administrator](/azure/active-directory/roles/permissions-reference#application-administrator) and [Groups Administrator](/azure/active-directory/roles/permissions-reference#groups-administrator) Microsoft Entra roles in your tenant to change the Domain Services synchronization scope.
3535

3636
## Scoped synchronization overview
3737

@@ -213,8 +213,8 @@ To learn more about the synchronization process, see [Understand synchronization
213213
[scoped-sync]: scoped-synchronization.md
214214
[concepts-sync]: synchronization.md
215215
[tutorial-create-instance]: tutorial-create-instance.md
216-
[create-azure-ad-tenant]: ../active-directory/fundamentals/sign-up-organization.md
217-
[associate-azure-ad-tenant]: ../active-directory/fundamentals/active-directory-how-subscriptions-associated-directory.md
216+
[create-azure-ad-tenant]: /azure/active-directory/fundamentals/sign-up-organization
217+
[associate-azure-ad-tenant]: /azure/active-directory/fundamentals/how-subscriptions-associated-directory
218218

219219
<!-- EXTERNAL LINKS -->
220220
[Connect-AzureAD]: /powershell/module/azuread/connect-azuread

articles/active-directory-domain-services/scenarios.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -166,13 +166,13 @@ For more information about this deployment scenario, see [how to configure domai
166166
To get started, [Create and configure a Microsoft Entra Domain Services managed domain][tutorial-create-instance].
167167

168168
<!-- INTERNAL LINKS -->
169-
[hdinsight]: ../hdinsight/domain-joined/apache-domain-joined-configure-using-azure-adds.md
169+
[hdinsight]: /azure/hdinsight/domain-joined/apache-domain-joined-configure-using-azure-adds
170170
[tutorial-create-instance]: tutorial-create-instance.md
171171
[custom-ou]: create-ou.md
172172
[create-gpo]: manage-group-policy.md
173-
[sspr]: ../active-directory/authentication/overview-authentication.md#self-service-password-reset
173+
[sspr]: /azure/active-directory/authentication/overview-authentication#self-service-password-reset
174174
[compare]: compare-identity-solutions.md
175-
[azure-ad-connect]: ../active-directory/hybrid/whatis-azure-ad-connect.md
175+
[azure-ad-connect]: /azure/active-directory/hybrid/connect/whatis-azure-ad-connect
176176

177177
<!-- EXTERNAL LINKS -->
178178
[windows-rds]: /windows-server/remote/remote-desktop-services/rds-azure-adds

0 commit comments

Comments
 (0)