Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into nr-100222-phpwebapp-1906169

Author: v-niranjan

articles/active-directory/app-provisioning/use-scim-to-build-users-and-groups-endpoints.md

@@ -99,7 +99,7 @@ The default token validation code is configured to use an Azure AD token and req
 
 After you deploy the SCIM endpoint, you can test to ensure that it's compliant with SCIM RFC. This example provides a set of tests in Postman that validate CRUD (create, read, update, and delete) operations on users and groups, filtering, updates to group membership, and disabling users.
 
-The endpoints are in the `{host}/scim/` directory, and you can use standard HTTP requests to interact with them. To modify the `/scim/` route, see *ControllerConstant.cs* in **AzureADProvisioningSCIMreference** > **ScimReferenceApi** > **Controllers**.
+The endpoints are in the `{host}/scim/` directory, and you can use standard HTTP requests to interact with them. To modify the `/scim/` route, see *TokenController.cs* in **SCIMReferenceCode** > **Microsoft.SCIM.WebHostSample** > **Controllers**.
 
 > [!NOTE]
 > You can only use HTTP endpoints for local tests. The Azure AD provisioning service requires that your endpoint support HTTPS.
@@ -141,4 +141,4 @@ To develop a SCIM-compliant user and group endpoint with interoperability for a
 
 > [!div class="nextstepaction"]
 > [Tutorial: Develop and plan provisioning for a SCIM endpoint](use-scim-to-provision-users-and-groups.md)
-> [Tutorial: Configure provisioning for a gallery app](configure-automatic-user-provisioning-portal.md)
+> [Tutorial: Configure provisioning for a gallery app](configure-automatic-user-provisioning-portal.md)

articles/marketplace/marketplace-categories-industries.md

@@ -32,7 +32,6 @@ Following are the categories and industries applicable to each online stores, by
 | Dynamics 365 Operations Apps | | ✔ | ✔ |
 | Dynamics 365 Business Central | | ✔ | ✔ |
 | Power BI app | | ✔ | ✔ |
-|
 
 ## Applicable store by offer type
 
@@ -48,7 +47,6 @@ Following are the combinations of options applicable to each online stores:
 |  |  |  | &#x2714; |  | AppSource<sup>1</sup><br>Azure Marketplace<sup>1</sup> |
 |  |  |  |  | &#x2714; | AppSource<sup>1</sup><br>Azure Marketplace<sup>1,2</sup> |
 |  |  |  |  | &#x2714; | AppSource<sup>1</sup><br>Azure Marketplace<sup>1</sup> |
-|
 
 <sup>1</sup> Depending on category/subcategory and industry selection.<br>
 <sup>2</sup> Offers with private plans will be published to the Azure portal.<br>
@@ -89,8 +87,7 @@ Industry selection applies only for offers published to AppSource and Consulting
 | Media and Communications | Media and Entertainment<br>Telecommunications | 
 | Professional Services | Partner Professional Services<br>Legal<br>Architecture and Construction<br>Real Estate | 
 | Distribution | Wholesale<br>Parcel and Package Shipping |  
-| Hospitality and Travel | Travel & Transportation<br>Hotels and Leisure<br>Restaurants and Food Services | 
-|
+| Hospitality and Travel | Travel & Transportation<br>Hotels and Leisure<br>Restaurants and Food Services |
 
 ## Applicable products
 
