Merge pull request #212589 from MicrosoftDocs/repo_sync_working_branch

Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)

Author: huypub

articles/azure-monitor/essentials/metrics-supported.md

@@ -16,7 +16,7 @@ ms.reviewer: priyamishra
 
 Date list was last updated: 2021-10-05.
 
-Azure Monitor provides several ways to interact with metrics, including charting them in the Azure portal, accessing them through the REST API, or querying them by using PowerShell or the Azure CLI. 
+Azure Monitor provides several ways to interact with metrics, including charting them in the Azure portal, accessing them through the REST API, or querying them by using PowerShell or the Azure CLI (Command Line Interface). 
 
 This article is a complete list of all platform (that is, automatically collected) metrics currently available with the consolidated metric pipeline in Azure Monitor. Metrics changed or added after the date at the top of this article might not yet appear in the list. To query for and access the list of metrics programmatically, use the [2018-01-01 api-version](/rest/api/monitor/metricdefinitions). Other metrics not in this list might be available in the portal or through legacy APIs.
 

articles/cosmos-db/sql/how-to-write-stored-procedures-triggers-udfs.md

@@ -334,19 +334,21 @@ function updateMetadata() {
 
     function updateMetadataCallback(err, items, responseOptions) {
         if(err) throw new Error("Error" + err.message);
-            if(items.length != 1) throw 'Unable to find metadata document';
 
-            var metadataItem = items[0];
+        if(items.length != 1) throw 'Unable to find metadata document';
 
-            // update metadata
-            metadataItem.createdItems += 1;
-            metadataItem.createdNames += " " + createdItem.id;
-            var accept = container.replaceDocument(metadataItem._self,
-                metadataItem, function(err, itemReplaced) {
-                        if(err) throw "Unable to update metadata, abort";
-                });
-            if(!accept) throw "Unable to update metadata, abort";
-            return;
+        var metadataItem = items[0];
+
+        // update metadata
+        metadataItem.createdItems += 1;
+        metadataItem.createdNames += " " + createdItem.id;
+        var accept = container.replaceDocument(metadataItem._self,
+            metadataItem, function(err, itemReplaced) {
+                    if(err) throw "Unable to update metadata, abort";
+            });
+
+        if(!accept) throw "Unable to update metadata, abort";
+        return;
     }
 }
 ```

articles/energy-data-services/concepts-entitlements.md

@@ -33,9 +33,9 @@ For each group, you can either add a user as an OWNER or a MEMBER. The only diff
 
 ## Group naming
 
-All group identifiers (emails) will be of form {groupType}.{serviceName|resourceName}.{permission}@{partition}.{domain}.com. A group naming convention has been adopted such that the group's name should start with the word "data." for data groups; "service." for service groups; and "users." for user groups. An exception is when a data partition is provisioned. When a data partition is created, so is a corresponding group: users (for example, for data partition `opendes`, the group `[email protected]` is created). 
+All group identifiers (emails) will be of form {groupType}.{serviceName|resourceName}.{permission}@{partition}.{domain}.com. A group naming convention has been adopted such that the group's name should start with the word "data." for data groups; "service." for service groups; and "users." for user groups. An exception is when a data partition is provisioned. When a data partition is created, so is a corresponding group-for example, for data partition `opendes`, the group `[email protected]` is created. 
 
-## Permissions/roles
+## Permissions and roles
 
 The OSDU™ Data Ecosystem user groups provide an abstraction from permission and user management and--without a user creating their own groups--the following user groups exist by default:
 

articles/energy-data-services/how-to-manage-legal-tags.md

@@ -9,10 +9,10 @@ ms.date: 08/19/2022
 ms.custom: template-how-to #Required; leave this attribute/value as-is.
 ---
 
-# How to manage legal tags?
-A Legal tag is the entity that represents the legal status of data in the Microsoft Energy Data Services Preview instance. Legal tag is a collection of properties that governs how data can be ingested and consumed. A legal tag is necessarily required for data to be [ingested](concepts-csv-parser-ingestion.md) into your Microsoft Energy Data Services Preview instance. It's also required for the [consumption](concepts-index-and-search.md) of the data from your Microsoft Energy Data Services Preview instance. Legal tags are defined at a data partition level individually.
+# How to manage legal tags
+In this article, you'll know how to manage legal tags in your Microsoft Energy Data Services Preview instance. A Legal tag is the entity that represents the legal status of data in the Microsoft Energy Data Services Preview instance. Legal tag is a collection of properties that governs how data can be ingested and consumed. A legal tag is required for data to be [ingested](concepts-csv-parser-ingestion.md) into your Microsoft Energy Data Services Preview instance. It's also required for the [consumption](concepts-index-and-search.md) of the data from your Microsoft Energy Data Services Preview instance. Legal tags are defined at a data partition level individually.
 
-While in Microsoft Energy Data Services Preview instance, [entitlement service](concepts-entitlements.md) defines access to data for a given user(s), legal tag defines the overall access to the data across users. A user may have access to manage the data within a data partition however, they may not be able to do so, until certain legal requirements are fulfilled.
+While in Microsoft Energy Data Services Preview instance, [entitlement service](concepts-entitlements.md) defines access to data for a given user(s), legal tag defines the overall access to the data across users. A user may have access to manage the data within a data partition however, they may not be able to do so-until certain legal requirements are fulfilled.
 
 [!INCLUDE [preview features callout](./includes/preview/preview-callout.md)]
 
@@ -88,8 +88,7 @@ Run the below curl command in Azure Cloud Bash to create a legal tag for a given
 
 The country of origin should follow [ISO Alpha2 format](https://www.nationsonline.org/oneworld/country_code_list.htm).
 
-> [!NOTE]
-> Create Legal Tag api, internally appends data-partition-id to legal tag name if it isn't already present. For instance, if request has name as: ```legal-tag```, then the create legal tag name would be ```<instancename>-<data-partition-id>-legal-tag``` 
+The Create Legal Tag api, internally appends data-partition-id to legal tag name if it isn't already present. For instance, if request has name as: ```legal-tag```, then the create legal tag name would be ```<instancename>-<data-partition-id>-legal-tag``` 
 
 ```bash
     curl --location --request POST 'https://<instance>.energy.azure.com/api/legal/v1/legaltags' \

