Skip to content

Commit 7145ce6

Browse files
msmbaldwinmsmbaldwin
committed
Merge branch 'master' of https://github.com/microsoftdocs/azure-docs-pr into ade
2 parents 5b95aae + 084e176 commit 7145ce6

File tree

1,039 files changed

+11091
-7820
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,039 files changed

+11091
-7820
lines changed

‎.openpublishing.redirection.json

Lines changed: 180 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -607,6 +607,46 @@
607607
"redirect_url": "/azure/virtual-machines/workloads/oracle/oracle-overview/",
608608
"redirect_document_id": false
609609
},
610+
{
611+
"source_path": "articles/machine-learning/studio/use-case-excel-studio.md",
612+
"redirect_url": "/azure/machine-learning/studio/",
613+
"redirect_document_id": false
614+
},
615+
{
616+
"source_path": "articles/machine-learning/studio/azure-ml-customer-churn-scenario.md",
617+
"redirect_url": "/azure/machine-learning/studio/",
618+
"redirect_document_id": false
619+
},
620+
{
621+
"source_path": "articles/machine-learning/studio/text-analytics-module-tutorial.md",
622+
"redirect_url": "/azure/machine-learning/studio/",
623+
"redirect_document_id": false
624+
},
625+
{
626+
"source_path": "articles/machine-learning/studio/extend-your-experiment-with-r.md",
627+
"redirect_url": "/azure/machine-learning/studio/",
628+
"redirect_document_id": false
629+
},
630+
{
631+
"source_path": "articles/machine-learning/studio/debug-models.md",
632+
"redirect_url": "/azure/machine-learning/studio/",
633+
"redirect_document_id": false
634+
},
635+
{
636+
"source_path": "articles/machine-learning/studio/troubleshooting-creating-ml-workspace.md",
637+
"redirect_url": "/azure/machine-learning/studio/",
638+
"redirect_document_id": false
639+
},
640+
{
641+
"source_path": "articles/machine-learning/studio/basics-infographic-with-algorithm-examples.md",
642+
"redirect_url": "/azure/machine-learning/how-to-select-algorithms",
643+
"redirect_document_id": false
644+
},
645+
{
646+
"source_path": "articles/machine-learning/studio/convert-training-experiment-to-scoring-experiment.md",
647+
"redirect_url": "/azure/machine-learning/studio/deploy-a-machine-learning-web-service",
648+
"redirect_document_id": false
649+
},
610650
{
611651
"source_path": "articles/machine-learning/studio/consume-web-service-with-web-app-template.md",
612652
"redirect_url": "/azure/machine-learning/studio/consume-web-services",
@@ -2832,6 +2872,11 @@
28322872
"redirect_url": "https://github.com/Azure-Samples/active-directory-dotnet-native-uwp-v2",
28332873
"redirect_document_id": false
28342874
},
2875+
{
2876+
"source_path": "articles/active-directory/develop/quickstart-v2-javascipt-auth-code.md",
2877+
"redirect_url": "/azure/active-directory/develop/quickstart-v2-javascript-auth-code",
2878+
"redirect_document_id": true
2879+
},
28352880
{
28362881
"source_path": "articles/active-directory/develop/active-directory-v2-devquickstarts-wpf.md",
28372882
"redirect_url": "https://docs.microsoft.com/azure/active-directory/develop/guidedsetups/active-directory-windesktop",
@@ -6422,6 +6467,11 @@
64226467
"redirect_url": "https://azure.microsoft.com/global-infrastructure/services/?products=active-directory-ds",
64236468
"redirect_document_id": false
64246469
},
6470+
{
6471+
"source_path": "articles/active-directory-b2c/saml-technical-profile.md",
6472+
"redirect_url": "/azure/active-directory-b2c/saml-identity-provider-technical-profile",
6473+
"redirect_document_id": false
6474+
},
64256475
{
64266476
"source_path": "articles/active-directory-ds/active-directory-ds-synchronization.md",
64276477
"redirect_url": "/azure/active-directory-domain-services/synchronization",
@@ -23941,6 +23991,11 @@
2394123991
"redirect_url": "/azure/active-directory/develop/authentication-scenarios",
2394223992
"redirect_document_id": true
2394323993
},
23994+
{
23995+
"source_path": "articles/active-directory/develop/authentication-scenarios.md",
23996+
"redirect_url": "/azure/active-directory/develop/authentication-vs-authorization",
23997+
"redirect_document_id": true
23998+
},
2394423999
{
2394524000
"source_path": "articles/active-directory/develop/active-directory-v2-app-registration.md",
2394624001
"redirect_url": "/azure/active-directory/develop/quickstart-v2-register-an-app",
@@ -51435,6 +51490,121 @@
5143551490
"redirect_url": "/azure/media-services",
5143651491
"redirect_document_id": false
5143751492
},
51493+
{
51494+
"source_path": "articles/databox-online/data-box-edge-deploy-add-shares.md",
51495+
"redirect_url": "/azure/databox-online/azure-stack-edge-deploy-add-shares",
51496+
"redirect_document_id": false
51497+
},
51498+
{
51499+
"source_path": "articles/databox-online/data-box-edge-connect-powershell-interface.md",
51500+
"redirect_url": "/azure/databox-online/azure-stack-edge-connect-powershell-interface",
51501+
"redirect_document_id": false
51502+
},
51503+
{
51504+
"source_path": "articles/databox-online/data-box-edge-contact-microsoft-support.md",
51505+
"redirect_url": "/azure/databox-online/azure-stack-edge-contact-microsoft-support",
51506+
"redirect_document_id": false
51507+
},
51508+
{
51509+
"source_path": "articles/databox-online/data-box-edge-create-iot-edge-module.md",
51510+
"redirect_url": "/azure/databox-online/azure-stack-edge-create-iot-edge-module",
51511+
"redirect_document_id": false
51512+
},
51513+
{
51514+
"source_path": "articles/databox-online/data-box-edge-deploy-configure-compute.md",
51515+
"redirect_url": "/azure/databox-online/azure-stack-edge-deploy-configure-compute",
51516+
"redirect_document_id": false
51517+
},
51518+
{
51519+
"source_path": "articles/databox-online/data-box-edge-deploy-configure-compute-advanced.md",
51520+
"redirect_url": "/azure/databox-online/azure-stack-edge-deploy-configure-compute-advanced",
51521+
"redirect_document_id": false
51522+
},
51523+
{
51524+
"source_path": "articles/databox-online/data-box-edge-deploy-connect-setup-activate.md",
51525+
"redirect_url": "/azure/databox-online/azure-stack-edge-deploy-connect-setup-activate",
51526+
"redirect_document_id": false
51527+
},
51528+
{
51529+
"source_path": "articles/databox-online/data-box-edge-deploy-install.md",
51530+
"redirect_url": "/azure/databox-online/azure-stack-edge-deploy-install",
51531+
"redirect_document_id": false
51532+
},
51533+
{
51534+
"source_path": "articles/databox-online/data-box-edge-deploy-prep.md",
51535+
"redirect_url": "/azure/databox-online/azure-stack-edge-deploy-prep",
51536+
"redirect_document_id": false
51537+
},
51538+
{
51539+
"source_path": "articles/databox-online/data-box-edge-extend-compute-access-modules.md",
51540+
"redirect_url": "/azure/databox-online/azure-stack-edge-extend-compute-access-modules",
51541+
"redirect_document_id": false
51542+
},
51543+
{
51544+
"source_path": "articles/databox-online/data-box-edge-limits.md",
51545+
"redirect_url": "/azure/databox-online/azure-stack-edge-limits",
51546+
"redirect_document_id": false
51547+
},
51548+
{
51549+
"source_path": "articles/databox-online/data-box-edge-manage-access-power-connectivity-mode.md",
51550+
"redirect_url": "/azure/databox-online/azure-stack-edge-manage-access-power-connectivity-mode",
51551+
"redirect_document_id": false
51552+
},
51553+
{
51554+
"source_path": "articles/databox-online/data-box-edge-manage-bandwidth-schedules.md",
51555+
"redirect_url": "/azure/databox-online/azure-stack-edge-manage-bandwidth-schedules",
51556+
"redirect_document_id": false
51557+
},
51558+
{
51559+
"source_path": "articles/databox-online/data-box-edge-manage-compute.md",
51560+
"redirect_url": "/azure/databox-online/azure-stack-edge-manage-compute",
51561+
"redirect_document_id": false
51562+
},
51563+
{
51564+
"source_path": "articles/databox-online/data-box-edge-manage-shares.md",
51565+
"redirect_url": "/azure/databox-online/azure-stack-edge-manage-shares",
51566+
"redirect_document_id": false
51567+
},
51568+
{
51569+
"source_path": "articles/databox-online/data-box-edge-manage-users.md",
51570+
"redirect_url": "/azure/databox-online/azure-stack-edge-manage-users",
51571+
"redirect_document_id": false
51572+
},
51573+
{
51574+
"source_path": "articles/databox-online/data-box-edge-monitor.md",
51575+
"redirect_url": "/azure/databox-online/azure-stack-edge-monitor",
51576+
"redirect_document_id": false
51577+
},
51578+
{
51579+
"source_path": "articles/databox-online/data-box-edge-overview.md",
51580+
"redirect_url": "/azure/databox-online/azure-stack-edge-overview",
51581+
"redirect_document_id": false
51582+
},
51583+
{
51584+
"source_path": "articles/databox-online/data-box-edge-return-device.md",
51585+
"redirect_url": "/azure/databox-online/azure-stack-edge-return-device",
51586+
"redirect_document_id": false
51587+
},
51588+
{
51589+
"source_path": "articles/databox-online/data-box-edge-security.md",
51590+
"redirect_url": "/azure/databox-online/azure-stack-edge-security",
51591+
"redirect_document_id": false
51592+
},
51593+
{
51594+
"source_path": "articles/databox-online/data-box-edge-system-requirements.md",
51595+
"redirect_url": "/azure/databox-online/azure-stack-edge-system-requirements",
51596+
"redirect_document_id": false
51597+
},
51598+
{
51599+
"source_path": "articles/databox-online/data-box-edge-technical-specifications-compliance.md",
51600+
"redirect_url": "/azure/databox-online/azure-stack-edge-technical-specifications-compliance",
51601+
"redirect_document_id": false
51602+
},
51603+
{
51604+
"source_path": "articles/databox-online/data-box-edge-troubleshoot.md",
51605+
"redirect_url": "/azure/databox-online/azure-stack-edge-troubleshoot",
51606+
"redirect_document_id": false
51607+
},
5143851608
{
5143951609
"source_path": "articles/aks/kubernetes-draft.md",
5144051610
"redirect_url": "/azure/aks/quickstart-helm",
@@ -51904,6 +52074,16 @@
5190452074
"source_path": "articles/terraform/index.yml",
5190552075
"redirect_url": "/azure/developer/terraform/",
5190652076
"redirect_document_id": false
52077+
},
52078+
{
52079+
"source_path": "articles/sql-database/sql-database-auditing-and-threat-detection-powershell.md",
52080+
"redirect_url": "/azure/sql-database/scripts/sql-database-auditing-and-threat-detection-powershell",
52081+
"redirect_document_id": true
52082+
},
52083+
{
52084+
"source_path": "articles/media-services/azure-media-player/azure-media-player-license.md",
52085+
"redirect_url": "/legal/azure-media-player/azure-media-player-license",
52086+
"redirect_document_id": false
5190752087
}
5190852088
]
5190952089
}

