Merge pull request #94625 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/authentication/howto-mfa-mfasettings.md

@@ -295,7 +295,7 @@ If your organization deploys the NPS extension to provide MFA to on-premises app
 
 | Azure AD tenant type | Trusted IPs feature options |
 |:--- |:--- |
-| Managed |**Specific range of IP addresses**: Administrators specify a range of IP addresses that can bypass two-step verification for users who sign in from the company intranet.|
+| Managed |**Specific range of IP addresses**: Administrators specify a range of IP addresses that can bypass two-step verification for users who sign in from the company intranet. A maximum of 50 Trusted IP ranges can be configured.|
 | Federated |**All Federated Users**: All federated users who sign in from inside of the organization can bypass two-step verification. The users bypass verification by using a claim that is issued by Active Directory Federation Services (AD FS).<br/>**Specific range of IP addresses**: Administrators specify a range of IP addresses that can bypass two-step verification for users who sign in from the company intranet. |
 
 The Trusted IPs bypass works only from inside of the company intranet. If you select the **All Federated Users** option and a user signs in from outside the company intranet, the user has to authenticate by using two-step verification. The process is the same even if the user presents an AD FS claim. 

articles/active-directory/authentication/howto-mfa-userstates.md

@@ -171,6 +171,9 @@ function Set-MfaState {
 Get-MsolUser -All | Set-MfaState -State Disabled
 ```
 
+> [!NOTE]
+> We recently changed the behavior and PowerShell script above accordingly. Previously, the script saved off the MFA methods, disabled MFA, and restored the methods. This is no longer necessary now that the default behavior for disable doesn't clear the methods.
+
 ## Next steps
 
 * Why was a user prompted or not prompted to perform MFA? See the section [Azure AD sign-ins report in the Reports in Azure Multi-Factor Authentication document](howto-mfa-reporting.md#azure-ad-sign-ins-report).

articles/asc-for-iot/resources-frequently-asked-questions.md

@@ -66,7 +66,7 @@ The Azure Security Center for IoT security agent is open source and available on
 
 ## Where does the Azure Security Center for IoT agent get installed? 
 
-Detailed installation and agent deployment information can be found in GitHub: https://github.com/Azure/Azure-Security-IoT.
+Detailed installation and agent deployment information can be found in GitHub: https://github.com/Azure/Azure-IoT-Security.
 
 ## What are the dependencies and prerequisites of the agent?
 

articles/azure-functions/functions-bindings-service-bus.md

@@ -471,12 +471,12 @@ public static void Run(TimerInfo myTimer, ILogger log, out string outputSbQueue)
 Here's C# script code that creates multiple messages:
 
 ```cs
-public static void Run(TimerInfo myTimer, ILogger log, ICollector<string> outputSbQueue)
+public static async Task Run(TimerInfo myTimer, ILogger log, IAsyncCollector<string> outputSbQueue)
 {
     string message = $"Service Bus queue messages created at: {DateTime.Now}";
     log.LogInformation(message); 
-    outputSbQueue.Add("1 " + message);
-    outputSbQueue.Add("2 " + message);
+    await outputSbQueue.AddAsync("1 " + message);
+    await outputSbQueue.AddAsync("2 " + message);
 }
 ```
 

articles/azure-maps/mobility-coverage.md

@@ -52,7 +52,7 @@ The following table provides coverage information for Azure Maps Mobility serv
 | Australia      | <p>Adelaide, Alice Springs, Bowen, Brisbane, Bundaberg QLD, Burnie, Cairns, Canberra, Darwin, Gladstone, Hobart, Innisfail, Launceston, Mackay, Magnetic Island, Maryborough-Hervey Bay, Melbourne, New South Wales, Perth, RockHampton, South East Queensland, Sydney, Toowoomba, Townsville, Victoria, Warwick, Yeppoon</p> |
 | China | <p> Changchun, Changsha, Chengdu, Chongqing, Dalian, Datong, Dongguan, Hangzhou, Jiangyin, Jinan, Nanjing, Nantong, Ningbo, Pingdingshan, Qingdao, Shenyang, Suzhou, Tangshan, Tianjin, Weifang, Wuhan, Wuxi, Yantai, Yixing, Zhuhai, Shanghai, Beijing, Guangzhou, Shenzhen, Zhengzhou</P>| 
 | Hong Kong SAR | Hong Kong SAR*|
-| Macau SAR | Macau SAR*|
+| Macao SAR | Macao SAR*|
 | India | Ahmedabad, Bengaluru, Delhi, Mumbai, Mysuru|
 | Indonesia | Bandung, Banyuwangi, Batam, Denpasar, Jakarta, Kediri, Malang, Palembang, Semarang, Surabaya, Surakarta, Yogyakarta |
 | Japan | Shizuoka Prefecture, Tokyo, Wakkanai, Yamanashi Prefecture |

articles/azure-maps/tutorial-search-location.md

@@ -246,13 +246,16 @@ The map that we've made so far only looks at the longitude/latitude data for the
         var position = e.shapes[0].getCoordinates();
 
         //Create HTML from properties of the selected result.
-        var html = ['<div style="padding:5px"><div><b>', p.poi.name,
-            '</b></div><div>', p.address.freeformAddress,
-            '</div><div>', position[1], ', ', position[0], '</div></div>'];
+        var html = `
+          <div style="padding:5px">
+            <div><b>${p.poi.name}</b></div>
+            <div>${p.address.freeformAddress}</div>
+            <div>${position[1]}, ${position[0]}</div>
+          </div>`;
 
         //Update the content and position of the popup.
         popup.setPopupOptions({
-            content: html.join(''),
+            content: html,
             position: position
         });
 

articles/azure-monitor/app/app-map.md

@@ -176,14 +176,24 @@ appInsights.defaultClient.addTelemetryProcessor(envelope => {
 
 ### Java
 
+Starting with Application Insights Java SDK 2.5.0, you can specify the cloud role name
+by adding `<RoleName>` to your `ApplicationInsights.xml` file, e.g.
+
+```XML
+<?xml version="1.0" encoding="utf-8"?>
+<ApplicationInsights xmlns="http://schemas.microsoft.com/ApplicationInsights/2013/Settings" schemaVersion="2014-05-30">
+   <InstrumentationKey>** Your instrumentation key **</InstrumentationKey>
+   <RoleName>** Your role name **</RoleName>
+   ...
+</ApplicationInsights>
+```
+
 If you use Spring Boot with the Application Insights Spring Boot starter, the only required change is to set your custom name for the application in the application.properties file.
 
 `spring.application.name=<name-of-app>`
 
 The Spring Boot starter will automatically assign cloud role name to the value you enter for the spring.application.name property.
 
-For further information on Java correlation and how to configure cloud role name for non-SpringBoot applications checkout this [section](https://docs.microsoft.com/azure/application-insights/application-insights-correlation#role-name) on correlation.
-
 ### Client/browser-side JavaScript
 
 ```javascript

articles/azure-monitor/app/correlation.md

@@ -331,25 +331,23 @@ In order to correlate telemetry in Asynchronous Spring Boot application, please
 
 At times, you might want to customize the way component names are displayed in the [Application Map](../../azure-monitor/app/app-map.md). To do so, you can manually set the `cloud_RoleName` by doing one of the following:
 
-- If you use Spring Boot with the Application Insights Spring Boot starter, the only required change is to set your custom name for the application in the application.properties file.
-
-  `spring.application.name=<name-of-app>`
-
-  The Spring Boot starter automatically assigns `cloudRoleName` to the value you enter for the `spring.application.name` property.
-
-- If you're using the `WebRequestTrackingFilter`, the `WebAppNameContextInitializer` sets the application name automatically. Add the following to your configuration file (ApplicationInsights.xml):
+- Starting with Application Insights Java SDK 2.5.0, you can specify the cloud role name
+  by adding `<RoleName>` to your `ApplicationInsights.xml` file, e.g.
 
   ```XML
-  <ContextInitializers>
-    <Add type="com.microsoft.applicationinsights.web.extensibility.initializers.WebAppNameContextInitializer" />
-  </ContextInitializers>
+  <?xml version="1.0" encoding="utf-8"?>
+  <ApplicationInsights xmlns="http://schemas.microsoft.com/ApplicationInsights/2013/Settings" schemaVersion="2014-05-30">
+     <InstrumentationKey>** Your instrumentation key **</InstrumentationKey>
+     <RoleName>** Your role name **</RoleName>
+     ...
+  </ApplicationInsights>
   ```
 
-- If you use the cloud context class:
+- If you use Spring Boot with the Application Insights Spring Boot starter, the only required change is to set your custom name for the application in the application.properties file.
 
-  ```Java
-  telemetryClient.getContext().getCloud().setRole("My Component Name");
-  ```
+  `spring.application.name=<name-of-app>`
+
+  The Spring Boot starter automatically assigns `cloudRoleName` to the value you enter for the `spring.application.name` property.
 
 ## Next steps
 

articles/azure-resource-manager/deployment-quota-exceeded.md

@@ -31,7 +31,7 @@ To delete all deployments older than five days, use:
 
 ```azurecli-interactive
 startdate=$(date +%F -d "-5days")
-deployments=$(az group deployment list --resource-group exampleGroup --query "[?properties.timestamp>'$startdate'].name" --output tsv)
+deployments=$(az group deployment list --resource-group exampleGroup --query "[?properties.timestamp<'$startdate'].name" --output tsv)
 
 for deployment in $deployments
 do

articles/azure-resource-manager/resource-group-template-deploy-portal.md

@@ -84,7 +84,7 @@ If you want to execute a deployment but not use any of the templates in the Mark
 1. You see several options for creating a template:
 
     - **Build your own template in editor**: create a template using the portal template editor.  The editor is capable to add a resource template schema.
-    - **Common templates**: There are four common templatess for creating a Linux virtual machine, Windows virtual machine, a web application, and an Azure SQL database.
+    - **Common templates**: There are four common templates for creating a Linux virtual machine, Windows virtual machine, a web application, and an Azure SQL database.
     - **Load a GitHub quickstart template**: use an existing [quickstart templates](https://azure.microsoft.com/resources/templates/).
 
    ![View options](./media/resource-group-template-deploy-portal/see-options.png)