Skip to content

Commit bd7203f

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into work-vms-edit
2 parents 1a21cc6 + afae431 commit bd7203f

File tree

1,387 files changed

+14544
-11729
lines changed

Some content is hidden

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

1,387 files changed

+14544
-11729
lines changed

.openpublishing.redirection.json

Lines changed: 72 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11462,6 +11462,11 @@
1146211462
"redirect_url": "/azure/event-hubs/",
1146311463
"redirect_document_id": false
1146411464
},
11465+
{
11466+
"source_path": "articles/event-hubs/event-hubs-create-kafka-enabled.md",
11467+
"redirect_url": "/azure/event-hubs/event-hubs-create",
11468+
"redirect_document_id": false
11469+
},
1146511470
{
1146611471
"source_path": "articles/event-hubs/event-hubs-csharp-ephcs-getstarted.md",
1146711472
"redirect_url": "/azure/event-hubs/event-hubs-dotnet-standard-getstarted-send",
@@ -15617,6 +15622,11 @@
1561715622
"redirect_url": "/azure/monitoring-and-diagnostics/insights-advanced-autoscale-virtual-machine-scale-sets",
1561815623
"redirect_document_id": false
1561915624
},
15625+
{
15626+
"source_path": "articles/virtual-machine-scale-sets/virtual-machine-scale-sets-use-low-priority.md",
15627+
"redirect_url": "/azure/virtual-machine-scale-sets/virtual-machine-scale-sets-use-spot",
15628+
"redirect_document_id": true
15629+
},
1562015630
{
1562115631
"source_path": "articles/virtual-machine-scale-sets/virtual-machine-scale-sets-cli-quick-create-cli-nodejs.md",
1562215632
"redirect_url": "/azure/virtual-machine-scale-sets/virtual-machine-scale-sets-create",
@@ -29506,9 +29516,54 @@
2950629516
"redirect_url": "/azure/cognitive-services/speech/concepts",
2950729517
"redirect_document_id": false
2950829518
},
29519+
{
29520+
"source_path": "articles/cognitive-services/Bing-Image-Search/index.yml",
29521+
"redirect_url": "/azure/cognitive-services/Bing-Web-Search",
29522+
"redirect_document_id": false
29523+
},
29524+
{
29525+
"source_path": "articles/cognitive-services/Bing-Autosuggest/index.yml",
29526+
"redirect_url": "/azure/cognitive-services/Bing-Web-Search",
29527+
"redirect_document_id": false
29528+
},
29529+
{
29530+
"source_path": "articles/cognitive-services/Bing-Custom-Search/index.yml",
29531+
"redirect_url": "/azure/cognitive-services/Bing-Web-Search",
29532+
"redirect_document_id": false
29533+
},
29534+
{
29535+
"source_path": "articles/cognitive-services/Bing-Entities-Search/index.yml",
29536+
"redirect_url": "/azure/cognitive-services/Bing-Web-Search",
29537+
"redirect_document_id": false
29538+
},
29539+
{
29540+
"source_path": "articles/cognitive-services/bing-local-business-search/index.yml",
29541+
"redirect_url": "/azure/cognitive-services/Bing-Web-Search",
29542+
"redirect_document_id": false
29543+
},
29544+
{
29545+
"source_path": "articles/cognitive-services/Bing-News-Search/index.yml",
29546+
"redirect_url": "/azure/cognitive-services/Bing-Web-Search",
29547+
"redirect_document_id": false
29548+
},
29549+
{
29550+
"source_path": "articles/cognitive-services/Bing-Spell-Check/index.yml",
29551+
"redirect_url": "/azure/cognitive-services/Bing-Web-Search",
29552+
"redirect_document_id": false
29553+
},
29554+
{
29555+
"source_path": "articles/cognitive-services/Bing-Video-Search/index.yml",
29556+
"redirect_url": "/azure/cognitive-services/Bing-Web-Search",
29557+
"redirect_document_id": false
29558+
},
29559+
{
29560+
"source_path": "articles/cognitive-services/bing-visual-search/index.yml",
29561+
"redirect_url": "/azure/cognitive-services/Bing-Web-Search",
29562+
"redirect_document_id": false
29563+
},
2950929564
{
2951029565
"source_path": "articles/cognitive-services/Bing-Image-Search/search-the-web.md",
29511-
"redirect_url": "/azure/cognitive-services/bing-image-search",
29566+
"redirect_url": "/azure/cognitive-services/Bing-Image-Search/overview",
2951229567
"redirect_document_id": false
2951329568
},
2951429569
{
@@ -29518,7 +29573,7 @@
2951829573
},
2951929574
{
2952029575
"source_path": "articles/cognitive-services/Bing-Web-Search/search-the-web.md",
29521-
"redirect_url": "/azure/cognitive-services/bing-web-search",
29576+
"redirect_url": "/azure/cognitive-services/bing-web-search/overview",
2952229577
"redirect_document_id": false
2952329578
},
2952429579
{
@@ -43836,6 +43891,21 @@
4383643891
"source_path": "articles/media-services/previous/media-services-azure-media-clipper-overview.md",
4383743892
"redirect_url": "/azure/media-services/latest",
4383843893
"redirect_document_id": false
43894+
},
43895+
{
43896+
"source_path": "articles/lab-services/classroom-labs/how-to-enable-multi-vm-environment.md",
43897+
"redirect_url": "/azure/lab-services/classroom-labs/how-to-enable-nested-virtualization-template-vm",
43898+
"redirect_document_id": false
43899+
},
43900+
{
43901+
"source_path": "articles/service-bus-messaging/migrate-java-apps-wild-fly.md",
43902+
"redirect_url": "/azure/app-service/containers/configure-language-java#use-service-bus-as-a-message-broker",
43903+
"redirect_document_id": false
43904+
},
43905+
{
43906+
"source_path": "articles/mysql/howto-redirection.md",
43907+
"redirect_url": "/azure/mysql/concepts-connectivity-architecture",
43908+
"redirect_document_id": false
4383943909
}
4384043910
]
4384143911
}

