Skip to content

Commit 7d8158f

Browse files
authored
Merge pull request #110755 from MicrosoftDocs/master
4/08 PM Publish
2 parents df8b2c0 + aac9179 commit 7d8158f

File tree

173 files changed

+2605
-1119
lines changed

Some content is hidden

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

173 files changed

+2605
-1119
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27475,11 +27475,6 @@
2747527475
"redirect_url": "/azure/storage/blobs/storage-custom-domain-name",
2747627476
"redirect_document_id": true
2747727477
},
27478-
{
27479-
"source_path": "articles/storage/storage-decide-blobs-files-disks.md",
27480-
"redirect_url": "/azure/storage/common/storage-decide-blobs-files-disks",
27481-
"redirect_document_id": true
27482-
},
2748327478
{
2748427479
"source_path": "articles/storage/storage-designing-ha-apps-with-ragrs.md",
2748527480
"redirect_url": "/azure/storage/common/storage-designing-ha-apps-with-ragrs",
@@ -27780,11 +27775,6 @@
2778027775
"redirect_url": "/azure/virtual-machines/windows/incremental-snapshots",
2778127776
"redirect_document_id": true
2778227777
},
27783-
{
27784-
"source_path": "articles/storage/storage-introduction.md",
27785-
"redirect_url": "/azure/storage/common/storage-introduction",
27786-
"redirect_document_id": true
27787-
},
2778827778
{
2778927779
"source_path": "articles/storage/storage-ios-how-to-use-blob-storage.md",
2779027780
"redirect_url": "/azure/storage/blobs/storage-ios-how-to-use-blob-storage",
@@ -39925,6 +39915,11 @@
3992539915
"redirect_url": "/azure/app-service/app-service-web-get-started-java",
3992639916
"redirect_document_id": false
3992739917
},
39918+
{
39919+
"source_path": "articles/storage/common/storage-decide-blobs-files-disks.md",
39920+
"redirect_url": "/azure/storage/common/storage-introduction",
39921+
"redirect_document_id": true
39922+
},
3992839923
{
3992939924
"source_path": "articles/cognitive-services/LUIS/luis-get-started-php-add-utterance.md",
3993039925
"redirect_url": "/azure/cognitive-services/LUIS/",

articles/active-directory/azuread-dev/active-directory-devhowto-adal-error-handling.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -538,7 +538,7 @@ To explore specific ADAL errors, the source code in the [azure-activedirectory-l
538538
539539
#### Operating system errors
540540
541-
iOS errors may arise during sign-in when users use web views, and the nature of authentication. This can be caused by conditions such as SSL errors, timeouts, or network errors:
541+
iOS errors may arise during sign-in when users use web views, and the nature of authentication. This can be caused by conditions such as TLS errors, timeouts, or network errors:
542542
543543
- For Entitlement Sharing, logins are not persistent and the cache appears empty. You can resolve by adding the following line of code to the keychain:
544544
`[[ADAuthenticationSettings sharedInstance] setSharedCacheKeychainGroup:nil];`

articles/active-directory/develop/apple-sso-plugin.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ ms.custom: aaddev
2323
> This preview version is provided without a service level agreement, and it's not recommended for production workloads. Certain features might not be supported or might have constrained capabilities.
2424
> For more information, see [Supplemental Terms of Use for Microsoft Azure Previews](https://azure.microsoft.com/support/legal/preview-supplemental-terms/).
2525
26-
The *Microsoft Enterprise SSO plug-in for Apple devices* provides single sign-on (SSO) for Active Directory accounts across all applications that support Apple's [Enterprise Single Sign-On](https://developer.apple.com/documentation/authenticationservices) feature. Microsoft worked closely with Apple to develop this plug-in to increase your application's usability while providing the best protection that Apple and Microsoft can provide.
26+
The *Microsoft Enterprise SSO plug-in for Apple devices* provides single sign-on (SSO) for Azure Active Directory (Azure AD) accounts across all applications that support Apple's [Enterprise Single Sign-On](https://developer.apple.com/documentation/authenticationservices) feature. Microsoft worked closely with Apple to develop this plug-in to increase your application's usability while providing the best protection that Apple and Microsoft can provide.
2727

2828
In this Public Preview release, the Enterprise SSO plug-in is available only for iOS devices and is distributed in certain Microsoft applications.
2929

@@ -33,7 +33,7 @@ Our first use of the Enterprise SSO plug-in is with our new [shared device mode]
3333

3434
The Microsoft Enterprise SSO plug-in for Apple devices offers the following benefits:
3535

36-
- Provides SSO for Active Directory accounts across all applications that support Apple's Enterprise Single Sign-On feature.
36+
- Provides SSO for Azure AD accounts across all applications that support Apple's Enterprise Single Sign-On feature.
3737
- Delivered automatically in the Microsoft Authenticator and can be enabled by any mobile device management (MDM) solution.
3838

3939
## Requirements

articles/active-directory/develop/tutorial-v2-javascript-spa.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -346,6 +346,18 @@ Create a new .js file named `authPopup.js`, which will contain your authenticati
346346
function signOut() {
347347
myMSALObj.logout();
348348
}
349+
350+
function callMSGraph(theUrl, accessToken, callback) {
351+
var xmlHttp = new XMLHttpRequest();
352+
xmlHttp.onreadystatechange = function () {
353+
if (this.readyState == 4 && this.status == 200) {
354+
callback(JSON.parse(this.responseText));
355+
}
356+
}
357+
xmlHttp.open("GET", theUrl, true); // true for asynchronous
358+
xmlHttp.setRequestHeader('Authorization', 'Bearer ' + accessToken);
359+
xmlHttp.send();
360+
}
349361

350362
function getTokenPopup(request) {
351363
return myMSALObj.acquireTokenSilent(request)

articles/active-directory/fundamentals/active-directory-manage-groups.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ ms.collection: M365-identity-device-management
2020
Azure Active Directory (Azure AD) lets you use groups to manage access to your cloud-based apps, on-premises apps, and your resources. Your resources can be part of the Azure AD organization, such as permissions to manage objects through roles in Azure AD, or external to the organization, such as for Software as a Service (SaaS) apps, Azure services, SharePoint sites, and on-premises resources.
2121

2222
>[!NOTE]
23-
>To use Azure Active Directory, you need an Azure account. If you don't have an account, you can [sign up for a free Azure account](https://azure.microsoft.com/free/).
24-
>
2523
> In the Azure portal, you can see some groups whose membership and group details you can't manage in the portal:
2624
>
2725
> - Groups synced from on-premises Active Directory can be managed only in on-premises Active Directory.

articles/active-directory/governance/create-access-review.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ms.tgt_pltfrm: na
1111
ms.devlang: na
1212
ms.topic: conceptual
1313
ms.subservice: compliance
14-
ms.date: 03/22/2020
14+
ms.date: 04/08/2020
1515
ms.author: barclayn
1616
ms.reviewer: mwahl
1717
ms.collection: M365-identity-device-management
10.4 KB
Loading

articles/active-directory/hybrid/how-to-connect-sync-change-serviceacct-pass.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ Abandon the existing encryption key so that new encryption key can be created:
7979

8080
2. Start a new PowerShell session.
8181

82-
3. Navigate to folder: `$env:Program Files\Microsoft Azure AD Sync\bin\`
82+
3. Navigate to folder: `'$env:ProgramFiles\Microsoft Azure AD Sync\bin\'`
8383

8484
4. Run the command: `./miiskmu.exe /a`
8585

articles/active-directory/hybrid/how-to-connect-sync-feature-preferreddatalocation.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ The geos in Office 365 available for Multi-Geo are:
4646
| Japan | JPN |
4747
| Korea | KOR |
4848
| South Africa | ZAF |
49+
| Switzerland | CHE |
4950
| United Arab Emirates | ARE |
5051
| United Kingdom | GBR |
5152
| United States | NAM |

articles/active-directory/hybrid/how-to-connect-syncservice-features.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,12 +84,14 @@ Set-MsolDirSyncFeature -Feature EnableSoftMatchOnUpn -Enable $true
8484

8585
## Synchronize userPrincipalName updates
8686

87-
Historically, updates to the UserPrincipalName attribute using the sync service from on-premises has been blocked, unless both of these conditions are true:
87+
Historically, updates to the UserPrincipalName attribute using the sync service from on-premises has been blocked, unless both of these conditions were true:
8888

8989
* The user is managed (non-federated).
9090
* The user has not been assigned a license.
9191

92-
For more details, see [User names in Office 365, Azure, or Intune don't match the on-premises UPN or alternate login ID](https://support.microsoft.com/kb/2523192).
92+
> [!NOTE]
93+
> From March 2019, synchronizing UPN changes for federated user accounts is allowed.
94+
>
9395
9496
Enabling this feature allows the sync engine to update the userPrincipalName when it is changed on-premises and you use password hash sync or pass-through authentication.
9597

0 commit comments

Comments
 (0)