articles/energy-data-services/how-to-manage-users.md

@@ -9,19 +9,16 @@ ms.date: 08/19/2022
 ms.custom: template-how-to #Required; leave this attribute/value as-is.
 ---
 
-# How to manage users?
-This article describes how to manage users in Microsoft Energy Data Services Preview. It uses the [entitlements API](https://community.opengroup.org/osdu/platform/security-and-compliance/entitlements/-/tree/master/) and acts as a group-based authorization system for data partitions within Microsoft Energy Data Service instance. For more information about Microsoft Energy Data Services Preview entitlements, see [entitlement services](concepts-entitlements.md).
+# How to manage users
+In this article, you'll know how to manage users in Microsoft Energy Data Services Preview. It uses the [entitlements API](https://community.opengroup.org/osdu/platform/security-and-compliance/entitlements/-/tree/master/) and acts as a group-based authorization system for data partitions within Microsoft Energy Data Service instance. For more information about Microsoft Energy Data Services Preview entitlements, see [entitlement services](concepts-entitlements.md).
 
 [!INCLUDE [preview features callout](./includes/preview/preview-callout.md)]
 
 ## Prerequisites
 
-Create a Microsoft Energy Data Services Preview instance using guide at [How to create Microsoft Energy Data Services Preview instance](quickstart-create-microsoft-energy-data-services-instance.md).
+Create a Microsoft Energy Data Services Preview instance using the tutorial at [How to create Microsoft Energy Data Services Preview instance](quickstart-create-microsoft-energy-data-services-instance.md).
 
-Keep the following values handy. These values will be used to: 
-
-* Generate the access token, which you'll need to make valid calls to the Entitlements API of your Microsoft Energy Data Services Preview instance
-* Pass as parameters for different user management requests to the Entitlements API. 
+You will need to pass parameters for generating the access token, which you'll need to make valid calls to the Entitlements API of your Microsoft Energy Data Services Preview instance. You will also need these parameters for different user management requests to the Entitlements API. Hence Keep the following values handy for these actions.
 
 #### Find `tenant-id`
 Navigate to the Azure Active Directory account for your organization. One way to do so is by searching for "Azure Active Directory" in the Azure portal's search bar. Once there, locate `tenant-id` under the basic information section in the *Overview* tab. Copy the `tenant-id` and paste in an editor to be used later.  
@@ -33,15 +30,17 @@ Navigate to the Azure Active Directory account for your organization. One way to
 #### Find `client-id`
 Often called `app-id`, it's the same value that you used to register your application during the provisioning of your [Microsoft Energy Data Services Preview instance](quickstart-create-microsoft-energy-data-services-instance.md). You'll find the `client-id` in the *Essentials* pane of Microsoft Energy Data Services Preview *Overview* page. Copy the `client-id` and paste in an editor to be used later. 
 
-> [!NOTE]
+> [!IMPORTANT]
 > The 'client-id' that is passed as values in the entitlement API calls needs to be the same which was used for provisioning of your Microsoft Energy Data Services Preview instance.
+
 :::image type="content" source="media/how-to-manage-users/client-id-or-app-id.png" alt-text="Screenshot of finding the client-id for your registered App.":::
 
 #### Find `client-secret`
-Sometimes called an application password, a `client-secret` is a string value your app can use in place of a certificate to identity itself. Navigate to *App Registrations*. Once there, open 'Certificates & secrets' under the *Manage* section.Create a `client-secret` for the `client-id` that you used to create your Microsoft Energy Data Services Preview instance, you can add one now by clicking on *New Client Secret*. Record the secret's `value` for use in your client application code. 
+Sometimes called an application password, a `client-secret` is a string value your app can use in place of a certificate to identity itself. Navigate to *App Registrations*. Once there, open 'Certificates & secrets' under the *Manage* section. Create a `client-secret` for the `client-id` that you used to create your Microsoft Energy Data Services Preview instance, you can add one now by clicking on *New Client Secret*. Record the secret's `value` for use in your client application code. 
 
-> [!NOTE]
+> [!CAUTION]
 > Don't forget to record the secret's value for use in your client application code. This secret value is never displayed again after you leave this page at the time of creation of 'client secret'.
+
 :::image type="content" source="media/how-to-manage-users/client-secret.png" alt-text="Screenshot of finding the client secret.":::
 
 #### Find the `url`for your Microsoft Energy Data Services Preview instance
@@ -51,11 +50,11 @@ Navigate to your Microsoft Energy Data Services Preview *Overview* page on Azure
 
 #### Find the `data-partition-id` for your group
 You have two ways to get the list of data-partitions in your Microsoft Energy Data Services Preview instance. 
-- By navigating *Data Partitions* menu-item under the Advanced section of your Microsoft Energy Data Services Preview UI.
+- One option is to navigate *Data Partitions* menu item under the Advanced section of your Microsoft Energy Data Services Preview UI.
 
 :::image type="content" source="media/how-to-manage-users/data-partition-id.png" alt-text="Screenshot of finding the data-partition-id from the Microsoft Energy Data Services Preview instance.":::
 
-- By clicking on the *view* below the *data partitions* field in the essentials pane of your Microsoft Energy Data Services Preview *Overview* page. 
+- Another option is by clicking on the *view* below the *data partitions* field in the essentials pane of your Microsoft Energy Data Services Preview *Overview* page. 
 
 :::image type="content" source="media/how-to-manage-users/data-partition-id-second-option.png" alt-text="Screenshot of finding the data-partition-id from the Microsoft Energy Data Services Preview instance overview page.":::
 
@@ -89,7 +88,7 @@ curl --location --request POST 'https://login.microsoftonline.com/<tenant-id>/oa
 Copy the `access_token` value from the response. You'll need it to pass as one of the headers in all calls to the Entitlements API of your Microsoft Energy Data Services Preview instance. 
 
 ## User management activities
-You can manage user's access to your Microsoft Energy Data Services instance or data partitions. As a prerequisite for the same, you need to find the 'object-id' (OID) of the user(s) first. 
+You can manage user's access to your Microsoft Energy Data Services instance or data partitions. As a prerequisite for this step, you need to find the 'object-id' (OID) of the user(s) first. 
 
 You'll need to input `object-id` (OID) of the users as parameters in the calls to the Entitlements API of your Microsoft Energy Data Services Preview Instance. `object-id`(OID) is the Azure Active Directory User Object ID.
 
@@ -121,8 +120,8 @@ Run the below curl command in Azure Cloud Bash to add user(s) to the "Users" gro
                     "role": "MEMBER"
                 }'
 ```
-> [!NOTE]
-> The value to be sent for the param "email" is the Object ID of the user and not the user's email
+
+The value to be sent for the param **"email"** is the **Object_ID (OID)** of the user and not the user's email
 
 **Sample request**
 
@@ -160,8 +159,8 @@ Run the below curl command in Azure Cloud Bash to add user(s) to an entitlement
                 "role": "MEMBER"
     }'
 ```
-> [!NOTE]
-> The value to be sent for the param "email" is the Object ID of the user and not the user's email
+The value to be sent for the param **"email"** is the **Object_ID (OID)** of the user and not the user's email
+
 **Sample request**
 
 ```bash
@@ -226,8 +225,8 @@ Run the below curl command in Azure Cloud Bash to get all the groups associated
 
 Run the below curl command in Azure Cloud Bash to delete a given user to your Microsoft Energy Data Services instance data partition.
 
-> [!NOTE]
-> As stated above, **DO NOT** delete the OWNER of a group unless you have another OWNER that can manage users in that group.
+As stated above, **DO NOT** delete the OWNER of a group unless you have another OWNER that can manage users in that group.
+
 ```bash
     curl --location --request DELETE 'https://<URI>/api/entitlements/v2/members/<OBJECT_ID>' \
     --header 'data-partition-id: <data-partition-id>' \