Skip to content

Commit 655544d

Browse files
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into us1679050dh
2 parents d17491f + deac7b8 commit 655544d

File tree

1,005 files changed

+18803
-6677
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,005 files changed

+18803
-6677
lines changed

.openpublishing.publish.config.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,11 @@
163163
"url": "https://github.com/Azure/azure-functions-templates",
164164
"branch": "dev"
165165
},
166+
{
167+
"path_to_root": "functions-quickstart-java",
168+
"url": "https://github.com/Azure-Samples/functions-quickstarts-java",
169+
"branch": "master"
170+
},
166171
{
167172
"path_to_root": "functions-docs-csharp",
168173
"url": "https://github.com/Azure-Samples/functions-docs-csharp",

.openpublishing.redirection.json

Lines changed: 41 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -345,6 +345,17 @@
345345
"redirect_url": "/azure/machine-learning/data-science-virtual-machine/dsvm-tools-languages",
346346
"redirect_document_id": true
347347
},
348+
{
349+
"source_path": "articles/machine-learning/data-science-virtual-machine/reference-centos-vm.md",
350+
"redirect_url": "/azure/machine-learning/data-science-virtual-machine/reference-deprecation",
351+
"redirect_document_id": false
352+
},
353+
{
354+
"source_path": "articles/machine-learning/data-science-virtual-machine/linux-dsvm-intro.md",
355+
"redirect_url": "/azure/machine-learning/data-science-virtual-machine/reference-deprecation",
356+
"redirect_document_id": true
357+
},
358+
348359
{
349360
"source_path": "articles/machine-learning/service/how-to-understand-accuracy-metrics.md",
350361
"redirect_url": "/azure/machine-learning/service/how-to-understand-automated-ml",
@@ -4055,11 +4066,21 @@
40554066
"redirect_url": "/azure/azure-government/documentation-government-welcome",
40564067
"redirect_document_id": false
40574068
},
4069+
{
4070+
"source_path": "articles/azure-government/documentation-government-k8.md",
4071+
"redirect_url": "/azure/azure-government",
4072+
"redirect_document_id": false
4073+
},
40584074
{
40594075
"source_path": "articles/azure-portal/resource-group-portal-linked-resources.md",
40604076
"redirect_url": "/azure/azure-portal/azure-portal-dashboards",
40614077
"redirect_document_id": false
40624078
},
4079+
{
4080+
"source_path": "articles/azure-resource-manager/templates/template-tutorial-create-linked-templates.md",
4081+
"redirect_url": "/azure/azure-resource-manager/templates/deployment-tutorial-linked-template",
4082+
"redirect_document_id": false
4083+
},
40634084
{
40644085
"source_path": "articles/azure-resource-manager/templates/template-tutorial-create-encrypted-storage-accounts.md",
40654086
"redirect_url": "/azure/azure-resource-manager/templates/template-tutorial-use-template-reference",
@@ -7586,7 +7607,7 @@
75867607
},
75877608
{
75887609
"source_path": "articles/azure-functions/functions-add-output-binding-storage-queue-python.md",
7589-
"redirect_url": "/azure/azure-functions/functions-add-output-binding-storage-queue-cli.md?pivots=programming-language-python",
7610+
"redirect_url": "/azure/azure-functions/functions-add-output-binding-storage-queue-cli?pivots=programming-language-python",
75907611
"redirect_document_id": false
75917612
},
75927613
{
@@ -7619,6 +7640,11 @@
76197640
"redirect_url": "/azure/python/tutorial-vs-code-serverless-python-01",
76207641
"redirect_document_id": false
76217642
},
7643+
{
7644+
"source_path": "articles/azure-functions/functions-create-first-java-maven.md",
7645+
"redirect_url": "/azure/azure-functions/functions-create-first-java-gradle",
7646+
"redirect_document_id": false
7647+
},
76227648
{
76237649
"source_path": "articles/azure-functions/scripts/functions-cli-configure-custom-domain.md",
76247650
"redirect_url": "/azure/app-service/scripts/cli-configure-custom-domain?toc=%2fcli%2fazure%2ftoc.json",
@@ -19184,6 +19210,11 @@
1918419210
"redirect_url": "/azure/backup/backup-overview",
1918519211
"redirect_document_id": false
1918619212
},
19213+
{
19214+
"source_path": "articles/backup/tutorial-backup-azure-files.md",
19215+
"redirect_url": "/azure/backup/backup-afs",
19216+
"redirect_document_id": false
19217+
},
1918719218
{
1918819219
"source_path": "articles/backup/backup-azure-backup-ibiza-faq.md",
1918919220
"redirect_url": "/azure/backup/backup-azure-backup-faq",
@@ -32264,11 +32295,6 @@
3226432295
"redirect_url": "/azure/expressroute/expressroute-security-controls",
3226532296
"redirect_document_id": false
3226632297
},
32267-
{
32268-
"source_path": "articles/key-vault/key-vault-security-controls.md",
32269-
"redirect_url": "/azure/key-vault/security-baseline",
32270-
"redirect_document_id": false
32271-
},
3227232298
{
3227332299
"source_path": "articles/key-vault/automation-manage-key-vault.md",
3227432300
"redirect_url": "/azure/key-vault/",
@@ -47009,6 +47035,11 @@
4700947035
"redirect_url": "/azure/iot-fundamentals/iot-services-and-technologies/",
4701047036
"redirect_document_id": false
4701147037
},
47038+
{
47039+
"source_path": "articles/iot-central/core/tutorial-connect-device.md",
47040+
"redirect_url": "/azure/iot-central/core/tutorial-connect-device-nodejs/",
47041+
"redirect_document_id": true
47042+
},
4701247043
{
4701347044
"source_path": "articles/iot-accelerators/iot-accelerators-arduino-iot-devkit-az3166-devkit-remote-monitoringV2.md",
4701447045
"redirect_url": "/azure/iot-accelerators/iot-accelerators-arduino-iot-devkit-az3166-devkit-remote-monitoring-v2",
@@ -50558,6 +50589,10 @@
5055850589
"source_path": "articles/aks/use-cosmosdb-osba-mongo-app.md",
5055950590
"redirect_url": "/azure/aks/",
5056050591
"redirect_document_id": false
50592+
},
50593+
{
50594+
"source_path": "articles/cognitive-services/speech-service/ship-application.md",
50595+
"redirect_url": "/azure/cognitive-services/speech-service/speech-sdk"
5056150596
}
5056250597
]
5056350598
}

