Merge pull request #636 from Microsoft/FromPrivateRepo

From private repo

Author: v-anpasi

articles/active-directory/TOC.md

@@ -99,20 +99,6 @@
 ### [Register your device](active-directory-azureadjoin-personal-device.md)
 ### [Register a Windows 10 device](active-directory-azureadjoin-user-upgrade.md)
 
-### [Conditional access](active-directory-conditional-access.md)
-#### [Get started](active-directory-conditional-access-azuread-connected-apps.md)
-#### [Supported apps](active-directory-conditional-access-supported-apps.md)
-#### [Register devices](active-directory-conditional-access-device-registration-overview.md)
-#### [Manage automatic registration](active-directory-conditional-access-automatic-device-registration.md)
-##### [Setup](active-directory-conditional-access-automatic-device-registration-setup.md)
-#### [Manage Authenticator app](active-directory-conditional-access-azure-authenticator-app.md)
-#### [Understand device policies](active-directory-conditional-access-device-policies.md)
-#### [Set up access to connected apps](active-directory-conditional-access-policy-connected-applications.md)
-#### [Deploy on-premises](active-directory-conditional-access-on-premises-setup.md)
-#### [FAQs](active-directory-conditional-faqs.md)
-#### [Troubleshoot](active-directory-conditional-access-device-remediation.md)
-#### [Reference](active-directory-conditional-access-technical-reference.md)
-
 ### [Azure AD Join](active-directory-azureadjoin-overview.md)
 #### [Plan](active-directory-azureadjoin-deployment-aadjoindirect.md)
 #### [Set up device registration](active-directory-azureadjoin-setup.md)
@@ -127,10 +113,6 @@
 ##### [Troubleshooting for Windows 10 and Windows Server 2016](active-directory-conditional-access-automatic-device-registration-troubleshoot-windows.md)
 ##### [Troubleshooting for Windows down-level clients](active-directory-conditional-access-automatic-device-registration-troubleshoot-windows-legacy.md)
 
-### Certificate-based Authentication
-#### [Android](active-directory-certificate-based-authentication-android.md)
-#### [iOS](active-directory-certificate-based-authentication-ios.md)
-
 ## Manage apps
 ### [Overview](active-directory-enable-sso-scenario.md)
 ### [Getting started](active-directory-integrating-applications-getting-started.md)
@@ -209,14 +191,15 @@
 #### [FAQs](active-directory-windows-enterprise-state-roaming-faqs.md)
 #### [Troubleshoot](active-directory-windows-enterprise-state-roaming-troubleshooting.md)
 ### [Integrate partners with Azure AD B2B](active-directory-b2b-what-is-azure-ad-b2b.md)
-#### [Overview](active-directory-b2b-collaboration-overview.md)
-#### [How it works](active-directory-b2b-how-it-works.md)
-#### [Compare capabilities](active-directory-b2b-compare-external-identities.md)
-#### [Walkthrough](active-directory-b2b-detailed-walkthrough.md)
-#### [Limitations](active-directory-b2b-current-preview-limitations.md)
-#### [CSV file format](active-directory-b2b-references-csv-file-format.md)
-#### [User objects](active-directory-b2b-references-external-user-object-attribute-changes.md)
-#### [User tokens](active-directory-b2b-references-external-user-token-format.md)
+#### [Admins adding B2B users](active-directory-b2b-admin-add-users.md)
+#### [Information workers adding B2B users](active-directory-b2b-how-it-works.md)
+#### [Invitation email](active-directory-b2b-invitation-email.md)
+#### [Invitation redemption](active-directory-b2b-redemption-experience.md)
+#### [Licensing](active-directory-b2b-licensing.md)
+#### [Troubleshooting B2B](active-directory-b2b-troubleshooting.md)
+#### [FAQ](active-directory-b2b-faq.md)
+#### [API and customization](active-directory-b2b-api.md)
+#### [Multi-factor authentication for B2B](active-directory-b2b-mfa-instructions.md)
 ### [Integrate on-premises identities using Azure AD Connect](./connect/active-directory-aadconnect.md)
 
 
@@ -240,6 +223,22 @@
 ### [Configure token lifetimes](active-directory-configurable-token-lifetimes.md)
 
 ## Secure your identities
