Merge pull request #88956 from MicrosoftDocs/repo_sync_working_branch

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

Author: huypub

articles/active-directory/users-groups-roles/groups-dynamic-tutorial.md

@@ -46,15 +46,26 @@ First, you'll create a group for your guest users who all are from a single part
    ![select command to start a new group](./media/groups-dynamic-tutorial/new-group.png)
 3. On the **Group** blade:
 
-   * Select **Security** as the group type
-   * Enter `Guest users Contoso` as the name and description for the group
-   * Change **Membership type** to **Dynamic User**
-   * Select **Add dynamic query**
-  
-4. Select **Advanced rule**, and in the **Advanced rule** box, enter:
-   `(user.userType -eq "Guest") -and (user.companyName -eq "Contoso")`
-5. Select **Add query** to close the blade.
-6. On the **Group** blade, select **Create** to create the group.
+   * Select **Security** as the group type.
+   * Enter `Guest users Contoso` as the name and description for the group.
+   * Change **Membership type** to **Dynamic User**.
+   
+4. Select **Owners** and in the **Add Owners** blade search for any desired owners. Click on the desired owners to add to the selection.
+5. Click **Select** to close the **Add Owners** blade.  
+6. Select **Edit dynamic query** in the **Dynamic user members** box.
+7. On the **Dynamic membership rules** blade:
+
+   * In the **Property** field, click on the existing value and select **userType**. 
+   * Verify that the **Operator** field has **Equals** selected.  
+   * Select the **Value** field and enter **Guest**. 
+   * Click the **Add Expression** hyperlink to add another line.
+   * In the **And/Or** field, select **And**.
+   * In the **Property** field, select **companyName**.
+   * Verify that the **Operator** field has **Equals** selected.
+   * In the **Value** field, enter **Contoso**.
+   * Click **Save** to close the **Dynamic membership rules** blade.
+   
+8. On the **Group** blade, select **Create** to create the group.
 
 ## Assign licenses
 

articles/api-management/api-management-configuration-repository-git.md

@@ -94,7 +94,7 @@ git clone https://username:password@{name}.scm.azure-api.net/
 If this provides an error, try URL encoding the password portion of the command. One quick way to do this is to open Visual Studio, and issue the following command in the **Immediate Window**. To open the **Immediate Window**, open any solution or project in Visual Studio (or create a new empty console application), and choose **Windows**, **Immediate** from the **Debug** menu.
 
 ```
-?System.NetWebUtility.UrlEncode("password from the Azure portal")
+?System.Net.WebUtility.UrlEncode("password from the Azure portal")
 ```
 
 Use the encoded password along with your user name and repository location to construct the git command.

articles/governance/management-groups/index.md

@@ -17,7 +17,7 @@ above subscriptions. You organize subscriptions into containers called "manageme
 apply your governance conditions to the management groups. All subscriptions within a management
 group automatically inherit the conditions applied to the management group. Management groups give
 you enterprise-grade management at a large scale no matter what type of subscriptions you might
-have.
+have. All subscriptions within a single management group must trust the same Azure Active Directory tenant.
 
 For example, you can apply policies to a management group that limits the regions available for
 virtual machine (VM) creation. This policy would be applied to all management groups,

articles/iot-edge/tutorial-csharp-module.md

@@ -207,14 +207,16 @@ Currently, Visual Studio Code can develop C# modules for Linux AMD64 and Linux A
             {
                 Console.WriteLine($"Machine temperature {messageBody.machine.temperature} " +
                     $"exceeds threshold {temperatureThreshold}");
-                var filteredMessage = new Message(messageBytes);
-                foreach (KeyValuePair<string, string> prop in message.Properties)
+                using (var filteredMessage = new Message(messageBytes))
                 {
-                    filteredMessage.Properties.Add(prop.Key, prop.Value);
-                }
+                    foreach (KeyValuePair<string, string> prop in message.Properties)
+                    {
+                        filteredMessage.Properties.Add(prop.Key, prop.Value);
+                    }
 
-                filteredMessage.Properties.Add("MessageType", "Alert");
-                await moduleClient.SendEventAsync("output1", filteredMessage);
+                    filteredMessage.Properties.Add("MessageType", "Alert");
+                    await moduleClient.SendEventAsync("output1", filteredMessage);
+                }
             }
 
             // Indicate that the message treatment is completed.

articles/marketplace/partner-center-portal/saas-metered-billing.md

@@ -50,7 +50,7 @@ As an example, Contoso is a publisher with a SaaS service called Contoso Notific
     * Beyond the 50000 emails, pay $0.5 for every 100 emails
     * Beyond the 10000 texts, pay $0.01 for every text
 
-An Azure customer subscribing to CNS service will be able to send the included quantity of text and emails per month based on the plan selected.  When customers consume more than the included quantity, they do not have to change plans or do anything different.  Contoso will measure the overage beyond the included quantity and start emitting usage events to Microsoft for additional usage using the [Marketplace metering service API](./marketplace-metering-service-apis.md).  Microsoft in turn will charge the customer for the additional usage as specified by the publisher.
+An Azure customer subscribing to CNS service will be able to send the included quantity of text and emails per month based on the plan selected.  Contoso measures the usage up to the included quantity without sending any usage events to Microsoft.  When customers consume more than the included quantity, they do not have to change plans or do anything different.  Contoso will measure the overage beyond the included quantity and start emitting usage events to Microsoft for additional usage using the [Marketplace metering service API](./marketplace-metering-service-apis.md).  Microsoft in turn will charge the customer for the additional usage as specified by the publisher.
 
 ## Billing dimensions
 

articles/vpn-gateway/vpn-gateway-troubleshoot-vpn-point-to-site-connection-problems.md

@@ -43,8 +43,7 @@ To resolve this problem, follow these steps:
     | Certificate | Location |
     | ------------- | ------------- |
     | AzureClient.pfx  | Current User\Personal\Certificates |
-    | Azuregateway-*GUID*.cloudapp.net  | Current User\Trusted Root Certification Authorities|
-    | AzureGateway-*GUID*.cloudapp.net, AzureRoot.cer    | Local Computer\Trusted Root Certification Authorities|
+    | AzureRoot.cer    | Local Computer\Trusted Root Certification Authorities|
 
 3. Go to C:\Users\<UserName>\AppData\Roaming\Microsoft\Network\Connections\Cm\<GUID>, manually install the certificate (*.cer file) on the user and computer's store.