Merge remote-tracking branch 'upstream/master' into cli-rebrand/merge-master

Author: Stephen Tramer

.openpublishing.redirection.json

@@ -3002,7 +3002,7 @@
         },
         {
             "source_path": "articles/app-service-web/app-service-web-get-started-python-cli-nodejs.md",
-            "redirect_url": "/azure/app-service/app-service-web-get-started-python",
+            "redirect_url": "/azure/app-service/containers/quickstart-python",
             "redirect_document_id": false
         },
         {
@@ -3277,37 +3277,37 @@
         },
         {
             "source_path": "articles/app-service-web/web-sites-python-create-deploy-bottle-app.md",
-            "redirect_url": "/azure/app-service/app-service-web-get-started-python",
+            "redirect_url": "/azure/app-service/containers/quickstart-python",
             "redirect_document_id": false
         },
         {
             "source_path": "articles/app-service-web/web-sites-python-create-deploy-django-app.md",
-            "redirect_url": "/azure/app-service/app-service-web-get-started-python",
+            "redirect_url": "/azure/app-service/containers/quickstart-python",
             "redirect_document_id": false
         },
         {
             "source_path": "articles/app-service-web/web-sites-python-create-deploy-flask-app.md",
-            "redirect_url": "/azure/app-service/app-service-web-get-started-python",
+            "redirect_url": "/azure/app-service/containers/quickstart-python",
             "redirect_document_id": false
         },
         {
             "source_path": "articles/app-service-web/web-sites-python-ptvs-bottle-table-storage.md",
-            "redirect_url": "/azure/app-service/app-service-web-get-started-python",
+            "redirect_url": "/azure/app-service/containers/quickstart-python",
             "redirect_document_id": false
         },
         {
             "source_path": "articles/app-service-web/web-sites-python-ptvs-django-mysql.md",
-            "redirect_url": "/azure/app-service/app-service-web-get-started-python",
+            "redirect_url": "/azure/app-service/containers/quickstart-python",
             "redirect_document_id": false
         },
         {
             "source_path": "articles/app-service-web/web-sites-python-ptvs-django-sql.md",
-            "redirect_url": "/azure/app-service/app-service-web-get-started-python",
+            "redirect_url": "/azure/app-service/containers/quickstart-python",
             "redirect_document_id": false
         },
         {
             "source_path": "articles/app-service-web/web-sites-python-ptvs-flask-table-storage.md",
-            "redirect_url": "/azure/app-service/app-service-web-get-started-python",
+            "redirect_url": "/azure/app-service/containers/quickstart-python",
             "redirect_document_id": false
         },
         {
@@ -3552,7 +3552,7 @@
         },
         {
             "source_path": "articles/app-service-web/app-service-web-get-started-python.md",
-            "redirect_url": "/azure/app-service/app-service-web-get-started-python",
+            "redirect_url": "/azure/app-service/containers/quickstart-python",
             "redirect_document_id": false
         },
         {
@@ -4010,6 +4010,16 @@
             "redirect_url": "https://github.com/Azure/azure-webjobs-sdk/wiki",
             "redirect_document_id": false
         },
+        {
+            "source_path": "articles/app-service/app-service-web-get-started-python.md",
+            "redirect_url": "/azure/app-service/containers/quickstart-python",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/app-service/app-service-web-tutorial-python-postgresql.md",
+            "redirect_url": "/azure/app-service/containers/tutorial-docker-python-postgresql-app",
+            "redirect_document_id": false
+        },
         {
             "source_path": "articles/app-service-api/app-service-api-apps-why-best-platform.md",
             "redirect_url": "/azure/app-service/app-service-web-overview",
@@ -23130,6 +23140,16 @@
             "redirect_url": "/azure/stream-analytics/stream-analytics-job-diagram-with-metrics",
             "redirect_document_id": false
         },
