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

asudbring · asudbring · commit 00269daeaeed · 2020-04-13T14:42:15.000-07:00
diff --git a/articles/firewall/media/quick-create-multiple-ip-template/deploy-to-azure.png b/articles/firewall/media/quick-create-multiple-ip-template/deploy-to-azure.png
diff --git a/articles/firewall/quick-create-multiple-ip-template.md b/articles/firewall/quick-create-multiple-ip-template.md
@@ -0,0 +1,82 @@
+---
+title: 'Quickstart: Create an Azure Firewall with multiple public IP addresses - Resource Manager template'
+description: Learn how to use a Resource Manager template to create an Azure Firewall with multiple public IP addresses.
+services: firewall
+author: vhorne
+ms.service: firewall
+ms.topic: quickstart
+ms.date: 04/13/2020
+ms.author: victorh
+---
+
+# Quickstart: Create an Azure Firewall with multiple public IP addresses - Resource Manager template
+
+In this quickstart, you use a Resource Manager template to deploy an Azure Firewall with multiple public IP addresses.
+
+NAT rule collection rules allow RDP connections to two Windows Server 2019 virtual machines.
+
+[!INCLUDE [About Azure Resource Manager](../../includes/resource-manager-quickstart-introduction.md)]
+
+## Prerequisites
+
+- An Azure account with an active subscription. [Create an account for free](https://azure.microsoft.com/free/?WT.mc_id=A261C142F).
+
+## Create an Azure Firewall
+
+This template creates an Azure Firewall with two public IP addresses, along with the necessary resources to support the Azure Firewall.
+
+### Review the template
+
+The template used in this quickstart is from [Azure Quickstart templates](https://github.com/Azure/azure-quickstart-templates/blob/master/fw-docs-qs/azuredeploy.json)
+
+:::code language="json" source="~/quickstart-templates/fw-docs-qs/azuredeploy.json" range="001-391" highlight="238-370":::
+
+Multiple Azure resources are defined in the template:
+
+- [**Microsoft.Network/publicIPAddresses**](/azure/templates/microsoft.network/publicipaddresses)
+- [**Microsoft.Network/networkSecurityGroups**](/azure/templates/microsoft.network/networksecuritygroups)
+- [**Microsoft.Network/virtualNetworks**](/azure/templates/microsoft.network/virtualnetworks)
+- [**Microsoft.Compute/virtualMachines**](/azure/templates/microsoft.compute/virtualmachines)
+- [**Microsoft.Network/networkInterfaces**](/azure/templates/microsoft.network/networkinterfaces)
+- [**Microsoft.Storage/storageAccounts**](/azure/templates/microsoft.storage/storageAccounts)
+- [**Microsoft.Network/azureFirewalls**](/azure/templates/microsoft.network/azureFirewalls)
+- [**Microsoft.Network/routeTables**](/azure/templates/microsoft.network/routeTables)
+
+
+### Deploy the template
+
+Deploy Resource Manager template to Azure:
+
+1. Select **Deploy to Azure** to sign in to Azure and open the template. The template creates an Azure Firewall, the network infrastructure, and two virtual machines.
+
+   <a href="https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2Fazure-quickstart-templates%2Fmaster%2Ffw-docs-qs%2Fazuredeploy.json"><img src="./media/quick-create-multiple-ip-template/deploy-to-azure.png" alt="deploy to azure"/></a>
+
+2. In the portal, on the **Create an Azure Firewall with multiple IP public addresses** page, type or select the following values:
+   - Subscription: Select from existing subscriptions 
+   - Resource group:  Select from existing resource groups or select **Create new**, and select **OK**.
+   - Location: Select a location
+   - Admin Username: Type username for the administrator user account 
+   - Admin Password: Type an administrator password or key
+
+3. Select **I agree to the terms and conditions stated above** and then select **Purchase**. The deployment can take 10 minutes or longer to complete.
+
+## Validate the deployment
+
+In the Azure portal, review the deployed resources. Note the firewall public IP addresses.  
+
+Use Remote Desktop Connection to connect to the firewall public IP addresses. Successful connections demonstrates firewall NAT rules that allow the connection to the backend servers.
+
+## Clean up resources
+
+When you no longer need the resources that you created with the firewall, delete the resource group. This removes the firewall and all the related resources.
+
+To delete the resource group, call the `Remove-AzResourceGroup` cmdlet:
+
+```azurepowershell-interactive
+Remove-AzResourceGroup -Name "<your resource group name>"
+```
+
+## Next steps
+
+> [!div class="nextstepaction"]
+> [Tutorial: Deploy and configure Azure Firewall in a hybrid network using the Azure portal](tutorial-hybrid-portal.md)
diff --git a/articles/firewall/toc.yml b/articles/firewall/toc.yml
@@ -20,6 +20,9 @@
   - name: Deploy with IP Groups
     displayName: Resource Manager
     href: quick-create-ipgroup-template.md
+  - name: Deploy with multiple addresses
+    displayName: Resource Manager
+    href: quick-create-multiple-ip-template.md
 - name: Samples
   items:
   - name: Azure PowerShell
diff --git a/articles/governance/policy/samples/pattern-logical-operators.md b/articles/governance/policy/samples/pattern-logical-operators.md
@@ -1,7 +1,7 @@
 ---
 title: "Pattern: Logical operators in a policy definition"
 description: This Azure Policy pattern provides examples of how to use the logical operators in a policy definition.
-ms.date: 01/31/2020
+ms.date: 04/15/2020
 ms.topic: sample
 ---
 # Azure Policy pattern: logical operators
@@ -42,6 +42,22 @@ the **not** logical operator. The conditional inside the **not** logical operato
 and then evaluates the **not** to determine if the entire clause is true or false. If both **not**
 logical operators evaluate to true, the policy effect triggers.
 
+## Sample 3: Combining logical operators
+
+This policy definition evaluates Java Spring accounts to see if either trace isn't enabled or if
+trace isn't in a successful state.
+
+:::code language="json" source="~/policy-templates/patterns/pattern-logical-operators-3.json":::
+
+### Sample 3: Explanation
+
+:::code language="json" source="~/policy-templates/patterns/pattern-logical-operators-3.json" range="6-28" highlight="3,8":::
+
+This **policyRule.if** block includes both the **allOf** and **anyOf** logical operators. The
+**anyOf** logical operator evaluates true as long as one included condition is true. As the _type_
+is at the core of the **allOf**, it must always evaluate true. If the _type_ and one of the
+conditions in the **anyOf** are true, the policy effect triggers.
+
 ## Next steps
 
 - Review other [patterns and built-in definitions](./index.md).
diff --git a/articles/marketplace/partner-center-portal/commercial-marketplace-overview.md b/articles/marketplace/partner-center-portal/commercial-marketplace-overview.md
@@ -1,57 +1,70 @@
 ---
-title: Overview of the commercial marketplace in Partner Center 
-description: Learn more about the commercial marketplace in Partner Center and how to list and sell offers on Azure Marketplace, Microsoft AppSource, and through the Cloud Solution Provider (CSP) program.
-author: dsindona 
+title: Overview of the Commercial Marketplace portal in Partner Center 
+description: Learn more about the Commercial Marketplace portal in Partner Center and how to list and sell offers on Azure Marketplace, AppSource, and through the Cloud Solution Provider (CSP) program.
+author: dsindona
 ms.author: dsindona
 ms.service: marketplace 
 ms.subservice: partnercenter-marketplace-publisher
 ms.topic: conceptual
-ms.date: 02/06/2020
+ms.date: 04/13/2020
 ---
 
-# Overview of the commercial marketplace in Partner Center
+# Overview of the Commercial Marketplace Portal in Partner Center
 
-Welcome to the Commercial Marketplace Portal in Partner Center. The [Commercial Marketplace portal](https://partner.microsoft.com/dashboard/commercial-marketplace/) helps you monetize your products and services, reach customers, and grow your business.
+Welcome to the Commercial Marketplace Portal in Partner Center. The [commercial marketplace portal](https://partner.microsoft.com/dashboard/commercial-marketplace/) helps you monetize your products and services, reach customers, and grow your business.
 
-These articles cover the basics of creating and using your Partner Center account. This includes creating new Software as a Service (SaaS) offers that can be listed on [Azure Marketplace](https://azuremarketplace.microsoft.com/) or [Microsoft AppSource](https://appsource.microsoft.com/), managing your existing SaaS offers, and providing resources to help with questions and collect your feedback.
+These articles cover the basics of creating and using your Partner Center account. This includes creating new offers that can be listed on [Azure Marketplace](https://azuremarketplace.microsoft.com/) or [AppSource](https://appsource.microsoft.com/), managing your existing offers that were migrated from the Cloud Partner Portal, and providing resources to help with questions and collect your feedback.
 
-## About Microsoft's commercial marketplace
+## About the commercial marketplace
 
-Enterprises, governments, and organizations of all sizes find business solutions, innovative technology, and enablement services through the [Azure Marketplace](https://azuremarketplace.microsoft.com/) and [Microsoft AppSource](https://appsource.microsoft.com/) web stores, [Azure portal's in-product experience](https://portal.azure.com), [Cloud Solution Providers](https://partner.microsoft.com/cloud-solution-provider), and Microsoft Sales teams.
+Enterprises, governments, and organizations of all sizes find business solutions, innovative technology, and enablement services through the [Azure Marketplace](https://azuremarketplace.microsoft.com/) and [AppSource](https://appsource.microsoft.com/) web stores, [Azure portal's in-product experience](https://portal.azure.com), [Cloud Solution Providers](https://partner.microsoft.com/cloud-solution-provider), and Microsoft Sales teams.
 
-Partner Center is the hub of a Microsoft partner experience. For organizations who go to market with Microsoft and take advantage of the commercial marketplace, Partner Center is the portal through which publishers create and manage offers, provide test drive demonstrations, and view analytics on offer performance.
+Partner Center is the hub of a Microsoft partner experience. For organizations who go to market with Microsoft and take advantage of the commercial marketplace, Partner Center is the portal which publishers use to create and manage offers, provide test drive demonstrations, and view analytics on offer performance.
 
 ## Migration from Cloud Partner Portal
 
-Partner Center is evolving to better integrate all aspects of Microsoft's relationship with software publishers. As part of this evolution, we are migrating the functions of the [Cloud Partner Portal](https://cloudpartner.azure.com/) to Partner Center.
+Partner Center is evolving to better integrate all aspects of our relationship with software publishers. As part of this evolution, we're migrating [Cloud Partner Portal](https://cloudpartner.azure.com/) to Partner Center.
+
+Existing commercial marketplace publishers will find a familiar but improved user experience with an intuitive interface. Notifications in the portal and email notifications inform publishers of the migration. Users will be seamlessly directed to the appropriate location. Customers won't be affected by this partner experience upgrade.
 
 >[!NOTE]
->Currently, Partner Center supports the creation and management of Software-as-a-Service (SaaS) offers, Azure application offers, Dynamics 365 for Customer offers, Engagement & PowerApps offers, Dynamics 365 for Operations offers, and Dynamics 365 for Business Central offers. More offers will be supported soon.
+>Currently, Partner Center supports the creation and management of some offer types as noted in the table below. More offer types will be supported soon as we migrate all offer management to Partner Center.
 
-Existing commercial marketplace publishers will find a familiar but improved user experience with an intuitive interface. Notifications in the portal and via email will inform publishers of the migration. Users will be seamlessly directed to the appropriate location. Customers will not be affected by this partner experience upgrade.
+|Offer Type  |Offer management migrated from Cloud Partner Portal to Partner Center  |
+|---------|---------|
+|Software as a Service (SaaS)     | Available now       |
+|Dynamics 365 for Customer Engagement & PowerApps     | Available now         |
+|Dynamics 365 for operations     | Available now        |
+|Dynamics 365 for business central     | Available now        |
+|Azure Application     | Available now        |
+|Azure Virtual Machine     | General availability April–May 2020        |
+|Azure Container     | General availability April–May 2020        |
+|Consulting service     | General availability April–May 2020        |
+|IoT Edge module     | General availability April–May 2020        |
+|Power BI App    | General availability April–May 2020        |
 
-### Improvements on user experience and billing
+### Improvements on publishing and offer management user experience
 
-With the transition to Partner Center, new functionality is available to publishers, in addition to improvements on the user experience. SaaS offerings, which can be billed monthly or annually, support per-user licensing (seat-based) in addition to per-site licensing (flat-rate). This new monetization model is ideal for business software. The introduction of SaaS per-user licensing aligns with new functionality that allows customers to complete purchases in AppSource, the commercial marketplace for business and industry solutions.
+With the transition to Partner Center, new functionality is available to publishers, in addition to improvements on the user experience.  For details, see [Frequently asked questions for migrating from Cloud Partner Portal to Partner Center](https://docs.microsoft.com/azure/marketplace/cloud-partner-portal-orig/cloud-partner-portal-migration-faq).
 
 ### Account and user management updates
 
-Account and user management in Partner Center make it easy for individuals to access the portal and for administrators to apply appropriate permissions. Compared to prior offer management portals, the role-based access control capabilities in Partner Center provide security enhancements that will make the publishing process simpler for large organizations.
+Account and user management in Partner Center make it easy for you to access the portal and for administrators to apply appropriate permissions. Compared to prior offer management portals, the role-based access control capabilities in Partner Center provide security enhancements that make the publishing process simpler for large organizations.
 
 ### Improved certification experience
 
-Partner Center provides an improved certification experience. Certification now uses automation and machine learning for improved turnaround times and quicker processing. Maintaining accuracy will remain a top priority, ensuring that the cloud marketplace is safe and contains valuable offers for our customers. Requirements will not change, but now when you submit offers through Partner Center, you will receive more detailed and descriptive certification reports referencing [public-facing policies](https://docs.microsoft.com/legal/marketplace/certification-policies).
+Partner Center provides an improved certification experience. Certification now uses automation and machine learning for improved turnaround times and quicker processing. Maintaining accuracy will remain a top priority, ensuring that the marketplace is safe and contains valuable offers for our customers. Requirements won't change, but now when you submit offers through Partner Center, you'll receive more detailed and descriptive certification reports that reference [public-facing policies](https://docs.microsoft.com/legal/marketplace/certification-policies).
 
 ### Analytics for performance reporting
 
-Partner Center analytics provides a view into the performance of your offers and improved reporting tools. Publishers can monitor sales using the data visualization and insight graphs to optimize listings. The improved analytics tools enable you to act on performance results and maintain better relationships with customers and resellers.
+Partner Center analytics provides a view into the performance of your offers and improved reporting tools. Publishers can monitor sales using the data visualization and insight graphs to optimize listings. The improved analytics tools let you act on performance results and maintain better relationships with customers and resellers.
 
 ## View the roadmap and join the conversation
 
-Learn more about recent and future releases by visiting the [commercial marketplace roadmap](https://aka.ms/publicmarketplaceroadmap), or join the conversation in the [Microsoft Partner Community](https://www.microsoftpartnercommunity.com/).
+Learn more about recent and future releases by visiting the [Microsoft commercial marketplace roadmap](https://docs.microsoft.com/azure/marketplace/marketplace-roadmap), or join the conversation in the [Microsoft Partner Community](https://www.microsoftpartnercommunity.com/).
 
 ## Next steps
 
-- For new Microsoft partners interested in publishing a SaaS offer to the marketplaces, see [Create a commercial marketplace account in Partner Center](./create-account.md).
-- For existing partners who have previously published offers in Cloud Partner Portal, [Manage your commercial marketplace account in Partner Center](./manage-account.md).
+- For new Microsoft partners who are interested in publishing an offer to the marketplaces, see [Create a Commercial Marketplace account in Partner Center](https://docs.microsoft.com/azure/marketplace/partner-center-portal/create-account).
+- For existing partners who have previously published offers in Cloud Partner Portal, [Manage your Commercial Marketplace account in Partner Center](https://docs.microsoft.com/azure/marketplace/partner-center-portal/manage-account).
 - Learn more about cloud marketplace management moving to Partner Center in this [Partner Community blog post](https://www.microsoftpartnercommunity.com/t5/Azure-Marketplace-and-AppSource/Cloud-Marketplace-In-Partner-Center/m-p/9738#M293), which includes a demo video.
diff --git a/articles/virtual-desktop/create-fslogix-profile-container.md b/articles/virtual-desktop/create-fslogix-profile-container.md
@@ -6,7 +6,7 @@ author: Heidilohr
 
 ms.service: virtual-desktop
 ms.topic: conceptual
-ms.date: 11/25/2019
+ms.date: 04/13/2020
 ms.author: helohr
 manager: lizross
 ---
@@ -113,9 +113,6 @@ After that, you need to join an Active Directory connection.
     - For **Username**, enter the name of the account with permissions to perform domain join.
     - For **Password**, enter the account's password.
 
-  >[!NOTE]
-  >It's best practice to confirm that the computer account you created in [Join an Active Directory connection](create-fslogix-profile-container.md#join-an-active-directory-connection) has appeared in your domain controller under **Computers** or **your enterprise's relevant OU**.
-
 ## Create a new volume
 
 Next, you'll need to create a new volume.
