Merge pull request #78983 from MicrosoftDocs/repo_sync_working_branch

huypub · web-flow · commit 1de8b911cd91 · 2019-06-07T11:07:11.000-07:00
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/Microsoft/azure-docs (branch master)
diff --git a/articles/app-service/operating-system-functionality.md b/articles/app-service/operating-system-functionality.md
@@ -61,7 +61,7 @@ It is important to monitor your disk utilization as your application grows. If t
 
 - The app may throw an error indicating not enough space on the disk.
 - You may see disk errors when browsing to the Kudu console.
-- Deployment from VSTS or Visual Studio may fail with `ERROR_NOT_ENOUGH_DISK_SPACE: Web deployment task failed. (Web Deploy detected insufficient space on disk)`.
+- Deployment from Azure DevOps or Visual Studio may fail with `ERROR_NOT_ENOUGH_DISK_SPACE: Web deployment task failed. (Web Deploy detected insufficient space on disk)`.
 - Your app may suffer slow performance.
 
 <a id="NetworkDrives"></a>
diff --git a/articles/azure-cache-for-redis/cache-faq.md b/articles/azure-cache-for-redis/cache-faq.md
@@ -247,7 +247,7 @@ You can use any of the commands listed at [Redis commands](https://redis.io/comm
 * `redis-cli -h <Azure Cache for Redis name>.redis.cache.windows.net -a <key>`
 
 > [!NOTE]
-> The Redis command-line tools do not work with the SSL port, but you can use a utility such as `stunnel` to securely connect the tools to the SSL port by following the directions in the [Announcing ASP.NET Session State Provider for Redis Preview Release](https://blogs.msdn.com/b/webdev/archive/2014/05/12/announcing-asp-net-session-state-provider-for-redis-preview-release.aspx) blog post.
+> The Redis command-line tools do not work with the SSL port, but you can use a utility such as `stunnel` to securely connect the tools to the SSL port by following the directions in the [How to use the Redis command-line tool with Azure Cache for Redis](https://docs.microsoft.com/en-us/azure/azure-cache-for-redis/cache-how-to-redis-cli-tool) article.
 >
 >
 
diff --git a/articles/azure-monitor/platform/activity-logs-overview.md b/articles/azure-monitor/platform/activity-logs-overview.md
@@ -24,7 +24,7 @@ There is a single Activity Log for each Azure subscription. It provides data abo
 
 
 > [!NOTE]
-> The Azure Activity Log is primarily for activities that occur in Azure Resource Manager. It does not track ugresources using the Classic/RDFE model. Some Classic resource types have a proxy resource provider in Azure Resource Manager (for example, Microsoft.ClassicCompute). If you interact with a Classic resource type through Azure Resource Manager using these proxy resource providers, the operations appear in the Activity Log. If you interact with a Classic resource type outside of the Azure Resource Manager proxies, your actions are only recorded in the Operation Log. The Operation Log can be browsed in a separate section of the portal.
+> The Azure Activity Log is primarily for activities that occur in Azure Resource Manager. It does not track resources using the Classic/RDFE model. Some Classic resource types have a proxy resource provider in Azure Resource Manager (for example, Microsoft.ClassicCompute). If you interact with a Classic resource type through Azure Resource Manager using these proxy resource providers, the operations appear in the Activity Log. If you interact with a Classic resource type outside of the Azure Resource Manager proxies, your actions are only recorded in the Operation Log. The Operation Log can be browsed in a separate section of the portal.
 
 ## Activity Log retention
 Activity Log events are stored for 90 days. To store this data for longer periods, [collect it in Azure Monitor](activity-log-collect.md) or [export it to storage or Event Hubs](activity-log-export.md).
diff --git a/articles/cognitive-services/Anomaly-Detector/tutorials/anomaly-detection-streaming-databricks.md b/articles/cognitive-services/Anomaly-Detector/tutorials/anomaly-detection-streaming-databricks.md
@@ -14,7 +14,7 @@ ms.author: aahi
 
 # Tutorial: Anomaly detection on streaming data using Azure Databricks
 
-[Azure Databricks](https://azure.microsoft.com/en-us/services/databricks/) is a fast, easy, and collaborative Apache Spark–based analytics service. The Anomaly Detector API, part of Azure Cognitive Services, provides a way of monitoring your time series data. Use this tutorial to run anomaly detection on a stream of data in near real-time using Azure Databricks. You'll ingest twitter data using Azure Event Hubs, and import them into Azure Databricks using the Spark Event Hubs connector. Afterwards, you'll use the API to detect anomalies on the streamed data. 
+[Azure Databricks](https://azure.microsoft.com/services/databricks/) is a fast, easy, and collaborative Apache Spark–based analytics service. The Anomaly Detector API, part of Azure Cognitive Services, provides a way of monitoring your time series data. Use this tutorial to run anomaly detection on a stream of data in near real-time using Azure Databricks. You'll ingest twitter data using Azure Event Hubs, and import them into Azure Databricks using the Spark Event Hubs connector. Afterwards, you'll use the API to detect anomalies on the streamed data. 
 
 The following illustration shows the application flow:
 
diff --git a/articles/cognitive-services/Speech-Service/ship-application.md b/articles/cognitive-services/Speech-Service/ship-application.md
@@ -25,8 +25,8 @@ The Cognitive Services Speech SDK is tested on Windows 10 and on Windows Server
 
 The Cognitive Services Speech SDK requires the [Microsoft Visual C++ Redistributable for Visual Studio 2019](https://support.microsoft.com/help/2977003/the-latest-supported-visual-c-downloads) on the system. You can download installers for the latest version of the `Microsoft Visual C++ Redistributable for Visual Studio 2019` here:
 
-- [Win32](https://aka.ms/vs/15/release/vc_redist.x86.exe)
-- [x64](https://aka.ms/vs/15/release/vc_redist.x64.exe)
+- [Win32](https://aka.ms/vs/16/release/vc_redist.x86.exe)
+- [x64](https://aka.ms/vs/16/release/vc_redist.x64.exe)
 
 If your application uses managed code, the `.NET Framework 4.6.1` or later is required on the target machine.
 
diff --git a/articles/digital-twins/how-to-diagnose-user-defined-functions.md b/articles/digital-twins/how-to-diagnose-user-defined-functions.md
@@ -29,7 +29,7 @@ A variety of logging, analytics, and diagnostic tools are provided to that end.
 Azure Digital Twins supports robust logging, monitoring, and analytics. Solutions developers can use Azure Monitor logs, diagnostic logs, activity logs, and other services to support the complex monitoring needs of an IoT app. Logging options can be combined to query or display records across several services and to provide granular logging coverage for many services.
 
 * For logging configuration specific to Azure Digital Twins, read [How to configure monitoring and logging](./how-to-configure-monitoring.md).
-* Consult the the [Azure Monitor](../azure-monitor/overview.md) overview to learn about powerful log settings enabled through Azure Monitor.
+* Consult the [Azure Monitor](../azure-monitor/overview.md) overview to learn about powerful log settings enabled through Azure Monitor.
 * Review the article [Collect and consume log data from your Azure resources](../azure-monitor/platform/diagnostic-logs-overview.md) for configuring diagnostic log settings in Azure Digital Twins through the Azure Portal, Azure CLI, or PowerShell.
 
 Once configured, you'll be able to select all log categories, metrics, and use powerful Azure Monitor log analytics workspaces to support your debugging efforts.
diff --git a/articles/frontdoor/waf-front-door-configure-ip-restriction.md b/articles/frontdoor/waf-front-door-configure-ip-restriction.md
@@ -58,7 +58,7 @@ az network waf-policy custom-rule create \
   --name IPAllowListRule \
   --priority 1 \
   --rule-type MatchRule \
-  --match-condition RemoteAddr IPMatch "<ip-address-range-1>","<ip-address-range-2>" \
+  --match-condition RemoteAddr IPMatch ("<ip-address-range-1>","<ip-address-range-2>") \
   --action Allow \
   --resource-group <resource-group-name> \
   --policy-name IPAllowPolicyExampleCLI
@@ -134,7 +134,7 @@ In the following example, replace *ip-address-range-1*, *ip-address-range-2* wit
 $IPMatchCondition = New-AzFrontDoorWafMatchConditionObject `
 -MatchVariable  RemoteAddr `
 -OperatorProperty IPMatch `
--MatchValue ["ip-address-range-1", "ip-address-range-2"]
+-MatchValue "ip-address-range-1", "ip-address-range-2"
 ```
 Create an IP *match all condition* rule by using the following command:
 ```powershell
diff --git a/articles/iot-edge/how-to-install-iot-edge-windows.md b/articles/iot-edge/how-to-install-iot-edge-windows.md
@@ -81,7 +81,7 @@ This example demonstrates a manual installation with Windows containers:
 3. The **Deploy-IoTEdge** command checks that your Windows machine is on a supported version, turns on the containers feature, and then downloads the moby runtime and the IoT Edge runtime. The command defaults to using Windows containers. 
 
    ```powershell
-   . {Invoke-WebRequest -useb aka.ms/iotedge-win} | Invoke-Expression; `
+   . {Invoke-WebRequest -useb https://aka.ms/iotedge-win} | Invoke-Expression; `
    Deploy-IoTEdge
    ```
 
@@ -90,7 +90,7 @@ This example demonstrates a manual installation with Windows containers:
 5. The **Initialize-IoTEdge** command configures the IoT Edge runtime on your machine. The command defaults to manual provisioning with Windows containers. 
 
    ```powershell
-   . {Invoke-WebRequest -useb aka.ms/iotedge-win} | Invoke-Expression; `
+   . {Invoke-WebRequest -useb https://aka.ms/iotedge-win} | Invoke-Expression; `
    Initialize-IoTEdge
    ```
 
@@ -130,7 +130,7 @@ The following example demonstrates an automatic installation with Windows contai
 3. The **Deploy-IoTEdge** command checks that your Windows machine is on a supported version, turns on the containers feature, and then downloads the moby runtime and the IoT Edge runtime. The command defaults to using Windows containers. 
 
    ```powershell
-   . {Invoke-WebRequest -useb aka.ms/iotedge-win} | Invoke-Expression; `
+   . {Invoke-WebRequest -useb https://aka.ms/iotedge-win} | Invoke-Expression; `
    Deploy-IoTEdge
    ```
 
@@ -139,7 +139,7 @@ The following example demonstrates an automatic installation with Windows contai
 6. The **Initialize-IoTEdge** command configures the IoT Edge runtime on your machine. The command defaults to manual provisioning with Windows containers. Use the `-Dps` flag to use the Device Provisioning Service instead of manual provisioning.
 
    ```powershell
-   . {Invoke-WebRequest -useb aka.ms/iotedge-win} | Invoke-Expression; `
+   . {Invoke-WebRequest -useb https://aka.ms/iotedge-win} | Invoke-Expression; `
    Initialize-IoTEdge -Dps
    ```
 
@@ -167,7 +167,7 @@ For the latest IoT Edge installation files along with previous versions, see [Az
 To install with offline components, use the `-OfflineInstallationPath` parameter as part of the Deploy-IoTEdge command and provide the absolute path to the file directory. For example,
 
 ```powershell
-. {Invoke-WebRequest -useb aka.ms/iotedge-win} | Invoke-Expression; `
+. {Invoke-WebRequest -useb https://aka.ms/iotedge-win} | Invoke-Expression; `
 Deploy-IoTEdge -OfflineInstallationPath C:\Downloads\iotedgeoffline
 ```
 
@@ -184,7 +184,7 @@ Get-Service iotedge
 Examine service logs from the last 5 minutes. If you just finished installing the IoT Edge runtime, you may see a list of errors from the time between running **Deploy-IoTEdge** and **Initialize-IoTEdge**. These errors are expected, as the service is trying to start before being configured. 
 
 ```powershell
-. {Invoke-WebRequest -useb aka.ms/iotedge-win} | Invoke-Expression; Get-IoTEdgeLog
+. {Invoke-WebRequest -useb https://aka.ms/iotedge-win} | Invoke-Expression; Get-IoTEdgeLog
 ```
 
 List running modules. After a new installation, the only module you should see running is **edgeAgent**. After you [deploy IoT Edge modules](how-to-deploy-modules-portal.md), you will see others. 
@@ -228,7 +228,7 @@ For more information, see [Update the IoT Edge security daemon and runtime](how-
 This example shows an installation that points to an existing configuration file, and uses Windows containers: 
 
 ```powershell
-. {Invoke-WebRequest -useb aka.ms/iotedge-win} | Invoke-Expression; `
+. {Invoke-WebRequest -useb https://aka.ms/iotedge-win} | Invoke-Expression; `
 Update-IoTEdge
 ```
 
diff --git a/articles/iot-edge/tutorial-c-module-windows.md b/articles/iot-edge/tutorial-c-module-windows.md
@@ -102,6 +102,7 @@ The deployment manifest shares the credentials for your container registry with
        "address": "<registry name>.azurecr.io"
      }
    }
+   ```
 
 4. Save the deployment.template.json file. 
 
diff --git a/articles/iot-edge/tutorial-csharp-module-windows.md b/articles/iot-edge/tutorial-csharp-module-windows.md
@@ -102,6 +102,7 @@ The deployment manifest shares the credentials for your container registry with
        "address": "<registry name>.azurecr.io"
      }
    }
+   ```
 
 4. Save the deployment.template.json file. 
 
diff --git a/articles/iot-edge/tutorial-develop-for-windows.md b/articles/iot-edge/tutorial-develop-for-windows.md
@@ -170,6 +170,7 @@ The IoT Edge runtime needs your registry credentials to pull your container imag
        "address": "<registry name>.azurecr.io"
      }
    }
+   ```
 
 4. Save the deployment.template.json file. 
 
@@ -334,4 +335,4 @@ In this tutorial, you set up Visual Studio 2019 on your development machine and
 
 > [!div class="nextstepaction"] 
 > [C](tutorial-c-module-windows.md)
-> [C#](tutorial-csharp-module-windows.md)
+> [C#](tutorial-csharp-module-windows.md)
diff --git a/articles/lab-services/add-artifact-repository.md b/articles/lab-services/add-artifact-repository.md
@@ -17,7 +17,7 @@ ms.author: spelluru
 
 ---
 # Add an artifact repository to your lab in DevTest Labs
-DevTest Labs allows you to specify an artifact to be added to a VM at the time of creating the VM or after the VM is created. This artifact could be a tool or an application that you want to install on the VM. Artifacts are defined in a JSON file loaded from a GitHub or VSTS Git repository. 
+DevTest Labs allows you to specify an artifact to be added to a VM at the time of creating the VM or after the VM is created. This artifact could be a tool or an application that you want to install on the VM. Artifacts are defined in a JSON file loaded from a GitHub or Azure DevOps Git repository. 
 
 The [public artifact repository](https://github.com/Azure/azure-devtestlab/tree/master/Artifacts), maintained by DevTest Labs, provides many common tools for both Windows and Linux. A link to this repository is automatically added to your lab. You can create your own artifact repository with specific tools that aren't available in the public artifact repository. To learn about creating custom artifacts, see [Create custom artifacts](devtest-lab-artifact-author.md).
 

Original file line number	Diff line number	Diff line change
`@@ -247,7 +247,7 @@ You can use any of the commands listed at [Redis commands](https://redis.io/comm`
`247`	`247`	* `redis-cli -h <Azure Cache for Redis name>.redis.cache.windows.net -a <key>`
`248`	`248`
`249`	`249`	`> [!NOTE]`
`250`		-> The Redis command-line tools do not work with the SSL port, but you can use a utility such as `stunnel` to securely connect the tools to the SSL port by following the directions in the [Announcing ASP.NET Session State Provider for Redis Preview Release](https://blogs.msdn.com/b/webdev/archive/2014/05/12/announcing-asp-net-session-state-provider-for-redis-preview-release.aspx) blog post.
	`250`	+> The Redis command-line tools do not work with the SSL port, but you can use a utility such as `stunnel` to securely connect the tools to the SSL port by following the directions in the [How to use the Redis command-line tool with Azure Cache for Redis](https://docs.microsoft.com/en-us/azure/azure-cache-for-redis/cache-how-to-redis-cli-tool) article.
`251`	`251`	`>`
`252`	`252`	`>`
`253`	`253`
Original file line number	Diff line number	Diff line change
`@@ -102,6 +102,7 @@ The deployment manifest shares the credentials for your container registry with`
`102`	`102`	`"address": "<registry name>.azurecr.io"`
`103`	`103`	`}`
`104`	`104`	`}`
	`105`	+ ```
`105`	`106`
`106`	`107`	`4. Save the deployment.template.json file.`
`107`	`108`