Skip to content

Commit db39560

Browse files
authored
Merge branch 'master' into askspoke
2 parents 655d1c2 + a89f986 commit db39560

File tree

1,077 files changed

+20046
-6425
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,077 files changed

+20046
-6425
lines changed

.openpublishing.publish.config.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
2727
],
2828
"sync_notification_subscribers": [
29-
"tysonn@microsoft.com"
29+
"angrobe_extended_dir@microsoft.com"
3030
],
3131
"branches_to_filter": [],
3232
"git_repository_url_open_to_public_contributors": "https://github.com/MicrosoftDocs/azure-docs",
@@ -439,6 +439,11 @@
439439
"url": "https://github.com/Azure-Samples/azure-cosmos-db-sql-xamarin-getting-started",
440440
"branch": "master"
441441
},
442+
{
443+
"path_to_root": "cosmosdb-python-sdk",
444+
"url": "https://github.com/Azure/azure-sdk-for-python/",
445+
"branch": "master"
446+
},
442447
{
443448
"path_to_root": "cosmosdb-nodejs-get-started",
444449
"url": "https://github.com/Azure-Samples/azure-cosmos-db-sql-api-nodejs-getting-started",

.openpublishing.redirection.json

Lines changed: 70 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -781,6 +781,11 @@
781781
"redirect_url": "/azure/cognitive-services/Content-Moderator/client-libraries?pivots=programming-language-python",
782782
"redirect_document_id": false
783783
},
784+
{
785+
"source_path": "articles/cognitive-services/LUIS/luis-tutorial-list-entity.md",
786+
"redirect_url": "/azure/cognitive-services/luis/reference-entity-list",
787+
"redirect_document_id": false
788+
},
784789
{
785790
"source_path": "articles/cognitive-services/QnAMaker/Tutorials/integrate-qnamaker-luis.md",
786791
"redirect_url": "/azure/cognitive-services/luis/choose-natural-language-processing-service",
@@ -2500,12 +2505,12 @@
25002505
},
25012506
{
25022507
"source_path": "articles/cosmos-db/analytics-usecases.md",
2503-
"redirect_url": "/azure/cosmos-db/synapse-link",
2508+
"redirect_url": "/azure/cosmos-db/synapse-link-use-cases",
25042509
"redirect_document_id": true
25052510
},
25062511
{
25072512
"source_path": "articles/cosmos-db/analytics-solution-architectures.md",
2508-
"redirect_url": "/azure/cosmos-db/synapse-link",
2513+
"redirect_url": "/azure/cosmos-db/synapse-link-use-cases",
25092514
"redirect_document_id": false
25102515
},
25112516
{
@@ -2515,7 +2520,7 @@
25152520
},
25162521
{
25172522
"source_path": "articles/cosmos-db/globally-distributed-transactional-analytical-storage.md",
2518-
"redirect_url": "/azure/cosmos-db/synapse-link",
2523+
"redirect_url": "/azure/cosmos-db/analytical-store-introduction",
25192524
"redirect_document_id": false
25202525
},
25212526
{
@@ -33922,6 +33927,11 @@
3392233927
"redirect_url": "/azure/role-based-access-control/role-assignments-portal",
3392333928
"redirect_document_id": false
3392433929
},
33930+
{
33931+
"source_path": "articles/role-based-access-control/tutorial-role-assignments-user-template.md",
33932+
"redirect_url": "/azure/role-based-access-control/quickstart-role-assignments-template",
33933+
"redirect_document_id": true
33934+
},
3392533935
{
3392633936
"source_path": "articles/active-directory/privileged-identity-management/active-directory-securing-privileged-access.md",
3392733937
"redirect_url": "/azure/active-directory/users-groups-roles/directory-admin-roles-secure",
@@ -40828,7 +40838,7 @@
4082840838
},
4082940839
{
4083040840
"source_path": "articles/monitoring/monitoring-solutions-inventory.md",
40831-
"redirect_url": "/azure/azure-monitor/insights/solutions-inventory",
40841+
"redirect_url": "/azure/azure-monitor/monitor-reference",
4083240842
"redirect_document_id": false
4083340843
},
4083440844
{
@@ -41693,8 +41703,8 @@
4169341703
},
4169441704
{
4169541705
"source_path": "articles/log-analytics/powershell-samples.md",
41696-
"redirect_url": "/azure/azure-monitor/platform/powershell-samples",
41697-
"redirect_document_id": true
41706+
"redirect_url": "/azure/azure-monitor/samples/powershell-samples",
41707+
"redirect_document_id": false
4169841708
},
4169941709
{
4170041710
"source_path": "articles/monitoring-and-diagnostics/alert-log.md",
@@ -41833,7 +41843,7 @@
4183341843
},
4183441844
{
4183541845
"source_path": "articles/monitoring-and-diagnostics/insights-cli-samples.md",
41836-
"redirect_url": "/azure/azure-monitor/platform/cli-samples",
41846+
"redirect_url": "/azure/azure-monitor/samples/cli-samples",
4183741847
"redirect_document_id": true
4183841848
},
4183941849
{
@@ -42719,7 +42729,7 @@
4271942729
{
4272042730
"source_path": "articles/application-insights/app-insights-usage-workbooks.md",
4272142731
"redirect_url": "/azure/azure-monitor/app/usage-workbooks",
42722-
"redirect_document_id": true
42732+
"redirect_document_id": false
4272342733
},
4272442734
{
4272542735
"source_path": "articles/application-insights/app-insights-visual-studio-codelens.md",
@@ -43001,6 +43011,41 @@
4300143011
"redirect_url": "/azure/azure-monitor/platform/activity-log-collect",
4300243012
"redirect_document_id": false
4300343013
},
43014+
{
43015+
"source_path": "articles/azure-monitor/learn/quick-create-workspace-posh.md",
43016+
"redirect_url": "/azure/azure-monitor/platform/powershell-workspace-configuration",
43017+
"redirect_document_id": false
43018+
},
43019+
{
43020+
"source_path": "articles/azure-monitor/platform/powershell-quickstart-samples.md",
43021+
"redirect_url": "/azure/azure-monitor/platform/powershell-samples",
43022+
"redirect_document_id": false
43023+
},
43024+
{
43025+
"source_path": "articles/azure-monitor/platform/cli-samples.md",
43026+
"redirect_url": "/azure/azure-monitor/samples/cli-samples",
43027+
"redirect_document_id": false
43028+
},
43029+
{
43030+
"source_path": "articles/azure-monitor/azure-management.md",
43031+
"redirect_url": "/azure/azure-monitor/overview",
43032+
"redirect_document_id": false
43033+
},
43034+
{
43035+
"source_path": "articles/azure-monitor/insights/solutions-inventory.md",
43036+
"redirect_url": "/azure/azure-monitor/monitor-reference",
43037+
"redirect_document_id": false
43038+
},
43039+
{
43040+
"source_path": "articles/azure-monitor/policy-samples.md",
43041+
"redirect_url": "/azure/azure-monitor/samples/policy-samples",
43042+
"redirect_document_id": false
43043+
},
43044+
{
43045+
"source_path": "articles/azure-monitor/platform/powershell-samples.md",
43046+
"redirect_url": "/azure/azure-monitor/samples/powershell-samples",
43047+
"redirect_document_id": false
43048+
},
4300443049
{
4300543050
"source_path": "articles/machine-learning/service/how-to-automated-ml.md",
4300643051
"redirect_url": "/azure/machine-learning/service/concept-automated-ml",
@@ -52428,12 +52473,26 @@
5242852473
"source_path": "articles/sql-database/sql-database-auditing-and-threat-detection-powershell.md",
5242952474
"redirect_url": "/azure/sql-database/scripts/sql-database-auditing-and-threat-detection-powershell",
5243052475
"redirect_document_id": true
52431-
},
52432-
{
52476+
},
52477+
{
5243352478
"source_path": "articles/cdn/endpoint-multiorigin.md",
5243452479
"redirect_url": "/azure/cdn/cdn-overview",
5243552480
"redirect_document_id": false
52481+
},
52482+
{
52483+
"source_path": "articles/azure-monitor/app/usage-workbooks.md",
52484+
"redirect_url": "/azure/azure-monitor/platform/workbooks-overview",
52485+
"redirect_document_id": false
52486+
},
52487+
{
52488+
"source_path": "articles/batch/batch-api-basics.md",
52489+
"redirect_url": "/azure/batch/batch-service-workflow-features",
52490+
"redirect_document_id": false
52491+
},
52492+
{
52493+
"source_path": "articles/batch/batch-retry-after-errors.md",
52494+
"redirect_url": "/azure/batch/error-handling",
52495+
"redirect_document_id": false
5243652496
}
52437-
5243852497
]
5243952498
}

