Skip to content

Commit e9b242b

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into azuread-combinedreg-ga
2 parents 7db54ec + 5d40078 commit e9b242b

File tree

3,160 files changed

+39561
-30663
lines changed

Some content is hidden

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

3,160 files changed

+39561
-30663
lines changed

.openpublishing.redirection.json

Lines changed: 134 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
"redirect_url": "/previous-versions/azure/virtual-network/virtual-networks-create-vnet-classic-cli",
2121
"redirect_document_id": false
2222
},
23+
2324
{
2425
"source_path": "articles/virtual-network/virtual-networks-specifying-a-dns-settings-in-a-virtual-network-configuration-file.md",
2526
"redirect_url": "/previous-versions/azure/virtual-network/virtual-networks-specifying-a-dns-settings-in-a-virtual-network-configuration-file",
@@ -355,7 +356,7 @@
355356
"redirect_url": "/azure/machine-learning/data-science-virtual-machine/reference-deprecation",
356357
"redirect_document_id": true
357358
},
358-
359+
359360
{
360361
"source_path": "articles/machine-learning/service/how-to-understand-accuracy-metrics.md",
361362
"redirect_url": "/azure/machine-learning/service/how-to-understand-automated-ml",
@@ -423,12 +424,17 @@
423424
},
424425
{
425426
"source_path": "articles/active-directory/saas-apps/realtimeboard-tutorial.md",
426-
"redirect_url": "/articles/active-directory/saas-apps/miro-tutorial",
427+
"redirect_url": "/azure/active-directory/saas-apps/miro-tutorial",
427428
"redirect_document_id": false
428429
},
429430
{
430431
"source_path": "articles/active-directory/saas-apps/redbrickhealth-tutorial.md",
431-
"redirect_url": "/articles/active-directory/saas-apps/redbrick-health-tutorial",
432+
"redirect_url": "/azure/active-directory/saas-apps/redbrick-health-tutorial",
433+
"redirect_document_id": false
434+
},
435+
{
436+
"source_path": "articles/active-directory/saas-apps/adobe-identity-management-tutorial.md",
437+
"redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
432438
"redirect_document_id": false
433439
},
434440
{
@@ -470,6 +476,11 @@
470476
"source_path": "articles/azure-arc/servers/quickstart-onboard-portal.md",
471477
"redirect_url": "/azure/azure-arc/servers/onboard-portal",
472478
"redirect_document_id": false
479+
},
480+
{
481+
"source_path": "articles/active-directory/saas-apps/123contactform-tutorial.md",
482+
"redirect_url": "/azure/active-directory/saas-apps/123formbuilder-tutorial",
483+
"redirect_document_id": true
473484
},
474485
{
475486
"source_path": "articles/azure-arc/servers/quickstart-onboard-powershell.md",
@@ -533,7 +544,7 @@
533544
},
534545
{
535546
"source_path": "articles/site-recovery/vmware-physical-mobility-service-install-manual.md",
536-
"redirect_url": "/azure/site-recovery/vmware-physical-mobility-service-overview#install-mobility-agent-through-ui",
547+
"redirect_url": "/azure/site-recovery/vmware-physical-mobility-service-overview#install-the-mobility-service-using-ui",
537548
"redirect_document_id": false
538549
},
539550
{
@@ -1686,6 +1697,11 @@
16861697
"redirect_url": "/azure/architecture/reference-architectures/enterprise-integration/queues-events",
16871698
"redirect_document_id": false
16881699
},
1700+
{
1701+
"source_path": "articles/azure-arc/servers/azcmagent-reference.md",
1702+
"redirect_url": "/azure/azure-arc/servers/manage-agent",
1703+
"redirect_document_id": false
1704+
},
16891705
{
16901706
"source_path": "articles/cognitive-services/bing-web-search/computer-vision-web-search-tutorial.md",
16911707
"redirect_url": "/azure/cognitive-services/bing-web-search/index",
@@ -4936,6 +4952,11 @@
49364952
"redirect_url": "/azure/azure-resource-manager/management/view-activity-logs",
49374953
"redirect_document_id": false
49384954
},
4955+
{
4956+
"source_path": "articles/event-grid/event-sources.md",
4957+
"redirect_url": "/azure/event-grid/overview#event-sources",
4958+
"redirect_document_id": false
4959+
},
49394960
{
49404961
"source_path": "articles/event-grid/event-subscription-template.md",
49414962
"redirect_url": "/azure/event-grid/template-samples",
@@ -5488,7 +5509,12 @@
54885509
},
54895510
{
54905511
"source_path": "articles/managed-applications/publish-managed-app-definition-quickstart.md",
5491-
"redirect_url": "/azure/azure-resource-manager/managed-applications/publish-managed-app-definition-quickstart",
5512+
"redirect_url": "/azure/azure-resource-manager/managed-applications/publish-service-catalog-app",
5513+
"redirect_document_id": false
5514+
},
5515+
{
5516+
"source_path": "articles/azure-resource-manager/managed-applications/publish-managed-app-definition-quickstart.md",
5517+
"redirect_url": "/azure/azure-resource-manager/managed-applications/publish-service-catalog-app",
54925518
"redirect_document_id": false
54935519
},
54945520
{
@@ -38325,6 +38351,16 @@
3832538351
"redirect_url": "/azure/active-directory/authentication/howto-password-ban-bad-configure",
3832638352
"redirect_document_id": false
3832738353
},
38354+
{
38355+
"source_path": "articles/active-directory/authentication/multi-factor-authentication-security-best-practices.md",
38356+
"redirect_url": "/azure/active-directory/authentication/howto-mfa-getstarted",
38357+
"redirect_document_id": false
38358+
},
38359+
{
38360+
"source_path": "articles/active-directory/authentication/concept-sspr-customization.md",
38361+
"redirect_url": "/azure/active-directory/authentication/howto-sspr-customization",
38362+
"redirect_document_id": true
38363+
},
3832838364
{
3832938365
"source_path": "articles/active-directory/active-directory-passwords-reset-register.md",
3833038366
"redirect_url": "/azure/active-directory/user-help/active-directory-passwords-reset-register",
@@ -40082,12 +40118,12 @@
4008240118
},
4008340119
{
4008440120
"source_path": "articles/iot-central/tutorial-add-device-pnp.md",
40085-
"redirect_url": "/azure/iot-central/core/tutorial-connect-pnp-device",
40121+
"redirect_url": "/azure/iot-central/core/quick-create-pnp-device",
4008640122
"redirect_document_id": false
4008740123
},
4008840124
{
4008940125
"source_path": "articles/iot-central/tutorial-define-device-type-pnp.md",
40090-
"redirect_url": "/azure/iot-central/core/howto-set-up-template",
40126+
"redirect_url": "/azure/iot-central/core/quick-create-pnp-device",
4009140127
"redirect_document_id": false
4009240128
},
4009340129
{
@@ -43760,6 +43796,76 @@
4376043796
"redirect_url": "/azure/cognitive-services/acoustics/what-is-acoustics",
4376143797
"redirect_document_id": false
4376243798
},
43799+
{
43800+
"source_path": "articles/cognitive-services/Acoustics/what-is-acoustics.md",
43801+
"redirect_url": "https://docs.microsoft.com/gaming/acoustics/what-is-acoustics",
43802+
"redirect_document_id": false
43803+
},
43804+
{
43805+
"source_path": "articles/cognitive-services/Acoustics/unity-quickstart.md",
43806+
"redirect_url": "https://docs.microsoft.com/gaming/acoustics/unity-quickstart",
43807+
"redirect_document_id": false
43808+
},
43809+
{
43810+
"source_path": "articles/cognitive-services/Acoustics/unreal-quickstart.md",
43811+
"redirect_url": "https://docs.microsoft.com/gaming/acoustics/unreal-quickstart",
43812+
"redirect_document_id": false
43813+
},
43814+
{
43815+
"source_path": "articles/cognitive-services/Acoustics/unity-baking.md",
43816+
"redirect_url": "https://docs.microsoft.com/gaming/acoustics/unity-baking",
43817+
"redirect_document_id": false
43818+
},
43819+
{
43820+
"source_path": "articles/cognitive-services/Acoustics/unity-workflow.md",
43821+
"redirect_url": "https://docs.microsoft.com/gaming/acoustics/unity-workflow",
43822+
"redirect_document_id": false
43823+
},
43824+
{
43825+
"source_path": "articles/cognitive-services/Acoustics/unreal-baking.md",
43826+
"redirect_url": "https://docs.microsoft.com/gaming/acoustics/unreal-baking",
43827+
"redirect_document_id": false
43828+
},
43829+
{
43830+
"source_path": "articles/cognitive-services/Acoustics/unreal-workflow.md",
43831+
"redirect_url": "https://docs.microsoft.com/gaming/acoustics/unreal-workflow",
43832+
"redirect_document_id": false
43833+
},
43834+
{
43835+
"source_path": "articles/cognitive-services/Acoustics/design-process.md",
43836+
"redirect_url": "https://docs.microsoft.com/gaming/acoustics/design-process",
43837+
"redirect_document_id": false
43838+
},
43839+
{
43840+
"source_path": "articles/cognitive-services/Acoustics/bake-resolution.md",
43841+
"redirect_url": "https://docs.microsoft.com/gaming/acoustics/bake-resolution",
43842+
"redirect_document_id": false
43843+
},
43844+
{
43845+
"source_path": "articles/cognitive-services/Acoustics/create-azure-account.md",
43846+
"redirect_url": "https://docs.microsoft.com/gaming/acoustics/create-azure-account",
43847+
"redirect_document_id": false
43848+
},
43849+
{
43850+
"source_path": "articles/cognitive-services/Acoustics/unity-integration.md",
43851+
"redirect_url": "https://docs.microsoft.com/gaming/acoustics/unity-integration",
43852+
"redirect_document_id": false
43853+
},
43854+
{
43855+
"source_path": "articles/cognitive-services/Acoustics/unreal-integration.md",
43856+
"redirect_url": "https://docs.microsoft.com/gaming/acoustics/unreal-integration",
43857+
"redirect_document_id": false
43858+
},
43859+
{
43860+
"source_path": "articles/cognitive-services/Acoustics/faq.md",
43861+
"redirect_url": "https://docs.microsoft.com/gaming/acoustics/faq",
43862+
"redirect_document_id": false
43863+
},
43864+
{
43865+
"source_path": "articles/cognitive-services/Acoustics/known-issues.md",
43866+
"redirect_url": "https://docs.microsoft.com/gaming/acoustics/known-issues",
43867+
"redirect_document_id": false
43868+
},
4376343869
{
4376443870
"source_path": "articles/iot-central/howto-export-data.md",
4376543871
"redirect_url": "/azure/iot-central/core/howto-export-data-event-hubs-service-bus",
@@ -46282,7 +46388,7 @@
4628246388
},
4628346389
{
4628446390
"source_path": "articles/iot-central/quick-create-pnp-device-pnp.md",
46285-
"redirect_url": "/azure/iot-central/core/quick-create-simulated-device/",
46391+
"redirect_url": "/azure/iot-central/core/quick-create-pnp-device/",
4628646392
"redirect_document_id": false
4628746393
},
4628846394
{
@@ -46347,12 +46453,7 @@
4634746453
},
4634846454
{
4634946455
"source_path": "articles/iot-central/core/quick-create-pnp-device-pnp.md",
46350-
"redirect_url": "/azure/iot-central/core/quick-create-simulated-device/",
46351-
"redirect_document_id": false
46352-
},
46353-
{
46354-
"source_path": "articles/iot-central/core/quick-create-pnp-device.md",
46355-
"redirect_url": "/azure/iot-central/core/quick-create-simulated-device/",
46456+
"redirect_url": "/azure/iot-central/core/quick-create-pnp-device/",
4635646457
"redirect_document_id": false
4635746458
},
4635846459
{
@@ -46787,7 +46888,7 @@
4678746888
},
4678846889
{
4678946890
"source_path": "articles/iot-central/preview/quick-create-pnp-device.md",
46790-
"redirect_url": "/azure/iot-central/core/quick-create-simulated-device/",
46891+
"redirect_url": "/azure/iot-central/core/quick-create-pnp-device/",
4679146892
"redirect_document_id": false
4679246893
},
4679346894
{
@@ -49990,6 +50091,11 @@
4999050091
"redirect_url": "/azure/cognitive-services/speech-service",
4999150092
"redirect_document_id": false
4999250093
},
50094+
{
50095+
"source_path": "articles/hdinsight/spark/azure-synapse-analytics-job-definition.md",
50096+
"redirect_url": "../../synapse-analytics/spark/apache-spark-job-definitions.md",
50097+
"redirect_document_id": true
50098+
},
4999350099
{
4999450100
"source_path": "articles/media-services/latest/access-api-portal.md",
4999550101
"redirect_url": "/azure/media-services/latest/access-api-howto",
@@ -50644,11 +50750,6 @@
5064450750
"redirect_url": "/azure/developer/ansible/vm-scale-set-update-image",
5064550751
"redirect_document_id": false
5064650752
},
50647-
{
50648-
"source_path": "articles/ansible/",
50649-
"redirect_url": "/azure/developer/ansible/",
50650-
"redirect_document_id": false
50651-
},
5065250753
{
5065350754
"source_path": "articles/ansible/index.yml",
5065450755
"redirect_url": "/azure/developer/ansible/",
@@ -50680,13 +50781,23 @@
5068050781
"redirect_document_id": false
5068150782
},
5068250783
{
50683-
"source_path": "articles/chef/",
50784+
"source_path": "articles/chef/index.yml",
5068450785
"redirect_url": "/azure/developer/chef/",
5068550786
"redirect_document_id": false
5068650787
},
5068750788
{
50688-
"source_path": "articles/chef/index.yml",
50689-
"redirect_url": "/azure/developer/chef/",
50789+
"source_path": "articles/security/fundamentals/database-security-overview.md",
50790+
"redirect_url": "/azure/sql-database/sql-database-security-overview",
50791+
"redirect_document_id": false
50792+
},
50793+
{
50794+
"source_path": "articles/azure-monitor/insights/key-vault-insights-overview.md",
50795+
"redirect_url": "/azure/azure-monitor/overview",
50796+
"redirect_document_id": false
50797+
},
50798+
{
50799+
"source_path": "articles/security/fundamentals/database-best-practices.md",
50800+
"redirect_url": "/azure/sql-database/sql-database-security-best-practice",
5069050801
"redirect_document_id": false
5069150802
}
5069250803
]