+### [Conditional access](active-directory-conditional-access.md)
+#### [Get started](active-directory-conditional-access-azuread-connected-apps.md)
+#### [Supported apps](active-directory-conditional-access-supported-apps.md)
+#### [Register devices](active-directory-conditional-access-device-registration-overview.md)
+#### [Manage automatic registration](active-directory-conditional-access-automatic-device-registration.md)
+##### [Setup](active-directory-conditional-access-automatic-device-registration-setup.md)
+#### [Manage Authenticator app](active-directory-conditional-access-azure-authenticator-app.md)
+#### [Understand device policies](active-directory-conditional-access-device-policies.md)
+#### [Set up access to connected apps](active-directory-conditional-access-policy-connected-applications.md)
+#### [Deploy on-premises](active-directory-conditional-access-on-premises-setup.md)
+#### [FAQs](active-directory-conditional-faqs.md)
+#### [Troubleshoot](active-directory-conditional-access-device-remediation.md)
+#### [Reference](active-directory-conditional-access-technical-reference.md)
+### Certificate-based Authentication
+#### [Android](active-directory-certificate-based-authentication-android.md)
+#### [iOS](active-directory-certificate-based-authentication-ios.md)
 ### [Azure AD Identity Protection](active-directory-identityprotection.md)
 #### [Enable](active-directory-identityprotection-enable.md)
 #### [Detect vulnerabilities](active-directory-identityprotection-vulnerabilities.md)

articles/active-directory/active-directory-b2b-admin-add-users.md