articles/active-directory-b2c/identity-provider-salesforce-custom.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ Now that you have a button in place, you need to link it to an action. The actio
205205
<ClaimsExchange Id="SalesforceExchange" TechnicalProfileReferenceId="salesforce" />
206206
```
207207

208-
Update the value of **TechnicalProfileReferenceId** to the **ID** of the technical profile you created earlier. For example, `LinkedIn-OAUTH`.
208+
Update the value of **TechnicalProfileReferenceId** to the **ID** of the technical profile you created earlier. For example, `salesforce` or `LinkedIn-OAUTH`.
209209

210210
3. Save the *TrustFrameworkExtensions.xml* file and upload it again for verification.
211211

articles/active-directory-b2c/secure-rest-api.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ For the ServiceUrl, replace your-tenant-name with the name of your Azure AD tena
237237
<DisplayName></DisplayName>
238238
<Protocol Name="Proprietary" Handler="Web.TPEngine.Providers.RestfulProvider, Web.TPEngine, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" />
239239
<Metadata>
240-
<Item Key="ServiceUrl">https://login.microsoftonline.com/your-tenant-name.microsoft.com/oauth2/v2.0/token</Item>
240+
<Item Key="ServiceUrl">https://login.microsoftonline.com/your-tenant-name.onmicrosoft.com/oauth2/v2.0/token</Item>
241241
<Item Key="AuthenticationType">Basic</Item>
242242
<Item Key="SendClaimsIn">Form</Item>
243243
</Metadata>

articles/active-directory-b2c/tokens-overview.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ manager: celestedg
88
ms.service: active-directory
99
ms.workload: identity
1010
ms.topic: conceptual
11-
ms.date: 05/12/2020
11+
ms.date: 05/21/2020
1212
ms.author: mimart
1313
ms.subservice: B2C
1414
---
@@ -33,8 +33,8 @@ The following tokens are used in communication with Azure AD B2C:
3333

3434
A [registered application](tutorial-register-applications.md) receives tokens and communicates with Azure AD B2C by sending requests to these endpoints:
3535

36-
- `https://<tenant-name>.b2clogin.com/<tenant-name>.onmicrosoft.com/oauth2/v2.0/authorize`
37-
- `https://<tenant-name>.b2clogin.com/<tenant-name>.onmicrosoft.com/oauth2/v2.0/token`
36+
- `https://<tenant-name>.b2clogin.com/<tenant-name>.onmicrosoft.com/<policy-name>/oauth2/v2.0/authorize`
37+
- `https://<tenant-name>.b2clogin.com/<tenant-name>.onmicrosoft.com/<policy-name>/oauth2/v2.0/token`
3838

