Skip to content

Commit c5dc19a

Browse files
authored
Merge branch 'master' into greenlightcompliant
2 parents 2c5b036 + 8225e35 commit c5dc19a

File tree

1,518 files changed

+21061
-13183
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,518 files changed

+21061
-13183
lines changed

.openpublishing.publish.config.json

Lines changed: 26 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",
@@ -346,6 +352,26 @@
346352
"url": "https://github.com/Azure-Samples/azure-sdk-for-go-samples",
347353
"branch": "master"
348354
},
355+
{
356+
"path_to_root": "azure-sdk-for-java-event-hubs",
357+
"url": "https://github.com/Azure/azure-sdk-for-java/",
358+
"branch": "master"
359+
},
360+
{
361+
"path_to_root": "azure-sdk-for-java-script-event-hubs",
362+
"url": "https://github.com/Azure/azure-sdk-for-js/",
363+
"branch": "master"
364+
},
365+
{
366+
"path_to_root": "azure-sdk-for-net-event-hubs",
367+
"url": "https://github.com/Azure/azure-sdk-for-net/",
368+
"branch": "master"
369+
},
370+
{
371+
"path_to_root": "azure-sdk-for-python-event-hubs",
372+
"url": "https://github.com/Azure/azure-sdk-for-python/",
373+
"branch": "master"
374+
},
349375
{
350376
"path_to_root": "cosmos-dotnet-getting-started",
351377
"url": "https://github.com/Azure-Samples/cosmos-dotnet-getting-started",

.openpublishing.redirection.json

Lines changed: 89 additions & 77 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",
@@ -846,78 +856,6 @@
846856
"redirect_url": "/azure/cognitive-services/personalizer/how-to-manage-model",
847857
"redirect_document_id": false
848858
},
849-
{
850-
"source_path": "articles/cognitive-services/QnaMaker/quickstarts/create-new-kb-csharp.md",
851-
"redirect_url": "/azure/cognitive-services/QnaMaker/quickstarts/quickstart-rest-curl",
852-
"redirect_document_id": false
853-
},
854-
{
855-
"source_path": "articles/cognitive-services/QnaMaker/quickstarts/create-new-kb-go.md",
856-
"redirect_url": "/azure/cognitive-services/QnaMaker/quickstarts/quickstart-rest-curl",
857-
"redirect_document_id": false
858-
},
859-
{
860-
"source_path": "articles/cognitive-services/QnaMaker/quickstarts/create-new-kb-java.md",
861-
"redirect_url": "/azure/cognitive-services/QnaMaker/quickstarts/quickstart-rest-curl",
862-
"redirect_document_id": false
863-
},
864-
{
865-
"source_path": "articles/cognitive-services/QnaMaker/quickstarts/create-new-kb-python.md",
866-
"redirect_url": "/azure/cognitive-services/QnaMaker/quickstarts/quickstart-rest-curl",
867-
"redirect_document_id": false
868-
},
869-
{
870-
"source_path": "articles/cognitive-services/QnaMaker/quickstarts/get-answer-from-knowledge-base-csharp.md",
871-
"redirect_url": "/azure/cognitive-services/QnaMaker/quickstarts/quickstart-rest-curl",
872-
"redirect_document_id": false
873-
},
874-
{
875-
"source_path": "articles/cognitive-services/QnaMaker/quickstarts/get-answer-from-knowledge-base-go.md",
876-
"redirect_url": "/azure/cognitive-services/QnaMaker/quickstarts/quickstart-rest-curl",
877-
"redirect_document_id": false
878-
},
879-
{
880-
"source_path": "articles/cognitive-services/QnaMaker/quickstarts/get-answer-from-knowledge-base-java.md",
881-
"redirect_url": "/azure/cognitive-services/QnaMaker/quickstarts/quickstart-rest-curl",
882-
"redirect_document_id": false
883-
},
884-
{
885-
"source_path": "articles/cognitive-services/QnaMaker/quickstarts/get-answer-from-knowledge-base-python.md",
886-
"redirect_url": "/azure/cognitive-services/QnaMaker/quickstarts/quickstart-rest-curl",
887-
"redirect_document_id": false
888-
},
889-
{
890-
"source_path": "articles/cognitive-services/QnaMaker/quickstarts/get-answer-from-knowledge-base-nodejs.md",
891-
"redirect_url": "/azure/cognitive-services/QnaMaker/quickstarts/quickstart-rest-curl",
892-
"redirect_document_id": false
893-
},
894-
895-
{
896-
"source_path": "articles/cognitive-services/QnaMaker/quickstarts/publish-kb-csharp.md",
897-
"redirect_url": "/azure/cognitive-services/QnaMaker/quickstarts/quickstart-rest-curl",
898-
"redirect_document_id": false
899-
},
900-
{
901-
"source_path": "articles/cognitive-services/QnaMaker/quickstarts/publish-kb-go.md",
902-
"redirect_url": "/azure/cognitive-services/QnaMaker/quickstarts/quickstart-rest-curl",
903-
"redirect_document_id": false
904-
},
905-
{
906-
"source_path": "articles/cognitive-services/QnaMaker/quickstarts/publish-kb-java.md",
907-
"redirect_url": "/azure/cognitive-services/QnaMaker/quickstarts/quickstart-rest-curl",
908-
"redirect_document_id": false
909-
},
910-
{
911-
"source_path": "articles/cognitive-services/QnaMaker/quickstarts/publish-kb-python.md",
912-
"redirect_url": "/azure/cognitive-services/QnaMaker/quickstarts/quickstart-rest-curl",
913-
"redirect_document_id": false
914-
},
915-
{
916-
"source_path": "articles/cognitive-services/QnaMaker/quickstarts/publish-kb-nodejs.md",
917-
"redirect_url": "/azure/cognitive-services/QnaMaker/quickstarts/quickstart-rest-curl",
918-
"redirect_document_id": false
919-
},
920-
921859
{
922860
"source_path": "articles/cognitive-services/LUIS/luis-tutorial-bot-csharp-appinsights.md",
923861
"redirect_url": "/azure/cognitive-services/LUIS/luis-csharp-tutorial-bf-v4",
@@ -1763,6 +1701,26 @@
17631701
"redirect_url": "/azure/cognitive-services/bing-web-search/quickstarts/client-libraries?pivots=programming-language-python",
17641702
"redirect_document_id": false
17651703
},
1704+
{
1705+
"source_path": "articles/cognitive-services/Bing-Image-Search/image-search-sdk-quickstart.md",
1706+
"redirect_url": "/azure/cognitive-services/bing-image-search/quickstarts/client-libraries?pivots=programming-language-csharp",
1707+
"redirect_document_id": false
1708+
},
1709+
{
1710+
"source_path": "articles/cognitive-services/Bing-Image-Search/image-sdk-java-quickstart.md",
1711+
"redirect_url": "/azure/cognitive-services/bing-image-search/quickstarts/client-libraries?pivots=programming-language-java",
1712+
"redirect_document_id": false
1713+
},
1714+
{
1715+
"source_path": "articles/cognitive-services/Bing-Image-Search/image-search-sdk-node-quickstart.md",
1716+
"redirect_url": "/azure/cognitive-services/bing-image-search/quickstarts/client-libraries?pivots=programming-language-javascript",
1717+
"redirect_document_id": false
1718+
},
1719+
{
1720+
"source_path": "articles/cognitive-services/Bing-Image-Search/image-sdk-python-quickstart.md",
1721+
"redirect_url": "/azure/cognitive-services/bing-image-search/quickstarts/client-libraries?pivots=programming-language-python",
1722+
"redirect_document_id": false
1723+
},
17661724
{
17671725
"source_path": "articles/virtual-machines/linux/classic/rdma-cluster.md",
17681726
"redirect_url": "/azure/virtual-machines/linux/sizes-hpc#rdma-capable-instances",
@@ -6768,6 +6726,10 @@
67686726
"redirect_url": "/azure/logic-apps/logic-apps-using-sap-connector",
67696727
"redirect_document_id": true
67706728
},
6729+
{
6730+
"source_path": "articles/scheduler/get-started-portal.md",
6731+
"redirect_url": "/azure/scheduler/migrate-from-scheduler-to-logic-apps",
6732+
},
67716733
{
67726734
"source_path": "articles/connectors/connectors-create-api-googledrive.md",
67736735
"redirect_url": "https://docs.microsoft.com/connectors/googledrive/",
@@ -7277,7 +7239,7 @@
72777239
"source_path": "articles/azure-functions/functions-create-first-azure-function-azure-cli-linux.md",
72787240
"redirect_url": "/azure/azure-functions/functions-create-first-azure-function-azure-cli?pivots=programming-language-python",
72797241
"redirect_document_id": false
7280-
},
7242+
},
72817243
{
72827244
"source_path": "articles/azure-functions/functions-add-output-binding-storage-queue-python.md",
72837245
"redirect_url": "/azure/azure-functions/functions-add-output-binding-storage-queue-cli.md?pivots=programming-language-python",
@@ -8510,7 +8472,12 @@
85108472
},
85118473
{
85128474
"source_path": "articles/app-service-web/web-sites-traffic-manager-custom-domain-name.md",
8513-
"redirect_url": "/azure/app-service/web-sites-traffic-manager-custom-domain-name",
8475+
"redirect_url": "/azure/app-service/configure-domain-traffic-manager",
8476+
"redirect_document_id": false
8477+
},
8478+
{
8479+
"source_path": "articles/app-service/web-sites-traffic-manager-custom-domain-name.md",
8480+
"redirect_url": "/azure/app-service/configure-domain-traffic-manager",
85148481
"redirect_document_id": false
85158482
},
85168483
{
@@ -13492,7 +13459,7 @@
1349213459
"source_path": "articles/event-hubs/event-hubs-authentication-and-security-model-overview.md",
1349313460
"redirect_url": "/azure/event-hubs/authenticate-shared-access-signature",
1349413461
"redirect_document_id": false
13495-
},
13462+
},
1349613463
{
1349713464
"source_path": "articles/event-hubs/event-hubs-c-ephcs-getstarted.md",
1349813465
"redirect_url": "/azure/event-hubs/event-hubs-c-getstarted-send",
@@ -14978,6 +14945,11 @@
1497814945
"redirect_url": "/azure/machine-learning/how-to-designer-sample-text-classification",
1497914946
"redirect_document_id": true
1498014947
},
14948+
{
14949+
"source_path": "articles/machine-learning/designer-sample-datasets.md",
14950+
"redirect_url": "/azure/machine-learning/sample-designer-datasets",
14951+
"redirect_document_id": false
14952+
},
1498114953
{
1498214954
"source_path": "articles/machine-learning/service/how-to-enable-app-insights.md",
1498314955
"redirect_url": "/azure/machine-learning/how-to-enable-app-insights",
@@ -15283,6 +15255,16 @@
1528315255
"redirect_url": "/azure/machine-learning/tutorial-train-models-with-aml",
1528415256
"redirect_document_id": true
1528515257
},
15258+
{
15259+
"source_path": "articles/machine-learning/algorithm-module-reference/pca-based-anomaly-detection.md",
15260+
"redirect_url": "/azure/machine-learning/algorithm-module-reference/module-reference",
15261+
"redirect_document_id": false
15262+
},
15263+
{
15264+
"source_path": "articles/machine-learning/algorithm-module-reference/train-anomaly-detection-model.md",
15265+
"redirect_url": "/azure/machine-learning/algorithm-module-reference/module-reference",
15266+
"redirect_document_id": false
15267+
},
1528615268
{
1528715269
"source_path": "articles/machine-learning/how-to-ui-sample-regression-predict-automobile-price-basic.md",
1528815270
"redirect_url": "/azure/machine-learning/how-to-designer-sample-regression-automobile-price-basic",
@@ -18618,6 +18600,11 @@
1861818600
"redirect_url": "/azure/backup/backup-azure-backup-faq",
1861918601
"redirect_document_id": false
1862018602
},
18603+
{
18604+
"source_path": "articles/backup/backup-configure-vault.md",
18605+
"redirect_url": "/azure/backup/backup-windows-with-mars-agent",
18606+
"redirect_document_id": false
18607+
},
1862118608
{
1862218609
"source_path": "articles/backup/backup-upgrade-backup-vault.md",
1862318610
"redirect_url": "/azure/backup/backup-azure-backup-faq",
@@ -26913,6 +26900,16 @@
2691326900
"redirect_url": "/azure/storage/common/storage-azure-cli",
2691426901
"redirect_document_id": true
2691526902
},
26903+
{
26904+
"source_path": "articles/storage/common/storage-azure-cli.md",
26905+
"redirect_url": "/azure/storage/blobs/storage-quickstart-blobs-cli",
26906+
"redirect_document_id": true
26907+
},
26908+
{
26909+
"source_path": "articles/storage/common/storage-azure-cli-nodejs.md",
26910+
"redirect_url": "/azure/storage/blobs/storage-quickstart-blobs-cli",
26911+
"redirect_document_id": false
26912+
},
2691626913
{
2691726914
"source_path": "articles/storage/storage-backup-and-disaster-recovery-for-azure-iaas-disks.md",
2691826915
"redirect_url": "/azure/storage/common/storage-backup-and-disaster-recovery-for-azure-iaas-disks",
@@ -31100,7 +31097,7 @@
3110031097
},
3110131098
{
3110231099
"source_path": "articles/backup/backup-configure-vault-classic.md",
31103-
"redirect_url": "/azure/backup/backup-configure-vault",
31100+
"redirect_url": "/azure/backup/backup-windows-with-mars-agent",
3110431101
"redirect_document_id": false
3110531102
},
3110631103
{
@@ -31110,7 +31107,7 @@
3111031107
},
3111131108
{
3111231109
"source_path": "articles/backup/backup-try-azure-backup-in-10-mins.md",
31113-
"redirect_url": "/azure/backup/backup-configure-vault",
31110+
"redirect_url": "/azure/backup/backup-windows-with-mars-agent",
3111431111
"redirect_document_id": false
3111531112
},
3111631113
{
@@ -49203,6 +49200,21 @@
4920349200
"source_path": "articles/jenkins/install-jenkins-solution-template.md",
4920449201
"redirect_url": "/azure/jenkins/install-solution-template-tutorial",
4920549202
"redirect_document_id": true
49203+
},
49204+
{
49205+
"source_path": "articles/cognitive-services/Speech-Service/sapi-phoneset-usage.md",
49206+
"redirect_url": "/azure/cognitive-services/speech-service/speech-ssml-phonetic-sets",
49207+
"redirect_document_id": false
49208+
},
49209+
{
49210+
"source_path": "articles/cognitive-services/Speech-Service/how-to-use-codec-compressed-audio-input-streams-android.md",
49211+
"redirect_url": "/azure/cognitive-services/Speech-Service/how-to-use-codec-compressed-audio-input-streams?pivots=programming-language-java",
49212+
"redirect_document_id": false
49213+
},
49214+
{
49215+
"source_path": "articles/cognitive-services/Speech-Service/how-to-use-codec-compressed-audio-input-streams-ios.md",
49216+
"redirect_url": "/azure/cognitive-services/Speech-Service/how-to-use-codec-compressed-audio-input-streams?pivots=programming-language-objectivec",
49217+
"redirect_document_id": false
4920649218
}
4920749219
]
4920849220
}