@@ -99,4 +96,4 @@ Select the applicable products your app works with for the offer to show up unde
 ## Next steps
 
 - To create an offer, sign in to [Partner Center](https://go.microsoft.com/fwlink/?linkid=2165290) to create and configure your offer. If you haven't yet enrolled in Partner Center, [create an account](./create-account.md).
-- For step-by-step instructions on publishing an offer, see the commercial marketplace [publishing guide by offer type](./publisher-guide-by-offer-type.md).
+- For step-by-step instructions on publishing an offer, see the commercial marketplace [publishing guide by offer type](./publisher-guide-by-offer-type.md).

articles/virtual-machine-scale-sets/scripts/cli-sample-attach-disks.md

@@ -26,7 +26,7 @@ This script creates a virtual machine scale set and attaches and prepares data d
 
 ### Run the script
 
-:::code language="azurecli" source="~/azure_cli_scripts/virtual-machine-scale-sets/use-data-disks/use-data-disks.sh" range="4-42":::
+:::code language="azurecli" source="~/azure_cli_scripts/virtual-machine-scale-sets/use-data-disks/use-data-disks.sh" id="FullScript":::
 
 ## Clean up resources
 

articles/virtual-machine-scale-sets/scripts/cli-sample-create-scale-set-from-custom-image.md

@@ -25,7 +25,7 @@ This script creates a virtual machine scale set that uses a custom VM image as t
 
 ### Run the script
 
-:::code language="azurecli" source="~/azure_cli_scripts/virtual-machine-scale-sets/use-custom-vm-image/create-use-custom-vm-image.sh" range="4-55":::
+:::code language="azurecli" source="~/azure_cli_scripts/virtual-machine-scale-sets/use-custom-vm-image/create-use-custom-vm-image.sh" id="FullScript":::
 
 ## Clean up resources
 

articles/virtual-machine-scale-sets/scripts/cli-sample-create-simple-scale-set.md

@@ -25,7 +25,7 @@ This script creates an Azure virtual machine scale set with an Ubuntu operating
 
 ### Run the script
 
-:::code language="azurecli" source="~/azure_cli_scripts/virtual-machine-scale-sets/simple-scale-set/simple-scale-set.sh" range="4-21":::
+:::code language="azurecli" source="~/azure_cli_scripts/virtual-machine-scale-sets/simple-scale-set/simple-scale-set.sh" id="FullScript":::
 
 ## Clean up resources
 

articles/virtual-machine-scale-sets/scripts/cli-sample-enable-autoscale.md

@@ -27,7 +27,7 @@ This script creates a virtual machine scale set running Ubuntu and uses host-bas
 
 ### Run the script
 
-:::code language="azurecli" source="~/azure_cli_scripts/virtual-machine-scale-sets/auto-scale-host-metrics/auto-scale-host-metrics.sh" range="4-46":::
+:::code language="azurecli" source="~/azure_cli_scripts/virtual-machine-scale-sets/auto-scale-host-metrics/auto-scale-host-metrics.sh" id="FullScript":::
 
 ## Clean up resources
 

articles/virtual-machine-scale-sets/scripts/cli-sample-install-apps.md

@@ -24,7 +24,7 @@ This script creates a virtual machine scale set running Ubuntu and uses the Cust
 
 ### Run the script
 
-:::code language="azurecli" source="~/azure_cli_scripts/virtual-machine-scale-sets/install-apps/install-apps.sh" range="4-33":::
+:::code language="azurecli" source="~/azure_cli_scripts/virtual-machine-scale-sets/install-apps/install-apps.sh" id="FullScript":::
 
 ## Clean up resources
 

articles/virtual-machine-scale-sets/scripts/cli-sample-single-availability-zone-scale-set.md

@@ -25,7 +25,7 @@ This script creates a virtual machine scale set running Ubuntu in a single Avail
 
 ### Run the script
 
-:::code language="azurecli" source="~/azure_cli_scripts/virtual-machine-scale-sets/create-single-availability-zone/create-single-availability-zone.sh" range="4-32":::
+:::code language="azurecli" source="~/azure_cli_scripts/virtual-machine-scale-sets/create-single-availability-zone/create-single-availability-zone.sh" id="FullScript":::
 
 ## Clean up resources
 

articles/virtual-machine-scale-sets/scripts/cli-sample-zone-redundant-scale-set.md

@@ -26,7 +26,7 @@ This script creates a virtual machine scale set running Ubuntu across multiple A
 
 ### Run the script
 
-:::code language="azurecli" source="~/azure_cli_scripts/virtual-machine-scale-sets/create-zone-redundant-scale-set/create-zone-redundant-scale-set.sh" range="4-35":::
+:::code language="azurecli" source="~/azure_cli_scripts/virtual-machine-scale-sets/create-zone-redundant-scale-set/create-zone-redundant-scale-set.sh" id="FullScript":::
 
 ## Clean up resources
 

articles/virtual-machine-scale-sets/virtual-machine-scale-sets-use-availability-zones.md

@@ -21,6 +21,7 @@ To protect your virtual machine scale sets from datacenter-level failures, you c
 ## Availability considerations
 
 When you deploy a regional (non-zonal) scale set into one or more zones as of API version *2017-12-01*, you have the following availability options:
+
 - Max spreading (platformFaultDomainCount = 1)
 - Static fixed spreading (platformFaultDomainCount = 5)
 - Spreading aligned with storage disk fault domains (platformFaultDomainCount = 2 or 3)
@@ -43,7 +44,7 @@ When you deploy a scale set, you also have the option to deploy with a single [p
 
 Finally, for scale sets deployed across multiple zones, you also have the option of choosing "best effort zone balance" or "strict zone balance". A scale set is considered "balanced" if each zone the same number of VMs or +\\- 1 VM in all other zones for the scale set. For example:
 
-- A scale set with 2 VMs in zone 1, 3 VMs in zone 2, and 3 VMs in zone 3 is considered balanced. There is only one zone with a different VM count and it is only 1 less than the other zones. 
+- A scale set with 2 VMs in zone 1, 3 VMs in zone 2, and 3 VMs in zone 3 is considered balanced. There is only one zone with a different VM count and it is only 1 less than the other zones.
 - A scale set with 1 VM in zone 1, 3 VMs in zone 2, and 3 VMs in zone 3 is considered unbalanced. Zone 1 has 2 fewer VMs than zones 2 and 3.
 
 It's possible that VMs in the scale set are successfully created, but extensions on those VMs fail to deploy. These VMs with extension failures are still counted when determining if a scale set is balanced. For instance, a scale set with 3 VMs in zone 1, 3 VMs in zone 2, and 3 VMs in zone 3 is considered balanced even if all extensions failed in zone 1 and all extensions succeeded in zones 2 and 3.
@@ -64,7 +65,7 @@ When you create a scale set in a single zone, you control which zone all those V
 To use Availability Zones, your scale set must be created in a [supported Azure region](../availability-zones/az-region.md). You can create a scale set that uses Availability Zones with one of the following methods:
 
 - [Azure portal](#use-the-azure-portal)
-- Azure CLI
+- [Azure CLI](#use-the-azure-cli)
 - [Azure PowerShell](#use-azure-powershell)
 - [Azure Resource Manager templates](#use-azure-resource-manager-templates)
 
@@ -80,7 +81,11 @@ The scale set and supporting resources, such as the Azure load balancer and publ
 
 The process to create a scale set that uses an Availability Zone is the same as detailed in the [getting started article](quick-create-cli.md). To use Availability Zones, you must create your scale set in a supported Azure region.
 
-Add the `--zones` parameter to the [az vmss create](/cli/azure/vmss) command and specify which zone to use (such as zone *1*, *2*, or *3*). The following example creates a single-zone scale set named *myScaleSet* in zone *1*:
+Add the `--zones` parameter to the [az vmss create](/cli/azure/vmss) command and specify which zone to use (such as zone *1*, *2*, or *3*).
+
+### Single-zone scale set
+
+The following example creates a single-zone scale set named *myScaleSet* in zone *1*:
 
 ```azurecli
 az vmss create \
@@ -93,7 +98,7 @@ az vmss create \
     --zones 1
 ```
 
-For a complete example of a single-zone scale set and network resources, see [this sample CLI script](https://github.com/Azure/azure-docs-cli-python-samples/blob/master/virtual-machine-scale-sets/create-single-availability-zone/create-single-availability-zone.sh)
+For a complete example of a single-zone scale set and network resources, see [this sample CLI script](scripts/cli-sample-single-availability-zone-scale-set.md#sample-script)
 
 ### Zone-redundant scale set
 
@@ -112,12 +117,14 @@ az vmss create \
     --zones 1 2 3
 ```
 
-It takes a few minutes to create and configure all the scale set resources and VMs in the zone(s) that you specify. For a complete example of a zone-redundant scale set and network resources, see [this sample CLI script](https://github.com/Azure/azure-docs-cli-python-samples/blob/master/virtual-machine-scale-sets/create-zone-redundant-scale-set/create-zone-redundant-scale-set.sh)
+It takes a few minutes to create and configure all the scale set resources and VMs in the zone(s) that you specify. For a complete example of a zone-redundant scale set and network resources, see [this sample CLI script](scripts/cli-sample-zone-redundant-scale-set.md#sample-script)
 
 ## Use Azure PowerShell
 
 To use Availability Zones, you must create your scale set in a supported Azure region. Add the `-Zone` parameter to the [New-AzVmssConfig](/powershell/module/az.compute/new-azvmssconfig) command and specify which zone to use (such as zone *1*, *2*, or *3*).
 
+### Single-zone scale set
+
 The following example creates a single-zone scale set named *myScaleSet* in *East US 2* zone *1*. The Azure network resources for virtual network, public IP address, and load balancer are automatically created. When prompted, provide your own desired administrative credentials for the VM instances in the scale set:
 
 ```powershell
@@ -154,6 +161,8 @@ New-AzVmss `
 
 The process to create a scale set that uses an Availability Zone is the same as detailed in the getting started article for [Linux](quick-create-template-linux.md) or [Windows](quick-create-template-windows.md). To use Availability Zones, you must create your scale set in a supported Azure region. Add the `zones` property to the *Microsoft.Compute/virtualMachineScaleSets* resource type in your template and specify which zone to use (such as zone *1*, *2*, or *3*).
 
+### Single-zone scale set
+
 The following example creates a Linux single-zone scale set named *myScaleSet* in *East US 2* zone *1*:
 
 ```json