Skip to content

Commit 584f18b

Browse files
committed
Merge branch 'master' of https://github.com/microsoftdocs/azure-docs-pr into akv-rotate
2 parents a524970 + be57aa6 commit 584f18b

File tree

254 files changed

+4200
-2888
lines changed

Some content is hidden

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

254 files changed

+4200
-2888
lines changed

.openpublishing.publish.config.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,12 @@
152152
"branch": "master",
153153
"branch_mapping": {}
154154
},
155+
{
156+
"path_to_root": "functions-pytorch",
157+
"url": "https://github.com/Azure-Samples/functions-python-pytorch-tutorial",
158+
"branch": "master",
159+
"branch_mapping": {}
160+
},
155161
{
156162
"path_to_root": "functions-quickstart-templates",
157163
"url": "https://github.com/Azure/azure-functions-templates",

.openpublishing.redirection.json

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -801,6 +801,16 @@
801801
"redirect_url": "/azure/machine-learning",
802802
"redirect_document_id": false
803803
},
804+
{
805+
"source_path": "articles/cognitive-services/QnAMaker/Tutorials/create-publish-query-in-portal.md",
806+
"redirect_url": "/azure/cognitive-services/QnAMaker/Quickstarts/create-publish-knowledge-base",
807+
"redirect_document_id": false
808+
},
809+
{
810+
"source_path": "articles/cognitive-services/QnAMaker/Tutorials/create-qna-bot.md",
811+
"redirect_url": "/azure/cognitive-services/QnAMaker/Quickstarts/create-publish-knowledge-base#create-a-bot",
812+
"redirect_document_id": false
813+
},
804814
{
805815
"source_path": "articles/cognitive-services/QnAMaker/concepts/data-sources-supported.md",
806816
"redirect_url": "/azure/cognitive-services/QnAMaker/Quickstarts/reference-document-format-guidelines",
@@ -7277,7 +7287,7 @@
72777287
"source_path": "articles/azure-functions/functions-create-first-azure-function-azure-cli-linux.md",
72787288
"redirect_url": "/azure/azure-functions/functions-create-first-azure-function-azure-cli?pivots=programming-language-python",
72797289
"redirect_document_id": false
7280-
},
7290+
},
72817291
{
72827292
"source_path": "articles/azure-functions/functions-add-output-binding-storage-queue-python.md",
72837293
"redirect_url": "/azure/azure-functions/functions-add-output-binding-storage-queue-cli.md?pivots=programming-language-python",
@@ -13492,7 +13502,7 @@
1349213502
"source_path": "articles/event-hubs/event-hubs-authentication-and-security-model-overview.md",
1349313503
"redirect_url": "/azure/event-hubs/authenticate-shared-access-signature",
1349413504
"redirect_document_id": false
13495-
},
13505+
},
1349613506
{
1349713507
"source_path": "articles/event-hubs/event-hubs-c-ephcs-getstarted.md",
1349813508
"redirect_url": "/azure/event-hubs/event-hubs-c-getstarted-send",
@@ -26913,6 +26923,16 @@
2691326923
"redirect_url": "/azure/storage/common/storage-azure-cli",
2691426924
"redirect_document_id": true
2691526925
},
26926+
{
26927+
"source_path": "articles/storage/common/storage-azure-cli.md",
26928+
"redirect_url": "/azure/storage/blobs/storage-quickstart-blobs-cli",
26929+
"redirect_document_id": true
26930+
},
26931+
{
26932+
"source_path": "articles/storage/common/storage-azure-cli-nodejs.md",
26933+
"redirect_url": "/azure/storage/blobs/storage-quickstart-blobs-cli",
26934+
"redirect_document_id": false
26935+
},
2691626936
{
2691726937
"source_path": "articles/storage/storage-backup-and-disaster-recovery-for-azure-iaas-disks.md",
2691826938
"redirect_url": "/azure/storage/common/storage-backup-and-disaster-recovery-for-azure-iaas-disks",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ No. After you create an Azure AD Domain Services managed domain, you can't then
8787
No. You don't have permissions to connect to domain controllers for the managed domain using Remote Desktop. Members of the *AAD DC Administrators* group can administer the managed domain using AD administration tools such as the Active Directory Administration Center (ADAC) or AD PowerShell. These tools are installed using the *Remote Server Administration Tools* feature on a Windows server joined to the managed domain. For more information, see [Create a management VM to configure and administer an Azure AD Domain Services managed domain](tutorial-create-management-vm.md).
8888

8989
### I've enabled Azure AD Domain Services. What user account do I use to domain join machines to this domain?
90-
Members of the administrative group *AAD DC Administrators* can domain-join machines. Additionally, members of this group are granted remote desktop access to machines that have been joined to the domain.
90+
Any user account that's part of the Azure AD DS managed domain can join a VM. Members of the *AAD DC Administrators* group are granted remote desktop access to machines that have been joined to the managed domain.
9191

9292
### Do I have domain administrator privileges for the managed domain provided by Azure AD Domain Services?
9393
No. You aren't granted administrative privileges on the managed domain. *Domain Administrator* and *Enterprise Administrator* privileges aren't available for you to use within the domain. Members of the domain administrator or enterprise administrator groups in your on-premises Active Directory are also not granted domain / enterprise administrator privileges on the managed domain.

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ To complete this tutorial, you need the following resources and privileges:
3030
* If needed, [create an Azure Active Directory tenant][create-azure-ad-tenant] or [associate an Azure subscription with your account][associate-azure-ad-tenant].
3131
* An Azure Active Directory Domain Services managed domain enabled and configured in your Azure AD tenant.
3232
* If needed, the first tutorial [creates and configures an Azure Active Directory Domain Services instance][create-azure-ad-ds-instance].
33-
* A user account that's a member of the *Azure AD DC administrators* group in your Azure AD tenant.
33+
* A user account that's part of the Azure AD DS managed domain.
3434

3535
## Create and connect to a CentOS Linux VM
3636

@@ -94,15 +94,15 @@ Now that the required packages are installed on the VM, join the VM to the Azure
9494
* Check that the VM is deployed to the same, or a peered, virtual network in which the Azure AD DS managed domain is available.
9595
* Confirm that the DNS server settings for the virtual network have been updated to point to the domain controllers of the Azure AD DS managed domain.
9696

97-
1. Now initialize Kerberos using the `kinit` command. Specify a user that belongs to the *AAD DC Administrators* group. If needed, [add a user account to a group in Azure AD](../active-directory/fundamentals/active-directory-groups-members-azure-portal.md).
97+
1. Now initialize Kerberos using the `kinit` command. Specify a user that's a part of the Azure AD DS managed domain. If needed, [add a user account to a group in Azure AD](../active-directory/fundamentals/active-directory-groups-members-azure-portal.md).
9898

99-
Again, the Azure AD DS managed domain name must be entered in ALL UPPERCASE. In the following example, the account named `[email protected]` is used to initialize Kerberos. Enter your own user account that's a member of the *AAD DC Administrators* group:
99+
Again, the Azure AD DS managed domain name must be entered in ALL UPPERCASE. In the following example, the account named `[email protected]` is used to initialize Kerberos. Enter your own user account that's a part of the Azure AD DS managed domain:
100100

101101
```console
102102
103103
```
104104

105-
1. Finally, join the machine to the Azure AD DS managed domain using the `realm join` command. Use the same user account that's a member of the *AAD DC Administrators* group that you specified in the previous `kinit` command, such as `[email protected]`:
105+
1. Finally, join the machine to the Azure AD DS managed domain using the `realm join` command. Use the same user account that's a part of the Azure AD DS managed domain that you specified in the previous `kinit` command, such as `[email protected]`:
106106

107107
```console
108108
sudo realm join --verbose AADDSCONTOSO.COM -U '[email protected]'

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ To complete this tutorial, you need the following resources and privileges:
3030
* If needed, [create an Azure Active Directory tenant][create-azure-ad-tenant] or [associate an Azure subscription with your account][associate-azure-ad-tenant].
3131
* An Azure Active Directory Domain Services managed domain enabled and configured in your Azure AD tenant.
3232
* If needed, the first tutorial [creates and configures an Azure Active Directory Domain Services instance][create-azure-ad-ds-instance].
33-
* A user account that's a member of the *Azure AD DC administrators* group in your Azure AD tenant.
33+
* A user account that's a part of the Azure AD DS managed domain.
3434

3535
## Create and connect to a CoreOS Linux VM
3636

@@ -130,9 +130,9 @@ With the SSSD configuration file updated, now join the virtual machine to the ma
130130
* Check that the VM is deployed to the same, or a peered, virtual network in which the Azure AD DS managed domain is available.
131131
* Confirm that the DNS server settings for the virtual network have been updated to point to the domain controllers of the Azure AD DS managed domain.
132132

133-
1. Now join the VM to the Azure AD DS managed domain using the `adcli join` command. Specify a user that belongs to the *AAD DC Administrators* group. If needed, [add a user account to a group in Azure AD](../active-directory/fundamentals/active-directory-groups-members-azure-portal.md).
133+
1. Now join the VM to the Azure AD DS managed domain using the `adcli join` command. Specify a user that's a part of the Azure AD DS managed domain. If needed, [add a user account to a group in Azure AD](../active-directory/fundamentals/active-directory-groups-members-azure-portal.md).
134134

135-
Again, the Azure AD DS managed domain name must be entered in ALL UPPERCASE. In the following example, the account named `[email protected]` is used to initialize Kerberos. Enter your own user account that's a member of the *AAD DC Administrators* group.
135+
Again, the Azure AD DS managed domain name must be entered in ALL UPPERCASE. In the following example, the account named `[email protected]` is used to initialize Kerberos. Enter your own user account that's a part of the Azure AD DS managed domain.
136136

137137
```console
138138
sudo adcli join -D AADDSCONTOSO.COM -U [email protected] -K /etc/krb5.keytab -H coreos.aaddscontoso.com -N coreos

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ To complete this tutorial, you need the following resources and privileges:
3030
* If needed, [create an Azure Active Directory tenant][create-azure-ad-tenant] or [associate an Azure subscription with your account][associate-azure-ad-tenant].
3131
* An Azure Active Directory Domain Services managed domain enabled and configured in your Azure AD tenant.
3232
* If needed, the first tutorial [creates and configures an Azure Active Directory Domain Services instance][create-azure-ad-ds-instance].
33-
* A user account that's a member of the *Azure AD DC administrators* group in your Azure AD tenant.
33+
* A user account that's a part of the Azure AD DS managed domain.
3434

3535
## Create and connect to a RHEL Linux VM
3636

@@ -104,15 +104,15 @@ Now that the required packages are installed on the VM, join the VM to the Azure
104104
* Check that the VM is deployed to the same, or a peered, virtual network in which the Azure AD DS managed domain is available.
105105
* Confirm that the DNS server settings for the virtual network have been updated to point to the domain controllers of the Azure AD DS managed domain.
106106

107-
1. Now initialize Kerberos using the `kinit` command. Specify a user that belongs to the *AAD DC Administrators* group. If needed, [add a user account to a group in Azure AD](../active-directory/fundamentals/active-directory-groups-members-azure-portal.md).
107+
1. Now initialize Kerberos using the `kinit` command. Specify a user that's a part of the Azure AD DS managed domain. If needed, [add a user account to a group in Azure AD](../active-directory/fundamentals/active-directory-groups-members-azure-portal.md).
108108

109-
Again, the Azure AD DS managed domain name must be entered in ALL UPPERCASE. In the following example, the account named `[email protected]` is used to initialize Kerberos. Enter your own user account that's a member of the *AAD DC Administrators* group:
109+
Again, the Azure AD DS managed domain name must be entered in ALL UPPERCASE. In the following example, the account named `[email protected]` is used to initialize Kerberos. Enter your own user account that's a part of the Azure AD DS managed domain:
110110

111111
```console
112112
113113
```
114114

115-
1. Finally, join the machine to the Azure AD DS managed domain using the `realm join` command. Use the same user account that's a member of the *AAD DC Administrators* group that you specified in the previous `kinit` command, such as `[email protected]`:
115+
1. Finally, join the machine to the Azure AD DS managed domain using the `realm join` command. Use the same user account that's a part of the Azure AD DS managed domain that you specified in the previous `kinit` command, such as `[email protected]`:
116116

117117
```console
118118
sudo realm join --verbose AADDSCONTOSO.COM -U '[email protected]'
@@ -138,7 +138,7 @@ Successfully enrolled machine in realm
138138
* Check that the VM is deployed to the same, or a peered, virtual network in which the Azure AD DS managed domain is available.
139139
* Confirm that the DNS server settings for the virtual network have been updated to point to the domain controllers of the Azure AD DS managed domain.
140140

141-
1. First, join the domain using the `adcli join` command, this command will also creates the keytab to authenticate the machine. Use a user account that's a member of the *AAD DC Administrators* group.
141+
1. First, join the domain using the `adcli join` command, this command will also creates the keytab to authenticate the machine. Use a user account that's a part of the Azure AD DS managed domain.
142142

143143
```console
144144
sudo adcli join aaddscontoso.com -U contosoadmin

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ To complete this tutorial, you need the following resources and privileges:
3030
* If needed, [create an Azure Active Directory tenant][create-azure-ad-tenant] or [associate an Azure subscription with your account][associate-azure-ad-tenant].
3131
* An Azure Active Directory Domain Services managed domain enabled and configured in your Azure AD tenant.
3232
* If needed, the first tutorial [creates and configures an Azure Active Directory Domain Services instance][create-azure-ad-ds-instance].
33-
* A user account that's a member of the *Azure AD DC administrators* group in your Azure AD tenant.
33+
* A user account that's a part of the Azure AD DS managed domain.
3434

3535
## Create and connect to an Ubuntu Linux VM
3636

@@ -129,15 +129,15 @@ Now that the required packages are installed on the VM and NTP is configured, jo
129129
* Check that the VM is deployed to the same, or a peered, virtual network in which the Azure AD DS managed domain is available.
130130
* Confirm that the DNS server settings for the virtual network have been updated to point to the domain controllers of the Azure AD DS managed domain.
131131

132-
1. Now initialize Kerberos using the `kinit` command. Specify a user that belongs to the *AAD DC Administrators* group. If needed, [add a user account to a group in Azure AD](../active-directory/fundamentals/active-directory-groups-members-azure-portal.md).
132+
1. Now initialize Kerberos using the `kinit` command. Specify a user that's a part of the Azure AD DS managed domain. If needed, [add a user account to a group in Azure AD](../active-directory/fundamentals/active-directory-groups-members-azure-portal.md).
133133

134-
Again, the Azure AD DS managed domain name must be entered in ALL UPPERCASE. In the following example, the account named `[email protected]` is used to initialize Kerberos. Enter your own user account that's a member of the *AAD DC Administrators* group:
134+
Again, the Azure AD DS managed domain name must be entered in ALL UPPERCASE. In the following example, the account named `[email protected]` is used to initialize Kerberos. Enter your own user account that's a part of the Azure AD DS managed domain:
135135

136136
```console
137137
138138
```
139139

140-
1. Finally, join the machine to the Azure AD DS managed domain using the `realm join` command. Use the same user account that's a member of the *AAD DC Administrators* group that you specified in the previous `kinit` command, such as `[email protected]`:
140+
1. Finally, join the machine to the Azure AD DS managed domain using the `realm join` command. Use the same user account that's a part of the Azure AD DS managed domain that you specified in the previous `kinit` command, such as `[email protected]`:
141141

142142
```console
143143
sudo realm join --verbose AADDSCONTOSO.COM -U '[email protected]' --install=/

0 commit comments

Comments
 (0)