Merge pull request #6532 from MicrosoftDocs/FromPrivateRepo

From private repo

Author: v-alje

.openpublishing.redirection.json

@@ -17777,7 +17777,11 @@
         "source_path": "articles/monitoring/management-overview-monitoring.md",
         "redirect_url": "/azure/monitoring/",
         "redirect_document_id": false
+    },
+    {
+        "source_path": "articles/cli-install-nodejs.md",
+        "redirect_url": "/cli/azure/install-cli-version-1.0",
+        "redirect_document_id": false
     }
-
    ]
 }

articles/active-directory/active-directory-conditional-access-controls.md

@@ -14,7 +14,7 @@ ms.devlang: na
 ms.topic: article
 ms.tgt_pltfrm: na
 ms.workload: identity
-ms.date: 02/09/2018
+ms.date: 03/28/2018
 ms.author: markvi
 ms.reviewer: calebb
 
@@ -73,11 +73,15 @@ Using multi-factor authentication helps protect resources from being accessed by
 
 ### Compliant device
 
-You can configure conditional access policies that are device-based. The objective of a device-based conditional access policy is to grant access to the configured resources only from trusted devices. Requiring a compliant device is one option you have to define what a trusted device is. For more information, see [set up Azure Active Directory device-based conditional access policies](active-directory-conditional-access-policy-connected-applications.md).
+You can configure conditional access policies that are device-based. The objective of a device-based conditional access policy is to grant access to the configured resources only from trusted devices. Requiring a compliant device is one option you have to define what a trusted device is. If this option is selected, your conditional access policy grants access to access attempts made with devices that are joined to your Azure Active Directory and are marked as compliant by your MDM solution.
+
+For more information, see [set up Azure Active Directory device-based conditional access policies](active-directory-conditional-access-policy-connected-applications.md).
 
 ### Domain-joined device
 
-Requiring a domain-joined device is another option you have to configure device-based conditional access policies. This requirement refers to Windows desktops, laptops, and enterprise tablets that are joined to an on-premises Active Directory. For more information, see [set up Azure Active Directory device-based conditional access policies](active-directory-conditional-access-policy-connected-applications.md).
+Requiring a domain-joined device is another option you have to configure device-based conditional access policies. This requirement refers to Windows desktops, laptops, and enterprise tablets that are joined to an on-premises Active Directory. If this option is selected, your conditional access policy grants access to access attempts made with devices that are joined to your on-premises Active Directory and your Azure Active Directory.  
+
+For more information, see [set up Azure Active Directory device-based conditional access policies](active-directory-conditional-access-policy-connected-applications.md).
 
 
 

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

@@ -1,8 +1,7 @@
 ---
 title: 'Azure Active Directory Terms of Use| Microsoft Docs'
-description: Azure AD Terms of Use will allow you and your company the ability to provide terms of use to users of Azure AD servcies.
+description: Azure AD Terms of Use will allow you and your company the ability to provide terms of use to users of Azure AD services.
 services: active-directory
-documentationcenter: ''
 author: billmath
 manager: mtillman
 editor: ''
@@ -12,20 +11,20 @@ ms.workload: identity
 ms.tgt_pltfrm: na
 ms.devlang: na
 ms.topic: get-started-article
-ms.date: 03/06/2018
+ms.date: 03/29/2018
 ms.author: billmath
 
 ---
 
-# Azure Active Directory Terms of Use feature (Preview)
-Azure AD Terms of Use provides a simple method organizations can use to present information to end users.  This ensures users see relevant disclaimers for legal or compliance requirements.
+# Azure Active Directory Terms of Use feature
+Azure AD Terms of Use provides a simple method organizations can use to present information to end users.  This presentation, ensures users see relevant disclaimers for legal or compliance requirements.
 
-Azure AD Terms of Use uses the pdf format to present content.   This pdf can be any content, such as existing contract documents, allowing you to collect end user agreements during user sign-in.  You can use the terms of use for applications, groups of users, or if you have multiple terms of use for different purposes.
+Azure AD Terms of Use uses the pdf format to present content.   The pdf can be any content, such as existing contract documents, allowing you to collect end user agreements during user sign-in.  You can use the terms of use for applications, groups of users, or if you have multiple terms of use for different purposes.
 
 The remainder of this document describes how to get going with Azure AD Terms of Use.  
 
 ## Why use Azure AD Terms of Use
-Finding it difficult to get employee’s or guests to agree to your terms of use before getting access? Need help figuring out who has or hasn’t agreed to your company terms of use?  Azure AD Terms of Use provides a simple method organizations can use to present information to end users.  This ensures that they see relevant disclaimers for legal or compliance requirements.
+Finding it difficult to get employee’s or guests to agree to your terms of use before getting access? Need help figuring out who has or hasn’t agreed to your company terms of use?  Azure AD Terms of Use provides a simple method organizations can use to present information to end users.  This presentation, ensures that they see relevant disclaimers for legal or compliance requirements.
 
 Azure AD Terms of Use can be used in the following scenarios:
 -	General terms of use for all users in your organization.
@@ -51,11 +50,11 @@ Once you have finalized your Terms of Use, use the following procedure to add it
 2. Click Add.</br>
 ![Add TOU](media/active-directory-tou/tou12.png)
 3. Enter the **Name** for the Terms of Use