articles/active-directory-b2c/analytics-with-application-insights.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ manager: celestedg
99
ms.service: active-directory
1010
ms.topic: conceptual
1111
ms.workload: identity
12-
ms.date: 03/24/2020
12+
ms.date: 04/05/2020
1313
ms.author: mimart
1414
ms.subservice: B2C
1515

@@ -128,6 +128,7 @@ Add the profiles to the *TrustFrameworkExtensions.xml* file from the starter pac
128128
<InputClaim ClaimTypeReferenceId="PolicyId" PartnerClaimType="{property:Policy}" DefaultValue="{Policy:PolicyId}" />
129129
<InputClaim ClaimTypeReferenceId="CorrelationId" PartnerClaimType="{property:CorrelationId}" DefaultValue="{Context:CorrelationId}" />
130130
<InputClaim ClaimTypeReferenceId="Culture" PartnerClaimType="{property:Culture}" DefaultValue="{Culture:RFC5646}" />
131+
</InputClaims>
131132
</TechnicalProfile>
132133

133134
<TechnicalProfile Id="AppInsights-SignInRequest">
@@ -236,4 +237,4 @@ Add claim types and events to your user journey to fit your needs. You can use [
236237

237238
## Next steps
238239

239-
- Learn more about [Application Insights](application-insights-technical-profile.md) technical profile in the IEF reference.
240+
- Learn more about [Application Insights](application-insights-technical-profile.md) technical profile in the IEF reference.

articles/active-directory-b2c/custom-policy-keep-me-signed-in.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ To enable KMSI, set the content definition `DataUri` element to [page identifier
5050

5151
## Add the metadata to the self-asserted technical profile
5252

53-
To add the KMSI checkbox to the sign-up and sign-in page, set the `setting.enableRememberMe` metadata to false. Override the SelfAsserted-LocalAccountSignin-Email technical profiles in the extension file.
53+
To add the KMSI checkbox to the sign-up and sign-in page, set the `setting.enableRememberMe` metadata to true. Override the SelfAsserted-LocalAccountSignin-Email technical profiles in the extension file.
5454

5555
1. Find the ClaimsProviders element. If the element doesn't exist, add it.
5656
1. Add the following claims provider to the ClaimsProviders element:

articles/active-directory-b2c/customize-ui-overview.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ manager: celestedg
99
ms.service: active-directory
1010
ms.workload: identity
1111
ms.topic: conceptual
12-
ms.date: 03/19/2020
12+
ms.date: 04/04/2020
1313
ms.author: mimart
1414
ms.subservice: B2C
1515
---
@@ -87,7 +87,10 @@ Review the following guidance before using your own HTML and CSS files to custom
8787

8888
When using your own HTML and CSS files to customize the UI, you can host your UI content on any publicly available HTTPS endpoint that supports CORS. For example, [Azure Blob storage](../storage/blobs/storage-blobs-introduction.md), web servers, CDNs, AWS S3, or file sharing systems.
8989

90-
The important point is that you host the content on a publicly available HTTPS endpoint with CORS enabled. You must use an absolute URL when you specify it in your content.
90+
The important point is that you host the content on a publicly available HTTPS endpoint with [CORS enabled](https://enable-cors.org/server.html). You must use an absolute URL when you specify it in your content.
91+
92+
> [!NOTE]
93+
> For details about creating HTML content, uploading content to Azure Blob storage, and configuring CORS, see the [Custom page content walkthrough](custom-policy-ui-customization.md#custom-page-content-walkthrough) section in the UI customization article.
9194
9295
## Get started with custom HTML and CSS
9396

articles/active-directory-b2c/secure-rest-api.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ To support bearer token authentication in your custom policy, modify the REST AP
268268
1. Ensure you add the claim used above as an input claim:
269269

270270
```xml
271-
<InputClaim ClaimTyeReferenceId="bearerToken"/>
271+
<InputClaim ClaimTypeReferenceId="bearerToken"/>
272272
```
273273

274274
After you add the above snippets, your technical profile should look like the following XML code:
@@ -288,7 +288,7 @@ After you add the above snippets, your technical profile should look like the fo
288288
<Item Key="AllowInsecureAuthInProduction">false</Item>
289289
</Metadata>
290290
<InputClaims>
291-
<InputClaim ClaimTyeReferenceId="bearerToken"/>
291+
<InputClaim ClaimTypeReferenceId="bearerToken"/>
292292
</InputClaims>
293293
...
294294
</TechnicalProfile>

articles/active-directory-domain-services/change-sku.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ manager: daveba
88
ms.service: active-directory
99
ms.subservice: domain-services
1010
ms.workload: identity
11-
ms.topic: conceptual
11+
ms.topic: how-to
1212
ms.date: 01/31/2020
1313
ms.author: iainfou
1414

@@ -26,7 +26,7 @@ This article shows you how to change the SKU for an existing Azure AD DS managed
2626
To complete this article, you need the following resources and privileges:
2727

2828
* An active Azure subscription.
29-
* If you dont have an Azure subscription, [create an account](https://azure.microsoft.com/free/?WT.mc_id=A261C142F).
29+
* If you don't have an Azure subscription, [create an account](https://azure.microsoft.com/free/?WT.mc_id=A261C142F).
3030
* An Azure Active Directory tenant associated with your subscription, either synchronized with an on-premises directory or a cloud-only directory.
3131
* If needed, [create an Azure Active Directory tenant][create-azure-ad-tenant] or [associate an Azure subscription with your account][associate-azure-ad-tenant].
3232
* An Azure Active Directory Domain Services managed domain enabled and configured in your Azure AD tenant.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.assetid: 8999eec3-f9da-40b3-997a-7a2587911e96
99
ms.service: active-directory
1010
ms.subservice: domain-services
1111
ms.workload: identity
12-
ms.topic: conceptual
12+
ms.topic: how-to
1313
ms.date: 01/21/2020
1414
ms.author: iainfou
1515

articles/active-directory-domain-services/compare-identity-solutions.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,17 @@ Although the three Active Directory-based identity solutions share a common name
2323

2424
* **Active Directory Domain Services (AD DS)** - Enterprise-ready lightweight directory access protocol (LDAP) server that provides key features such as identity and authentication, computer object management, group policy, and trusts.
2525
* AD DS is a central component in many organizations with an on-premises IT environment, and provides core user account authentication and computer management features.
26+
* For more information, see [Active Directory Domain Services overview in the Windows Server documentation][overview-adds].
2627
* **Azure Active Directory (Azure AD)** - Cloud-based identity and mobile device management that provides user account and authentication services for resources such as Office 365, the Azure portal, or SaaS applications.
2728
* Azure AD can be synchronized with an on-premises AD DS environment to provide a single identity to users that works natively in the cloud.
29+
* For more information about Azure AD, see [What is Azure Active Directory?][whatis-azuread]
2830
* **Azure Active Directory Domain Services (Azure AD DS)** - Provides managed domain services with a subset of fully-compatible traditional AD DS features such as domain join, group policy, LDAP, and Kerberos / NTLM authentication.
2931
* Azure AD DS integrates with Azure AD, which itself can synchronize with an on-premises AD DS environment. This ability extends central identity use cases to traditional web applications that run in Azure as part of a lift-and-shift strategy.
3032

3133
This overview article compares and contrasts how these identity solutions can work together, or would be used independently, depending on the needs of your organization.
3234

35+
To get started, [create an Azure AD DS managed domain using the Azure portal][tutorial-create].
36+
3337
## Azure AD DS and self-managed AD DS
3438

3539
If you have applications and services that need access to traditional authentication mechanisms such as Kerberos or NTLM, there are two ways to provide Active Directory Domain Services in the cloud:
@@ -116,3 +120,5 @@ To get started with using Azure AD DS, [create an Azure AD DS managed domain usi
116120
[manage-gpos]: manage-group-policy.md
117121
[tutorial-ldaps]: tutorial-configure-ldaps.md
118122
[tutorial-create]: tutorial-create-instance.md
123+
[whatis-azuread]: ../active-directory/fundamentals/active-directory-whatis.md
124+
[overview-adds]: /windows-server/identity/ad-ds/get-started/virtual-dc/active-directory-domain-services-overview

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.assetid: e6faeddd-ef9e-4e23-84d6-c9b3f7d16567
99
ms.service: active-directory
1010
ms.subservice: domain-services
1111
ms.workload: identity
12-
ms.topic: conceptual
12+
ms.topic: how-to
1313
ms.date: 03/30/2020
1414
ms.author: iainfou
1515

0 commit comments

Comments
 (0)