@@ -30,24 +30,29 @@ Add B2B collaboration users to the directory as an Azure AD administrator, as sh
 
   >[!VIDEO https://channel9.msdn.com/Blogs/Azure/Admin-adding-guests-for-B2B-collaboration-to-Azure-AD-tenant]
 
+  If this video does not appear embedded, you can reach it [here](https://channel9.msdn.com/Blogs/Azure/Admin-adding-guests-for-B2B-collaboration-to-Azure-AD-tenant).
+
 ## Admins adding guest users to a group
 Add B2B collaboration users to a group as an Azure AD administrator, as shown in the following video:
 
   >[!VIDEO https://channel9.msdn.com/Blogs/Azure/admin-adding-guests-to-a-group]
 
+  If this video does not appear embedded, you can reach it [here](https://channel9.msdn.com/Blogs/Azure/admin-adding-guests-to-a-group).
+
 ## Admins adding guest users to an application
 
 Add B2B collaboration users to an application as an Azure AD administrator, as shown in the following video:
 
   >[!VIDEO https://channel9.msdn.com/Blogs/Azure/admin-assign-b2b-to-apps]
 
+  If this video does not appear embedded, you can reach it [here](https://channel9.msdn.com/Blogs/Azure/admin-assign-b2b-to-apps).
 
 ## Related articles
 
 Browse our other articles on Azure AD B2B collaboration:
 
 * [What is Azure AD B2B collaboration?](active-directory-b2b-what-is-azure-ad-b2b.md)
-* [How do information workers add B2B collaboration users?](active-directory-b2b-how-it-works.md)
+* [How do information workers add B2B collaboration users?](active-directory-b2b-iw-add-users.md)
 * [The elements of the B2B collaboration invitation email](active-directory-b2b-invitation-email.md)
 * [B2B collaboration invitation redemption](active-directory-b2b-redemption-experience.md)
 * [Azure AD B2B collaboration licensing](active-directory-b2b-licensing.md)

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

@@ -21,7 +21,7 @@ ms.author: sasubram
 
 # Azure Active Directory B2B collaboration frequently-asked questions (FAQ)
 
-Frequently-asked questions is periodically updated to reflect any new issues.
+Frequently-asked questions is periodically updated to reflect any new interests.
 
 ### Is this functionality available in the Azure classic portal?
 The new capabilities in this Azure AD B2B collaboration public preview refresh are available only through [the Azure portal](https://portal.azure.com) and the new Access Panel. Try it!
@@ -73,6 +73,8 @@ You can block access to the [Azure portal](https://portal.azure.com) by guest us
 
   >[!VIDEO https://channel9.msdn.com/Blogs/Azure/b2b-block-guest-user]
 
+  If this video does not appear embedded, you can reach it [here](https://channel9.msdn.com/Blogs/Azure/b2b-block-guest-user).
+
 ### What is the timeline by which Azure AD B2B collaboration will start support for MFA and consumer email accounts?
 Both MFA and consumer email accounts are supported now in this public preview refresh.
 

articles/active-directory/active-directory-b2b-invitation-email.md

@@ -24,6 +24,8 @@ ms.author: sasubram
 
 Invitation emails are a critical component to bring partners on board as B2B collaboration users in Azure AD. The primary goal for this is to increase trust in the recipient and add legitimacy and social proof to the email, to make sure the recipient feels comfortable with selecting the **Get Started** button to accept the invitation. This is a key component to reducing sharing friction. And of course, we also want the email to look great!
 
+![Azure AD B2b invitation email](media/active-directory-b2b-invitation-email/invitation-email.png)
+
 ## Explaining the email
 Let's look at a few elements of the email so you know how best to make use of these capabilities.
 
@@ -39,7 +41,7 @@ We use a LinkedIn-like pattern for the From address. Our goal here is to be clea
 The reply to email is set to the inviter's email when available, so that replying to the email will send an email back to the inviter.
 
 ### Branding
-The invitation emails from your tenant use the company branding that you may have set up for your tenant. If you want to take advantage of this, here are the details on how to configure it. The banner logo will show up in the email. Follow the image size and quality instructions here for best results. In addition, the company name also shows up in the call to action.
+The invitation emails from your tenant use the company branding that you may have set up for your tenant. If you want to take advantage of this, [here](https://docs.microsoft.com/azure/active-directory/active-directory-branding-custom-signon-azure-portal) are the details on how to configure it. The banner logo will show up in the email. Follow the image size and quality instructions [here](https://docs.microsoft.com/azure/active-directory/active-directory-branding-custom-signon-azure-portal) for best results. In addition, the company name also shows up in the call to action.
 
 ### Call to action
 The call to action consists of two parts: explaining why the recipient has received the mail and what the recipient is being asked to do about it.
@@ -50,6 +52,7 @@ The call to action consists of two parts: explaining why the recipient has recei
 
 ### Inviter's information
 The inviter's display name will be included in the email. And in addition, if you've set up a profile picture for your Azure AD account, the inviting email will include that picture as well. Both of these are intended to increase your recipient's confidence in the email.
+
 If the inviter hasn't yet set up their profile picture, Azure AD creates an icon with the inviter's initials in place of the picture as shown:
 
   ![displaying the inviter's initials](media/active-directory-b2b-invitation-email/inviters-initials.png)
@@ -74,7 +77,7 @@ The footer contains the Microsoft company brand and will let the recipient know
 
 Browse our other articles on Azure AD B2B collaboration:
 
-* [What is Azure AD B2B collaboration(active-directory-b2b-what-is-azure-ad-b2b.md)
+* [What is Azure AD B2B collaboration](active-directory-b2b-what-is-azure-ad-b2b.md)
 * [How do Azure Active Directory admins add B2B collaboration users?](active-directory-b2b-admin-add-users.md)
 * [How do information workers add B2B collaboration users?](active-directory-b2b-how-it-works.md)
 * [B2B collaboration invitation redemption](active-directory-b2b-redemption-experience.md)

articles/active-directory/active-directory-b2b-iw-add-users.md

@@ -29,6 +29,8 @@ Assign B2B collaboration users to a app as an information worker in a partner or
 
   >[!VIDEO https://channel9.msdn.com/Blogs/Azure/information-worker-assign-to-apps]
 
+  If this video does not appear embedded, you can reach it [here](https://channel9.msdn.com/Blogs/Azure/information-worker-assign-to-apps).
+
 ## Information workers adding B2B collaboration users to a group
 
 Information workers can similarly add B2B collaboration users to an assigned group that is enabled for self-service group management.
@@ -45,10 +47,6 @@ This is the scenario in which this is most useful:
 4. Now Sam can add other users from Litware to the WoodGrove directory, groups or applications without needing invitations to be redeemed. If Sam has the appropriate enumeration privileges in Litware, this happens automatically.
 
 
-## Related articles
-
-Browse our other articles on Azure AD B2B collaboration:
-
 * [What is Azure AD B2B collaboration?](active-directory-b2b-what-is-azure-ad-b2b.md)
 * [How do Azure Active Directory admins add B2B collaboration users?](active-directory-b2b-admin-add-users.md)
 * [The elements of the B2B collaboration invitation email](active-directory-b2b-invitation-email.md)

articles/active-directory/active-directory-b2b-mfa-instructions.md

@@ -19,7 +19,7 @@ ms.author: sasubram
 
 ---
 
-# Multi-factor authentication for B2B collaboration users
+# Multi-factor authentication for Azure Active Directory B2B collaboration users
 
 With this Azure AD B2B collaboration public preview refresh, we are introducing the capability for organizations to enforce multi-factor authentication (MFA) policies for B2B collaboration users also. In this refresh, MFA is always enforced at the resource tenancy.
 
@@ -37,23 +37,26 @@ To discover how easy it is to set up MFA for B2B collaboration users, see how in
 
   >[!VIDEO https://channel9.msdn.com/Blogs/Azure/b2b-conditional-access-setup]
 
+  If this video does not appear embedded, you can reach it [here](https://channel9.msdn.com/Blogs/Azure/b2b-conditional-access-setup).
 
 ## B2B users MFA experience for offer redemption
 Check out the animation below to see the redemption experience, as shown in the following video:
 
   >[!VIDEO https://channel9.msdn.com/Blogs/Azure/MFA-redemption]
 
+  If this video does not appear embedded, you can reach it [here](https://channel9.msdn.com/Blogs/Azure/MFA-redemption).
+
 ## MFA reset for B2B collaboration users
 Currently, the admin can require B2B collaboration users to proof up again only by using the following PowerShell cmdlets. Therefore, the following PowerShell cmdlts should be used if you want to reset a B2B user's proof up method.
 Note: To use the new cmdlet, you need to install the Azure AD PowerShell V2 module, which you can get from here: https://www.powershellgallery.com/packages/AzureADPreview
 1. Connect to Azure AD
-    ```Connect-AzureAd and login```
+    Connect-AzureAd and login
 2. Get all users with proof up methods
-    ```Get-MsolUser | where { $_.StrongAuthenticationMethods} | select UserPrincipalName,
+    Get-MsolUser | where { $_.StrongAuthenticationMethods} | select UserPrincipalName,
     @{n="Methods";e={($_.StrongAuthenticationMethods).MethodType}}
   Here is an example:
     PS C:\Users\tjwasser> Get-MsolUser | where { $_.StrongAuthenticationMethods} | select UserPrincipalName, @{n="Methods";e
-={($_.StrongAuthenticationMethods).MethodType}}```
+={($_.StrongAuthenticationMethods).MethodType}}
 
   UserPrincipalName   |   Methods
   ----------------- | -------
@@ -69,8 +72,8 @@ Note: To use the new cmdlet, you need to install the Azure AD PowerShell V2 modu
 
 3. Reset the MFA method for a specific user
   You can then use that UserPrincipalName to run the reset command to require the B2B user to set proof-up methods again. Example:
-    ```Reset-MsolStrongAuthenticationMethodByUpn -UserPrincipalName
-    gsamoogle_gmail.com#EXT#@ WoodGroveAzureAD.onmicrosoft.com```
+    Reset-MsolStrongAuthenticationMethodByUpn -UserPrincipalName
+    gsamoogle_gmail.com#EXT#@ WoodGroveAzureAD.onmicrosoft.com
 
 ## Next steps
 

articles/active-directory/active-directory-b2b-redemption-experience.md

@@ -31,6 +31,7 @@ Azure AD B2B collaboration makes it easy for any email address to be used for re
 
   >[!VIDEO https://channel9.msdn.com/Blogs/Azure/admin-adding-guests-to-a-group]
 
+If this video does not appear embedded, you can reach it [here](https://channel9.msdn.com/Blogs/Azure/admin-adding-guests-to-a-group).
 
 ## Next steps
 

articles/active-directory/media/active-directory-b2b-invitation-email/invitation-email.png

@@ -84,6 +84,14 @@ DocumentDB allows you to write application logic as named programs written entir
 
 JavaScript execution within DocumentDB is modeled after the concepts supported by relational database systems, with JavaScript as a modern replacement for Transact-SQL. All JavaScript logic is executed within an ambient ACID transaction with snapshot isolation. During the course of its execution, if the JavaScript throws an exception, then the entire transaction is aborted.
 
+## Are there any online courses on DocumentDB?
+
+Yes, there's a [Microsoft Virtual Academy](https://mva.microsoft.com/en-US/training-courses/azure-documentdb-planetscale-nosql-16847) course on Azure DocumentDB. 
+
+>[!VIDEO https://mva.microsoft.com/en-US/training-courses-embed/azure-documentdb-planetscale-nosql-16847]
+>
+>
+
 ## Next steps
 Already have an Azure account? Then you can get started with DocumentDB in the [Azure Portal](https://portal.azure.com/#gallery/Microsoft.DocumentDB) by [creating a DocumentDB database account](documentdb-create-account.md).