Skip to content

Commit 8c884f7

Browse files
authored
Merge branch 'master' into indexingSamples
2 parents 24f6f8c + 4e93481 commit 8c884f7

File tree

2,123 files changed

+17859
-12211
lines changed

Some content is hidden

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

2,123 files changed

+17859
-12211
lines changed

.openpublishing.publish.config.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,12 @@
9090
"url": "https://github.com/Azure/azure-docs-json-samples",
9191
"branch": "master"
9292
},
93+
{
94+
"path_to_root": "samples-key-vault-dotnet-quickstart",
95+
"url": "https://github.com/Azure-Samples/key-vault-dotnet-core-quickstart",
96+
"branch": "master",
97+
"branch_mapping": {}
98+
},
9399
{
94100
"path_to_root": "samples-mediaservices-integration",
95101
"url": "https://github.com/Azure-Samples/media-services-dotnet-functions-integration",

.openpublishing.redirection.json

Lines changed: 57 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,21 @@
1515
"redirect_url": "/azure/storage/common/storage-use-azcopy-v10",
1616
"redirect_document_id": false
1717
},
18+
{
19+
"source_path": "articles/machine-learning/service/how-to-load-data.md",
20+
"redirect_url": "/azure/machine-learning/service/how-to-create-register-datasets",
21+
"redirect_document_id": false
22+
},
23+
{
24+
"source_path": "articles/machine-learning/service/how-to-transform-data.md",
25+
"redirect_url": "/azure/machine-learning/service/how-to-create-register-datasets",
26+
"redirect_document_id": false
27+
},
28+
{
29+
"source_path": "articles/machine-learning/service/how-to-write-data.md",
30+
"redirect_url": "/azure/machine-learning/service/how-to-create-register-datasets",
31+
"redirect_document_id": false
32+
},
1833
{
1934
"source_path": "articles/machine-learning/data-science-virtual-machine/deep-learning-dsvm-overview.md",
2035
"redirect_url": "/azure/machine-learning/data-science-virtual-machine/overview",
@@ -7185,6 +7200,11 @@
71857200
"redirect_url": "/azure/active-directory/saas-apps/airwatch-tutorial",
71867201
"redirect_document_id": true
71877202
},
7203+
{
7204+
"source_path": "articles/active-directory/paloaltoglobalprotect-tutorial.md",
7205+
"redirect_url": "/azure/active-directory/saas-apps/palo-alto-networks-globalprotect-tutorial",
7206+
"redirect_document_id": true
7207+
},
71887208
{
71897209
"source_path": "articles/active-directory/active-directory-saas-alcumus-info-tutorial.md",
71907210
"redirect_url": "/azure/active-directory/saas-apps/alcumus-info-tutorial",
@@ -8720,11 +8740,6 @@
87208740
"redirect_url": "/azure/active-directory/saas-apps/paloaltoadmin-tutorial",
87218741
"redirect_document_id": true
87228742
},
8723-
{
8724-
"source_path": "articles/active-directory/active-directory-saas-paloaltoglobalprotect-tutorial.md",
8725-
"redirect_url": "/azure/active-directory/saas-apps/paloaltoglobalprotect-tutorial",
8726-
"redirect_document_id": true
8727-
},
87288743
{
87298744
"source_path": "articles/active-directory/active-directory-saas-paloaltonetworks-aperture-tutorial.md",
87308745
"redirect_url": "/azure/active-directory/saas-apps/paloaltonetworks-aperture-tutorial",
@@ -26013,6 +26028,21 @@
2601326028
"source_path": "articles/security-center/security-center-incident-response.md",
2601426029
"redirect_url": "/azure/security-center/tutorial-security-incident",
2601526030
"redirect_document_id": false
26031+
},
26032+
{
26033+
"source_path": "articles/security-center/security-center-detection-capabilities.md",
26034+
"redirect_url": "/azure/security-center/security-center-alerts-overview",
26035+
"redirect_document_id": false
26036+
},
26037+
{
26038+
"source_path": "articles/security-center/security-center-enable-network-security-groups.md",
26039+
"redirect_url": "/azure/security-center/security-center-network-recommendations",
26040+
"redirect_document_id": false
26041+
},
26042+
{
26043+
"source_path": "articles/security-center/security-center-events-dashboard.md",
26044+
"redirect_url": "/azure/security-center/security-center-features-retirement-july2019#events-dashboard---the-new-experience",
26045+
"redirect_document_id": false
2601626046
},
2601726047
{
2601826048
"source_path": "articles/virtual-network/virtual-network-deploy-multinic-arm-cli.md",
@@ -31544,21 +31574,6 @@
3154431574
"redirect_url": "/azure/hdinsight/storm/apache-storm-overview",
3154531575
"redirect_document_id": false
3154631576
},
31547-
{
31548-
"source_path": "articles/storage/blobs/index.md",
31549-
"redirect_url": "/azure/storage/blobs/storage-blobs-introduction",
31550-
"redirect_document_id": false
31551-
},
31552-
{
31553-
"source_path": "articles/storage/files/index.md",
31554-
"redirect_url": "/azure/storage/files/storage-files-introduction",
31555-
"redirect_document_id": false
31556-
},
31557-
{
31558-
"source_path": "articles/storage/queues/index.md",
31559-
"redirect_url": "/azure/storage/queues/storage-queues-introduction",
31560-
"redirect_document_id": false
31561-
},
3156231577
{
3156331578
"source_path": "articles/storage/data-lake-storage/index.md",
3156431579
"redirect_url": "/azure/storage/blobs/data-lake-storage-introduction",
@@ -41478,8 +41493,28 @@
4147841493
},
4147941494
{
4148041495
"source_path": "articles/machine-learning/service/tutorial-data-prep.md",
41481-
"redirect_url": "/azure/machine-learning/service/tutorial-auto-train-models",
41482-
"redirect_document_id": false
41496+
"redirect_url": "/azure/machine-learning/service/tutorial-auto-train-models",
41497+
"redirect_document_id": false
41498+
},
41499+
{
41500+
"source_path": "articles/cognitive-services/text-analytics/how-tos/deploy-sentiment-analysis-on-container-instances.md",
41501+
"redirect_url": "/azure/cognitive-services/text-analytics/how-tos/text-analytics-how-to-use-container-instances?tabs=sentiment",
41502+
"redirect_document_id": false
41503+
},
41504+
{
41505+
"source_path": "articles/cognitive-services/text-analytics/how-tos/use-language-detection-on-aks.md",
41506+
"redirect_url": "/azure/cognitive-services/text-analytics/how-tos/text-analytics-how-to-use-kubernetes-service?tabs=language",
41507+
"redirect_document_id": false
41508+
},
41509+
{
41510+
"source_path": "articles/cognitive-services/text-analytics/how-tos/use-sentiment-analysis-on-aks.md",
41511+
"redirect_url": "/azure/cognitive-services/text-analytics/how-tos/text-analytics-how-to-use-kubernetes-service?tabs=sentiment",
41512+
"redirect_document_id": false
41513+
},
41514+
{
41515+
"source_path": "articles/sql-database/sql-database-paas.yml",
41516+
"redirect_url": "/azure/sql-database/sql-database-paas-index",
41517+
"redirect_document_id": false
4148341518
}
4148441519
]
4148541520
}

