Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into release-cmk-hpc-cache

Author: v-alje

.openpublishing.redirection.json

@@ -236,6 +236,11 @@
       "redirect_url": "/azure//virtual-machines/windows/sql/virtual-machines-windows-portal-sql-create-failover-cluster-premium-file-share",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/virtual-machines/windows/encrypt-disks.md",
+      "redirect_url": "/azure//virtual-machines/windows/disk-encryption-overview",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/virtual-machines/linux/cli-manage-nodejs.md",
       "redirect_url": "/azure/virtual-machines/linux/create-cli-complete",

articles/active-directory/authentication/concept-registration-mfa-sspr-combined.md

@@ -22,7 +22,7 @@ Before combined registration, users registered authentication methods for Azure
 This article outlines what combined security registration is. To get started with combined security registration, see the following article:
 
 > [!div class="nextstepaction"]
-> [Enable combined security regiration](howto-registration-mfa-sspr-combined.md)
+> [Enable combined security registration](howto-registration-mfa-sspr-combined.md)
 
 ![My Profile showing registered Security info for a user](media/concept-registration-mfa-sspr-combined/combined-security-info-defualts-registered.png)
 

articles/active-directory/develop/customize-webviews.md

@@ -98,7 +98,7 @@ Objective-C
 ```objc
 UIViewController *myParentController = ...;
 WKWebView *myCustomWebView = ...;
-MSALWebviewParameters *webViewParameters = [[MSALWebviewParameters alloc] initWithParentViewController:myParentController];
+MSALWebviewParameters *webViewParameters = [[MSALWebviewParameters alloc] initWithAuthPresentationViewController:myParentController];
 webViewParameters.webviewType = MSALWebviewTypeWKWebView;
 webViewParameters.customWebview = myCustomWebView;
 MSALInteractiveTokenParameters *interactiveParameters = [[MSALInteractiveTokenParameters alloc] initWithScopes:@[@"myscope"] webviewParameters:webViewParameters];
@@ -109,7 +109,7 @@ Swift
 ```swift
 let myParentController: UIViewController = ...
 let myCustomWebView: WKWebView = ...
-let webViewParameters = MSALWebviewParameters(parentViewController: myParentController)
+let webViewParameters = MSALWebviewParameters(authPresentationViewController: myParentController)
 webViewParameters.webviewType = MSALWebviewType.wkWebView
 webViewParameters.customWebview = myCustomWebView
 let interactiveParameters = MSALInteractiveTokenParameters(scopes: ["myscope"], webviewParameters: webViewParameters)

articles/active-directory/develop/reference-app-manifest.md

@@ -8,15 +8,15 @@ ms.service: active-directory
 ms.subservice: develop
 ms.topic: conceptual
 ms.workload: identity
-ms.date: 03/23/2020
+ms.date: 04/15/2020
 ms.author: ryanwi
 ms.custom: aaddev
 ms.reviewer: sureshja
 ---
 
 # Azure Active Directory app manifest
 
