Skip to content

Commit 1cf03da

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into release-cmk-hpc-cache
2 parents 63a41dd + 5d40078 commit 1cf03da

File tree

1,339 files changed

+22349
-3391
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,339 files changed

+22349
-3391
lines changed

.openpublishing.redirection.json

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4952,6 +4952,11 @@
49524952
"redirect_url": "/azure/azure-resource-manager/management/view-activity-logs",
49534953
"redirect_document_id": false
49544954
},
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+
},
49554960
{
49564961
"source_path": "articles/event-grid/event-subscription-template.md",
49574962
"redirect_url": "/azure/event-grid/template-samples",
@@ -43791,6 +43796,76 @@
4379143796
"redirect_url": "/azure/cognitive-services/acoustics/what-is-acoustics",
4379243797
"redirect_document_id": false
4379343798
},
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+
},
4379443869
{
4379543870
"source_path": "articles/iot-central/howto-export-data.md",
4379643871
"redirect_url": "/azure/iot-central/core/howto-export-data-event-hubs-service-bus",
@@ -50016,6 +50091,11 @@
5001650091
"redirect_url": "/azure/cognitive-services/speech-service",
5001750092
"redirect_document_id": false
5001850093
},
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+
},
5001950099
{
5002050100
"source_path": "articles/media-services/latest/access-api-portal.md",
5002150101
"redirect_url": "/azure/media-services/latest/access-api-howto",
@@ -50709,6 +50789,11 @@
5070950789
"source_path": "articles/security/fundamentals/database-security-overview.md",
5071050790
"redirect_url": "/azure/sql-database/sql-database-security-overview",
5071150791
"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
5071250797
},
5071350798
{
5071450799
"source_path": "articles/security/fundamentals/database-best-practices.md",

.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.

articles/active-directory/authentication/TOC.yml

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,7 @@
2222
items:
2323
- name: Authentication methods
2424
href: concept-authentication-methods.md
25-
- name: Passwordless authentication
26-
href: concept-authentication-passwordless.md
27-
- name: Security information registration
28-
href: concept-registration-mfa-sspr-combined.md
29-
- name: Password reset
25+
- name: Self-service password reset
3026
items:
3127
- name: How password reset works
3228
href: concept-sspr-howitworks.md
@@ -48,12 +44,16 @@
4844
href: https://docs.microsoft.com/office365/admin/security-and-compliance/set-up-multi-factor-authentication?view=o365-worldwide
4945
- name: FAQ
5046
href: multi-factor-authentication-faq.md
51-
- name: Azure AD password protection
47+
- name: Passwordless authentication
48+
href: concept-authentication-passwordless.md
49+
- name: Password protection
5250
items:
5351
- name: Eliminate weak passwords in the cloud
5452
href: concept-password-ban-bad.md
5553
- name: Eliminate weak passwords on-premises
5654
href: concept-password-ban-bad-on-premises.md
55+
- name: Security information registration
56+
href: concept-registration-mfa-sspr-combined.md
5757
- name: Resilient access controls
5858
href: concept-resilient-controls.md
5959
- name: How-to guides
@@ -100,28 +100,6 @@
100100
href: howto-mfa-nps-extension-rdg.md
101101
- name: VPN
102102
href: howto-mfa-nps-extension-vpn.md
103-
- name: Security info registration
104-
items:
105-
- name: Enable combined registration
106-
href: howto-registration-mfa-sspr-combined.md
107-
- name: Troubleshoot combined registration
108-
href: howto-registration-mfa-sspr-combined-troubleshoot.md
109-
- name: Azure AD password protection
110-
items:
111-
- name: Plan and deploy on-premises
112-
href: howto-password-ban-bad-on-premises-deploy.md
113-
- name: Enable and configure on-premises
114-
href: howto-password-ban-bad-on-premises-operations.md
115-
- name: Monitor on-premises deployments
116-
href: howto-password-ban-bad-on-premises-monitor.md
117-
- name: Troubleshoot on-premises deployments
118-
href: howto-password-ban-bad-on-premises-troubleshoot.md
119-
- name: On-premises FAQs
120-
href: howto-password-ban-bad-on-premises-faq.md
121-
- name: On-premises agent version history
122-
href: howto-password-ban-bad-on-premises-agent-versions.md
123-
- name: Azure AD smart lockout
124-
href: howto-password-smart-lockout.md
125103
- name: Passwordless
126104
items:
127105
- name: Deploying passwordless
@@ -138,16 +116,38 @@
138116
href: howto-authentication-passwordless-phone.md
139117
- name: Windows Hello for Business
140118
href: https://docs.microsoft.com/windows/security/identity-protection/hello-for-business/hello-identity-verification
119+
- name: Security info registration
120+
items:
121+
- name: Enable combined registration
122+
href: howto-registration-mfa-sspr-combined.md
123+
- name: Troubleshoot combined registration
124+
href: howto-registration-mfa-sspr-combined-troubleshoot.md
125+
- name: On-premises password protection
126+
items:
127+
- name: Plan and deploy
128+
href: howto-password-ban-bad-on-premises-deploy.md
129+
- name: Enable and configure
130+
href: howto-password-ban-bad-on-premises-operations.md
131+
- name: Monitor
132+
href: howto-password-ban-bad-on-premises-monitor.md
133+
- name: Troubleshoot
134+
href: howto-password-ban-bad-on-premises-troubleshoot.md
135+
- name: FAQs
136+
href: howto-password-ban-bad-on-premises-faq.md
137+
- name: Agent version history
138+
href: howto-password-ban-bad-on-premises-agent-versions.md
141139
- name: Use SMS-based authentication (preview)
142140
href: howto-authentication-sms-signin.md
141+
- name: Azure AD smart lockout
142+
href: howto-password-smart-lockout.md
143143
- name: Certificate-based authentication
144144
items:
145145
- name: Get started with certificate auth
146146
href: active-directory-certificate-based-authentication-get-started.md
147147
items:
148-
- name: CBA on Android Devices
148+
- name: Use on Android Devices
149149
href: active-directory-certificate-based-authentication-android.md
150-
- name: CBA on iOS Devices
150+
- name: Use on iOS Devices
151151
href: active-directory-certificate-based-authentication-ios.md
152152
- name: Reporting
153153
items:

0 commit comments

Comments
 (0)