Skip to content

Commit c7a1065

Browse files
authored
Merge branch 'master' into user/v-sonan/harness
2 parents 28dda2e + 8aea57b commit c7a1065

File tree

1,950 files changed

+20290
-15449
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,950 files changed

+20290
-15449
lines changed

.openpublishing.redirection.json

Lines changed: 111 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
"redirect_url": "/azure/virtual-machines/maintenance-and-updates?toc=/azure/virtual-machines/linux/toc.json&bc=/azure/virtual-machines/linux/breadcrumb/toc.json",
5656
"redirect_document_id": false
5757
},
58-
{
58+
{
5959
"source_path": "articles/virtual-machines/windows/maintenance-notifications.md",
6060
"redirect_url": "/azure/virtual-machines/maintenance-notifications?toc=/azure/virtual-machines/windows/toc.json&bc=/azure/virtual-machines/windows/breadcrumb/toc.json",
6161
"redirect_document_id": false
@@ -561,17 +561,17 @@
561561
"source_path": "articles/cognitive-services/QnAMaker/Quickstarts/get-answer-from-kb-using-postman.md",
562562
"redirect_url": "/azure/cognitive-services//QnAMaker/Quickstarts/get-answer-from-knowledge-base-using-url-tool",
563563
"redirect_document_id": false
564-
},
564+
},
565565
{
566566
"source_path": "articles/cognitive-services/QnAMaker/Quickstarts/get-answer-from-kb-using-curl.md",
567567
"redirect_url": "/azure/cognitive-services//QnAMaker/Quickstarts/get-answer-from-knowledge-base-using-url-tool",
568568
"redirect_document_id": false
569-
},
569+
},
570570
{
571571
"source_path": "articles/cognitive-services/LUIS/luis-how-to-add-example-utterances.md",
572572
"redirect_url": "/azure/cognitive-services/LUIS/luis-how-to-add-entities",
573573
"redirect_document_id": false
574-
},
574+
},
575575
{
576576
"source_path": "articles/cognitive-services/LUIS/luis-tutorial-prebuilt-intents-entities.md",
577577
"redirect_url": "/azure/cognitive-services/LUIS/tutorial-machine-learned-entity",
@@ -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
{
@@ -43801,6 +43856,56 @@
4380143856
"source_path": "articles/healthcare-apis/configure-cosmos-db.md",
4380243857
"redirect_url": "/azure/healthcare-apis/configure-database",
4380343858
"redirect_document_id": false
43859+
},
43860+
{
43861+
"source_path": "articles/media-services/previous/media-services-azure-media-clipper-portal.md",
43862+
"redirect_url": "/azure/media-services/latest",
43863+
"redirect_document_id": false
43864+
},
43865+
{
43866+
"source_path": "articles/media-services/previous/media-services-azure-media-clipper-getting-started.md",
43867+
"redirect_url": "/azure/media-services/latest",
43868+
"redirect_document_id": false
43869+
},
43870+
{
43871+
"source_path": "articles/media-services/previous/media-services-azure-media-clipper-load-assets.md",
43872+
"redirect_url": "/azure/media-services/latest",
43873+
"redirect_document_id": false
43874+
},
43875+
{
43876+
"source_path": "articles/media-services/previous/media-services-azure-media-clipper-keyboard-shortcuts.md",
43877+
"redirect_url": "/azure/media-services/latest",
43878+
"redirect_document_id": false
43879+
},
43880+
{
43881+
"source_path": "articles/media-services/previous/media-services-azure-media-clipper-localization.md",
43882+
"redirect_url": "/azure/media-services/latest",
43883+
"redirect_document_id": false
43884+
},
43885+
{
43886+
"source_path": "articles/media-services/previous/media-services-azure-media-clipper-submit-job.md",
43887+
"redirect_url": "/azure/media-services/latest",
43888+
"redirect_document_id": false
43889+
},
43890+
{
43891+
"source_path": "articles/media-services/previous/media-services-azure-media-clipper-overview.md",
43892+
"redirect_url": "/azure/media-services/latest",
43893+
"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
4380443909
}
4380543910
]
4380643911
}

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-b2c/active-directory-b2c-tutorials-desktop-app.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Record the **Application (client) ID** for use in a later step.
3939

4040
## Configure the sample
4141

