Skip to content

Commit 65f8f65

Browse files
committed
Merging changes synced from https://github.com/MicrosoftDocs/azure-docs-pr (branch live)
2 parents f2bc773 + d815163 commit 65f8f65

File tree

160 files changed

+3405
-1836
lines changed

Some content is hidden

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

160 files changed

+3405
-1836
lines changed

.openpublishing.publish.config.json

+5
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,11 @@
233233
"url": "https://github.com/Azure-Samples/azure-iot-samples-node",
234234
"branch": "master"
235235
},
236+
{
237+
"path_to_root": "azure-iot-sdk-node",
238+
"url": "https://github.com/Azure/azure-iot-sdk-node",
239+
"branch": "master"
240+
},
236241
{
237242
"path_to_root": "iot-samples-c",
238243
"url": "https://github.com/Azure/azure-iot-sdk-c",

.openpublishing.redirection.json

+21-6
Original file line numberDiff line numberDiff line change
@@ -17800,6 +17800,11 @@
1780017800
"redirect_url": "/azure/sql-data-warehouse/sql-data-warehouse-load-with-data-factory",
1780117801
"redirect_document_id": false
1780217802
},
17803+
{
17804+
"source_path": "articles/synapse-analytics/sql-data-warehouse/sql-data-warehouse-get-started-visualize-with-power-bi.md",
17805+
"redirect_url": "/power-bi/service-azure-sql-data-warehouse-with-direct-connect",
17806+
"redirect_document_id": false
17807+
},
1780317808
{
1780417809
"source_path": "articles/sql-data-warehouse/sql-data-warehouse-load-from-azure-blob-storage-with-data-factory.md",
1780517810
"redirect_url": "/azure/sql-data-warehouse/sql-data-warehouse-load-with-data-factory",
@@ -17937,7 +17942,7 @@
1793717942
},
1793817943
{
1793917944
"source_path": "articles/sql-data-warehouse/sql-data-warehouse-get-started-visualize-with-power-bi.md",
17940-
"redirect_url": "/azure/synapse-analytics/sql-data-warehouse/sql-data-warehouse-get-started-visualize-with-power-bi",
17945+
"redirect_url": "/power-bi/service-azure-sql-data-warehouse-with-direct-connect",
1794117946
"redirect_document_id": true
1794217947
},
1794317948
{
@@ -28205,6 +28210,16 @@
2820528210
"redirect_url": "/azure/storage/blobs/storage-blob-snapshots",
2820628211
"redirect_document_id": true
2820728212
},
28213+
{
28214+
"source_path": "articles/storage/blobs/storage-blob-snapshots.md",
28215+
"redirect_url": "/azure/storage/blobs/snapshots-overview",
28216+
"redirect_document_id": false
28217+
},
28218+
{
28219+
"source_path": "articles/storage/blobs/storage-blob-soft-delete.md",
28220+
"redirect_url": "/azure/storage/blobs/soft-delete-overview",
28221+
"redirect_document_id": true
28222+
},
2820828223
{
2820928224
"source_path": "articles/storage/storage-blob-storage-tiers.md",
2821028225
"redirect_url": "/azure/storage/blobs/storage-blob-storage-tiers",
@@ -28435,6 +28450,11 @@
2843528450
"redirect_url": "/azure/storage/files/storage-how-to-use-files-linux",
2843628451
"redirect_document_id": true
2843728452
},
28453+
{
28454+
"source_path": "articles/storage/files/storage-how-to-recover-deleted-account.md",
28455+
"redirect_url": "/azure/storage/common/storage-account-create",
28456+
"redirect_document_id": false
28457+
},
2843828458
{
2843928459
"source_path": "articles/storage/storage-https-custom-domain-cdn.md",
2844028460
"redirect_url": "/azure/storage/blobs/storage-https-custom-domain-cdn",
@@ -52323,11 +52343,6 @@
5232352343
"source_path": "articles/load-balancer/azure-media-player/components-limitations.md",
5232452344
"redirect_url": "/articles/load-balancer/concepts",
5232552345
"redirect_document_id": false
52326-
},
52327-
{
52328-
"source_path": "articles/virtual-machines/troubleshooting/linux-virtual-machine-cannot-start-fstab-errors.md",
52329-
"redirect_url": "/articles/virtual-machines/troubleshooting",
52330-
"redirect_document_id": false
5233152346
}
5233252347

5233352348
]

articles/active-directory/authentication/howto-authentication-sms-signin.md

