Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into cy_azure_master

Author: ClareMSYanGit

.acrolinx-config.edn

@@ -1,29 +1,2 @@
 {:allowed-branchname-matches ["^master$" "^release..*"]
- :allowed-filename-matches ["articles" "includes"]
-
- :template-header
-   "
-## Acrolinx Scorecards
-
-**A minimum Acrolinx score of 80 is required.** 
- 
- Click the scorecard links for each article to review the Acrolinx feedback on grammar, spelling, punctuation, writing style, and terminology:
-
-| Article | Score | Issues | Scorecard |
-| ------- | ----- | ------ | --------- |
-"
-
-   ;; do not remove the spaces at the end of lines! That is markdown for
-   ;; linebreak
-   :template-change
-   "| **${github/filename}** | ${acrolinx/qualityscore} | ${acrolinx/flags/issues} | [link](${acrolinx/scorecard}) |
-"
-
- :template-footer
-"
-**More info about Acrolinx**
-
-- [Install Acrolinx locally for VSCode](https://review.docs.microsoft.com/en-us/help/contribute/contribute-acrolinx-vscode)
-- [Report false positives or issues](https://aka.ms/acrolinxbug)
-
-"}
+ :allowed-filename-matches ["articles" "includes"]}

.openpublishing.redirection.json

@@ -27249,7 +27249,7 @@
         },
         {
             "source_path": "articles/active-directory/application-proxy-sso-overview.md",
-            "redirect_url": "/azure/active-directory/manage-apps/application-proxy-single-sign-on",
+            "redirect_url": "/azure/active-directory/manage-apps/what-is-single-sign-on",
             "redirect_document_id": false
         },
         {
@@ -28415,8 +28415,8 @@
         },
         {
             "source_path": "articles/active-directory/application-config-sso-how-to-choose-sign-on-method.md",
-            "redirect_url": "/azure/active-directory/manage-apps/single-sign-on-modes",
-            "redirect_document_id": true
+            "redirect_url": "/azure/active-directory/manage-apps/what-is-single-sign-on",
+            "redirect_document_id": false
         },
         {
             "source_path": "articles/active-directory/application-config-sso-how-to-configure-federated-sso-gallery.md",
@@ -28643,6 +28643,16 @@
             "redirect_url": "/azure/active-directory/manage-apps/developer-guidance-for-integrating-applications",
             "redirect_document_id": true
         },
+        {
+            "source_path": "articles/active-directory/manage-apps/application-proxy-single-sign-on.md",
+            "redirect_url": "/azure/active-directory/manage-apps/what-is-single-sign-on",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/active-directory/manage-apps/single-sign-on-modes.md",
+            "redirect_url": "/azure/active-directory/manage-apps/what-is-single-sign-on",
+            "redirect_document_id": false
+        },
         {
             "source_path": "articles/virtual-machines/linux/classic/cli-use-docker.md",
             "redirect_url": "/azure/virtual-machines/linux/dockerextension",

articles/active-directory/fundamentals/active-directory-faq.md

@@ -10,7 +10,7 @@ ms.service: active-directory
 ms.component: fundamentals
 ms.workload: identity
 ms.topic: conceptual
-ms.date: 12/14/2017
+ms.date: 11/12/2018
 ms.author: lizross
 ---
 
@@ -167,7 +167,7 @@ For more information, see:
 * Direct sign-in to federated apps
 * Deep links to federated, password-based, or existing apps
 
-For more information, see [Deploying Azure AD integrated applications to users](../manage-apps/what-is-single-sign-on.md#deploying-azure-ad-integrated-applications-to-users).
+For more information, see [End user experiences for applications](../manage-apps/end-user-experiences.md).
 
 - - -
 **Q: What are the different ways Azure AD enables authentication and single sign-on to applications?**
@@ -178,7 +178,7 @@ For more information, see:
 
 * [Authentication Scenarios for Azure AD](../develop/authentication-scenarios.md)
 * [Active Directory authentication protocols](https://msdn.microsoft.com/library/azure/dn151124.aspx)
-* [How does single sign-on with Azure Active Directory work?](../manage-apps/what-is-single-sign-on.md#how-does-single-sign-on-with-azure-active-directory-work)
+* [Single sign-on for applications in Azure AD](../manage-apps/what-is-single-sign-on.md)
 
 - - -
 **Q: Can I add applications I’m running on-premises?**

articles/active-directory/manage-apps/application-proxy-configure-for-claims-aware-applications.md

@@ -12,9 +12,9 @@ ms.workload: identity
 ms.tgt_pltfrm: na
 ms.devlang: na
 ms.topic: conceptual
-ms.date: 08/04/2017
+ms.date: 11/08/2018
 ms.author: barbkess
-ms.reviewer: harshja
+ms.reviewer: japere
 
 ---
 
@@ -51,7 +51,7 @@ If all the internal URLs for your applications are fully qualified domain names
    ![Add an Endpoint - set Trusted URL value - screenshot](./media/application-proxy-configure-for-claims-aware-applications/appproxyendpointtrustedurl.png)  
 
 ## Next steps
-* [Enable single-sign on](application-proxy-single-sign-on.md) for applications that aren't claims-aware
+* [Enable single-sign on](configure-single-sign-on-portal.md) for applications that aren't claims-aware
 * [Enable native client apps to interact with proxy applications](application-proxy-configure-native-client-application.md)
 
 

articles/active-directory/manage-apps/application-proxy-configure-native-client-application.md

@@ -12,9 +12,9 @@ ms.workload: identity
 ms.tgt_pltfrm: na
 ms.devlang: na
 ms.topic: conceptual
-ms.date: 01/31/2018
+ms.date: 11/08/2018
 ms.author: barbkess
-ms.reviewer: harshja
+ms.reviewer: japere
 ms.custom: it-pro
 
 ---
@@ -95,4 +95,4 @@ Once the ADAL is edited with these parameters, your users should be able to auth
 
 For more information about the native application flow, see [Native application to web API](../develop/native-app.md)
 
-Learn about setting up [Single sign-on for Application Proxy](application-proxy-single-sign-on.md)
+Learn about setting up [Single sign-on for Application Proxy](what-is-single-sign-on.md#single- sign-on-methods)

articles/active-directory/manage-apps/application-proxy-configure-single-sign-on-password-vaulting.md

@@ -9,20 +9,18 @@ manager: mtillman
 ms.service: active-directory
 ms.component: app-mgmt
 ms.workload: identity
-ms.tgt_pltfrm: na
-ms.devlang: na
 ms.topic: conceptual
-ms.date: 07/20/2017
+ms.date: 11/12/2018
 ms.author: barbkess
-ms.reviewer: harshja
+ms.reviewer: japere
 ms.custom: it-pro
 ---
 
 # Password vaulting for single sign-on with Application Proxy
 
 Azure Active Directory Application Proxy helps you improve productivity by publishing on-premises applications so that remote employees can securely access them, too. In the Azure portal, you can also set up single sign-on (SSO) to these apps. Your users only need to authenticate with Azure AD, and they can access your enterprise application without having to sign in again.
 
-Application Proxy supports several [single sign-on modes](application-proxy-single-sign-on.md). Password-based sign-on is intended for applications that use a username/password combination for authentication. When you configure password-based sign-on for your application, your users have to sign in to the on-premises application once. After that, Azure Active Directory stores the sign-in information and automatically provides it to the application when your users access it remotely. 
+Application Proxy supports several [single sign-on modes](what-is-single-sign-on.md#choosing-a-single-sign-on-method). Password-based sign-on is intended for applications that use a username/password combination for authentication. When you configure password-based sign-on for your application, your users have to sign in to the on-premises application once. After that, Azure Active Directory stores the sign-in information and automatically provides it to the application when your users access it remotely. 
 
 You should already have published and tested your app with Application Proxy. If not, follow the steps in [Publish applications using Azure AD Application Proxy](application-proxy-publish-azure-portal.md) then come back here. 
 
@@ -52,5 +50,5 @@ Go to external URL that you configured for remote access to your application. Si
 
 ## Next steps
 
-- Read about other ways to implement [Single sign-on with Application Proxy](application-proxy-single-sign-on.md)
+- Read about other ways to implement [Single sign-on](what-is-single-sign-on.md)
 - Learn about [Security considerations for accessing apps remotely with Azure AD Application Proxy](application-proxy-security.md)

articles/active-directory/manage-apps/application-proxy-connector-groups.md

@@ -2,7 +2,6 @@
 title: Publishing applications on separate networks and locations using connector groups in Azure AD App Proxy | Microsoft Docs
 description: Covers how to create and manage groups of connectors in Azure AD Application Proxy.
 services: active-directory
-documentationcenter: ''
 author: barbkess
 manager: mtillman
 
@@ -12,10 +11,9 @@ ms.workload: identity
 ms.tgt_pltfrm: na
 ms.devlang: na
 ms.topic: conceptual
-ms.date: 01/31/2018
+ms.date: 11/08/2018
 ms.author: barbkess
-ms.reviewer: harshja
-ms.custom: H1Hack27Feb2017; it-pro
+ms.reviewer: japere
 
 ---
 
@@ -124,6 +122,6 @@ In the example below, the company has two datacenters, A and B, with two connect
 ## Next steps
 
 * [Understand Azure AD Application Proxy connectors](application-proxy-connectors.md)
-* [Enable single-sign on](application-proxy-single-sign-on.md)
+* [Enable single-sign on](what-is-single-sign-on.md)
 
 

articles/active-directory/manage-apps/application-proxy-single-sign-on.md

@@ -13,20 +13,15 @@ ms.workload: identity
 ms.tgt_pltfrm: na
 ms.devlang: na
 ms.topic: conceptual
-ms.date: 09/09/2018
+ms.date: 11/08/2018
 ms.author: barbkess
 
 ---
 
-# How to choose which application type to use when adding an application
+# Choosing the application type when adding an application in Azure Active Directory
+Learn about the four types of applications you can add to Azure Active Directory (Azure AD). When you are adding an application in Azure Active Directory, you'll be prompted to choose one of the four application type. 
 
-This article help you to understand the four main types of applications you can integrate with Azure AD:
-
-* What is supported by each of them
-* Why you might choose which application
-* How to configure those application’s core properties, like how users are **provisioned**, or what **single sign-on** technology to use.
-
-## Supported application types in Azure AD
+## What are the types of applications?
 
 Azure AD supports four main application types that you can add using the **Add** feature found under **Enterprise Applications**. These include:
 
@@ -38,7 +33,7 @@ Azure AD supports four main application types that you can add using the **Add**
 
 -   **Non-Gallery Applications** – Bring your own applications! Any web link you want, or any application that renders a username and password field, supports SAML or OpenID Connect protocols, or supports SCIM that you wish to integrate for single sign-on with Azure AD.
 
-## Features and capabilities supported by all the preceding application types
+## Features and capabilities supported by the application types
 
 The following features are supported by any of the preceding four application types in Azure AD:
 

articles/active-directory/manage-apps/choose-application-type.md

@@ -20,10 +20,10 @@ ms.reviewer: asmalser
 
 ---
 # Managing user account provisioning for enterprise apps in the Azure portal
-This article describes how to use the [Azure portal](https://portal.azure.com) to manage automatic user account provisioning and de-provisioning for applications that support it, particularly ones that have been added from the "featured" category of the [Azure Active Directory application gallery](what-is-single-sign-on.md#get-started-with-the-azure-ad-application-gallery). To learn more about automatic user account provisioning and how it works, see [Automate User Provisioning and Deprovisioning to SaaS Applications with Azure Active Directory](user-provisioning.md).
+This article describes how to use the [Azure portal](https://portal.azure.com) to manage automatic user account provisioning and de-provisioning for applications that support it. To learn more about automatic user account provisioning and how it works, see [Automate User Provisioning and Deprovisioning to SaaS Applications with Azure Active Directory](user-provisioning.md).
 
 ## Finding your apps in the portal
-All applications that are configured for single sign-on in a directory, by a directory administrator using the [Azure Active Directory application gallery](what-is-single-sign-on.md#get-started-with-the-azure-ad-application-gallery), can be viewed and managed in the [Azure portal](https://portal.azure.com). The applications can be found in the **All Services** > **Enterprise Applications** section of the portal. Enterprise apps are apps that are deployed and used within your organization.
+All applications that are configured for single sign-on in a directory can be viewed and managed in the [Azure portal](https://portal.azure.com). The applications can be found in the **All Services** > **Enterprise Applications** section of the portal. Enterprise apps are apps that are deployed and used within your organization.
 
 ![Enterprise Applications pane](./media/configure-automatic-user-provisioning-portal/enterprise-apps-pane.png)