+        {
+            "source_path": "articles/active-directory/authentication/active-directory-passwords-overview.md",
+            "redirect_url": "/azure/active-directory/authentication/concept-sspr-howitworks",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/active-directory/authentication/multi-factor-authentication.md",
+            "redirect_url": "/azure/active-directory/authentication/concept-mfa-howitworks",
+            "redirect_document_id": false
+        },
         {
             "source_path": "articles/multi-factor-authentication/multi-factor-authentication-get-started-adfs-cloud.md",
             "redirect_url": "/azure/active-directory/authentication/howto-mfa-adfs",
@@ -23150,6 +23170,11 @@
             "redirect_url": "/azure/active-directory/authentication/concept-mfa-whichversion",
             "redirect_document_id": false
         },
+        {
+            "source_path": "articles/multi-factor-authentication/index.md",
+            "redirect_url": "/azure/active-directory/authentication/index",
+            "redirect_document_id": false
+        },
         {
             "source_path": "articles/multi-factor-authentication/multi-factor-authentication-how-it-works.md",
             "redirect_url": "/azure/active-directory/authentication/concept-mfa-howitworks",
@@ -25160,6 +25185,11 @@
             "redirect_url": "/azure/iot-hub/iot-hub-security-x509-get-started",
             "redirect_document_id": false
         },
+        {
+            "source_path": "articles/iot-hub/iot-hub-get-started.md",
+            "redirect_url": "/azure/iot-hub/iot-hub-get-started-physical",
+            "redirect_document_id": false
+        },
         {
             "source_path": "articles/iot-suite/index.md",
             "redirect_url": "/azure/iot-accelerators",
@@ -26419,6 +26449,16 @@
         "source_path": "articles/cognitive-services/LUIS/find-region-nodejs.md",
         "redirect_url": "/azure/cognitive-services/LUIS/luis-find-region-nodejs",
         "redirect_document_id": true
-        }         
+        },
+        {
+        "source_path": "articles/cognitive-services/LUIS/migration-v1-to-v2.md",
+        "redirect_url": "/azure/cognitive-services/LUIS/luis-migration-api-v1-to-v2",
+        "redirect_document_id": true
+        },
+        {
+        "source_path": "articles/cognitive-services/LUIS/interactive-test.md",
+        "redirect_url": "/azure/cognitive-services/LUIS/luis-interactive-test",
+        "redirect_document_id": true
+        }
     ]
 }

articles/active-directory-b2c/active-directory-b2c-reference-trustframeworks-defined-ief-custom.md

@@ -85,7 +85,7 @@ In terms of implementation, the TF specification consists of a set of policies t
 
 - The metadata for establishing network communications between participants. This metadata, along with the technical profiles, are used during a transaction to plumb “on the wire” interoperability between the relying party and other community participants.
 
-- The protocol conversion if any (for example, SAML, OAuth2, WS-Federation, and OpenID Connect).
+- The protocol conversion if any (for example, SAML 2.0, OAuth2, WS-Federation, and OpenID Connect).
 
 - The authentication requirements.
 

articles/active-directory/TOC.md

@@ -140,33 +140,13 @@
 #### [Sign-in samples](active-directory-reporting-api-sign-in-activity-samples.md)
 #### [Using certificates](active-directory-reporting-api-with-certificates.md)
 
-## Manage passwords
-### [Passwords overview](authentication/active-directory-passwords-overview.md)
+## Manage passwords(active-directory/authentication/concept-sspr-howitworks.md)
 ### User documents
 #### [Reset or change your password](user-help/active-directory-passwords-update-your-own-password.md)
 #### [Password best practices](active-directory-secure-passwords.md)
 #### [Register for self-service password reset](user-help/active-directory-passwords-reset-register.md)
-### [SSPR How it works](authentication/concept-sspr-howitworks.md)
-### [SSPR Deployment guide](authentication/howto-sspr-deployment.md)
-### [SSPR and Windows 10](authentication/tutorial-sspr-windows.md)
-### [SSPR Policies ](authentication/concept-sspr-policy.md)
-### [SSPR Customization](authentication/concept-sspr-customization.md)
-### [SSPR Data requirements](authentication/howto-sspr-authenticationdata.md)
-### [SSPR Reporting](authentication/howto-sspr-reporting.md)
-### [Smart lockout](authentication/howto-password-smart-lockout.md)
-### [Eliminate weak passwords](authentication/concept-password-ban-bad.md)
-### [Configure the banned password list](authentication/howto-password-ban-bad.md)
-### [On-premises integration](authentication/concept-password-ban-bad-on-premises.md)
-### [Deploy Azure AD password protection](authentication/howto-password-ban-bad-on-premises.md)
-### [Configure Azure AD password protection](authentication/howto-password-ban-bad-on-premises-operations.md)
-### [Monitor Azure AD password protection](authentication/howto-password-ban-bad-on-premises-troubleshoot.md)
 ### IT Admins: Reset passwords
 #### [Azure portal](fundamentals/active-directory-users-reset-password-azure-portal.md)
-### [License SSPR](authentication/concept-sspr-licensing.md)
-### [Password writeback](authentication/howto-sspr-writeback.md)
-### [Troubleshoot](authentication/active-directory-passwords-troubleshoot.md)
-### [FAQ](authentication/active-directory-passwords-faq.md)
-
 
 ## Manage devices
 ### [Introduction](device-management-introduction.md)

articles/active-directory/active-directory-secure-passwords.md

@@ -3,16 +3,20 @@ title: Azure AD tiered password security | Microsoft Docs
 description: Explains how Azure AD enforces strong passwords and protects users passwords from cyber criminals,
 services: active-directory
 documentationcenter: ''
-author: eross-msft
-manager: mtillman
+
 ms.assetid:
 ms.service: active-directory
 ms.workload: identity
 ms.tgt_pltfrm: na
 ms.devlang: na
 ms.topic: overview
 ms.date: 08/28/2017
-ms.author: lizross
+
+
+ms.author: joflore
+author: MicrosoftGuyJFlo
+manager: mtillman
+ms.reviewer: rogoya
 ---
 
 # A multi-tiered approach to Azure AD password security

articles/active-directory/authentication/active-directory-passwords-overview.md

@@ -3,7 +3,7 @@ documentType: LandingData
 title: Azure AD Authentication Documentation
 metadata:
   document_id: 
-  title: Azure Active Directory Managed Service Identity Documentation
+  title: Azure Active Directory Authentication Documentation
   description: Learn how to manage and deploy Azure Active Directory self-service password reset, Multi-Factor Authentication, custom banned password list, and smart lockout.
   services: active-directory
   ms.component: authentication
@@ -13,7 +13,7 @@ metadata:
   ms.tgt_pltfrm: na
   ms.devlang: na
   ms.topic: landing-page
-  ms.date: 07/11/2018
+  ms.date: 07/19/2018
   ms.author: joflore
 abstract:
   description: Learn how to deploy and manage Azure Active Directory self-service password reset, Multi-Factor Authentication, custom banned password list, and smart lockout. These features come together to deliver strong authentication with a range of verification methods while providing a simple sign-in process to your organization.

articles/active-directory/authentication/index.yml

@@ -79,8 +79,8 @@ Azure Active Directory (Azure AD) is a multi-tenant, cloud-based directory and i
                     <div class="cardText">
                         <h3>Authentication</h3>
                         <p>
-                        <a href="/azure/active-directory/active-directory-passwords-overview">Passwords</a><br/>
-                        <a href="/azure/active-directory/active-directory-hybrid-identity-design-considerations-multifactor-auth-requirements">Multi-factor authentication</a><br/>
+                        <a href="/azure/active-directory/authentication/concept-sspr-howitworks">Passwords</a><br/>
+                        <a href="/azure/active-directory/authentication/concept-mfa-howitworks">Multi-factor authentication</a><br/>
                         <a href="/azure/active-directory/active-directory-azureadjoin-passport">Windows Hello</a><br/>
                         <a href="/azure/active-directory/active-directory-certificate-based-authentication-get-started">Certificate-based authentication</a>
                         </p>