-The application manifest contains a definition of all the attributes of an application object in the Microsoft identity platform. It also serves as a mechanism for updating the application object. For more info on the Application entity and its schema, see the [Graph API Application entity documentation](https://msdn.microsoft.com/Library/Azure/Ad/Graph/api/entity-and-complex-type-reference#application-entity).
+The application manifest contains a definition of all the attributes of an application object in the Microsoft identity platform. It also serves as a mechanism for updating the application object. For more info on the Application entity and its schema, see the [Graph API Application entity documentation](https://docs.microsoft.com/previous-versions/azure/ad/graph/api/entity-and-complex-type-reference#application-entity).
 
 You can configure an app's attributes through the Azure portal or programmatically using [REST API](https://docs.microsoft.com/previous-versions/azure/ad/graph/api/entity-and-complex-type-reference#application-entity) or [PowerShell](https://docs.microsoft.com/powershell/module/azuread/?view=azureadps-2.0#applications). However, there are some scenarios where you'll need to edit the app manifest to configure an app's attribute. These scenarios include:
 
@@ -36,6 +36,20 @@ To configure the application manifest:
 
 This section describes the attributes found in the application manifest.
 
+### id attribute
+
+| Key | Value type |
+| :--- | :--- |
+| id | String |
+
+The unique identifier for the app in the directory. This ID is not the identifier used to identify the app in any protocol transaction. It's used for the referencing the object in directory queries.
+
+Example:
+
+```json
+    "id": "f7f9acfc-ae0c-4d6c-b489-0a81dc1652dd",
+```
+
 ### accessTokenAcceptedVersion attribute
 
 | Key | Value type |
@@ -225,19 +239,7 @@ Example:
     "optionalClaims": null,
 ```
 
-### id attribute
 
-| Key | Value type |
-| :--- | :--- |
-| id | String |
-
-The unique identifier for the app in the directory. This ID is not the identifier used to identify the app in any protocol transaction. It's used for the referencing the object in directory queries.
-
-Example:
-
-```json
-    "id": "f7f9acfc-ae0c-4d6c-b489-0a81dc1652dd",
-```
 
 ### identifierUris attribute
 

articles/active-directory/develop/scenario-mobile-acquire-token.md

@@ -146,7 +146,7 @@ If MSAL returns `MSALErrorInteractionRequired`, then try acquiring tokens intera
 
 ```objc
 UIViewController *viewController = ...; // Pass a reference to the view controller that should be used when getting a token interactively
-MSALWebviewParameters *webParameters = [[MSALWebviewParameters alloc] initWithParentViewController:viewController];
+MSALWebviewParameters *webParameters = [[MSALWebviewParameters alloc] initWithAuthPresentationViewController:viewController];
 MSALInteractiveTokenParameters *interactiveParams = [[MSALInteractiveTokenParameters alloc] initWithScopes:scopes webviewParameters:webParameters];
 [application acquireTokenWithParameters:interactiveParams completionBlock:^(MSALResult *result, NSError *error) {
 	if (!error)	
@@ -162,7 +162,7 @@ MSALInteractiveTokenParameters *interactiveParams = [[MSALInteractiveTokenParame
 
 ```swift
 let viewController = ... // Pass a reference to the view controller that should be used when getting a token interactively
-let webviewParameters = MSALWebviewParameters(parentViewController: viewController)
+let webviewParameters = MSALWebviewParameters(authPresentationViewController: viewController)
 let interactiveParameters = MSALInteractiveTokenParameters(scopes: scopes, webviewParameters: webviewParameters)
 application.acquireToken(with: interactiveParameters, completionBlock: { (result, error) in
                 

articles/active-directory/develop/tutorial-v2-ios.md

@@ -384,7 +384,7 @@ Add the following after `initMSAL` method to the `ViewController` class.
 
 ```swift
 func initWebViewParams() {
-        self.webViewParameters = MSALWebviewParameters(parentViewController: self)
+        self.webViewParameters = MSALWebviewParameters(authPresentationViewController: self)
     }
 ```
 

articles/active-directory/hybrid/index.yml

@@ -54,7 +54,7 @@ landingContent:
             url: whatis-phs.md
           - text: What is passthrough authentication?
             url: how-to-connect-pta.md
-          - text: What is federtation?
+          - text: What is federation?
             url: whatis-fed.md
           - text: What is single sign-on?
             url: how-to-connect-sso.md
@@ -100,4 +100,4 @@ landingContent:
 
 
 
-     
+     

articles/active-directory/saas-apps/highground-tutorial.md

@@ -81,15 +81,15 @@ Follow these steps to enable Azure AD SSO in the Azure portal.
 1. On the **Basic SAML Configuration** section, if you wish to configure the application in **IDP** initiated mode, enter the values for the following fields:
 
     a. In the **Identifier** text box, type a URL using the following pattern:
-    `https://<SUBDOMAIN>.highground.com/`
+    `https://app.highground.com/`
 
     b. In the **Reply URL** text box, type a URL using the following pattern:
-    `https://<SUBDOMAIN>.highground.com/svc/SSONoAuth/<companyName>`
+    `https://app.highground.com/svc/SSONoAuth/SAML?groupid=<company-guid>`
 
 1. Click **Set additional URLs** and perform the following step if you wish to configure the application in **SP** initiated mode:
 
     In the **Sign-on URL** text box, type a URL using the following pattern:
-    `https://app.highground.com/#/login/<companyName>`
+    `https://app.highground.com/#/login/<company-slug>`
 
 	> [!NOTE]
 	> These values are not real. Update these values with the actual Identifier, Reply URL and Sign-on URL. Contact [HighGround Client support team](https://youearnedit.freshdesk.com/support/home) to get these values. You can also refer to the patterns shown in the **Basic SAML Configuration** section in the Azure portal.