+5-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services: active-directory
66
ms.service: active-directory
77
ms.subservice: authentication
88
ms.topic: conceptual
9-
ms.date: 04/13/2020
9+
ms.date: 04/24/2020
1010

1111
ms.author: iainfou
1212
author: iainfoulds
@@ -36,9 +36,9 @@ To complete this article, you need the following resources and privileges:
3636
* An Azure Active Directory tenant associated with your subscription.
3737
* If needed, [create an Azure Active Directory tenant][create-azure-ad-tenant] or [associate an Azure subscription with your account][associate-azure-ad-tenant].
3838
* You need *global administrator* privileges in your Azure AD tenant to enable SMS-based authentication.
39-
* Each user that's enabled in the text message authentication method policy must be licensed, even if they don't use it. Each enabled user must have one of the following Azure AD or Microsoft 365 licenses:
39+
* Each user that's enabled in the text message authentication method policy must be licensed, even if they don't use it. Each enabled user must have one of the following Azure AD, Office 365, or Microsoft 365 licenses:
4040
* [Azure AD Premium P1 or P2][azuread-licensing]
41-
* [Microsoft 365 (M365) F1 or F3][m365-firstline-workers-licensing]
41+
* [Microsoft 365 (M365) F1 or F3][m365-firstline-workers-licensing] or [Office 365 F1][o365-f1] or [F3][o365-f3]
4242
* [Enterprise Mobility + Security (EMS) E3 or E5][ems-licensing] or [Microsoft 365 (M365) E3 or E5][m365-licensing]
4343

4444
## Limitations
@@ -162,3 +162,5 @@ For additional ways to sign in to Azure AD without a password, such as the Micro
162162
[azuread-licensing]: https://azure.microsoft.com/pricing/details/active-directory/
163163
[ems-licensing]: https://www.microsoft.com/microsoft-365/enterprise-mobility-security/compare-plans-and-pricing
164164
[m365-licensing]: https://www.microsoft.com/microsoft-365/compare-microsoft-365-enterprise-plans
165+
[o365-f1]: https://www.microsoft.com/microsoft-365/business/office-365-f1?market=af
166+
[o365-f3]: https://www.microsoft.com/microsoft-365/business/office-365-f3?activetab=pivot%3aoverviewtab

articles/active-directory/develop/active-directory-claims-mapping.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -479,7 +479,7 @@ In this example, you create a policy that adds the EmployeeID and TenantCountry
479479
1. To create the policy, run the following command:
480480
481481
``` powershell
482-
New-AzureADPolicy -Definition @('{"ClaimsMappingPolicy":{"Version":1,"IncludeBasicClaimSet":"true", "ClaimsSchema": [{"Source":"user","ID":"employeeid","SamlClaimType":"http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name","JwtClaimType":"name"},{"Source":"company","ID":"tenantcountry","SamlClaimType":"http://schemas.xmlsoap.org/ws/2005/05/identity/claims/country","JwtClaimType":"country"}]}}') -DisplayName "ExtraClaimsExample" -Type "ClaimsMappingPolicy"
482+
New-AzureADPolicy -Definition @('{"ClaimsMappingPolicy":{"Version":1,"IncludeBasicClaimSet":"true", "ClaimsSchema": [{"Source":"user","ID":"employeeid","SamlClaimType":"http://schemas.xmlsoap.org/ws/2005/05/identity/claims/employeeid","JwtClaimType":"name"},{"Source":"company","ID":"tenantcountry","SamlClaimType":"http://schemas.xmlsoap.org/ws/2005/05/identity/claims/country","JwtClaimType":"country"}]}}') -DisplayName "ExtraClaimsExample" -Type "ClaimsMappingPolicy"
483483
```
484484
485485
2. To see your new policy, and to get the policy ObjectId, run the following command:

articles/active-directory/develop/msal-authentication-flows.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -229,4 +229,4 @@ Apart from the [Integrated Windows Authentication constraints](#integrated-windo
229229

230230
### Azure AD B2C specifics
231231

232-
For more information on using MSAL.NET and Azure AD B2C, see [Using ROPC with Azure AD B2C (MSAL.NET)](msal-net-aad-b2c-considerations.md#resource-owner-password-credentials-ropc-with-azure-ad-b2c).
232+
For more information on using ROPC in MSAL.NET and Azure AD B2C, see [Using ROPC with Azure AD B2C](msal-net-aad-b2c-considerations.md#resource-owner-password-credentials-ropc).

0 commit comments

Comments
 (0)