Skip to content

Commit ac56438

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into yelevin/wef-connector
2 parents 045336e + 92185ff commit ac56438

File tree

173 files changed

+2707
-2011
lines changed

Some content is hidden

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

173 files changed

+2707
-2011
lines changed

.openpublishing.redirection.json

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10068,6 +10068,31 @@
1006810068
"redirect_url": "/azure/azure-resource-manager/management/extension-resource-types",
1006910069
"redirect_document_id": false
1007010070
},
10071+
{
10072+
"source_path_from_root": "/articles/azure-resource-manager/bicep/loop-modules.md",
10073+
"redirect_url": "/azure/azure-resource-manager/bicep/loops",
10074+
"redirect_document_id": false
10075+
},
10076+
{
10077+
"source_path_from_root": "/articles/azure-resource-manager/bicep/loop-outputs.md",
10078+
"redirect_url": "/azure/azure-resource-manager/bicep/loops",
10079+
"redirect_document_id": false
10080+
},
10081+
{
10082+
"source_path_from_root": "/articles/azure-resource-manager/bicep/loop-properties.md",
10083+
"redirect_url": "/azure/azure-resource-manager/bicep/loops",
10084+
"redirect_document_id": false
10085+
},
10086+
{
10087+
"source_path_from_root": "/articles/azure-resource-manager/bicep/loop-resources.md",
10088+
"redirect_url": "/azure/azure-resource-manager/bicep/loops",
10089+
"redirect_document_id": false
10090+
},
10091+
{
10092+
"source_path_from_root": "/articles/azure-resource-manager/bicep/loop-variables.md",
10093+
"redirect_url": "/azure/azure-resource-manager/bicep/loops",
10094+
"redirect_document_id": false
10095+
},
1007110096
{
1007210097
"source_path_from_root": "/articles/azure-resource-manager/templates/compare-template-syntax.md",
1007310098
"redirect_url": "/azure/azure-resource-manager/bicep/compare-template-syntax",
@@ -46542,6 +46567,11 @@
4654246567
"source_path_from_root": "/articles/azure-monitor/app/how-do-i.md",
4654346568
"redirect_url": "/azure/azure-monitor/faq",
4654446569
"redirect_document_id": false
46570+
},
46571+
{
46572+
"source_path_from_root": "/articles/app-service/web-sites-integrate-with-vnet.md",
46573+
"redirect_url": "/azure/app-service/overview-vnet-integration",
46574+
"redirect_document_id": false
4654546575
}
4654646576
]
4654746577
}

articles/active-directory-b2c/tutorial-create-tenant.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@ You learn how to register an application in the next tutorial.
4646
1. Select the directory that contains your subscription:
4747
1. In the Azure portal toolbar, select the **Directories + subscriptions** filter icon.
4848

49-
![Directories + subscriptions filter icon](media/tutorial-create-tenant/directories-subscription-filter-icon.png)
49+
![Directories + subscriptions filter icon](media/tutorial-create-tenant/directories-subscription-filter-icon.png)
5050

5151
1. Find the directory that contains your subscription and select the **Switch** button next to it. Switching a directory reloads the portal.
5252

53-
![Directories + subscriptions with Switch button](media/tutorial-create-tenant/switch-directory.png)
53+
![Directories + subscriptions with Switch button](media/tutorial-create-tenant/switch-directory.png)
5454

5555
1. Add **Microsoft.AzureActiveDirectory** as a resource provider for the Azure subscription your're using ([learn more](../azure-resource-manager/management/resource-providers-and-types.md?WT.mc_id=Portal-Microsoft_Azure_Support#register-resource-provider-1)):
5656

@@ -119,4 +119,4 @@ In this article, you learned how to:
119119
Next, learn how to register a web application in your new tenant.
120120

121121
> [!div class="nextstepaction"]
122-
> [Register your applications >](tutorial-register-applications.md)
122+
> [Register your applications >](tutorial-register-applications.md)

articles/active-directory-domain-services/tutorial-create-forest-trust.md

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.service: active-directory
99
ms.subservice: domain-services
1010
ms.workload: identity
1111
ms.topic: tutorial
12-
ms.date: 07/26/2021
12+
ms.date: 10/19/2021
1313
ms.author: justinha
1414

1515
#Customer intent: As an identity administrator, I want to create a one-way outbound forest from an Azure Active Directory Domain Services resource forest to an on-premises Active Directory Domain Services forest to provide authentication and resource access between forests.
@@ -72,9 +72,20 @@ Before you configure a forest trust in Azure AD DS, make sure your networking be
7272
To correctly resolve the managed domain from the on-premises environment, you may need to add forwarders to the existing DNS servers. If you haven't configured the on-premises environment to communicate with the managed domain, complete the following steps from a management workstation for the on-premises AD DS domain:
7373

7474
1. Select **Start** > **Administrative Tools** > **DNS**.
75-
1. Right-select DNS server, such as *myAD01*, then select **Properties**.
76-
1. Choose **Forwarders**, then **Edit** to add additional forwarders.
77-
1. Add the IP addresses of the managed domain, such as *10.0.2.4* and *10.0.2.5*.
75+
1. Select your DNS zone, such as *aaddscontoso.com*.
76+
1. Select **Conditional Forwarders**, then right-select and choose **New Conditional Forwarder...**
77+
1. Enter your other **DNS Domain**, such as *contoso.com*, then enter the IP addresses of the DNS servers for that namespace, as shown in the following example:
78+
79+
![Screenshot of how to add and configure a conditional forwarder for the DNS server.](./media/manage-dns/create-conditional-forwarder.png)
80+
81+
1. Check the box for **Store this conditional forwarder in Active Directory, and replicate it as follows**, then select the option for *All DNS servers in this domain*, as shown in the following example:
82+
83+
![Screenshot of how to select All DNS servers in this domain.](./media/manage-dns/store-in-domain.png)
84+
85+
> [!IMPORTANT]
86+
> If the conditional forwarder is stored in the *forest* instead of the *domain*, the conditional forwarder fails.
87+
88+
1. To create the conditional forwarder, select **OK**.
7889

7990
## Create inbound forest trust in the on-premises domain
8091

20.4 KB
Loading
46.1 KB
Loading
111 KB
Loading
Loading
71.9 KB
Loading

0 commit comments

Comments
 (0)