Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into rolyon-aadroles-admin-units-graph-api-update

Author: rolyon

articles/active-directory/enterprise-users/users-restrict-guest-permissions.md

@@ -5,7 +5,7 @@ services: active-directory
 author: curtand
 ms.author: curtand
 manager: KarenH444
-ms.date: 06/01/2021
+ms.date: 11/17/2021
 ms.topic: how-to
 ms.service: active-directory
 ms.subservice: enterprise-users
@@ -29,7 +29,7 @@ When guest access is restricted, guests can view only their own user profile. Pe
 
 ## Permissions and licenses
 
-You must be in the Global Administrator or Privileged Role Administrator role to configure guest user access. There are no additional licensing requirements to restrict guest access.
+You must be in the Global Administrator role to configure guest user access. There are no additional licensing requirements to restrict guest access.
 
 ## Update in the Azure portal
 

articles/marketplace/marketplace-virtual-machines.md

@@ -7,7 +7,7 @@ ms.subservice: partnercenter-marketplace-publisher
 ms.topic: conceptual
 author: iqshahmicrosoft
 ms.author: iqshah
-ms.date: 10/26/2021
+ms.date: 11/17/2021
 ---
 
 # Plan a virtual machine offer
@@ -38,10 +38,9 @@ The process of designing, building, and testing offers takes time and requires e
 VM offers have the following technical requirements:
 
 - You must prepare one operating system virtual hard disk (VHD). Data disk VHDs are optional. This is explained in more detail below.
