Skip to content

Commit 4b5dcdc

Browse files
huypubhuypub
authored
Merge pull request MicrosoftDocs#84231 from MicrosoftDocs/master
8/2 PM Publish
2 parents d060947 + 92ae1b0 commit 4b5dcdc

File tree

284 files changed

+1528
-4181
lines changed

Some content is hidden

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

284 files changed

+1528
-4181
lines changed

‎.openpublishing.redirection.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25215,9 +25215,9 @@
2521525215
"redirect_document_id": true
2521625216
},
2521725217
{
25218-
"source_path": "articles/data-factory/data-factory-copy-activity-tutorial-using-azure-portal.md",
25219-
"redirect_url": "/azure/data-factory/v1/data-factory-copy-activity-tutorial-using-azure-portal",
25220-
"redirect_document_id": true
25218+
"source_path": "articles/data-factory/v1/data-factory-copy-activity-tutorial-using-azure-portal.md",
25219+
"redirect_url": "/azure/data-factory/v1/data-factory-copy-data-from-azure-blob-storage-to-sql-database",
25220+
"redirect_document_id": false
2522125221
},
2522225222
{
2522325223
"source_path": "articles/data-factory/data-factory-copy-activity-tutorial-using-azure-resource-manager-template.md",
@@ -25510,7 +25510,7 @@
2551025510
"redirect_document_id": true
2551125511
},
2551225512
{
25513-
"source_path": "articles/data-factory/data-factory-spark.md",
25513+
"source_path": "articles/data-factory/data-factory-spark.md",
2551425514
"redirect_url": "/azure/data-factory/v1/data-factory-spark",
2551525515
"redirect_document_id": true
2551625516
},

‎articles/active-directory-b2c/active-directory-b2c-custom-setup-adfs2016-idp.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,8 @@ Open a browser and navigate to the URL. Make sure you type the correct URL and t
175175
| E-Mail-Address | email |
176176
| Display-Name | name |
177177
178+
Note that these names will not display in the outgoing claim type dropdown. You need to manually type them in. (The dropdown is actually editable).
179+
178180
12. Based on your certificate type, you may need to set the HASH algorithm. On the relying party trust (B2C Demo) properties window, select the **Advanced** tab and change the **Secure hash algorithm** to `SHA-256`, and click **Ok**.
179181
13. In Server Manager, select **Tools**, and then select **ADFS Management**.
180182
14. Select the relying party trust you created, select **Update from Federation Metadata**, and then click **Update**.

‎articles/active-directory-domain-services/join-centos-linux-vm.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,8 @@ Now that the required packages are installed on the Linux virtual machine, the n
104104

105105
> [!TIP]
106106
> Use the same user account you specified in the preceding step ('kinit').
107+
>
108+
> If your VM is unable to join the domain, make sure that the VM's network security group allows outbound Kerberos traffic on TCP + UDP port 464 to the virtual network subnet for your Azure AD DS managed domain.
107109

108110
```console
109111
sudo realm join --verbose CONTOSO100.COM -U 'bob@CONTOSO100.COM'

‎articles/active-directory-domain-services/join-rhel-linux-vm.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,8 @@ Now that the required packages are installed on the Linux virtual machine, the n
104104

105105
> [!TIP]
106106
> Use the same user account you specified in the preceding step ('kinit').
107+
>
108+
> If your VM is unable to join the domain, make sure that the VM's network security group allows outbound Kerberos traffic on TCP + UDP port 464 to the virtual network subnet for your Azure AD DS managed domain.
107109

108110
```console
109111
sudo realm join --verbose CONTOSO100.COM -U 'bob@CONTOSO100.COM'

‎articles/active-directory-domain-services/join-ubuntu-linux-vm.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,8 @@ Now that the required packages are installed on the Linux virtual machine, the n
142142

143143
> [!TIP]
144144
> Use the same user account you specified in the preceding step ('kinit').
145+
>
146+
> If your VM is unable to join the domain, make sure that the VM's network security group allows outbound Kerberos traffic on TCP + UDP port 464 to the virtual network subnet for your Azure AD DS managed domain.
145147

146148
```console
147149
sudo realm join --verbose CONTOSO100.COM -U 'bob@CONTOSO100.COM' --install=/

‎articles/active-directory-domain-services/media/active-directory-domain-services-design-guide/classic-arm-vnet-connectivity.png

-45.1 KB
Binary file not shown.

‎articles/active-directory-domain-services/media/active-directory-domain-services-design-guide/classic-vnet-connectivity.png

-53.2 KB
Binary file not shown.

‎articles/active-directory-domain-services/media/index/active-directory-domain-services.svg

Lines changed: 0 additions & 28 deletions
This file was deleted.

0 commit comments

Comments
 (0)