articles/active-directory-b2c/active-directory-b2c-faqs.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,9 @@ User accounts for applications must always be created through a sign-up user flo
3939

4040
### Which social identity providers do you support now? Which ones do you plan to support in the future?
4141

42-
We currently support Facebook, Google+, LinkedIn, Amazon, Twitter (preview), WeChat (preview), Weibo (preview), and QQ (Preview). We will add support for other popular social identity providers based on customer demand.
42+
We currently support several social identity providers including Amazon, Facebook, GitHub (preview), Google, LinkedIn, Microsoft Account (MSA), QQ (preview), Twitter, WeChat (preview), and Weibo (preview). We evaluate adding support for other popular social identity providers based on customer demand.
4343

44-
Azure AD B2C has also added support for [custom policies](active-directory-b2c-overview-custom.md). These custom policies allow a developer to create their own policy with any identity provider that supports [OpenID Connect](https://openid.net/specs/openid-connect-core-1_0.html) or SAML.
45-
46-
Get started with custom policies by checking out our [custom policy starter pack](https://github.com/Azure-Samples/active-directory-b2c-custom-policy-starterpack).
44+
Azure AD B2C also supports [custom policies](active-directory-b2c-overview-custom.md). Custom policies allow you to create your own policy for any identity provider that supports [OpenID Connect](https://openid.net/specs/openid-connect-core-1_0.html) or SAML. Get started with custom policies by checking out our [custom policy starter pack](https://github.com/Azure-Samples/active-directory-b2c-custom-policy-starterpack).
4745

4846
### Can I configure scopes to gather more information about consumers from various social identity providers?
4947

articles/active-directory-b2c/active-directory-b2c-reference-kmsi-custom.md

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Keep Me Signed In in Azure Active Directory B2C | Microsoft Docs
2+
title: Keep Me Signed In in Azure Active Directory B2C
33
description: Learn how to set up Keep Me Signed In (KMSI) in Azure Active Directory B2C.
44
services: active-directory-b2c
55
author: mmacy
@@ -8,7 +8,7 @@ manager: celestedg
88
ms.service: active-directory
99
ms.workload: identity
1010
ms.topic: conceptual
11-
ms.date: 12/03/2018
11+
ms.date: 08/29/2019
1212
ms.author: marsma
1313
ms.subservice: B2C
1414
---
@@ -17,15 +17,17 @@ ms.subservice: B2C
1717

1818
[!INCLUDE [active-directory-b2c-advanced-audience-warning](../../includes/active-directory-b2c-advanced-audience-warning.md)]
1919

20-
You can enable Keep Me Signed In (KMSI) functionality for your web and native applications in Azure Active Directory (Azure AD) B2C. This feature grants access to returning users to the application without prompting them to reenter their username and password. This access is revoked when a user signs out.
20+
You can enable Keep Me Signed In (KMSI) functionality for users of your web and native applications that have local accounts in your Azure Active Directory B2C (Azure AD B2C) directory. This feature grants access to users returning to your application without prompting them to reenter their username and password. This access is revoked when a user signs out.
2121

2222
Users should not enable this option on public computers.
2323

2424
![Example sign-up sign-in page showing a Keep me signed in checkbox](./media/active-directory-b2c-reference-kmsi-custom/kmsi.PNG)
2525

2626
## Prerequisites
2727

28-
An Azure AD B2C tenant that is configured to allow local account sign-up and sign-in. If you don't have a tenant, you can create one using the steps in [Tutorial: Create an Azure Active Directory B2C tenant](tutorial-create-tenant.md).
28+
An Azure AD B2C tenant that is configured to allow local account sign-in. KMSI is unsupported for external identity provider accounts.
29+
30+
If you don't have a tenant, you can create one using the steps in [Tutorial: Create an Azure Active Directory B2C tenant](tutorial-create-tenant.md).
2931

3032
## Add a content definition element
3133

@@ -83,7 +85,7 @@ Add the application identifiers to the *TrustFrameworkExtensions.xml* file.
8385

8486
1. In the *TrustFrameworkExtensions.xml* file, find the **TechnicalProfile** element with the identifier of `login-NonInteractive` and the **TechnicalProfile** element with an identifier of `login-NonInteractive-PasswordChange` and replace all values of `IdentityExperienceFrameworkAppId` with the application identifier of the Identity Experience Framework application as described in [Getting started](active-directory-b2c-get-started-custom.md).
8587

86-
```
88+
```XML
8789
<Item Key="client_id">8322dedc-cbf4-43bc-8bb6-141d16f0f489</Item>
8890
```
8991

@@ -179,11 +181,3 @@ Update the relying party (RP) file that initiates the user journey that you crea
179181
5. To test the custom policy that you uploaded, in the Azure portal, go to the policy page, and then select **Run now**.
180182

181183
You can find the sample policy [here](https://github.com/Azure-Samples/active-directory-b2c-custom-policy-starterpack/tree/master/scenarios/keep%20me%20signed%20in).
182-
183-
184-
185-
186-
187-
188-
189-

0 commit comments

Comments
 (0)