Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into twhitney-titles2

Author: Tyler Whitney

.openpublishing.redirection.json

@@ -567,6 +567,16 @@
       "redirect_url": "/azure/cognitive-services//QnAMaker/Quickstarts/get-answer-from-knowledge-base-using-url-tool",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/cognitive-services/LUIS/luis-quickstart-primary-and-secondary-data.md",
+      "redirect_url": "/azure/cognitive-services/LUIS/tutorial-machine-learned-entity",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cognitive-services/LUIS/luis-quickstart-intent-and-list-entity.md",
+      "redirect_url": "/azure/cognitive-services/LUIS/tutorial-list-entity",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/cognitive-services/LUIS/luis-quickstart-intents-regex-entity.md",
       "redirect_url": "/azure/cognitive-services/LUIS/tutorial-regex-entity",
@@ -5302,6 +5312,16 @@
       "redirect_url": "/azure/python/tutorial-vs-code-serverless-python-01",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/azure-functions/scripts/functions-cli-configure-custom-domain.md",
+      "redirect_url": "/azure/app-service/scripts/cli-configure-custom-domain?toc=%2fcli%2fazure%2ftoc.json",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/azure-functions/scripts/functions-cli-configure-ssl-certificate.md",
+      "redirect_url": "/azure/app-service/scripts/cli-configure-ssl-certificate?toc=%2fcli%2fazure%2ftoc.json",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/automation/automation-source-control-integration.md",
       "redirect_url": "/azure/automation/source-control-integration",
@@ -12437,6 +12457,11 @@
       "redirect_url": "/azure/cosmos-db/monitor-cosmos-db",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/cosmos-db/create-firewall-cli.md",
+      "redirect_url": "/azure/cosmos-db/scripts/cli/common/ipfirewall",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/iot-suite/iot-suite-v1-connecting-devices-linux.md",
       "redirect_url": "https://docs.microsoft.com/previous-versions/azure/iot-suite/iot-suite-v1-connecting-devices-linux",

README.md

