Merge pull request #46841 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/develop/active-directory-acs-migration.md

@@ -54,7 +54,7 @@ To use these components, you must create one or more Access Control namespaces.
 https://<mynamespace>.accesscontrol.windows.net
 ```
 
-All communication with the STS and management operations are done at this URL. You use different paths for different purposes. To determine whether your applications or services use Access Control, monitor for any traffic to https://<namespace>.accesscontrol.windows.net. Any traffic to this URL is handled by Access Control, and needs to be discontinued. 
+All communication with the STS and management operations are done at this URL. You use different paths for different purposes. To determine whether your applications or services use Access Control, monitor for any traffic to https://&lt;namespace&gt;.accesscontrol.windows.net. Any traffic to this URL is handled by Access Control, and needs to be discontinued. 
 
 The exception to this is any traffic to `https://accounts.accesscontrol.windows.net`. Traffic to this URL is already handled by a different service and **is not** affected by the Access Control deprecation. 
 

articles/cognitive-services/QnAMaker/How-To/metadata-generateanswer-usage.md

@@ -77,6 +77,7 @@ You call GenerateAnswer with an HTTP POST request. For sample code that shows ho
     - **answers** - A list of answers for the user query, sorted in decreasing order of ranking score.
         - **score**: A ranking score between 0 and 100.
         - **questions**: The questions provided by the user.
+        - **answer**: The answer to the question.
         - **source**: The name of the source from which the answer was extracted or saved in the knowledge base.
         - **metadata**: The metadata associated with the answer.
             - name: Metadata name. (string, max Length: 100, required)

articles/iot-edge/deploy-modbus-gateway.md

@@ -30,7 +30,7 @@ This article assumes that you're using Modbus TCP protocol. For more information
 If you want to test the Modbus gateway functionality, Microsoft has a sample module that you can use. To use the sample module, go to the [Run the solution](#run-the-solution) section and enter the following as the Image URI: 
 
 ```URL
-microsoft/azureiotedge-modbus-tcp:1.0-preview
+microsoft/azureiotedge-modbus-tcp:GA-preview-amd64
 ```
 
 If you want to create your own module and customize it for your environment, there is an open source [Azure IoT Edge Modbus module](https://github.com/Azure/iot-edge-modbus) project on Github. Follow the guidance in that project to create your own container image. If you create your own container image, refer to [Develop and deploy a C# IoT Edge module](tutorial-csharp-module.md) for instructions on publishing container images to a registry, and deploying a custom module to your device. 
@@ -43,7 +43,7 @@ If you want to create your own module and customize it for your environment, the
 4. Add the Modbus module:
    1. Click **Add** and select **IoT Edge module**.
    2. In the **Name** field, enter "modbus".
-   3. In the **Image** field, enter the image URI of the sample container: `microsoft/azureiotedge-modbus-tcp:1.0-preview`.
+   3. In the **Image** field, enter the image URI of the sample container: `microsoft/azureiotedge-modbus-tcp:GA-preview-amd64`.
    4. Check the **Enable** box to update the module twin's desired properties.
    5. Copy the following JSON into the text box. Change the value of **SlaveConnection** to the IPv4 address of your Modbus device.
 

articles/monitoring/monitoring-solutions-inventory.md

@@ -48,7 +48,7 @@ Explanations of the columns are as follows:
 | [Automation Hybrid Worker](../automation/automation-hybrid-runbook-worker.md) | Windows | • | • |  |  |  | n/a |
 | [Azure Application Gateway Analytics](../log-analytics/log-analytics-azure-networking-analytics.md) | Azure |  |  |  |  |  | on notification |
 | **Management solution** | **Platform** | **Microsoft monitoring agent** | **Operations Manager agent** | **Azure storage** | **Operations Manager required?** | **Operations Manager agent data sent via management group** | **Collection frequency** |
-| [Azure Network Security Group Analytics](../log-analytics/log-analytics-azure-networking-analytics.md) | Azure |  |  |  |  |  | on notification |
+| [Azure Network Security Group Analytics (Deprecated)](../log-analytics/log-analytics-azure-networking-analytics.md) | Azure |  |  |  |  |  | on notification |
 | [Azure SQL Analytics (Preview)](../log-analytics/log-analytics-azure-sql.md) | Windows | | | | | | 1 minute |
 | [Backup](https://azure.microsoft.com/resources/templates/101-backup-oms-monitoring/) | Azure |  |  |  |  |  | on notification |
 | [Capacity and Performance (Preview)](../log-analytics/log-analytics-capacity.md) |Windows |• |• | | |• |on arrival |
@@ -67,7 +67,7 @@ Explanations of the columns are as follows:
 | [System Center Operations Manager Assessment (Preview)](../log-analytics/log-analytics-scom-assessment.md) | Windows | • | • |  |  | • | seven days |
 | [Update Management](../operations-management-suite/oms-solution-update-management.md) | Windows |• |• | | |• |at least 2 times per day and 15 minutes after installing an update |
 | [Upgrade Readiness](https://docs.microsoft.com/windows/deployment/upgrade/upgrade-readiness-get-started) | Windows | • |  |  |  |  | 2 days |
-| [VMware Monitoring (Preview)](../log-analytics/log-analytics-vmware.md) | Linux | • |  |  |  |  | 3 minutes |
+| [VMware Monitoring (Deprecated)](../log-analytics/log-analytics-vmware.md) | Linux | • |  |  |  |  | 3 minutes |
 | [Wire Data 2.0 (Preview)](../log-analytics/log-analytics-wire-data.md) |Windows (2012 R2 / 8.1 or later) |• |• | | | | 1 minute |
 
 

articles/service-fabric-mesh/service-fabric-mesh-tutorial-deploy-service-fabric-mesh-app.md

@@ -175,9 +175,9 @@ In this part of the tutorial, you learned:
 
 Now that you have completed publishing a Service Fabric Mesh application to Azure, try the following:
 
-* Explore the [Voting app sample](https://github.com/Azure/service-fabric-mesh-preview-pr/tree/master/samples/src/votingapp) to see another example of service-to-service communication.
+* Explore the [Voting app sample](https://github.com/Azure-Samples/service-fabric-mesh/tree/master/src/votingapp) to see another example of service-to-service communication.
 * Read [Service Fabric resources](service-fabric-mesh-service-fabric-resources.md)
 * Read about the [Cloud Shell](https://docs.microsoft.com/azure/cloud-shell/overview)
 
 
-[azure-cli-install]: https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest
+[azure-cli-install]: https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest