Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs into aks-networking-permission

Author: weinong

.openpublishing.redirection.json

@@ -103,6 +103,7 @@
         {
             "source_path": "articles/active-directory/active-directory-licensing-product-and-service-plan-reference.md",
             "redirect_url": "/azure/active-directory/users-groups-roles/licensing-service-plan-reference",
+            "redirect_document_id": true
         },
         {
             "source_path": "articles/active-directory/active-directory-accessmanagement-groups-settings-cmdlets.md",
@@ -3001,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
         },
         {
@@ -3276,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
         },
         {
@@ -3551,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
         },
         {
@@ -4009,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",
@@ -11823,7 +11834,6 @@
             "source_path": "articles/stream-analytics/stream-analytics-resource-health.md",
             "redirect_url": "/azure/stream-analytics/stream-analytics-troubleshooting-guide",
             "redirect_document_id": false
-
         },
         {
             "source_path": "articles/stream-analytics/stream-analytics-get-started.md",
@@ -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",
@@ -25406,29 +25436,29 @@
             "redirect_document_id": false
         },
         {
-          "source_path": "articles/iot-accelerators/iot-accelerators-connected-factory-overview.md",
-          "redirect_url": "/azure/iot-accelerators/quickstart-connected-factory-deploy",
-          "redirect_document_id": false
+            "source_path": "articles/iot-accelerators/iot-accelerators-connected-factory-overview.md",
+            "redirect_url": "/azure/iot-accelerators/quickstart-connected-factory-deploy",
+            "redirect_document_id": false
         },
         {
-          "source_path": "articles/iot-accelerators/iot-accelerators-predictive-overview.md",
-          "redirect_url": "/azure/iot-accelerators/quickstart-predictive-maintenance-deploy",
-          "redirect_document_id": false
+            "source_path": "articles/iot-accelerators/iot-accelerators-predictive-overview.md",
+            "redirect_url": "/azure/iot-accelerators/quickstart-predictive-maintenance-deploy",
+            "redirect_document_id": false
         },
         {
             "source_path": "articles/iot-suite/securing-iot-ground-up.md",
             "redirect_url": "/azure/iot-fundamentals/iot-security-ground-up",
             "redirect_document_id": false
         },
         {
-          "source_path": "articles/iot-accelerators/iot-accelerators-device-simulation-deploy.md",
-          "redirect_url": "/azure/iot-accelerators/quickstart-device-simulation-deploy",
-          "redirect_document_id": false
+            "source_path": "articles/iot-accelerators/iot-accelerators-device-simulation-deploy.md",
+            "redirect_url": "/azure/iot-accelerators/quickstart-device-simulation-deploy",
+            "redirect_document_id": false
         },
         {
-          "source_path": "articles/iot-accelerators/iot-accelerators-device-simulation-explore.md",
-          "redirect_url": "/azure/iot-accelerators/quickstart-device-simulation-deploy",
-          "redirect_document_id": false
+            "source_path": "articles/iot-accelerators/iot-accelerators-device-simulation-explore.md",
+            "redirect_url": "/azure/iot-accelerators/quickstart-device-simulation-deploy",
+            "redirect_document_id": false
         },
         {
             "source_path": "articles/active-directory/develop/active-directory-v2-devquickstarts-angular-dotnet.md",
@@ -26306,24 +26336,24 @@
             "redirect_document_id": true
         },
         {
-        "source_path": "articles/cognitive-services/LUIS/Create-new-app.md",
-        "redirect_url": "/azure/cognitive-services/LUIS/luis-how-to-start-new-app",
-        "redirect_document_id": true
+            "source_path": "articles/cognitive-services/LUIS/Create-new-app.md",
+            "redirect_url": "/azure/cognitive-services/LUIS/luis-how-to-start-new-app",
+            "redirect_document_id": true
         },
         {
-        "source_path": "articles/cognitive-services/LUIS/Label-Suggested-Utterances.md",
-        "redirect_url": "/azure/cognitive-services/LUIS/luis-how-to-review-endoint-utt",
-        "redirect_document_id": true
+            "source_path": "articles/cognitive-services/LUIS/Label-Suggested-Utterances.md",
+            "redirect_url": "/azure/cognitive-services/LUIS/luis-how-to-review-endoint-utt",
+            "redirect_document_id": true
         },
         {
-        "source_path": "articles/cognitive-services/LUIS/luis-how-to-cortana-prebuilt-app.md",
-        "redirect_url": "/azure/cognitive-services/LUIS/luis-resources-faq#does-luis-currently-support-cortana",
-        "redirect_document_id": true
+            "source_path": "articles/cognitive-services/LUIS/luis-how-to-cortana-prebuilt-app.md",
+            "redirect_url": "/azure/cognitive-services/LUIS/luis-resources-faq#does-luis-currently-support-cortana",
+            "redirect_document_id": true
         },
         {
-        "source_path": "articles/cognitive-services/LUIS/luis-reference-cortana-prebuilt.md",
-        "redirect_url": "/azure/cognitive-services/LUIS/luis-resources-faq#does-luis-currently-support-cortana",
-        "redirect_document_id": true
+            "source_path": "articles/cognitive-services/LUIS/luis-reference-cortana-prebuilt.md",
+            "redirect_url": "/azure/cognitive-services/LUIS/luis-resources-faq#does-luis-currently-support-cortana",
+            "redirect_document_id": true
         },
         {
             "source_path": "articles/active-directory/authentication/end-user/current/microsoft-authenticator-app-backup-and-recovery.md",
@@ -26409,6 +26439,26 @@
         "source_path": "articles/cognitive-services/LUIS/traffic-manager.md",
         "redirect_url": "/azure/cognitive-services/LUIS/luis-traffic-manager",
         "redirect_document_id": true
-        }       
+        },
+        {
+        "source_path": "articles/cognitive-services/LUIS/find-region-csharp.md",
+        "redirect_url": "/azure/cognitive-services/LUIS/luis-find-region-csharp",
+        "redirect_document_id": true
+        },
+        {
+        "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-domain-services/media/active-directory-domain-services-suspension/suspension-timeline.PNG

@@ -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/TOC.md

@@ -56,6 +56,7 @@ The following section provides you with a complete overview of all possible erro
 
 |Error|Description|
 |---|---|
+|16000|This is an internal implementation detail and not an error condition. You can safely ignore this reference.|
 |20001|There is an issue with your federated Identity Provider. Contact your IDP to resolve this issue.|
 |20012|There is an issue with your federated Identity Provider. Contact your IDP to resolve this issue.|
 |20033|There is an issue with your federated Identity Provider. Contact your IDP to resolve this issue.|
@@ -171,6 +172,7 @@ The following section provides you with a complete overview of all possible erro
 |81001|User's Kerberos ticket is too large. This can happen if the user is in too many groups and thus the Kerberos ticket contains too many group memberships. Reduce the user's group memberships and try again.|
 |81005|Authentication Package Not Supported|
 |81007|Tenant is not enabled for Seamless SSO|
+|81012|This is not an error condition. It indicates that user trying to sign in to Azure AD is different from the user signed into the device. You can safely ignore this code in the logs.|
 |90010|The request is not supported for various reasons. For example, the request is made using an unsupported request method (only POST method is supported) or the token signing algorithm that was requested is not supported. Contact the application developer.|
 |90014| A required field for a protocol message was missing, contact the application owner. If you are the application owner, ensure that you have all the necessary parameters for the login request. |
 |90072| The account needs to be added as an external user in the tenant first. Sign-out and sign-in again with a different Azure AD account.|

articles/active-directory/active-directory-reporting-activity-sign-ins-errors.md

@@ -46,7 +46,7 @@ For detailed instructions, see the [prerequisites to access the Azure Active Dir
 
 ## APIs with Graph Explorer
 
-You can use the [MSGraph explorer](https://developer.microsoft.com/en-us/graph/graph-explorer) to verify your sign-in and audit API data. Make sure to sign in to your account using both of the sign-in buttons in the Graph Explorer UI, and set **Tasks.ReadWrite** and **Directory.ReadAll** permissions for your tenant as shown.   
+You can use the [MSGraph explorer](https://developer.microsoft.com/en-us/graph/graph-explorer) to verify your sign-in and audit API data. Make sure to sign in to your account using both of the sign-in buttons in the Graph Explorer UI, and set **AuditLog.Read.All** and **Directory.Read.All** permissions for your tenant as shown.   
 
 ![Graph Explorer](./media/active-directory-reporting-api-getting-started-azure-portal/graph-explorer.png)
 

articles/active-directory/active-directory-reporting-api-getting-started-azure-portal.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