-- The customer can cancel your offer at any time.
-- You must create at least one plan for your offer. Your plan is priced based on the [licensing option](#licensing-options) you select.
+- You must create at least one plan for your offer. Your plan is priced based on the [licensing model](#licensing-models) you select.
    > [!IMPORTANT]
-   > Every VM Image in a plan must have the same number of data disks.
+   > Every VM image in a plan must have the same number of data disks.
 
 A VM contains two components:
 
@@ -57,68 +56,78 @@ For detailed instructions on preparing your technical assets, see [Create a virt
 
 ## Preview audience
 
-[!INCLUDE [Test drives section](includes/preview-audience.md)]
+A preview audience can access your offer prior to it being published live in the marketplace in order to test the end-to-end functionality. On the **Preview audience** page, you can use Azure subscription IDs to define a limited preview audience.
 
-## Plans and pricing
+> [!NOTE]
+> A preview audience differs from a private audience. A preview audience is a list of subscription IDs that can test and validate your offer. This includes any private plans, before they are made available to your users. In contrast, when making an offer private, you need to specify a private audience to restrict visibility of your offer to customers of your choosing. A private audience (defined on the **Pricing and Availability** page for each of your plans) is a list of subscription IDs and/or tenant IDs that will have access to a particular plan after the offer is live.
+
+## Plans, pricing, and trials
 
-VM offers require at least one plan. A plan defines the solution scope and limits, and the associated pricing. You can create multiple plans for your offer to give your customers different technical and licensing options, as well as free trials. See [Plans and pricing for commercial marketplace offers](plans-pricing.md) for general guidance about plans, including pricing models, free trials, and private plans. 
+VM offers require at least one plan. A plan defines the solution scope and limits, and the associated pricing. You can create multiple plans for your offer to give your customers different technical and licensing options, as well as trial opportunities. See [Plans and pricing for commercial marketplace offers](plans-pricing.md) for general guidance about plans, including pricing models, free trials, and private plans.
 
-VMs are fully commerce-enabled, using pay-as-you-go or bring-your-own-license (BYOL) licensing models. Microsoft hosts the commerce transaction and bills your customer on your behalf. You get the benefit of using the preferred payment relationship between your customer and Microsoft, including any Enterprise Agreements. For more information, see [Commercial marketplace transact capabilities](./marketplace-commercial-transaction-capabilities-and-considerations.md).
+VMs are fully commerce-enabled, using usage-based pay-as-you-go or bring-your-own-license (BYOL) licensing models. Microsoft hosts the commerce transaction and bills your customer on your behalf. You get the benefit of using the preferred payment relationship between your customer and Microsoft, including any Enterprise Agreements. For more information, see [Commercial marketplace transact capabilities](./marketplace-commercial-transaction-capabilities-and-considerations.md).
 
 > [!NOTE]
 > The Azure Prepayment (previously called monetary commitment) associated with an Enterprise Agreement can be used against the Azure usage of your VM, but not against your software licensing fees.
 
-### Licensing options
+### Private plans
 
-As you prepare to publish a new offer, you need to decide which licensing option to choose. This will determine what additional information you'll need to provide later as you create the offer in Partner Center.
+Private plans restrict the discovery and deployment of your solution to a specific set of customers you choose and offer customized software, terms, and pricing. The customized terms enable you to highlight a variety of scenarios, including field-led deals with specialized pricing and terms as well as early access to limited release software.
+
+For more information, see [Plans and pricing for commercial marketplace offers](plans-pricing.md) and [Private offers in the Microsoft commercial marketplace](private-offers.md).
+
+### Licensing models
+
+As you prepare to publish a new offer, you need to make pricing-related decisions by selecting the appropriate licensing model.
 
 These are the available licensing options for VM offers:
 
-| Licensing option | Transaction process |
+| Licensing model | Transaction process |
 | --- | --- |
-| Free trial | Offer your customers a one-, three- or six-month free trial. |
-| Test drive | This option lets your customers evaluate VMs at no additional cost to them. They don't need to be an existing Azure customer to engage with the trial experience. For details, see [What is a test drive?](./what-is-test-drive.md) |
-| BYOL | The Bring Your Own Licensing option lets your customers bring existing software licenses to Azure.\* |
-| Usage-based | Also known as pay-as-you-go, this option lets your customers pay per hour. |
-| Interactive demo  | Give your customers a guided experience of your solution using an interactive demonstration. The benefit is that you can offer a trial experience without having to provide a complicated setup of your complex solution. |
+| Usage-based | Also known as pay-as-you-go. This licensing model lets you bill your customers per hour through various pricing options. |
+| BYOL | The Bring Your Own Licensing option lets your customers bring existing software licenses to Azure. * |
 |
 
-\* As the publisher, you support all aspects of the software license transaction, including (but not limited to) order, fulfillment, metering, billing, invoicing, payment, and collection.
+`*` As the publisher, you support all aspects of the software license transaction, including (but not limited to) order, fulfillment, metering, billing, invoicing, payment, and collection.
 
 The following example shows a VM offer in Azure Marketplace that has usage-based pricing.
 
 :::image type="content" source="media/vm/sample-offer-screen.png" alt-text="Sample VM offer screen.":::
 
-### Private plans
+### Trials
 
-You can restrict the discovery and deployment of your VM to a specific set of customers by publishing the image and pricing as a private plan. Private plans unlock the ability for you to create exclusive offers for your closest customers and offer customized software and terms. The customized terms enable you to highlight a variety of scenarios, including field-led deals with specialized pricing and terms as well as early access to limited release software. Private plans enable you to give specific pricing or products to a limited set of customers.
+The following are types of trials that can be configured to help identify customer leads. These trials give potential customers an opportunity to interact with your offer prior to purchasing via the licensing model you selected.
 
-For more information, see [Plans and pricing for commercial marketplace offers](plans-pricing.md) and [Private offers in the Microsoft commercial marketplace](private-offers.md).
+| Trials | Transaction process |
+| ------------ | ------------- |
+| Free trial | Offer your customers a one-, three- or six-month free trial. |
+| Test drive | This option lets your customers evaluate your solution at no additional cost to them. They don't need to be an existing Azure customer to engage with the trial experience. Learn more about [test drives](#test-drive). |
+|
 
-## Test drive
+> [!NOTE]
+> The licensing model along with any trial opportunities you select will determine the additional information you'll need to provide when you create the offer in Partner Center.
 
-[!INCLUDE [Test drives section](includes/test-drives.md)]
+## Test drive
 
-If you want to read more about test drives for VM offers now, see [Configure a VM test drive](azure-vm-test-drive.md).
+You can enable a test drive that lets customers try your offer prior to purchase by giving them access to a preconfigured environment for a fixed number of hours, resulting in highly qualified leads and an increased conversion rate. Test drives differ depending on the offer type and marketplace. To learn more about types of test drives and how they work, see [What is a test drive?](what-is-test-drive.md). To learn more about test drives for VM offers, see [Configure a VM test drive](azure-vm-test-drive.md).
 
 ## Customer leads
 
 When you're publishing an offer to the commercial marketplace with Partner Center, connect it to your Customer Relationship Management (CRM) system. This lets you receive customer contact information as soon as someone expresses interest in or uses your product. Connecting to a CRM is required if you want to enable a test drive (see the preceding section). Otherwise, connecting to a CRM is optional.
 
 ## Legal contracts
 
-[!INCLUDE [Legal contracts section](includes/legal-contracts-intro.md)]
-[!INCLUDE [Legal section for Standard contracts](includes/legal-contracts-standard.md)]
+You have two options for defining the terms and conditions for your offer:
+- Use the standard contract with optional amendments
+- Use your own terms and conditions
 
-## Cloud Solution Providers
+To learn about the standard contract and optional amendments, see [Standard Contract for the Microsoft commercial marketplace](standard-contract.md). You can download the [Standard Contract](https://go.microsoft.com/fwlink/?linkid=2041178) PDF (make sure your pop-up blocker is off).
 
-When creating your offer in Partner Center, you will see the **Resell through CSPs** tab. This option allows partners who are part of the Microsoft Cloud Solution Providers (CSP) program to resell your VM as part of a bundled offer. All Bring-your-own-license (BYOL) plans are automatically opted in to the program. You can also choose to opt in your non-BYOL plans. See [Cloud Solution Provider program](cloud-solution-providers.md) for more information. 
+## Cloud Solution Providers
 
-> [!NOTE]
-> The Cloud Solution Provider (CSP) partner channel opt-in is now available. For more information about marketing your offer through Microsoft CSP partner channels, see [**Cloud Solution Providers**](./cloud-solution-providers.md).
+When creating your offer in Partner Center, you will see the **Resell through CSPs** tab. This option allows partners who are part of the Microsoft Cloud Solution Providers (CSP) program to resell your VM as part of a bundled offer. All Bring-your-own-license (BYOL) plans are automatically opted in to the program. You can also choose to opt in your non-BYOL plans. See [Cloud Solution Provider program](cloud-solution-providers.md) for more information.
 
 ## Next steps
 
-- [Create a virtual machine offer on Azure Marketplace](azure-vm-offer-setup.md)
-- [Create a virtual machine using an approved base](azure-vm-use-approved-base.md) or [create a virtual machine using your own image](azure-vm-use-own-image.md).
-- [Offer listing best practices](gtm-offer-listing-best-practices.md)
+- If you do not yet have an image created for your offer, see [Create a virtual machine using an approved base](azure-vm-use-approved-base.md) or [Create a virtual machine using your own image](azure-vm-use-own-image.md).
+- Once you have an image ready, see [Create a virtual machine offer on Azure Marketplace](azure-vm-offer-setup.md)

articles/marketplace/media/vm/sample-offer-screen.png

@@ -84,18 +84,18 @@ Download Terraform to your environment:
 
 ## Set up repository
 
-Clone and configure the [automation framework repository](https://github.com/Azure/sap-hana).
+Clone and configure the [automation framework repository](https://github.com/Azure/sap-automation).
 
 1. Clone the repository from GitHub:
 
     ```azurecli-interactive
-    git clone https://github.com/Azure/sap-hana.git
+    git clone https://github.com/Azure/sap-automation.git
     ```
 
-1. Navigate to the `sap-hana` folder.
+1. Navigate to the `sap-automation` folder.
 
     ```azurecli-interactive
-    cd  ~/Azure_SAP_Automated_Deployment/sap-hana
+    cd  ~/Azure_SAP_Automated_Deployment/sap-automation
     ```
 
 1. Optionally, check out a different branch than the main branch. The main branch for the repository is the default.
@@ -152,23 +152,23 @@ Clone and configure the [automation framework repository](https://github.com/Azu
 1. Initialize Terraform.
 
     ```azurecli-interactive
-    terraform init  ../../../sap-hana/deploy/terraform/bootstrap/sap_deployer/
+    terraform init  ../../../sap-automation/deploy/terraform/bootstrap/sap_deployer/
     ```
 
 1. Create a Terraform execution plan that follows the default naming convention.
 
     ```azurecli-interactive
     terraform plan                                                                    \
                     --var-file=DEMO-EUS2-DEP00-INFRASTRUCTURE.json                    \
-                    ../../../sap-hana/deploy/terraform/bootstrap/sap_deployer/
+                    ../../../sap-automation/deploy/terraform/bootstrap/sap_deployer/
     ```
 
 1. Apply your Terraform execution plan to deploy the resources.
 
     ```azurecli-interactive
     terraform apply --auto-approve                                                    \
                     --var-file=DEMO-EUS2-DEP00-INFRASTRUCTURE.json                    \
-                    ../../../sap-hana/deploy/terraform/bootstrap/sap_deployer/
+                    ../../../sap-automation/deploy/terraform/bootstrap/sap_deployer/
     ```
 
 1. Note the output.
@@ -261,7 +261,7 @@ The deployer uses a service principal to deploy resources into a subscription.
 1. Navigate to where you cloned the automation framework repository.
 
     ```bash
-    cd  ~/Azure_SAP_Automated_Deployment/sap-hana
+    cd  ~/Azure_SAP_Automated_Deployment/sap-automation
     ```
 
 1. Optionally, check out a different branch than the main branch. The main branch for the repository is the default.

articles/virtual-machines/workloads/sap/automation-manual-deployment.md

@@ -67,7 +67,7 @@ For your own parameter files, it's a best practice to keep these files in a sour
 
 ### Folder structure
 
-The following sample folder hierarchy shows how to structure your configuration files along with the automation framework files. The first top-level folder, called **sap-hana**, has the automation framework files that you don't need to change in most use cases. The second top-level folder, called **WORKSPACES**, contains subfolders with configuration files for your deployment settings.
+The following sample folder hierarchy shows how to structure your configuration files along with the automation framework files. The first top-level folder, called **sap-automation**, has the automation framework files that you don't need to change in most use cases. The second top-level folder, called **WORKSPACES**, contains subfolders with configuration files for your deployment settings.
 
 | Folder name | Contents | Description |
 | ----------- | -------- | ----------- |