Merging changes synced from https://github.com/MicrosoftDocs/azure-docs-pr (branch live)

Author: Banani-Rath

.openpublishing.publish.config.json

@@ -867,7 +867,7 @@
       "branch_mapping": {}
     },
     {
-      "path_to_root": "reusable-content",
+      "path_to_root": "articles/reusable-content",
       "url": "https://github.com/MicrosoftDocs/reusable-content",
       "branch": "main",
       "branch_mapping": {}

.openpublishing.redirection.azure-monitor.json

@@ -5467,6 +5467,12 @@
             "redirect_document_id": false
         }
         ,
+        {
+            "source_path_from_root": "/articles/automation/migrate-oms-update-deployments.md",
+            "redirect_url": "/azure/azure-monitor/terminology#april-2018---retirement-of-operations-management-suite-brand",
+            "redirect_document_id": false
+        }
+        ,
         {
             "source_path_from_root": "/articles/azure-monitor/autoscale/autoscale-virtual-machine-scale-sets.md",
             "redirect_url": "/azure/virtual-machine-scale-sets/tutorial-autoscale-template",

articles/active-directory/verifiable-credentials/admin-api.md

@@ -28,7 +28,7 @@ The Admin API is server over HTTPS. All URLs referenced in the documentation hav
 
 ## Authentication
 
-The API is protected through Azure Active Directory and uses OAuth2 bearer tokens. The app registration needs to have the API Permission for `Verifiable Credentials Service Admin` and then when acquiring the access token the app should use scope `6a8b4b39-c021-437c-b060-5a14a3fd65f3/full_access`. 
+The API is protected through Azure Active Directory and uses OAuth2 bearer tokens. The app registration needs to have the API Permission for `Verifiable Credentials Service Admin` and then when acquiring the access token the app should use scope `6a8b4b39-c021-437c-b060-5a14a3fd65f3/full_access`. The access token must be for a user with the [global administrator](../../active-directory/roles/permissions-reference.md#global-administrator) or the [authentication policy administrator](../../active-directory/roles/permissions-reference.md#authentication-policy-administrator) role.
 
 ## Onboarding
 

articles/active-directory/verifiable-credentials/issuance-request-api.md

@@ -86,7 +86,7 @@ The issuance request payload contains information about your verifiable credenti
     "clientName": "Verifiable Credential Expert Sample"
   },
   "type": "VerifiedCredentialExpert",
-  "manifest": "https://verifiedid.did.msidentity.com/v1.0/12345678-0000-0000-0000-000000000000/verifiableCredentials/contracts/VerifiedCredentialExpert",
+  "manifest": "https://verifiedid.did.msidentity.com/v1.0/tenants/12345678-0000-0000-0000-000000000000/verifiableCredentials/contracts/MTIzNDU2NzgtMDAwMC0wMDAwLTAwMDAtMDAwMDAwMDAwMDAwdmVyaWZpZWRjcmVkZW50aWFsZXhwZXJ0/manifest",
   "claims": {
     "given_name": "Megan",
     "family_name": "Bowen"

articles/active-directory/verifiable-credentials/media/verifiable-credentials-configure-tenant/set-key-vault-admin-access-policy.png

@@ -162,6 +162,8 @@ In this article, you deployed a Kubernetes cluster and configured it to use a wo
 <!-- INTERNAL LINKS -->
 [kubernetes-concepts]: concepts-clusters-workloads.md
 [az-feature-register]: /cli/azure/feature#az_feature_register
+[az-provider-register]: /cli/azure/provider#az-provider-register
+[az-feature-list]: /cli/azure/feature#az-feature-list
 [workload-identity-overview]: workload-identity-overview.md
 [create-key-vault-azure-cli]: ../key-vault/general/quick-create-cli.md
 [az-keyvault-list]: /cli/azure/keyvault#az-keyvault-list

articles/aks/workload-identity-deploy-cluster.md

@@ -3,7 +3,7 @@ title: Migrate to App Service Environment v3 by using the migration feature
 description: Overview of the migration feature for migration to App Service Environment v3
 author: seligj95
 ms.topic: article
-ms.date: 9/15/2022
+ms.date: 10/26/2022
 ms.author: jordanselig
 ms.custom: references_regions
 ---
@@ -102,7 +102,7 @@ If your App Service Environment doesn't pass the validation checks or you try to
 |Migration to ASEv3 is not allowed for this ASE. |You won't be able to migrate using the migration feature. |Migrate using one of the [manual migration options](migration-alternatives.md).  |
 |Subscription has too many App Service Environments. Please remove some before trying to create more.|The App Service Environment [quota for your subscription](../../azure-resource-manager/management/azure-subscription-service-limits.md#app-service-limits) has been met. |Remove unneeded environments or contact support to review your options.  |
 |`<ZoneRedundant><DedicatedHosts><ASEv3/ASE>` is not available in this location. |You'll see this error if you're trying to migrate an App Service Environment in a region that doesn't support one of your requested features. |Migrate using one of the [manual migration options](migration-alternatives.md) if you want to migrate immediately. Otherwise, wait for the migration feature to support this App Service Environment configuration.  |
-|Migrate cannot be called on this ASE until the active upgrade has finished.    |App Service Environments can't be migrated during platform upgrades. You can set your [upgrade preference](using-an-ase.md#upgrade-preference) from the Azure portal.   |Wait until the upgrade finishes and then migrate.   |
+|Migrate cannot be called on this ASE until the active upgrade has finished.    |App Service Environments can't be migrated during platform upgrades. You can set your [upgrade preference](how-to-upgrade-preference.md) from the Azure portal. In some cases, an upgrade will be initiated when visiting the migration page if your App Service Environment isn't on the current build.  |Wait until the upgrade finishes and then migrate.   |
 |App Service Environment management operation in progress.    |Your App Service Environment is undergoing a management operation. These operations can include activities such as deployments or upgrades. Migration is blocked until these operations are complete.   |You'll be able to migrate once these operations are complete.  |
 
 ## Overview of the migration process using the migration feature
@@ -197,4 +197,4 @@ There's no cost to migrate your App Service Environment. You'll stop being charg
 > [Using an App Service Environment v3](using.md)
 
 > [!div class="nextstepaction"]
-> [Custom domain suffix](./how-to-custom-domain-suffix.md)
+> [Custom domain suffix](./how-to-custom-domain-suffix.md)

articles/app-service/environment/migrate.md

@@ -105,7 +105,7 @@ Sign in to the [Azure portal](https://portal.azure.com/) and follow these steps
 
 First, create an Azure SQL Server to host the database. A new Azure SQL Server is created by using the [az sql server create ](/cli/azure/sql/server#az-sql-server-create) command.
 
-Replace the *server-name* placeholder with a unique SQL Database name. The SQL Database name is used as part of the globally unique SQL Database endpoint. Also, replace *db-username* and *db-username* with a username and password of your choice.
+Replace the *server-name* placeholder with a unique SQL Database name. The SQL Database name is used as part of the globally unique SQL Database endpoint. Also, replace *db-username* and *db-password* with a username and password of your choice.
 
 ```azurecli-interactive
 az sql server create \

articles/app-service/tutorial-dotnetcore-sqldb-app.md

@@ -18,9 +18,9 @@ ms.author: greglin
 Azure Application Gateway is a layer 7 load-balancing solution, which enables scalable, highly available, and secure web application delivery on Azure.
 
 There are no upfront costs or termination costs associated with Application Gateway.
-You will be billed only for the resources pre-provisioned and utilized based on actual hourly consumption. Costs associated with Application Gateway are classified into two components: fixed costs and variable costs. Actual costs within each component will vary according to the SKU being utilized.
+You'll be billed only for the resources pre-provisioned and utilized based on actual hourly consumption. Costs associated with Application Gateway are classified into two components: fixed costs and variable costs. Actual costs within each component will vary according to the SKU being utilized.
 
-This article describes the costs associated with each SKU and it is recommended that users utilize this document for planning and managing costs associated with the Azure Application Gateway.
+This article describes the costs associated with each SKU and it's recommended that users utilize this document for planning and managing costs associated with the Azure Application Gateway.
 
 ## V2 SKUs  
 
@@ -45,7 +45,7 @@ Compute Unit is the measure of compute capacity consumed. Factors affecting comp
 Compute unit guidance:
 * Standard_v2 - Each compute unit is capable of approximately 50 connections per second with RSA 2048-bit key TLS certificate.
 
-* WAF_v2 - Each compute unit can support approximately 10 concurrent requests per second for 70-30% mix of traffic with 70% requests less than 2 KB GET/POST and remaining higher. WAF performance is not affected by response size currently.
+* WAF_v2 - Each compute unit can support approximately 10 concurrent requests per second for 70-30% mix of traffic with 70% requests less than 2 KB GET/POST and remaining higher. WAF performance isn't affected by response size currently.
 
 ##### Instance Count 
 Pre-provisioning of resources for Application Gateway V2 SKUs is defined in terms of instance count. Each instance guarantees a minimum of 10 capacity units in terms of processing capability. The same instance could potentially support more than 10 capacity units for different traffic patterns depending upon the Capacity Unit parameters.
@@ -60,7 +60,7 @@ V2 SKUs are billed based on the consumption and constitute of two parts:
 
     The fixed cost also includes the cost associated with the public IP attached to the Application Gateway.
 
-    The number of instances running at any point of time is not considered as a factor for fixed costs for V2 SKUs. The fixed costs of running a Standard_V2 (or WAF_V2) would be same per hour regardless of the number of instances running within the same Azure region.
+    The number of instances running at any point of time isn't considered as a factor for fixed costs for V2 SKUs. The fixed costs of running a Standard_V2 (or WAF_V2) would be same per hour regardless of the number of instances running within the same Azure region.
 
 * Capacity Unit Costs 
 
@@ -108,7 +108,7 @@ Since 80 (reserved capacity) > 40 (required capacity), no additional CUs are req
 
 Fixed Price = $0.246  * 730 (Hours) =  $179.58
 
-Variable Costs = $0.008 * 8 (Instance Units) * 10(capacity units) * 730 (Hours) = $467.2
+Variable Costs = $0.008 * 8 (Instance Units) * 10 (capacity units) * 730 (Hours) = $467.2
 
 Total Costs = $179.58 + $467.2 = $646.78
 
@@ -133,7 +133,7 @@ If processing capacity equivalent to 10 additional CUs was available for use wit
 
 Fixed Price = $0.246  * 730 (Hours) =  $179.58
 
-Variable Costs = $0.008 * ( 3(Instance Units) * 10(capacity units) + 10 (additional capacity units) ) * 730 (Hours) = $233.6
+Variable Costs = $0.008 * ( 3 (Instance Units) * 10 (capacity units) + 10 (additional capacity units) ) * 730 (Hours) = $233.6
 
 Total Costs = $179.58 + $233.6 = $413.18
 
@@ -142,7 +142,7 @@ In this scenario the Application Gateway resource is under scaled and could pote
 
 Fixed Price = $0.246  * 730 (Hours) =  $179.58
 
-Variable Costs = $0.008 * ( 3(Instance Units) * 10(capacity units) + 7 (additional capacity units) ) * 730 (Hours) = $216.08
+Variable Costs = $0.008 * ( 3(Instance Units) * 10 (capacity units) + 7 (additional capacity units) ) * 730 (Hours) = $216.08
 
 Total Costs = $179.58 + $216.08 = $395.66
 
@@ -154,14 +154,14 @@ Total Costs = $179.58 + $216.08 = $395.66
 
 ### Example 2 – WAF_V2 instance with Autoscaling
 
-Let’s assume you’ve provisioned a WAF_V2 with autoscaling enabled and set the minimum instance count to 6 for the entire month. The request load has caused the WAF instance to scale out and utilize 65 Capacity units(scale out of 5 capacity units, while 60 units were reserved) for the entire month.
+Let’s assume you’ve provisioned a WAF_V2 with autoscaling enabled and set the minimum instance count to 6 for the entire month. The request load has caused the WAF instance to scale out and utilize 65 Capacity units (scale out of 5 capacity units, while 60 units were reserved) for the entire month.
 Your Application Gateway costs using the pricing mentioned above would be calculated as follows:
 
 Monthly price estimates are based on 730 hours of usage per month.
 
 Fixed Price = $0.443   * 730 (Hours) =  $323.39
 
-Variable Costs = $0.0144  * 65(capacity units) * 730 (Hours) = $683.28
+Variable Costs = $0.0144  * 65 (capacity units) * 730 (Hours) = $683.28
 
 Total Costs = $323.39 + $683.28 = $1006.67
 
@@ -179,31 +179,31 @@ Monthly price estimates are based on 730 hours of usage per month.
 
 Fixed Price = $0.443   * 730 (Hours) =  $323.39
 
-Variable Costs = $0.0144  * 1(capacity units) * 730 (Hours) = $10.512
+Variable Costs = $0.0144  * 1 (capacity units) * 730 (Hours) = $10.512
 
 Total Costs = $323.39 + $10.512 = $333.902
 
 ### Example 3 (b) – WAF_V2 instance with Autoscaling with 0 Min instance count
 
-Let’s assume you’ve provisioned a WAF_V2 with autoscaling enabled and set the minimum instance count to 0 for the entire month. However, there is 0 traffic directed to the WAF instance for the entire month.
+Let’s assume you’ve provisioned a WAF_V2 with autoscaling enabled and set the minimum instance count to 0 for the entire month. However, there's 0 traffic directed to the WAF instance for the entire month.
 Your Application Gateway costs using the pricing mentioned above would be calculated as follows:
 
 Fixed Price = $0.443   * 730 (Hours) =  $323.39
 
-Variable Costs = $0.0144  * 0(capacity units) * 730 (Hours) = $0
+Variable Costs = $0.0144  * 0 (capacity units) * 730 (Hours) = $0
 
 Total Costs = $323.39 + $0 = $323.39
 
-### Example 3 (C) – WAF_V2 instance with manual scaling set to 1 instance
+### Example 3 (c) – WAF_V2 instance with manual scaling set to 1 instance
 
-Let’s assume you’ve provisioned a WAF_V2 and set it to manual scaling with the minimum acceptable value of 1 instance for the entire month. However, there is 0 traffic directed to the WAF for the entire month.
+Let’s assume you’ve provisioned a WAF_V2 and set it to manual scaling with the minimum acceptable value of 1 instance for the entire month. However, there's 0 traffic directed to the WAF for the entire month.
 Your Application Gateway costs using the pricing mentioned above would be calculated as follows:
 
 Monthly price estimates are based on 730 hours of usage per month.
 
 Fixed Price = $0.443   * 730 (Hours) =  $323.39
 
-Variable Costs = $0.0144  * 1(Instance count) * 10(capacity units) * 730 (Hours) = 
+Variable Costs = $0.0144  * 1 (Instance count) * 10 (capacity units) * 730 (Hours) = 
 $105.12
 
 Total Costs = $323.39 + $105.12 = $428.51
@@ -221,19 +221,34 @@ Variable Costs = $0.0144  * 730 (Hours) * {Max (25/50, 8.88/2.22)} = $42.048 (4
 
 Total Costs = $323.39 + $42.048 = $365.438
 
-### Example 5 (a) – Standard_V2 with Autoscaling, time-based calculations
+### Example 5 – Standard_V2 with Autoscaling, time-based calculations
 
 Let’s assume you’ve provisioned a standard_V2 with autoscaling enabled and set the minimum instance count to 0 and this application gateway is active for 2 hours.
 During the first hour, it receives traffic that can be handled by 10 Capacity Units and during the second hour it receives traffic that required 20 Capacity Units to handle the load.
 Your Application Gateway costs using the pricing mentioned above would be calculated as follows:
 
 Fixed Price = $0.246  * 2 (Hours) =  $0.492
 
-Variable Costs = $0.008  * 10(capacity units) * 1 (Hours)  + $0.008  * 20(capacity 
+Variable Costs = $0.008  * 10 (capacity units) * 1 (Hours)  + $0.008  * 20 (capacity 
 units) * 1 (Hours)  = $0.24
 
 Total Costs = $0.492 + $0.24 = $0.732
 
+### Example 6 – WAF_V2 with DDoS Protection Standard Plan, and with manual scaling set to 2 instance
+
+Let’s assume you’ve provisioned a WAF_V2 and set it to manual scaling with 2 instance for the entire month with 2 CUs. Let's also assume that you've enabled DDoS Protection Standard Plan. In this example, since you're paying the monthly fee for DDoS Protection Standard, there's no additional charges for WAF; and you're charged at the lower Standard_V2 rates.
+
+Monthly price estimates are based on 730 hours of usage per month.
+
+Fixed Price = $0.246   * 730 (Hours) =  $179.58
+
+Variable Costs = $0.008  * 2 (capacity units) * 730 (Hours) = $11.68
+
+DDoS Protection Standard Cost = $2,944 * 1 (month) = $2,944
+
+Total Costs = $179.58 + $11.68 + $2,944 = $3,135.26
+
+
 ## V1 SKUs
 
 Standard Application Gateway and WAF V1 SKUs are billed as a combination of:
@@ -351,12 +366,31 @@ Total Costs = $9 + $120 = $129
 ###### Large instance WAF Application Gateway
 24 Hours * 15 Days = 360 Hours
 
-Fixed Price = $0.448  * 360 (Hours) =  $161.28
+Fixed Price = $0.448 * 360 (Hours) = $161.28
 
-Variable Costs = 60 * 1000 * $0.0035/GB  = $210 (Large tier has no costs for the first 40 TB processed per month)
+Variable Costs = 60 * 1000 * $0.0035/GB = $210 (Large tier has no costs for the first 40 TB processed per month)
 
 Total Costs = $161.28 + $210 = $371.28
 
+### Example 3 – WAF Application Gateway with DDoS Protection Standard Plan
+
+Let's assume you've provisioned a medium type WAF application Gateway, and you've enabled DDoS Protection Standard Plan. This medium WAF application gateway processes 40 TB in the duration that it is active. Your Application Gateway costs using the pricing method above would be calculated as follows:
+
+Monthly price estimates are based on 730 hours of usage per month.
+
+Fixed Price = $0.07 * 730 (Hours) = $51.1
+
+Variable Costs = 30 * 1000 * $0.007/GB = $210 (Medium tier has no cost for the first 10 TB processed per month)
+
+DDoS Protection Standard Costs = $2,944 * 1 (month) = $2,944
+
+Total Costs = $3,507.08
+
+
+## Azure DDoS Protection Standard Plan
+
+When Azure DDoS Protection Standard Plan is enabled on your application gateway with WAF you'll be billed at the lower non-WAF rates. Please see [Azure DDoS Protection pricing](https://azure.microsoft.com/pricing/details/ddos-protection/) for more details.
+
 
 ## Monitoring Billed Usage
 
@@ -387,7 +421,7 @@ More metrics such as throughput, current connections and compute units are also
 * Compute Units = 17.38
 * Throughput = 1.37M Bytes/sec - 10.96 Mbps
 * Current Connections = 123.08k
-* Capacity Units calculated = max(17.38, 10.96/2.22, 123.08k/2500) = 49.232
+* Capacity Units calculated = max (17.38, 10.96/2.22, 123.08k/2500) = 49.232
 
 Observed Capacity Units in metrics = 49.23