.vscode/settings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,4 +62,4 @@
6262
"auditd"
6363
],
6464
"git.ignoreLimitWarning": true
65-
}
65+
}

articles/active-directory-b2c/azure-monitor.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ To onboard your Azure AD tenant (the **Customer**), create an [Azure Resource Ma
8080

8181
Download the Azure Resource Manager template and parameter files:
8282

83-
- [rgDelegatedResourceManagement.json](https://raw.githubusercontent.com/Azure/Azure-Lighthouse-samples/master/Azure-Delegated-Resource-Management/templates/rg-delegated-resource-management/rgDelegatedResourceManagement.json)
84-
- [rgDelegatedResourceManagement.parameters.json](https://raw.githubusercontent.com/Azure/Azure-Lighthouse-samples/master/Azure-Delegated-Resource-Management/templates/rg-delegated-resource-management/rgDelegatedResourceManagement.parameters.json)
83+
- [rgDelegatedResourceManagement.json](https://github.com/Azure/Azure-Lighthouse-samples/blob/master/templates/rg-delegated-resource-management/rgDelegatedResourceManagement.json)
84+
- [rgDelegatedResourceManagement.parameters.json](https://github.com/Azure/Azure-Lighthouse-samples/blob/master/templates/rg-delegated-resource-management/rgDelegatedResourceManagement.parameters.json)
8585

8686
Next, update the parameters file with the values you recorded earlier. The following JSON snippet shows an example of an Azure Resource Manager template parameters file. For `authorizations.value.roleDefinitionId`, use the [built-in role](../role-based-access-control/built-in-roles.md) value for the *Contributor role*, `b24988ac-6180-42a0-ab88-20f7382dd24c`.
8787

articles/active-directory-b2c/custom-policy-get-started.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ Next, expose the API by adding a scope:
112112
1. In **App registrations (Legacy)**, select **New application registration**.
113113
1. For **Name**, enter `ProxyIdentityExperienceFramework`.
114114
1. For **Application type**, choose **Native**.
115-
1. For **Redirect URI**, enter `https://your-tenant-name.b2clogin.com/your-tenant-name.onmicrosoft.com`, where `your-tenant-name` is your Azure AD B2C tenant.
115+
1. For **Redirect URI**, enter `myapp://auth`.
116116
1. Select **Create**. After it's created, copy the application ID and save it to use later.
117117
1. Select **Settings**, then select **Required permissions**, and then select **Add**.
118118
1. Choose **Select an API**, search for and select **IdentityExperienceFramework**, and then click **Select**.
@@ -125,7 +125,7 @@ Next, expose the API by adding a scope:
125125
1. For **Name**, enter `ProxyIdentityExperienceFramework`.
126126
1. Under **Supported account types**, select **Accounts in this organizational directory only**.
127127
1. Under **Redirect URI**, use the drop-down to select **Public client/native (mobile & desktop)**.
128-
1. For **Redirect URI**, enter `https://your-tenant-name.b2clogin.com/your-tenant-name.onmicrosoft.com`, where `your-tenant-name` is your Azure AD B2C tenant.
128+
1. For **Redirect URI**, enter `myapp://auth`.
129129
1. Under **Permissions**, select the *Grant admin consent to openid and offline_access permissions* check box.
130130
1. Select **Register**.
131131
1. Record the **Application (client) ID** for use in a later step.

0 commit comments

Comments
 (0)