3939
Security tokens that your application receives from Azure AD B2C can come from the `/authorize` or `/token` endpoints. When ID tokens are acquired from the `/authorize` endpoint, it's done using the [implicit flow](implicit-flow-single-page-application.md), which is often used for users signing in to JavaScript-based web applications. When ID tokens are acquired from the `/token` endpoint, it's done using the [authorization code flow](openid-connect.md#get-a-token), which keeps the token hidden from the browser.
4040

articles/active-directory-domain-services/alert-service-principal.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ To recreate the Azure AD application used for credential synchronization, use Az
9898
$app = Get-AzureADApplication -Filter "IdentifierUris eq 'https://sync.aaddc.activedirectory.windowsazure.com'"
9999
Remove-AzureADApplication -ObjectId $app.ObjectId
100100
$spObject = Get-AzureADServicePrincipal -Filter "DisplayName eq 'Azure AD Domain Services Sync'"
101-
Remove-AzureADServicePrincipal -ObjectId $app.ObjectId
101+
Remove-AzureADServicePrincipal -ObjectId $spObject
102102
```
103103
104104
After you delete both applications, the Azure platform automatically recreates them and tries to resume password synchronization. The Azure AD DS managed domain's health automatically updates itself within two hours and removes the alert.

articles/active-directory/app-provisioning/toc.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,8 @@
9999
href: /azure/active-directory/develop/developer-support-help-options
100100
- name: Azure feedback forum
101101
href: https://feedback.azure.com/forums/169401-azure-active-directory
102-
- name: MSDN forum
103-
href: https://social.msdn.microsoft.com/Forums/azure/en-US/home?forum=WindowsAzureAD
102+
- name: Microsoft Q&A question page
103+
href: https://docs.microsoft.com/answers/topics/azure-active-directory.html
104104
- name: Pricing
105105
href: https://azure.microsoft.com/pricing/details/active-directory
106106
- name: Service updates

articles/active-directory/app-provisioning/use-scim-to-provision-users-and-groups.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1224,10 +1224,6 @@ To help drive awareness and demand of our joint integration, we recommend you up
12241224
)
12251225
* **Customer communication.** Alert customers of the new integration through your customer communication (monthly newsletters, email campaigns, product release notes).
12261226

1227-
### Allow IP addresses used by the Azure AD provisioning service to make SCIM requests
1228-
1229-
Certain apps allow inbound traffic to their app. In order for the Azure AD provisioning service to function as expected, the IP addresses used must be allowed. For a list of IP addresses for each service tag/region, see the JSON file - [Azure IP Ranges and Service TagsPublic Cloud](https://www.microsoft.com/download/details.aspx?id=56519). You can download and program these IPs into your firewall as needed. The reserved IP ranges for Azure AD provisioning can be found under "AzureActiveDirectoryDomainServices."
1230-
12311227
## Related articles
12321228

12331229
* [Automate user provisioning and deprovisioning to SaaS apps](user-provisioning.md)

0 commit comments

Comments
 (0)