Skip to content

Commit fa1fb3f

Browse files
committed
Merging changes synced from https://github.com/MicrosoftDocs/azure-docs-pr (branch live)
2 parents b551a3e + 76bc196 commit fa1fb3f

File tree

604 files changed

+19197
-4069
lines changed

Some content is hidden

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

604 files changed

+19197
-4069
lines changed

.openpublishing.redirection.json

Lines changed: 212 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11992,12 +11992,17 @@
1199211992
},
1199311993
{
1199411994
"source_path": "articles/blockchain-workbench/hyperledger-fabric-single-member-blockchain.md",
11995-
"redirect_url": "/azure/blockchain/templates/hyperledger-fabric-consortium-blockchain",
11995+
"redirect_url": "/azure/blockchain/templates/hyperledger-fabric-consortium-azure-kubernetes-service",
1199611996
"redirect_document_id": false
1199711997
},
1199811998
{
1199911999
"source_path": "articles/blockchain/templates/hyperledger-fabric-single-member-blockchain.md",
12000-
"redirect_url": "/azure/blockchain/templates/hyperledger-fabric-consortium-blockchain",
12000+
"redirect_url": "/azure/blockchain/templates/hyperledger-fabric-consortium-azure-kubernetes-service",
12001+
"redirect_document_id": false
12002+
},
12003+
{
12004+
"source_path": "articles/blockchain/templates/hyperledger-fabric-consortium-blockchain.md",
12005+
"redirect_url": "/azure/blockchain/templates/hyperledger-fabric-consortium-azure-kubernetes-service",
1200112006
"redirect_document_id": false
1200212007
},
1200312008
{
@@ -21025,6 +21030,186 @@
2102521030
"redirect_url": "/azure/iot-fundamentals/iot-security-ground-up",
2102621031
"redirect_document_id": true
2102721032
},
21033+
{
21034+
"source_path": "articles/active-directory/develop/active-directory-acs-migration.md",
21035+
"redirect_url": "https://docs.microsoft.com/azure/active-directory/azuread-dev/active-directory-acs-migration",
21036+
"redirect_document_id": true
21037+
},
21038+
{
21039+
"source_path": "articles/active-directory/develop/active-directory-authentication-libraries.md",
21040+
"redirect_url": "https://docs.microsoft.com/azure/active-directory/azuread-dev/active-directory-authentication-libraries",
21041+
"redirect_document_id": true
21042+
},
21043+
{
21044+
"source_path": "articles/active-directory/develop/active-directory-devhowto-adal-error-handling.md",
21045+
"redirect_url": "https://docs.microsoft.com/azure/active-directory/azuread-dev/active-directory-devhowto-adal-error-handling",
21046+
"redirect_document_id": true
21047+
},
21048+
{
21049+
"source_path": "articles/active-directory/develop/app-types.md",
21050+
"redirect_url": "https://docs.microsoft.com/azure/active-directory/azuread-dev/app-types",
21051+
"redirect_document_id": true
21052+
},
21053+
{
21054+
"source_path": "articles/active-directory/develop/azure-ad-endpoint-comparison.md",
21055+
"redirect_url": "https://docs.microsoft.com/azure/active-directory/azuread-dev/azure-ad-endpoint-comparison",
21056+
"redirect_document_id": true
21057+
},
21058+
{
21059+
"source_path": "articles/active-directory/develop/azure-ad-federation-metadata.md",
21060+
"redirect_url": "https://docs.microsoft.com/azure/active-directory/azuread-dev/azure-ad-federation-metadata",
21061+
"redirect_document_id": true
21062+
},
21063+
{
21064+
"source_path": "articles/active-directory/develop/conditional-access-dev-guide.md",
21065+
"redirect_url": "https://docs.microsoft.com/azure/active-directory/azuread-dev/conditional-access-dev-guide",
21066+
"redirect_document_id": true
21067+
},
21068+
{
21069+
"source_path": "articles/active-directory/develop/howto-app-gallery-listing.md",
21070+
"redirect_url": "https://docs.microsoft.com/azure/active-directory/azuread-dev/howto-app-gallery-listing",
21071+
"redirect_document_id": true
21072+
},
21073+
{
21074+
"source_path": "articles/active-directory/develop/howto-get-appsource-certified.md",
21075+
"redirect_url": "https://docs.microsoft.com/azure/active-directory/azuread-dev/howto-get-appsource-certified",
21076+
"redirect_document_id": true
21077+
},
21078+
{
21079+
"source_path": "articles/active-directory/develop/howto-reactivate-disabled-acs-namespaces.md",
21080+
"redirect_url": "https://docs.microsoft.com/azure/active-directory/azuread-dev/howto-reactivate-disabled-acs-namespaces",
21081+
"redirect_document_id": true
21082+
},
21083+
{
21084+
"source_path": "articles/active-directory/develop/howto-v1-debug-saml-sso-issues.md",
21085+
"redirect_url": "https://docs.microsoft.com/azure/active-directory/azuread-dev/howto-v1-debug-saml-sso-issues",
21086+
"redirect_document_id": true
21087+
},
21088+
{
21089+
"source_path": "articles/active-directory/develop/howto-v1-enable-sso-android.md",
21090+
"redirect_url": "https://docs.microsoft.com/azure/active-directory/azuread-dev/howto-v1-enable-sso-android",
21091+
"redirect_document_id": true
21092+
},
21093+
{
21094+
"source_path": "articles/active-directory/develop/howto-v1-enable-sso-ios.md",
21095+
"redirect_url": "https://docs.microsoft.com/azure/active-directory/azuread-dev/howto-v1-enable-sso-ios",
21096+
"redirect_document_id": true
21097+
},
21098+
{
21099+
"source_path": "articles/active-directory/develop/native-app.md",
21100+
"redirect_url": "https://docs.microsoft.com/azure/active-directory/azuread-dev/native-app",
21101+
"redirect_document_id": true
21102+
},
21103+
{
21104+
"source_path": "articles/active-directory/develop/quickstart-v1-android.md",
21105+
"redirect_url": "https://docs.microsoft.com/azure/active-directory/develop/quickstart-v2-android",
21106+
"redirect_document_id": false
21107+
},
21108+
{
21109+
"source_path": "articles/active-directory/develop/quickstart-v1-angularjs-spa.md",
21110+
"redirect_url": "https://docs.microsoft.com/azure/active-directory/develop/authentication-flows-app-scenarios",
21111+
"redirect_document_id": false
21112+
},
21113+
{
21114+
"source_path": "articles/active-directory/develop/quickstart-v1-aspnet-webapp.md",
21115+
"redirect_url": "https://docs.microsoft.com/azure/active-directory/develop/quickstart-v2-aspnet-webapp",
21116+
"redirect_document_id": false
21117+
},
21118+
{
21119+
"source_path": "articles/active-directory/develop/quickstart-v1-dotnet.md",
21120+
"redirect_url": "https://docs.microsoft.com/azure/active-directory/develop/quickstart-v2-windows-desktop",
21121+
"redirect_document_id": false
21122+
},
21123+
{
21124+
"source_path": "articles/active-directory/develop/quickstart-v1-dotnet-webapi.md",
21125+
"redirect_url": "https://docs.microsoft.com/azure/active-directory/develop/quickstart-v2-dotnet-native-aspnet",
21126+
"redirect_document_id": false
21127+
},
21128+
{
21129+
"source_path": "articles/active-directory/develop/quickstart-v1-ios.md",
21130+
"redirect_url": "https://docs.microsoft.com/azure/active-directory/develop/quickstart-v2-ios",
21131+
"redirect_document_id": false
21132+
},
21133+
{
21134+
"source_path": "articles/active-directory/develop/quickstart-v1-netcore-daemon.md",
21135+
"redirect_url": "https://docs.microsoft.com/azure/active-directory/develop/quickstart-v2-netcore-daemon",
21136+
"redirect_document_id": false
21137+
},
21138+
{
21139+
"source_path": "articles/active-directory/develop/quickstart-v1-nodejs-webapi.md",
21140+
"redirect_url": "https://docs.microsoft.com/azure/active-directory/develop/authentication-flows-app-scenarios",
21141+
"redirect_document_id": false
21142+
},
21143+
{
21144+
"source_path": "articles/active-directory/develop/quickstart-v1-xamarin.md",
21145+
"redirect_url": "https://docs.microsoft.com/azure/active-directory/develop/authentication-flows-app-scenarios",
21146+
"redirect_document_id": false
21147+
},
21148+
{
21149+
"source_path": "articles/active-directory/develop/sample-v1-code.md",
21150+
"redirect_url": "https://docs.microsoft.com/azure/active-directory/azuread-dev/sample-v1-code",
21151+
"redirect_document_id": true
21152+
},
21153+
{
21154+
"source_path": "articles/active-directory/develop/service-to-service.md",
21155+
"redirect_url": "https://docs.microsoft.com/azure/active-directory/azuread-dev/service-to-service",
21156+
"redirect_document_id": true
21157+
},
21158+
{
21159+
"source_path": "articles/active-directory/develop/single-page-application.md",
21160+
"redirect_url": "https://docs.microsoft.com/azure/active-directory/azuread-dev/single-page-application",
21161+
"redirect_document_id": true
21162+
},
21163+
{
21164+
"source_path": "articles/active-directory/develop/v1-authentication-scenarios.md",
21165+
"redirect_url": "https://docs.microsoft.com/azure/active-directory/azuread-dev/v1-authentication-scenarios",
21166+
"redirect_document_id": true
21167+
},
21168+
{
21169+
"source_path": "articles/active-directory/develop/v1-oauth2-client-creds-grant-flow.md",
21170+
"redirect_url": "https://docs.microsoft.com/azure/active-directory/azuread-dev/v1-oauth2-client-creds-grant-flow",
21171+
"redirect_document_id": true
21172+
},
21173+
{
21174+
"source_path": "articles/active-directory/develop/v1-oauth2-implicit-grant-flow.md",
21175+
"redirect_url": "https://docs.microsoft.com/azure/active-directory/azuread-dev/v1-oauth2-implicit-grant-flow",
21176+
"redirect_document_id": true
21177+
},
21178+
{
21179+
"source_path": "articles/active-directory/develop/v1-oauth2-on-behalf-of-flow.md",
21180+
"redirect_url": "https://docs.microsoft.com/azure/active-directory/azuread-dev/v1-oauth2-on-behalf-of-flow",
21181+
"redirect_document_id": true
21182+
},
21183+
{
21184+
"source_path": "articles/active-directory/develop/v1-overview.md",
21185+
"redirect_url": "https://docs.microsoft.com/azure/active-directory/azuread-dev/v1-overview",
21186+
"redirect_document_id": true
21187+
},
21188+
{
21189+
"source_path": "articles/active-directory/develop/v1-permissions-and-consent.md",
21190+
"redirect_url": "https://docs.microsoft.com/azure/active-directory/azuread-dev/v1-permissions-and-consent",
21191+
"redirect_document_id": true
21192+
},
21193+
{
21194+
"source_path": "articles/active-directory/develop/v1-protocols-oauth-code.md",
21195+
"redirect_url": "https://docs.microsoft.com/azure/active-directory/azuread-dev/v1-protocols-oauth-code",
21196+
"redirect_document_id": true
21197+
},
21198+
{
21199+
"source_path": "articles/active-directory/develop/v1-protocols-openid-connect-code.md",
21200+
"redirect_url": "https://docs.microsoft.com/azure/active-directory/azuread-dev/v1-protocols-openid-connect-code",
21201+
"redirect_document_id": true
21202+
},
21203+
{
21204+
"source_path": "articles/active-directory/develop/web-api.md",
21205+
"redirect_url": "https://docs.microsoft.com/azure/active-directory/azuread-dev/web-api",
21206+
"redirect_document_id": true
21207+
},
21208+
{
21209+
"source_path": "articles/active-directory/develop/web-app.md",
21210+
"redirect_url": "https://docs.microsoft.com/azure/active-directory/azuread-dev/web-app",
21211+
"redirect_document_id": true
21212+
},
2102821213
{
2102921214
"source_path": "articles/active-directory/active-directory-app-gallery-listing.md",
2103021215
"redirect_url": "/azure/active-directory/develop/active-directory-app-gallery-listing",
@@ -26525,6 +26710,26 @@
2652526710
"redirect_url": "/azure/storage/common/storage-designing-ha-apps-with-ragrs",
2652626711
"redirect_document_id": true
2652726712
},
26713+
{
26714+
"source_path": "articles/storage/common/storage-redundancy-lrs.md",
26715+
"redirect_url": "/azure/storage/common/storage-redundancy",
26716+
"redirect_document_id": false
26717+
},
26718+
{
26719+
"source_path": "articles/storage/common/storage-redundancy-grs.md",
26720+
"redirect_url": "/azure/storage/common/storage-redundancy",
26721+
"redirect_document_id": false
26722+
},
26723+
{
26724+
"source_path": "articles/storage/common/storage-redundancy-zrs.md",
26725+
"redirect_url": "/azure/storage/common/storage-redundancy",
26726+
"redirect_document_id": false
26727+
},
26728+
{
26729+
"source_path": "articles/storage/common/storage-redundancy-gzrs.md",
26730+
"redirect_url": "/azure/storage/common/storage-redundancy",
26731+
"redirect_document_id": false
26732+
},
2652826733
{
2652926734
"source_path": "articles/storage/storage-disaster-recovery-guidance.md",
2653026735
"redirect_url": "/azure/storage/common/storage-disaster-recovery-guidance",
@@ -47901,6 +48106,11 @@
4790148106
"redirect_url": "/azure/mysql/concepts-azure-ad-authentication",
4790248107
"redirect_document_id": false
4790348108
},
48109+
{
48110+
"source_path": "articles/active-directory/authentication/tutorial-mfa-applications.md",
48111+
"redirect_url": "/azure/active-directory/authentication/tutorial-enable-azure-mfa",
48112+
"redirect_document_id": true
48113+
},
4790448114
{
4790548115
"source_path": "articles/load-balancer/quickstart-create-basic-load-balancer-portal.md",
4790648116
"redirect_url": "/azure/load-balancer/quickstart-load-balancer-standard-public-portal",

articles/active-directory-b2c/TOC.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -182,8 +182,6 @@
182182
- name: Custom email
183183
href: custom-email.md
184184
displayName: verification
185-
- name: Page layout
186-
href: page-layout.md
187185
- name: Enable JavaScript
188186
href: javascript-samples.md
189187
- name: Password complexity
@@ -383,6 +381,8 @@
383381
href: custom-policy-developer-notes.md
384382
- name: Code samples
385383
href: https://azure.microsoft.com/resources/samples/?service=active-directory-b2c
384+
- name: Page layout versions
385+
href: page-layout.md
386386
- name: Cookie definitions
387387
href: cookie-definitions.md
388388
displayName: cookies, SameSite
@@ -421,4 +421,4 @@
421421
href: support-options.md
422422
displayName: technical
423423
- name: Videos
424-
href: https://azure.microsoft.com/documentation/videos/index/?services=active-directory-b2c
424+
href: https://azure.microsoft.com/documentation/videos/index/?services=active-directory-b2c

0 commit comments

Comments
 (0)