@@ -1,10 +1,11 @@
+
 # Microsoft Azure Documentation
 
 Welcome to the open-source [documentation](https://docs.microsoft.com/azure) of [Microsoft Azure](https://azure.microsoft.com). Please review this README file to understand how you can assist in contributing to the Microsoft Azure documentation.
 
 ## Getting Started
 
-Contributing to open source is more than just providing updates, it's also letting us know when there is an issue. Read our [Contributing guidance](CONTRIBUTING.md) to find out more.
+Contributing to open source is more than just providing updates, it's also about letting us know when there is an issue. Read our [Contributing guidance](CONTRIBUTING.md) to find out more.
 
 ### Prerequisites
 

articles/active-directory-domain-services/migrate-from-classic-vnet.md

@@ -303,13 +303,14 @@ Azure AD DS needs a network security group to secure the ports needed for the ma
 
 If there's an error when you run the PowerShell cmdlet to prepare for migration in step 2 or for the migration itself in step 3, the Azure AD DS managed domain can roll back to the original configuration. This roll back requires the original Classic virtual network. Note that the IP addresses may still change after rollback.
 
-Run the `Migrate-Aadds` cmdlet using the *-Abort* parameter. Provide the *-ManagedDomainFqdn* for your own Azure AD DS managed domain prepared in a previous section, such as *contoso.com*:
+Run the `Migrate-Aadds` cmdlet using the *-Abort* parameter. Provide the *-ManagedDomainFqdn* for your own Azure AD DS managed domain prepared in a previous section, such as *contoso.com*, and the Classic virtual network name, such as *myClassicVnet*:
 
 ```powershell
 Migrate-Aadds `
     -Abort `
     -ManagedDomainFqdn contoso.com `
-    -Credentials $creds​
+    -ClassicVirtualNetworkName myClassicVnet `
+    -Credentials $creds
 ```
 
 ### Restore
@@ -357,4 +358,4 @@ With your Azure AD DS managed domain migrated to the Resource Manager deployment
 [get-credential]: /powershell/module/microsoft.powershell.security/get-credential
 
 <!-- EXTERNAL LINKS -->
-[powershell-script]: https://www.powershellgallery.com/packages/Migrate-Aadds/1.0
+[powershell-script]: https://www.powershellgallery.com/packages/Migrate-Aadds/

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

@@ -35,11 +35,11 @@ Make sure your organization's external collaboration settings are configured suc
 To add B2B collaboration users to the directory, follow these steps:
 
 1. Sign in to the [Azure portal](https://portal.azure.com) as a user who is assigned a limited administrator directory role or the Guest Inviter role.
-2. In the navigation pane, select **Azure Active Directory**.
+2. Search for and select **Azure Active Directory** from any page.
 3. Under **Manage**, select **Users**.
 4. Select **New guest user**.
 
-   ![Shows where New guest user is in the UI](./media/add-users-administrator/NewGuestUser-Directory.png) 
+   ![Shows where New guest user is in the UI](./media/add-users-administrator/new-guest-user-in-all-users.png) 
 
    > [!NOTE]
    > The **New guest user** option is also available on the **Organizational relationships** page. In **Azure Active Directory**, under **Manage**, select **Organizational relationships**.
@@ -66,7 +66,7 @@ After you send the invitation, the user account is automatically added to the di
 If you need to manually add B2B collaboration users to a group, follow these steps:
 
 1. Sign in to the [Azure portal](https://portal.azure.com) as an Azure AD administrator.
-2. In the navigation pane, select **Azure Active Directory**.
+2. Search for and select **Azure Active Directory** from any page.
 3. Under **Manage**, select **Groups**.
 4. Select a group (or click **New group** to create a new one). It's a good idea to include in the group description that the group contains B2B guest users.
 5. Select **Members**. 
@@ -83,7 +83,7 @@ You can also use dynamic groups with Azure AD B2B collaboration. For more inform
 To add B2B collaboration users to an application, follow these steps:
 
 1. Sign in to the [Azure portal](https://portal.azure.com) as an Azure AD administrator.
-2. In the navigation pane, select **Azure Active Directory**.
+2. Search for and select **Azure Active Directory** from any page.
 3. Under **Manage**, select **Enterprise applications** > **All applications**.
 4. Select the application to which you want to add guest users.
 5. On the application's dashboard, select **Total Users** to open the **Users and groups** pane.
@@ -111,13 +111,13 @@ To add B2B collaboration users to an application, follow these steps:
 If a guest user has not yet redeemed their invitation, you can resend the invitation email.
 
 1. Sign in to the [Azure portal](https://portal.azure.com) as an Azure AD administrator.
-2. In the navigation pane, select **Azure Active Directory**.
+2. Search for and select **Azure Active Directory** from any page.
 3. Under **Manage**, select **Users**.
 5. Select the user account.
 6. Under **Manage**, select **Profile**.
 7. If the user has not yet accepted the invitation, a **Resend invitation** option is available. Select this button to resend.
 
-   ![Resend invitation option in the user profile](./media/add-users-administrator/Resend-Invitation.png)
+   ![Resend invitation option in the user profile](./media/add-users-administrator/b2b-user-resend-invitation.png)
 
 > [!NOTE]
 > If you resend an invitation that originally directed the user to a specific app, understand that the link in the new invitation takes the user to the top-level Access Panel instead.

articles/active-directory/b2b/licensing-guidance.md

@@ -23,7 +23,7 @@ With Azure Active Directory (Azure AD) business-to-business (B2B) collaboration,
 > [!NOTE]
 > Refer to [Azure Active Directory pricing](https://azure.microsoft.com/pricing/details/active-directory/) for details about Azure AD pricing and B2B collaboration features.
 
-B2B guest user licensing is automatically calculated and reported based on the 1:5 ratio. Currently, it’s not possible to assign B2B guest user licenses directly to guest users.
+B2B guest user licensing is automatically calculated and reported based on the 1:5 ratio. 
 
 Additionally, guest users can use free Azure AD features with no additional licensing requirements. Guest users have access to free Azure AD features even if you don’t have any paid Azure AD licenses. 
 

articles/active-directory/b2b/media/add-users-administrator/b2b-user-resend-invitation.png

@@ -58,7 +58,7 @@ As an administrator, you can easily add guest users to your organization in the
 - The guest user immediately receives a customizable invitation that lets them sign in to their Access Panel.
 - Guest users in the directory can be assigned to apps or groups.  
 
-![Screenshot showing the New Guest User invitation entry page](media/what-is-b2b/adding-b2b-users-admin.png)
+![Screenshot showing the New Guest User invitation entry page](media/what-is-b2b/add-a-b2b-user-to-azure-portal.png)
 
 ## Let application and group owners manage their own guest users
 

articles/active-directory/b2b/media/add-users-administrator/new-guest-user-in-all-users.png

@@ -7,7 +7,7 @@ manager: daveba
 ms.service: active-directory
 ms.workload: identity
 ms.topic: overview
-ms.date: 12/02/2019
+ms.date: 12/05/2019
 ms.subservice: hybrid
 ms.author: billmath
 ms.collection: M365-identity-device-management
@@ -40,7 +40,7 @@ In this scenario, there is an existing forest synced using Azure AD Connect sync
      | --- | --- |
      | **80** | Downloads the certificate revocation lists (CRLs) while validating the SSL certificate |
      | **443** | Handles all outbound communication with the service |
-     | **8080** (optional) | Agents report their status every 10 minutes over port 8080, if port 443 is unavailable. This status is displayed on the Azure AD portal. Port 8080 is _not_ used for user sign-ins. |
+     | **8080** (optional) | Agents report their status every 10 minutes over port 8080, if port 443 is unavailable. This status is displayed on the Azure AD portal. |
      
      If your firewall enforces rules according to the originating users, open these ports for traffic from Windows services that run as a network service.
    - If your firewall or proxy allows you to specify safe suffixes, then add  connections to **\*.msappproxy.net** and **\*.servicebus.windows.net**. If not, allow access to the [Azure datacenter IP ranges](https://www.microsoft.com/download/details.aspx?id=41653), which are updated weekly.