-4. Enter **Display Name**.  This header is what users see when they sign in.
+4. Enter **Display Name**.  The header is what users see when they sign in.
 5. **Browse** to your finalized terms of use pdf and select it.  The recommended font size is 24.
 6. **Select** a language for the terms of use.  The language option allows you to upload multiple terms of use, each with a different language.  The version of the terms of use that an end user will see will be based on their browser preferences.
 7. Select  either on or off for **Require users to expand the terms of use**.  If this is set to on, end users will be required to view the terms of use prior to accepting them.
-8. Under the **Conditional Access** section you can **Enforce** the uploaded terms of use by using a template or a custom conditional access policy.  Custom conditional access policies enables granular terms of use, down to a specific cloud application or group of users.  For more information, see [configuring conditional access policies](active-directory-conditional-access-best-practices.md)
+8. Under the **Conditional Access**, you can **Enforce** the uploaded terms of use by selecting a template from the drop-down or a custom conditional access policy.  Custom conditional access policies enables granular terms of use, down to a specific cloud application or group of users.  For more information, see [configuring conditional access policies](active-directory-conditional-access-best-practices.md)
 9. Click **Create**.
 10. If you selected a custom conditional access template, then a new screen appears which allows you to customize the CA policy.
 11. You should now see your new Terms of Use.</br>
@@ -72,17 +71,33 @@ You can remove or delete old terms of use using the following procedure:
 4. You should no longer see your new terms of use.
 
 
+## Viewing current user status
+You will notice that your terms of use shows a count for users who have accepted and declined.
+
+![Audit Event](media/active-directory-tou/tou15.png)
+
+You can click on the numbers under **accepted** or **declined** to view the current state of users.
+
+![Audit Event](media/active-directory-tou/tou16.png)
+
 ## Audit Terms of Use
-Azure AD Terms of Use provides easy to use auditing so that you can see who has accepted and when they accepted your terms of use.  To get started with auditing use the following procedure:
+If you want to view historical acceptances and declines and not just the current status, Azure AD Terms of Use provides easy to use auditing.  This auditing allows you to see who has accepted and when they accepted your terms of use.  
+
+There are two ways in which you can use auditing depending on what you are currently trying to do.  
+
+
+To get started with auditing use the following procedure:
 
 ### To audit Terms of Use
 1. Navigate to the dashboard at [https://aka.ms/catou](https://aka.ms/catou)
-2. Click Audit Event.</br>
+2. Click View audit logs.</br>
 ![Audit Event](media/active-directory-tou/tou8.png)
 3.  On the Azure AD audit logs screen, you can filter the information using the provided drops downs to target specific audit log information.
 ![Audit Event](media/active-directory-tou/tou9.png)
 4.  You can also download the information in a .csv file for use locally.
 
+## 
+
 ## What users see
 Users, who are in scope, will see the following once a terms of use is created and enforced.  They will see these screens during sign in.
 -	Best practice is to have the font within the PDF at size 24.
@@ -91,7 +106,7 @@ Users, who are in scope, will see the following once a terms of use is created a
 ![Audit Event](media/active-directory-tou/tou11.png)
 
 ### Review terms of use
-Users can review and see the terms of use that they have accepted.  This can be done using the following procedure:
+Users can review and see the terms of use that they have accepted.  To review terms of use, use the following procedure:
 
 1. Navigate and sign-in to [https://myapps.microsoft.com](https://myapps.microsoft.com).
 2. In upper right corner, click your name and select **Profile** from the drop-down.
@@ -100,17 +115,18 @@ Users can review and see the terms of use that they have accepted.  This can be
 3. On your Profile, click **Review terms of use**.
 ![Audit Event](media/active-directory-tou/tou13a.png)
 
-4.  From there you can review the terms of use you have accepted. 
+4.  From there, you can review the terms of use you have accepted. 
 
 
 ## Additional information
 The following information is something to be aware of and can assist with using terms of use.
 
-Users in scope will need to sign-out and sign-in in order to satisfy a new policy if:
- - a conditional access policy is enabled on a terms of use
- - or a second terms of use is created
-
-This is because conditional access policies take effect immediately. When this happens the admin will start to see “sad clouds” or "Azure AD token issues". The admin must sign-out and sign-in again in order to satisfy the new policy.
+>[!IMPORTANT]
+> Users in scope will need to sign-out and sign-in in order to satisfy a new policy if:
+> - a conditional access policy is enabled on a terms of use
+> - or a second terms of use is created
+>
+>Conditional access policies take effect immediately. When this happens the admin will start to see “sad clouds” or "Azure AD token issues". The admin must sign-out and sign-in again in order to satisfy the new policy.
 
 
 
@@ -119,10 +135,10 @@ This is because conditional access policies take effect immediately. When this h
 ## Frequently asked questions
 
 **Q: How do I see when/if a user has accepted a terms of use?**</br>
-A: A user accepting the terms of use is written to the audit log. You can search the Azure AD audit log to see the results.  
+A: You can simply click on the number under accepted next to your terms of use.  For more information, see [Viewing current user status](#viewing-current-user-status).  Also, a user accepting the terms of use is written to the audit log. You can search the Azure AD audit log to see the results.  
 
 **Q: If you 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 re-accepting the new terms.
+A: Yes, an administrator can change the terms of use terms and it requires reaccepting the new terms.
 
 **Q: Can a terms of use support multiple languages?**</br>
 A: Yes.  Currently there are 18 different languages an administrator can configure for a single terms of use.