articles/active-directory-b2c/active-directory-b2c-get-started-custom.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ ms.subservice: B2C
3030
1. Sign in to the [Azure portal](https://portal.azure.com)
3131
1. Use the **Directory + subscription** filter in the top menu to select the directory that contains your Azure AD B2C tenant.
3232
1. In the left menu, select **Azure AD B2C**. Or, select **All services** and search for and select **Azure AD B2C**.
33-
1. On the Overview page, select **Identity Experience Framework**.
33+
1. On the Overview page, select **Identity Experience Framework** from the **Policies** pane.
3434

3535
### Create the signing key
3636

articles/active-directory-b2c/active-directory-b2c-reference-spa.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,5 +245,5 @@ GET https://{tenant}.b2clogin.com/{tenant}.onmicrosoft.com/{policy}/oauth2/v2.0/
245245
This sample on GitHub is intended to help get you started with Azure AD B2C in a simple web application built on [hello.js][github-hello-js] and using pop-up-style authentication.
246246

247247
<!-- Links - EXTERNAL -->
248-
[github-hello-js-example]: https://github.com/azure-ad-b2c/apps/tree/master/spa/javascript-hellojs-singlepageapp-popup
248+
[github-hello-js-example]: https://github.com/Azure-Samples/active-directory-b2c-javascript-hellojs-singlepageapp
249249
[github-hello-js]: https://github.com/MrSwitch/hello.js

articles/active-directory-domain-services/check-health.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ This article shows how to view the Azure AD DS health status and understand the
2525
The health status for an Azure AD DS managed domain is viewed using the Azure portal. Information on the last backup time and synchronization with Azure AD can be seen, along with any alerts that indicate a problem with the managed domain's health. To view the health status for an Azure AD DS managed domain, complete the following steps:
2626

2727
1. In the Azure portal, search for and select **Azure AD Domain Services**.
28-
1. Select your Azure AD DS managed domain, such as *contoso.com*.
28+
1. Select your Azure AD DS managed domain, such as *aadds.contoso.com*.
2929
1. On the left-hand side of the Azure AD DS resource window, select **Health**. The following example screenshot shows a healthy Azure AD DS managed domain and the status of the last backup and Azure AD synchronization:
3030

3131
![Health page overview in the Azure portal showing the Azure Active Directory Domain Services status](./media/check-health/health-page.png)

articles/active-directory-domain-services/create-gmsa.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ First, create a custom OU using the [New-ADOrganizationalUnit][New-AdOrganizatio
6161
> [!TIP]
6262
> To complete these steps to create a gMSA, [use your management VM][tutorial-create-management-vm]. This management VM should already have the required AD PowerShell cmdlets and connection to the managed domain.
6363
64-
The following example creates a custom OU named *myNewOU* in the Azure AD DS managed domain named *contoso.com*. Use your own OU and managed domain name:
64+
The following example creates a custom OU named *myNewOU* in the Azure AD DS managed domain named *aadds.contoso.com*. Use your own OU and managed domain name:
6565

6666
```powershell
6767
New-ADOrganizationalUnit -Name "myNewOU" -Path "DC=contoso,DC=COM"
@@ -71,20 +71,20 @@ Now create a gMSA using the [New-ADServiceAccount][New-ADServiceAccount] cmdlet.
7171

7272
* **-Name** is set to *WebFarmSvc*
7373
* **-Path** parameter specifies the custom OU for the gMSA created in the previous step.
74-
* DNS entries and service principal names are set for *WebFarmSvc.contoso.com*
74+
* DNS entries and service principal names are set for *WebFarmSvc.aadds.contoso.com*
7575
* Principals in *CONTOSO-SERVER$* are allowed to retrieve the password use the identity.
7676

7777
Specify your own names and domain names.
7878

7979
```powershell
8080
New-ADServiceAccount -Name WebFarmSvc `
81-
-DNSHostName WebFarmSvc.contoso.com `
81+
-DNSHostName WebFarmSvc.aadds.contoso.com `
8282
-Path "OU=MYNEWOU,DC=contoso,DC=com" `
8383
-KerberosEncryptionType AES128, AES256 `
8484
-ManagedPasswordIntervalInDays 30 `
85-
-ServicePrincipalNames http/WebFarmSvc.contoso.com/contoso.com, `
86-
http/WebFarmSvc.contoso.com/contoso, `
87-
http/WebFarmSvc/contoso.com, `
85+
-ServicePrincipalNames http/WebFarmSvc.aadds.contoso.com/aadds.contoso.com, `
86+
http/WebFarmSvc.aadds.contoso.com/contoso, `
87+
http/WebFarmSvc/aadds.contoso.com, `
8888
http/WebFarmSvc/contoso `
8989
-PrincipalsAllowedToRetrieveManagedPassword CONTOSO-SERVER$
9090
```

articles/active-directory-domain-services/create-ou.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,11 @@ To create a custom OU, you use the Active Directory Administrative Tools from a
6262
1. Sign in to your management VM. For steps on how to connect using the Azure portal, see [Connect to a Windows Server VM][connect-windows-server-vm].
6363
1. From the Start screen, select **Administrative Tools**. A list of available management tools is shown that were installed in the tutorial to [create a management VM][tutorial-create-management-vm].
6464
1. To create and manage OUs, select **Active Directory Administrative Center** from the list of administrative tools.
65-
1. In the left pane, choose your Azure AD DS managed domain, such as *contoso.com*. A list of existing OUs and resources is shown:
65+
1. In the left pane, choose your Azure AD DS managed domain, such as *aadds.contoso.com*. A list of existing OUs and resources is shown:
6666

6767
![Select your Azure AD DS managed domain in the Active Directory Administrative Center](./media/active-directory-domain-services-admin-guide/create-ou-adac-overview.png)
6868

69-
1. The **Tasks** pane is shown on the right side of the Active Directory Administrative Center. Under the domain, such as *contoso.com*, select **New > Organizational Unit**.
69+
1. The **Tasks** pane is shown on the right side of the Active Directory Administrative Center. Under the domain, such as *aadds.contoso.com*, select **New > Organizational Unit**.
7070

7171
![Select the option to create a new OU in the Active Directory Administrative Center](./media/active-directory-domain-services-admin-guide/create-ou-adac-new-ou.png)
7272

articles/active-directory-domain-services/delete-aadds.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ If you no longer need a managed domain, you can delete an Azure Active Directory
3131
To delete an Azure AD DS managed domain, complete the following steps:
3232

3333
1. In the Azure portal, search for and select **Azure AD Domain Services**.
34-
1. Select the name of your Azure AD DS managed domain, such as *contoso.com*.
34+
1. Select the name of your Azure AD DS managed domain, such as *aadds.contoso.com*.
3535
1. On the **Overview** page, select **Delete**. To confirm the deletion, type the domain name of the managed domain again, then select **Delete**.
3636

3737
It can take 15-20 minutes or more to delete the Azure AD DS managed domain.

articles/active-directory-domain-services/deploy-kcd.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ Resource-based KCD is configured using PowerShell. You use the [Set-ADComputer][
5252

5353
## Configure resource-based KCD for a computer account
5454

55-
In this scenario, let's assume you have a web app that runs on the computer named *contoso-webapp.contoso.com*. The web app needs to access a web API that runs on the computer named *contoso-api.contoso.com* in the context of domain users. Complete the following steps to configure this scenario:
55+
In this scenario, let's assume you have a web app that runs on the computer named *contoso-webapp.aadds.contoso.com*. The web app needs to access a web API that runs on the computer named *contoso-api.aadds.contoso.com* in the context of domain users. Complete the following steps to configure this scenario:
5656

5757
1. [Create a custom OU](create-ou.md). You can delegate permissions to manage this custom OU to users within the Azure AD DS managed domain.
5858
1. [Domain-join the virtual machines][create-join-windows-vm], both the one that runs the web app, and the one that runs the web API, to the Azure AD DS managed domain. Create these computer accounts in the custom OU from the previous step.
@@ -63,8 +63,8 @@ In this scenario, let's assume you have a web app that runs on the computer name
6363
1. Finally, configure resource-based KCD using the [Set-ADComputer][Set-ADComputer] PowerShell cmdlet. From your domain-joined management VM and logged in as user account that's a member of the *Azure AD DC administrators* group, run the following cmdlets. Provide your own computer names as needed:
6464

6565
```powershell
66-
$ImpersonatingAccount = Get-ADComputer -Identity contoso-webapp.contoso.com
67-
Set-ADComputer contoso-api.contoso.com -PrincipalsAllowedToDelegateToAccount $ImpersonatingAccount
66+
$ImpersonatingAccount = Get-ADComputer -Identity contoso-webapp.aadds.contoso.com
67+
Set-ADComputer contoso-api.aadds.contoso.com -PrincipalsAllowedToDelegateToAccount $ImpersonatingAccount
6868
```
6969
7070
## Configure resource-based KCD for a user account

articles/active-directory-domain-services/deploy-sp-profile-sync.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ From your Azure AD DS management VM, complete the following steps:
5858
5959
1. From the Start screen, select **Administrative Tools**. A list of available management tools is shown that were installed in the tutorial to [create a management VM][tutorial-create-management-vm].
6060
1. To manage group membership, select **Active Directory Administrative Center** from the list of administrative tools.
61-
1. In the left pane, choose your Azure AD DS managed domain, such as *contoso.com*. A list of existing OUs and resources is shown.
61+
1. In the left pane, choose your Azure AD DS managed domain, such as *aadds.contoso.com*. A list of existing OUs and resources is shown.
6262
1. Select the **Users** OU, then choose the *AAD DC Service Accounts* security group.
6363
1. Select **Members**, then choose **Add...**.
6464
1. Enter the name of the SharePoint service account, then select **OK**. In the following example, the SharePoint service account is named *spadmin*:

articles/active-directory-domain-services/join-windows-vm-template.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ To create a Windows Server VM then join it to an Azure AD DS managed domain, com
8989
| Existing Subnet Name | The name of the existing virtual network subnet, such as *Workloads*. |
9090
| DNS Label Prefix | Enter a DNS name to use for the VM, such as *myvm*. |
9191
| VM size | Specify a VM size, such as *Standard_DS2_v2*. |
92-
| Domain To Join | The Azure AD DS managed domain DNS name, such as *contoso.com*. |
92+
| Domain To Join | The Azure AD DS managed domain DNS name, such as *aadds.contoso.com*. |
9393
| Domain Username | The user account in the Azure AD DS managed domain that should be used to join the VM to the managed domain. This account must be a member of the *Azure AD DC administrators* group. |
9494
| Domain Password | The password for the user account specified in the previous setting. |
9595
| Optional OU Path | The custom OU in which to add the VM. If you don't specify a value for this parameter, the VM is added to the default *AAD DC Computers* OU. |

0 commit comments

Comments
 (0)