Merge pull request #104632 from MicrosoftDocs/master

2/17 AM Publish

Author: huypub

articles/active-directory/develop/scenario-web-app-sign-user-app-configuration.md

@@ -90,7 +90,7 @@ In ASP.NET Core, these settings are located in the [appsettings.json](https://gi
     // - "organizations" to sign in users in any work or school account
     // - "common" to sign in users with any work or school account or Microsoft personal account
     // - "consumers" to sign in users with a Microsoft personal account only
-    "TenantId": "[Enter the tenantId here]]",
+    "TenantId": "[Enter the tenantId here]",
 
     // Client ID (application ID) obtained from the Azure portal
     "ClientId": "[Enter the Client Id]",

articles/active-directory/fundamentals/whats-new-microsoft-365-government.md

@@ -65,6 +65,6 @@ For more information, see these articles:
 
 - [Azure Government AAD Authority Endpoint Update](https://devblogs.microsoft.com/azuregov/azure-government-aad-authority-endpoint-update/)
 
-- [Microsoft Graph endpoints in US Government cloud](https://developer.microsoft.com/graph/blogs/new-microsoft-graph-endpoints-in-us-government-cloud/)
+- [Microsoft Graph endpoints in US Government cloud](https://developer.microsoft.com/graph/blogs/new-microsoft-graph-endpoints-in-us-government-cloud/)
 
-- [Office 365 US Government GCC High and DoD](https://docs.microsoft.com/office365/servicedescriptions/office-365-platform-service-description/office-365-us-government/gcc-high-and-dod)
+- [Office 365 US Government GCC High and DoD](https://docs.microsoft.com/office365/servicedescriptions/office-365-platform-service-description/office-365-us-government/gcc-high-and-dod)

articles/active-directory/managed-identities-azure-resources/qs-configure-template-windows-vmss.md

@@ -185,7 +185,7 @@ In this section, you assign a user-assigned managed identity to a virtual machin
        "identity": {
            "type": "userAssigned",
            "identityIds": [
-               "[resourceID('Micrososft.ManagedIdentity/userAssignedIdentities/',variables('<USERASSIGNEDIDENTITY>'))]"
+               "[resourceID('Microsoft.ManagedIdentity/userAssignedIdentities/',variables('<USERASSIGNEDIDENTITY>'))]"
            ]
        }
 

articles/aks/supported-kubernetes-versions.md

@@ -71,7 +71,7 @@ When a new minor version is introduced, the oldest minor version and patch relea
 1.13.f
 ```
 
-And AKS releases 1.16.*, this means that the 1.13.* versions (all 1.13 versions) will be removed and out of support.
+And AKS releases 1.16.*, this means that the 1.13.* versions (all 1.13 versions) will be removed and are out of support.
 
 > [!NOTE]
 > Please note, that if customers are running an unsupported Kubernetes version, they will be asked to upgrade when
@@ -102,8 +102,7 @@ New Supported Version List
   * Customers have **30 days** from the public notification date to upgrade to a supported minor version release.
 * For new **patch** versions of Kubernetes
   * All users are notified of the new patch version being released and to upgrade to the latest patch release.
-  * Users have **30 days** to upgrade to a newer, supported patch release. Users have **30 days** to upgrade to
-    a supported patch release before the oldest is removed.
+  * Users have **30 days** to upgrade to a newer, supported patch release before the oldest is removed.
 
 AKS defines a "released version" as the generally available versions, enabled in all SLO / Quality of Service measurements and available in all regions. AKS may also support preview versions which are explicitly labeled and subject to Preview terms and conditions.
 
@@ -147,11 +146,11 @@ az aks get-versions --location eastus --output table
 If you are on the *n-3* version, you are outside of support and will be asked to upgrade. If your upgrade from version n-3 to n-2 succeeds, you are now within our support policies. For example:
 
 - If the oldest supported AKS version is are *1.13.a* and you are on *1.12.b* or older, you are outside of support.
-- If the upgrade from *1.12.b* to *1.13.a* or higher succeeds, you are back in the within our support policies.
+- If the upgrade from *1.12.b* to *1.13.a* or higher succeeds, you are back within our support policies.
 
 Upgrades to versions older than the supported window of *N-2* are not supported. In such cases, we recommend customers create new AKS clusters and redeploy their workloads with versions in the supported window.
 
-**What does 'Out of Support' mean**
+**What does 'Outside of Support' mean**
 
 'Outside of Support' means that the version you are running is outside of the supported versions list, and you will be
 asked to upgrade the cluster to a supported version when requesting support. Additionally, AKS does not make any

articles/application-gateway/application-gateway-metrics.md

@@ -91,10 +91,21 @@ For Application Gateway, the following metrics are available:
 - **Current connections**
 
    The total number of concurrent connections active from clients to the Application Gateway
+   
+- **Estimated Billed Capacity units**
+
+  Number of capacity units using which the billing is estimated. This is calcutaed as the greater value between *Current capacity units* and *Fixed billable capacity units*.  
 
 - **Failed Requests**
 
    Count of failed requests that Application Gateway has served. The request count can be further filtered to show count per each/specific backend pool-http setting combination.
+   
+- **Fixed Billable Capacity Units**
+The minimum number of capacity units kept provisioned as per the *Minimum scale units* setting in the Application Gateway configuration.
+   
+ - **New connections per second**
+
+   The average number of new TCP connections per second established from clients to the Application Gateway and from the Application Gateway to the backend members.
 
 
 - **Response Status**

articles/azure-app-configuration/concept-key-value.md

@@ -20,7 +20,7 @@ The usage of configuration data within application frameworks might dictate spec
 
 Keys stored in App Configuration are case-sensitive, unicode-based strings. The keys *app1* and *App1* are distinct in an App Configuration store. Keep this in mind when you use configuration settings within an application because some frameworks handle configuration keys case-insensitively. For example, the ASP.NET Core configuration system treats keys as case-insensitive strings. To avoid unpredictable behaviors when you query App Configuration within an ASP.NET Core application, don't use keys that differ only by casing.
 
-You can use any unicode character in key names entered into App Configuration except for `*`, `,`, and `\`. These characters are reserved. If you need to include a reserved character, you must escape it by using `\{Reserved Character}`. There's a combined size limit of 10,000 characters on a key-value pair. This limit includes all characters in the key, its value, and all associated optional attributes. Within this limit, you can have many hierarchical levels for keys.
+You can use any unicode character in key names entered into App Configuration except for `*`, `,`, and `\`. These characters are reserved. If you need to include a reserved character, you must escape it by using `\{Reserved Character}`. There's a combined size limit of 10 KB on a key-value pair. This limit includes all characters in the key, its value, and all associated optional attributes. Within this limit, you can have many hierarchical levels for keys.
 
 ### Design key namespaces
 
@@ -46,7 +46,7 @@ Here are several examples of how you can structure your key names into a hierarc
 
 ### Label keys
 
-Key values in App Configuration can optionally have a label attribute. Labels are used to differentiate key values with the same key. A key *app1* with labels *A* and *B* forms two separate keys in an App Configuration store. By default, the label for a key value is empty, or `null`.
+Key values in App Configuration can optionally have a label attribute. Labels are used to differentiate key values with the same key. A key *app1* with labels *A* and *B* forms two separate keys in an App Configuration store. By default, a key value has no label. To explicitly reference a key value without a label, use `\0` (URL encoded as `%00`).
 
 Label provides a convenient way to create variants of a key. A common use of labels is to specify multiple environments for the same key:
 
@@ -69,8 +69,6 @@ Each key value is uniquely identified by its key plus a label that can be `null`
 | `key` is omitted or `key=*` | Matches all keys |
 | `key=abc` | Matches key name **abc** exactly |
 | `key=abc*` | Matches key names that start with **abc** |
-| `key=*abc` | Matches key names that end with **abc** |
-| `key=*abc*` | Matches key names that contain **abc** |
 | `key=abc,xyz` | Matches key names **abc** or **xyz**, limited to five CSVs |
 
 You also can include the following label patterns:
@@ -81,8 +79,6 @@ You also can include the following label patterns:
 | `label=%00` | Matches `null` label |
 | `label=1.0.0` | Matches label **1.0.0** exactly |
 | `label=1.0.*` | Matches labels that start with **1.0.** |
-| `label=*.0.0` | Matches labels that end with **.0.0** |
-| `label=*.0.*` | Matches labels that contain **.0.** |
 | `label=%00,1.0.0` | Matches labels `null` or **1.0.0**, limited to five CSVs |
 
 ## Values

articles/azure-monitor/platform/alerts-log-api-switch.md

@@ -14,6 +14,9 @@ ms.subservice: alerts
 > [!NOTE]
 > Content stated applicable to users Azure public cloud only and **not** for Azure Government or Azure China cloud.  
 
+> [!NOTE]
+> Once a user chooses to switch preference to the new [scheduledQueryRules API](https://docs.microsoft.com/rest/api/monitor/scheduledqueryrules) it is not possible to revert to using of the older [legacy Log Analytics Alert API](api-alerts.md).
+
 Until recently, you managed alert rules in the Microsoft Operations Management Suite portal. The new alerts experience was integrated with various services in Microsoft Azure including Log Analytics and we asked to [extend your alert rules from OMS portal to Azure](alerts-extend.md). But to ensure minimal disruption for customers, the process did not alter the programmatic interface for its consumption - [Log Analytics Alert API](api-alerts.md) based on SavedSearch.
 
 But now you announce for Log Analytics alerting users a true Azure programmatic alternative, [Azure Monitor - ScheduledQueryRules API](https://docs.microsoft.com/rest/api/monitor/scheduledqueryrules), which is also reflective in your [Azure billing - for log alerts](alerts-unified-log.md#pricing-and-billing-of-log-alerts). To learn more on how to manage your log alerts using the API, see [Managing log alerts using Azure Resource Template](alerts-log.md#managing-log-alerts-using-azure-resource-template) and [Managing log alerts using PowerShell](alerts-log.md#managing-log-alerts-using-powershell).
@@ -45,9 +48,6 @@ The process of moving alert rules from [legacy Log Analytics Alert API](api-aler
 - A change in API preference and access to your rules via a new API.
 - A modified alert rule resource URI containing the IDs used in the [legacy Log Analytics Alert API](api-alerts.md) instead of the alert rule name in this structure `<WorkspaceName>|<savedSearchId>|<scheduleId>|<ActionId>`. Display name of the alert rule will remain unchanged.
 
-> [!NOTE]
-> Once a user chooses to switch preference to the new [scheduledQueryRules API](https://docs.microsoft.com/rest/api/monitor/scheduledqueryrules) it is not possible to revert to using of the older [legacy Log Analytics Alert API](api-alerts.md).
-
 Any customer who wishes to switch voluntarily to the new [scheduledQueryRules](https://docs.microsoft.com/rest/api/monitor/scheduledqueryrules) and block usage from the [legacy Log Analytics Alert API](api-alerts.md); can do so by performing a PUT call on the below API to switch all alert rules associated with the specific Log Analytics workspace.
 
 ```

articles/azure-monitor/platform/diagnostics-extension-troubleshooting.md

@@ -47,7 +47,7 @@ Following are the paths to some important logs and artifacts. We refer to this i
 | **MonAgentHost log file** | C:\WindowsAzure\Logs\Plugins\Microsoft.Azure.Diagnostics.IaaSDiagnostics\<DiagnosticsVersion>\WAD0107\Configuration\MonAgentHost.<seq_num>.log |
 
 ## Metric data doesn't appear in the Azure portal
-Azure Diagnostics provides metric data that can be displayed in the Azure portal. If you have problems seeing the data in portal, check the WADMetrics\* table in the Azure Diagnostics storage account to see if the corresponding metric records are there.
+Azure Diagnostics provides metric data that can be displayed in the Azure portal. If you have problems seeing the data in portal, check the WADMetrics\* table in the Azure Diagnostics storage account to see if the corresponding metric records are there and ensure that the [resource provider](https://docs.microsoft.com/azure/azure-resource-manager/resource-manager-supported-services) Microsoft.Insights is registered.
 
 Here, the **PartitionKey** of the table is the resource ID, virtual machine, or virtual machine scale set. **RowKey** is the metric name (also known as the performance counter name).
 

articles/backup/backup-azure-backup-cloud-as-tape.md

@@ -9,7 +9,7 @@ ms.date: 04/30/2017
 Azure Backup and System Center Data Protection Manager customers can:
 
 * Back up data in schedules which best suit the organizational needs.
-* Retain the backup data for longer periods
+* Retain the backup data for longer periods.
 * Make Azure a part of their long-term retention needs (instead of tape).
 
 This article explains how customers can enable backup and retention policies. Customers who use tapes to address their long-term-retention needs now have a powerful and viable alternative with the availability of this feature. The feature is enabled in the latest release of the Azure Backup (which is available [here](https://aka.ms/azurebackup_agent)). System Center DPM customers must update to, at least, DPM 2012 R2 UR5 before using DPM with the Azure Backup service.
@@ -37,9 +37,9 @@ The total number of “retention points” specified in this policy is 90 (daily
 ![Sample Screen](./media/backup-azure-backup-cloud-as-tape/samplescreen.png)
 
 1. **Daily retention policy**: Backups taken daily are stored for seven days.
-2. **Weekly retention policy**: Backups taken every day at midnight and 6PM Saturday are preserved for four weeks
-3. **Monthly retention policy**: Backups taken at midnight and 6pm on the last Saturday of each month are preserved for 12 months
-4. **Yearly retention policy**: Backups taken at midnight on the last Saturday of every March are preserved for 10 years
+2. **Weekly retention policy**: Backups taken at midnight and 6 PM Saturday are preserved for four weeks.
+3. **Monthly retention policy**: Backups taken at midnight and 6 PM on the last Saturday of each month are preserved for 12 months.
+4. **Yearly retention policy**: Backups taken at midnight on the last Saturday of every March are preserved for 10 years.
 
 The total number of “retention points” (points from which a customer can restore data) in the preceding diagram is computed as follows:
 

articles/backup/backup-azure-file-folder-backup-faq.md

@@ -8,7 +8,7 @@ ms.date: 07/29/2019
 
 # Common questions about backing up files and folders
 
-This article has answers to common questions abound backing up files and folders with the Microsoft Azure Recovery Services (MARS) Agent in the [Azure Backup](backup-overview.md) service.
+This article answers common questions abound backing up files and folders with the Microsoft Azure Recovery Services (MARS) Agent in the [Azure Backup](backup-overview.md) service.
 
 ## Configure backups
 
@@ -86,43 +86,43 @@ This warning can appear even though you've configured a backup policy, when the
 The size of the cache folder determines the amount of data that you are backing up.
 
 * The cache folder volumes should have free space that equals at least 5-10% of the total size of backup data.
-* If the volume has less than 5% free space, either increase the volume size, or move the cache folder to a volume with enough space.
+* If the volume has less than 5% free space, either increase the volume size, or move the cache folder to a volume with enough space by following [these steps](#how-do-i-change-the-cache-location-for-the-mars-agent).
 * If you backup Windows System State, you'll need an additional 30-35 GB of free space in the volume containing the cache folder.
 
 ### How to check if scratch folder is valid and accessible?
 
 1. By default scratch folder is located at `\Program Files\Microsoft Azure Recovery Services Agent\Scratch`
 2. Make sure the path of your scratch folder location matches with the values of the registry key entries shown below:
 
-  | Registry path | Registry Key | Value |
-  | --- | --- | --- |
-  | `HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Azure Backup\Config` |ScratchLocation |*New cache folder location* |
-  | `HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Azure Backup\Config\CloudBackupProvider` |ScratchLocation |*New cache folder location* |
+    | Registry path | Registry Key | Value |
+    | --- | --- | --- |
+    | `HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Azure Backup\Config` |ScratchLocation |*New cache folder location* |
+    | `HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Azure Backup\Config\CloudBackupProvider` |ScratchLocation |*New cache folder location* |
 
 ### How do I change the cache location for the MARS agent?
 
 1. Run this command in an elevated command prompt to stop the Backup engine:
 
     ```Net stop obengine```
-
 2. If you have configured System State backup, open Disk Management and unmount the disk(s) with names in the format `"CBSSBVol_<ID>"`.
-3. Don't move the files. Instead, copy the cache space folder to a different drive that has sufficient space.
-4. Update the following registry entries with the path of the new cache folder.
+3. By default, the scratch folder is located at `\Program Files\Microsoft Azure Recovery Services Agent\Scratch`
+4. Copy the entire `\Scratch` folder to a different drive that has sufficient space. Ensure the contents are copied, not moved.
+5. Update the following registry entries with the path of the newly moved scratch folder.
 
     | Registry path | Registry Key | Value |
     | --- | --- | --- |
-    | `HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Azure Backup\Config` |ScratchLocation |*New cache folder location* |
-    | `HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Azure Backup\Config\CloudBackupProvider` |ScratchLocation |*New cache folder location* |
+    | `HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Azure Backup\Config` |ScratchLocation |*New scratch folder location* |
+    | `HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Azure Backup\Config\CloudBackupProvider` |ScratchLocation |*New scratch folder location* |
 
-5. Restart the Backup engine at an elevated command prompt:
+6. Restart the Backup engine at an elevated command prompt:
 
-  ```command
-  Net stop obengine
+    ```command
+    Net stop obengine
 
-  Net start obengine
-  ```
+    Net start obengine
+    ```
 
-6. Run an on-demand backup. After the backup finishes successfully using the new location, you can remove the original cache folder.
+7. Run an on-demand backup. After the backup finishes successfully using the new location, you can remove the original cache folder.
 
 ### Where should the cache folder be located?