articles/active-directory-b2c/TOC.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@
4848
href: code-samples.md
4949
- name: Concepts
5050
items:
51+
- name: Azure AD B2C best practices
52+
href: best-practices.md
5153
- name: Application types
5254
href: application-types.md
5355
- name: Authentication protocols
@@ -327,6 +329,8 @@
327329
href: restful-technical-profile.md
328330
- name: SAML
329331
href: saml-technical-profile.md
332+
- name: SAML token issuer
333+
href: saml-issuer-technical-profile.md
330334
- name: Self-asserted
331335
href: self-asserted-technical-profile.md
332336
- name: SSO session

articles/active-directory-b2c/active-directory-technical-profile.md

Lines changed: 10 additions & 10 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: reference
12-
ms.date: 02/13/2020
12+
ms.date: 03/09/2020
1313
ms.author: mimart
1414
ms.subservice: B2C
1515
---
@@ -24,8 +24,8 @@ Azure Active Directory B2C (Azure AD B2C) provides support for the Azure Active
2424

2525
The **Name** attribute of the **Protocol** element needs to be set to `Proprietary`. The **handler** attribute must contain the fully qualified name of the protocol handler assembly `Web.TPEngine.Providers.AzureActiveDirectoryProvider, Web.TPEngine, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null`.
2626