42-
In this tutorial, you configure a sample that you can download from GitHub. The sample WPF desktop application demonstrates sign-up, sign-in, and can call a protected web API in Azure AD B2C. [Download a zip file](https://github.com/Azure-Samples/active-directory-b2c-dotnet-desktop/archive/master.zip), [browse the repo](https://github.com/Azure-Samples/active-directory-b2c-dotnet-desktop), or clone the sample from GitHub.
42+
In this tutorial, you configure a sample that you can download from GitHub. The sample WPF desktop application demonstrates sign-up, sign-in, and can call a protected web API in Azure AD B2C. [Download a zip file](https://github.com/Azure-Samples/active-directory-b2c-dotnet-desktop/archive/msalv3.zip), [browse the repo](https://github.com/Azure-Samples/active-directory-b2c-dotnet-desktop), or clone the sample from GitHub.
4343

4444
```
4545
git clone https://github.com/Azure-Samples/active-directory-b2c-dotnet-desktop.git

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: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,17 @@ ms.service: active-directory
1010
ms.subservice: domain-services
1111
ms.workload: identity
1212
ms.topic: conceptual
13-
ms.date: 09/09/2019
13+
ms.date: 11/26/2019
1414
ms.author: iainfou
1515

1616
---
1717
# Create a group managed service account (gMSA) in Azure AD Domain Services
1818

19-
Applications and services often need an identity to authenticate themselves with other resources. For example, a web service may need to authenticate with a database service. If an application or service has multiple instances, such as a web server farm, manually creating and configuring the identities for those resources gets time consuming. Instead, a group managed service account (gMSA) can be created in the Azure Active Directory Domain Services (Azure AD DS) managed domain. The Windows OS automatically manages the credentials for a gMSA, which simplifies the management of large groups of resources.
19+
Applications and services often need an identity to authenticate themselves with other resources. For example, a web service may need to authenticate with a database service. If an application or service has multiple instances, such as a web server farm, manually creating and configuring the identities for those resources gets time consuming.
2020

21-
This article shows you how to create a gMSA in an Azure AD DS managed domain.
21+
Instead, a group managed service account (gMSA) can be created in the Azure Active Directory Domain Services (Azure AD DS) managed domain. The Windows OS automatically manages the credentials for a gMSA, which simplifies the management of large groups of resources.
22+
23+
This article shows you how to create a gMSA in an Azure AD DS managed domain using Azure PowerShell.
2224

2325
## Before you begin
2426

@@ -56,7 +58,10 @@ As Azure AD DS managed domains are locked down and managed by Microsoft, there a
5658

5759
First, create a custom OU using the [New-ADOrganizationalUnit][New-AdOrganizationalUnit] cmdlet. For more information on creating and managing custom OUs, see [Custom OUs in Azure AD DS][create-custom-ou].
5860

59-
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:
61+
> [!TIP]
62+
> 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.
63+
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:
6065

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

6772
* **-Name** is set to *WebFarmSvc*
6873
* **-Path** parameter specifies the custom OU for the gMSA created in the previous step.
69-
* 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*
7075
* Principals in *CONTOSO-SERVER$* are allowed to retrieve the password use the identity.
7176

7277
Specify your own names and domain names.
7378

7479
```powershell
7580
New-ADServiceAccount -Name WebFarmSvc `
76-
-DNSHostName WebFarmSvc.contoso.com `
81+
-DNSHostName WebFarmSvc.aadds.contoso.com `
7782
-Path "OU=MYNEWOU,DC=contoso,DC=com" `
7883
-KerberosEncryptionType AES128, AES256 `
7984
-ManagedPasswordIntervalInDays 30 `
80-
-ServicePrincipalNames http/WebFarmSvc.contoso.com/contoso.com, `
81-
http/WebFarmSvc.contoso.com/contoso, `
82-
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, `
8388
http/WebFarmSvc/contoso `
8489
-PrincipalsAllowedToRetrieveManagedPassword CONTOSO-SERVER$
8590
```

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: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
title: Disable Azure Active Directory Domain Services | Microsoft Docs'
3-
description: Learn how to disable Azure Active Directory Domain Services using the Azure portal
2+
title: Delete Azure Active Directory Domain Services | Microsoft Docs
3+
description: Learn how to disable, or delete, an Azure Active Directory Domain Services managed domain using the Azure portal
44
services: active-directory-ds
55
author: iainfoulds
66
manager: daveba
@@ -10,11 +10,11 @@ ms.service: active-directory
1010
ms.subservice: domain-services
1111
ms.workload: identity
1212
ms.topic: conceptual
13-
ms.date: 09/04/2019
13+
ms.date: 11/26/2019
1414
ms.author: iainfou
1515

1616
---
17-
# Disable Azure Active Directory Domain Services using the Azure portal
17+
# Delete an Azure Active Directory Domain Services managed domain using the Azure portal
1818

1919
If you no longer need a managed domain, you can delete an Azure Active Directory Domain Services (Azure AD DS) instance. There's no option to turn off or temporarily disable an Azure AD DS managed domain. Deleting the Azure AD DS managed domain doesn't delete or otherwise adversely impact the Azure AD tenant. This article shows you how to use the Azure portal to delete an Azure AD DS managed domain.
2020

@@ -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.

0 commit comments

Comments
 (0)