‎articles/active-directory-b2c/TOC.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,8 @@
7676
href: user-overview.md
7777
- name: User profile attributes
7878
href: user-profile-attributes.md
79+
- name: SSO sessions
80+
href: session-overview.md
7981
- name: How-to guides
8082
items:
8183
- name: App integration
@@ -335,8 +337,8 @@
335337
href: phone-factor-technical-profile.md
336338
- name: REST
337339
href: restful-technical-profile.md
338-
- name: SAML
339-
href: saml-technical-profile.md
340+
- name: SAML identity provider
341+
href: saml-identity-provider-technical-profile.md
340342
- name: SAML token issuer
341343
href: saml-issuer-technical-profile.md
342344
- name: Self-asserted

‎articles/active-directory-b2c/claim-resolver-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ You can use claims resolvers with the following elements:
135135
|[OpenID Connect](openid-connect-technical-profile.md) technical profile| `InputClaim`, `OutputClaim`| 1, 2|
136136
|[Claims transformation](claims-transformation-technical-profile.md) technical profile| `InputClaim`, `OutputClaim`| 1, 2|
137137
|[RESTful provider](restful-technical-profile.md) technical profile| `InputClaim`| 1, 2|
138-
|[SAML2](saml-technical-profile.md) technical profile| `OutputClaim`| 1, 2|
138+
|[SAML identity provider](saml-identity-provider-technical-profile.md) technical profile| `OutputClaim`| 1, 2|
139139
|[Self-Asserted](self-asserted-technical-profile.md) technical profile| `InputClaim`, `OutputClaim`| 1, 2|
140140
|[ContentDefinition](contentdefinitions.md)| `LoadUri`| |
141141
|[ContentDefinitionParameters](relyingparty.md#contentdefinitionparameters)| `Parameter` | |

‎articles/active-directory-b2c/connect-with-saml-service-providers.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ You can change the value of the `IssuerUri` metadata. This is the issuer URI tha
125125
<!-- SAML Token Issuer technical profile -->
126126
<TechnicalProfile Id="Saml2AssertionIssuer">
127127
<DisplayName>Token Issuer</DisplayName>
128-
<Protocol Name="None"/>
128+
<Protocol Name="SAML2"/>
129129
<OutputTokenFormat>SAML2</OutputTokenFormat>
130130
<Metadata>
131131
<!-- The issuer contains the policy name; it should be the same name as configured in the relying party application. B2C_1A_signup_signin_SAML is used below. -->
@@ -138,11 +138,11 @@ You can change the value of the `IssuerUri` metadata. This is the issuer URI tha
138138
</CryptographicKeys>
139139
<InputClaims/>
140140
<OutputClaims/>
141-
<UseTechnicalProfileForSessionManagement ReferenceId="SM-Saml-sp"/>
141+
<UseTechnicalProfileForSessionManagement ReferenceId="SM-Saml-issuer"/>
142142
</TechnicalProfile>
143143
144144
<!-- Session management technical profile for SAML based tokens -->
145-
<TechnicalProfile Id="SM-Saml-sp">
145+
<TechnicalProfile Id="SM-Saml-issuer">
146146
<DisplayName>Session Management Provider</DisplayName>
147147
<Protocol Name="Proprietary" Handler="Web.TPEngine.SSO.SamlSSOSessionProvider, Web.TPEngine, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null"/>
148148
</TechnicalProfile>

‎articles/active-directory-b2c/custom-policy-developer-notes.md

Lines changed: 4 additions & 3 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/30/2020
12+
ms.date: 04/28/2020
1313
ms.author: mimart
1414
ms.subservice: B2C
1515
---
@@ -76,7 +76,7 @@ Custom policy/Identity Experience Framework capabilities are under constant and
7676
| [OpenID Connect](openid-connect-technical-profile.md) | | | X | For example, Google+. |
7777
| [OAuth2](oauth2-technical-profile.md) | | | X | For example, Facebook. |
7878
| [OAuth1](oauth1-technical-profile.md) | | X | | For example, Twitter. |
79-
| [SAML2](saml-technical-profile.md) | | | X | For example, Salesforce, ADFS. |
79+
| [SAML2](saml-identity-provider-technical-profile.md) | | | X | For example, Salesforce, ADFS. |
8080
| WSFED| X | | | |
8181

8282

@@ -130,7 +130,8 @@ Custom policy/Identity Experience Framework capabilities are under constant and
130130
| [Default SSO session provider](custom-policy-reference-sso.md#defaultssosessionprovider) | | | X | |
131131
| [External login session provider](custom-policy-reference-sso.md#externalloginssosessionprovider) | | | X | |
132132
| [SAML SSO session provider](custom-policy-reference-sso.md#samlssosessionprovider) | | | X | |
133-
133+
| [OAuthSSOSessionProvider](custom-policy-reference-sso.md#oauthssosessionprovider) | | X | | |
134+
| [Single sign-out](session-overview.md#sign-out) | | X | | |
134135

135136
### Security
136137

0 commit comments

Comments
 (0)