Merge pull request #47953 from MicrosoftDocs/master

8/1 AM Publish

Author: huypub

.openpublishing.redirection.json

@@ -8190,6 +8190,11 @@
             "redirect_url": "/azure/event-hubs/event-hubs-quickstart-powershell",
             "redirect_document_id": false
         },
+        {
+            "source_path": "articles/active-directory/active-directory-saml-protocol-reference.md",
+            "redirect_url": "/azure/active-directory/develop/active-directory-saml-protocol-reference",
+            "redirect_document_id": false
+        },
         {
             "source_path": "articles/event-hubs/event-hubs-overview.md",
             "redirect_url": "/azure/event-hubs/event-hubs-what-is-event-hubs",
@@ -11595,11 +11600,6 @@
             "redirect_url": "/azure/traffic-manager/traffic-manager-manage-endpoints",
             "redirect_document_id": false
         },
-        {
-            "source_path": "articles/traffic-manager/traffic-manager-how-traffic-manager-works.md",
-            "redirect_url": "/azure/traffic-manager/traffic-manager-overview",
-            "redirect_document_id": false
-        },
         {
             "source_path": "articles/virtual-machine-scale-sets/virtual-machine-scale-sets-advanced-autoscale.md",
             "redirect_url": "/azure/monitoring-and-diagnostics/insights-advanced-autoscale-virtual-machine-scale-sets",

articles/active-directory/active-directory-saml-protocol-reference.md

@@ -12,7 +12,7 @@ ms.tgt_pltfrm: na
 ms.devlang: na
 ms.topic: conceptual
 ms.component: compliance-reports
-ms.date: 07/18/2018
+ms.date: 07/31/2018
 ms.author: rolyon
 
 ---
@@ -134,6 +134,42 @@ Users can review and see the Terms of use that they have accepted by using the f
 
 1. From there, you can review the Terms of use you have accepted. 
 
+## Edit Terms of use details
+You can edit some details of Terms of use, but you can't modify an existing document. The following procedure describes how to edit the details.
+
+1. Sign in to Azure and navigate to **Terms of use** at [https://aka.ms/catou](https://aka.ms/catou).
+
+1. Select the Terms of use you want to edit.
+
+1. Click **Edit terms**.
+
+1. In the Edit terms of use pane, change the name, display name, or require users to expand values.
+
+    ![Add TOU](media/active-directory-tou/edit-tou.png)
+
+1. Click **Save** to save your changes.
+
+    Once you save your changes, users will have to reaccept the new terms.
+
+## Add a Terms of use language
+The following procedure describes how to add a Terms of use language.
+
+1. Sign in to Azure and navigate to **Terms of use** at [https://aka.ms/catou](https://aka.ms/catou).
+
+1. Select the Terms of use you want to edit.
+
+1. In the the details pane, click the **Languages** tab.
+
+    ![Add TOU](media/active-directory-tou/languages-tou.png)
+
+1. Click **Add language**.
+
+1. In the Add terms of use language pane, upload your localized PDF and select the language.
+
+    ![Add TOU](media/active-directory-tou/language-add-tou.png)
+
+1. Click **Add** to add the language.
+
 ## Delete Terms of use
 You can delete old Terms of use using the following procedure.
 
@@ -171,8 +207,11 @@ A: The user counts in the Terms of use report and who accepted/declined are stor
 **Q: Why do I see a different number of consents in the Terms of use report vs. the Azure AD audit logs?**</br>
 A: The Terms of use report is stored for the lifetime of that Terms of use, while the Azure AD audit logs are stored for 30 days. Also, the Terms of use report only displays the users current consent state. For example, if a user declines and then accepts, the Terms of use report will only show that user's accept. If you need to see the history, you can use the Azure AD audit logs.
 
-**Q: If I change the Terms of use terms, does it require users to accept again?**</br>
-A: Yes, an administrator can change the Terms of use terms and it requires users to reaccept the new terms.
+**Q: If I edit the details for a Terms of use, does it require users to accept again?**</br>
+A: Yes, if an administrator edits the details for a Terms of use, it requires users to reaccept the new terms.
+
+**Q: Can I update an existing Terms of use document?**</br>
+A: Currently, you can't update an existing Terms of use document. To change a Terms of use document, you will have to create a new Terms of use instance.
 
 **Q: If hyperlinks are in the Terms of use PDF document, will end users be able to click them?**</br>
 A: The PDF is rendered by default as a JPEG, so hyperlinks are not clickable. Users have the option to select **Having trouble viewing? Click here**, which renders the PDF natively where hyperlinks are supported.

articles/active-directory/active-directory-tou.md

@@ -24,10 +24,13 @@ With Azure AD B2B, you can enforce multi-factor authentication at the resource o
 ## Instant-on
 In the B2B collaboration flows, we add users to the directory and dynamically update them during invitation redemption, app assignment, and so on. The updates and writes ordinarily happen in one directory instance and must be replicated across all instances. Replication is completed once all instances are updated. Sometimes when the object is written or updated in one instance and the call to retrieve this object is to another instance, replication latencies can occur. If that happens, refresh or retry to help. If you are writing an app using our API, then retries with some back-off is a good, defensive practice to alleviate this issue.
 
+## Azure AD directories
+Azure AD B2B is subject to Azure AD service directory limits. For details about the number of directories a user can create and the number of directories to which a user or guest user can belong, see [Azure AD service limits and restrictions](https://docs.microsoft.com/azure/active-directory/users-groups-roles/directory-service-limits-restrictions).
+
 ## Next steps
 
 See the following articles on Azure AD B2B collaboration:
 
 - [What is Azure AD B2B collaboration?](what-is-b2b.md)
-- [Delegate B2bB collaboration invitations](delegate-invitations.md)
+- [Delegate B2B collaboration invitations](delegate-invitations.md)
 

articles/active-directory/b2b/current-limitations.md

@@ -10,7 +10,7 @@ ms.assetid: 5c872c89-ef04-4f4c-98de-bc0c7460c7c2
 ms.service: active-directory
 ms.component: develop
 ms.devlang: na
-ms.topic: hero-article
+ms.topic: article
 ms.tgt_pltfrm: na
 ms.workload: identity
 ms.date: 04/30/2018

articles/active-directory/develop/active-directory-developers-guide.md

@@ -44,9 +44,10 @@ To help secure your application, you first need to create an application in your
 
 1. Sign in to the [Azure portal](https://portal.azure.com).
 
-2. On the top bar, click your account. In the **Directory** list, choose the Azure AD tenant where you want to register your application.
+2. Choose your Azure AD tenant by clicking on your account in the top right corner of the page, followed by clicking on the **Switch Directory** navigation and then select the appropriate tenant.
+ * Skip this step, if you've only one Azure AD tenant under your account or if you've already selected the appropriate Azure AD tenant.
 
-3. Click **More Services** in the left pane, and then select **Azure Active Directory**.
+3. In the left hand navigation pane, click on **Azure Active Directory**.
 
 4. Click **App registrations**, and then select **Add**.
 

articles/active-directory/develop/active-directory-devquickstarts-webapi-dotnet.md

@@ -13,7 +13,7 @@ ms.component: develop
 ms.workload: identity
 ms.tgt_pltfrm: na
 ms.devlang: na
-ms.topic: hero-article
+ms.topic: article
 ms.date: 03/23/2018
 ms.author: celested
 ms.custom: aaddev

articles/active-directory/develop/active-directory-howto-tenant.md

@@ -13,7 +13,7 @@ ms.component: develop
 ms.workload: identity
 ms.tgt_pltfrm: na
 ms.devlang: na
-ms.topic: hero-article
+ms.topic: article
 ms.date: 06/25/2018
 ms.author: celested
 ms.reviewer: jesakowi, justhu

articles/active-directory/develop/active-directory-permissions.md

@@ -21,7 +21,13 @@ ms.reviewer: sandeo
 ---
 # How to plan your hybrid Azure Active Directory join implementation
 
-In a similar way to a user, the device is becoming another identity that you as an IT admin, want to protect and use to protect your resources at any time and location. You can accomplish this goal by bringing your device identities to Azure AD. You can do this by doing an Azure AD join, a hybrid Azure AD join or an Azure AD registered device state. By bringing your devices to Azure AD, you get to maximize your end user productivity by enjoying Single-Sign-On (SSO) across your cloud and on-premises resources and at the same time securing access to your cloud and on-premises resources by enabling Conditional Access. For more details, see Conditional Access in Azure AD.
+In a similar way to a user, a device is becoming another identity you want to protect and also use to protect your resources at any time and location. You can accomplish this goal by bringing your devices' identities to Azure AD using one of the following methods:
+
+- Azure AD join
+- Hybrid Azure AD join
+- Azure AD registration
+
+By bringing your devices to Azure AD, you maximize your users' productivity through single sign-on (SSO) across your cloud and on-premises resources. At the same time, you can secure access to your cloud and on-premises resources with [conditional access](../active-directory-conditional-access-azure-portal.md).
 
 If you have an on-premises Active Directory environment and you want to join your domain-joined devices to Azure AD, you can accomplish this by configuring hybrid Azure AD joined devices. This article provides you with the related steps to implement a hybrid Azure AD join in your environment. 
 
@@ -91,8 +97,6 @@ The registration of Windows Server running the Domain Controller (DC) role is no
 
 If your organization requires access to the Internet via an authenticated outbound proxy, you must make sure that your Windows 10 computers can successfully authenticate to the outbound proxy. Because Windows 10 computers run device registration using machine context, it is necessary to configure outbound proxy authentication using machine context.
 
-Hybrid Azure AD join is a process to automatically register your on-premises domain-joined devices with Azure AD. There are cases where you don't want all your devices to register automatically. If this is true for you, see How to control the hybrid Azure AD join of your devices.
-
 
 Hybrid Azure AD join is a process to automatically register your on-premises domain-joined devices with Azure AD. There are cases where you don't want all your devices to register automatically. If this is true for you, see [How to control the hybrid Azure AD join of your devices](hybrid-azuread-join-control.md).
 

articles/active-directory/devices/hybrid-azuread-join-plan.md

@@ -121,5 +121,3 @@ Now that you understand Azure identity concepts and the options available to you
 [Learn more about Azure hybrid identity solutions](https://docs.microsoft.com/azure/active-directory/choose-hybrid-identity-solution)
 
 [Learn more in an Azure Proof of Concept environment](https://aka.ms/aad-poc)
-
-[Deploy Azure AD in production](https://aka.ms/aad-onboard)