27-
All Azure AD technical profiles include the **AAD-Common** technical profile. The following technical profiles don't specify the protocol because the protocol is configured in the **AAD-Common** technical profile:
28-
27+
Following [custom policy starter pack](custom-policy-get-started.md#custom-policy-starter-pack) Azure AD technical profiles include the **AAD-Common** technical profile. The Azure AD technical profiles don't specify the protocol because the protocol is configured in the **AAD-Common** technical profile:
28+
2929
- **AAD-UserReadUsingAlternativeSecurityId** and **AAD-UserReadUsingAlternativeSecurityId-NoError** - Look up a social account in the directory.
3030
- **AAD-UserWriteUsingAlternativeSecurityId** - Create a new social account.
3131
- **AAD-UserReadUsingEmailAddress** - Look up a local account in the directory.
@@ -52,17 +52,17 @@ The following example shows the **AAD-Common** technical profile:
5252
</TechnicalProfile>
5353
```
5454

55-
## Input claims
55+
## InputClaims
56+
57+
The InputClaims element contains a claim, which is used to look up an account in the directory, or create a new one. There must be exactly one InputClaim element in the input claims collection for all Azure AD technical profiles. You may need to map the name of the claim defined in your policy to the name defined in Azure Active Directory.
5658

57-
The following technical profiles include **InputClaims** for social and local accounts:
59+
To read, update, or delete an existing user account, the input claim is a key that uniquely identifies the account in Azure AD directory. For example, **objectId**, **userPrincipalName**, **signInNames.emailAddress**, **signInNames.userName**, or **alternativeSecurityId**.
5860

59-
- The social account technical profiles **AAD-UserReadUsingAlternativeSecurityId** and **AAD-UserWriteUsingAlternativeSecurityId** includes the **AlternativeSecurityId** claim. This claim contains the social account user identifier.
60-
- The local account technical profiles **AAD-UserReadUsingEmailAddress** and **AAD-UserWriteUsingLogonEmail** includes the **email** claim. This claim contains the sign-in name of the local account.
61-
- The unified (local and social) technical profiles **AAD-UserReadUsingObjectId**, **AAD-UserWritePasswordUsingObjectId**, **AAD-UserWriteProfileUsingObjectId**, and **AAD-UserWritePhoneNumberUsingObjectId** includes the **objectId** claim. The unique identifier of an account.
61+
To create a new user account, the input claim is a key that uniquely identifies a local or federated account. For example, local account: **signInNames.emailAddress**, or **signInNames.userName**. For a federated account: the **alternativeSecurityId**.
6262

63-
The **InputClaimsTransformations** element may contain a collection of **InputClaimsTransformation** elements that are used to modify the input claims or generate new ones.
63+
The InputClaimsTransformations element may contain a collection of input claims transformation elements that are used to modify the input claim or generate new one.
6464

65-
## Output claims
65+
## OutputClaims
6666

6767
The **OutputClaims** element contains a list of claims returned by the Azure AD technical profile. You may need to map the name of the claim defined in your policy to the name defined in Azure Active Directory. You can also include claims that aren't returned by the Azure Active Directory, as long as you set the `DefaultValue` attribute.
6868

0 commit comments

Comments
 (0)