Merge branch 'master' of https://github.com/Microsoft/azure-docs-pr into oct0819

Author: TerryLanfear

articles/aks/cluster-autoscaler.md

@@ -86,7 +86,7 @@ az aks create \
   --resource-group myResourceGroup \
   --name myAKSCluster \
   --node-count 1 \
-  ---enable-vmss \
+  --enable-vmss \
   --enable-cluster-autoscaler \
   --min-count 1 \
   --max-count 3

articles/asc-for-iot/concept-baseline.md

@@ -15,7 +15,7 @@ ms.devlang: na
 ms.topic: conceptual
 ms.tgt_pltfrm: na
 ms.workload: na
-ms.date: 10/03/2019
+ms.date: 10/07/2019
 ms.author: mlottner
 
 ---
@@ -52,7 +52,7 @@ To configure baseline custom checks:
         "baselineCustomChecksFilePath": {
           "value" : "/home/user/full_path.xml"
         },
-        "baselineCustomChecksFilePath": {
+        "baselineCustomChecksFileHash": {
           "value" : "#hashexample!"
         }
       }

articles/asc-for-iot/how-to-deploy-edge.md

@@ -14,7 +14,7 @@ ms.devlang: na
 ms.topic: conceptual
 ms.tgt_pltfrm: na
 ms.workload: na
-ms.date: 07/23/2019
+ms.date: 10/08/2019
 ms.author: mlottner
 
 ---
@@ -67,7 +67,7 @@ There are three steps to create an IoT Edge deployment for Azure Security Center
 
 #### Step 1: Add modules
 
-1. From the **Add Modules** tab, **Deployment Modules** area, click  **AzureSecurityCenterforIoT**. 
+1. From the **Add Modules** tab, **Deployment Modules** area, click the **configure** option for **AzureSecurityCenterforIoT**. 
 
 1. Change the **name** to **azureiotsecurity**.
 1. Change the **Image URI** to **mcr.microsoft.com/ascforiot/azureiotsecurity:1.0.0**.
@@ -92,10 +92,13 @@ There are three steps to create an IoT Edge deployment for Azure Security Center
 1. Verify that **Set module twin's desired properties** is selected, and change the configuration object to:
 
     ``` json
-    "desired": {
-        "ms_iotn:urn_azureiot_Security_SecurityAgentConfiguration": {
-          } 
-        }
+    { 
+       "properties.desired":{ 
+      "ms_iotn:urn_azureiot_Security_SecurityAgentConfiguration":{ 
+
+          }
+       }
+    }
     ```
 
 1. Click **Save**.
@@ -107,13 +110,25 @@ There are three steps to create an IoT Edge deployment for Azure Security Center
 
     ``` json
     { 
-    "HostConfig":{
-                    "PortBindings":{
-                    "8883/tcp": [{"HostPort": "8883"}],
-                    "443/tcp": [{"HostPort": "443"}],
-                    "5671/tcp": [{"HostPort": "5671"}]
-                    }
-        }
+       "HostConfig":{ 
+          "PortBindings":{ 
+             "8883/tcp":[ 
+                { 
+                   "HostPort":"8883"
+                }
+             ],
+             "443/tcp":[ 
+                { 
+                   "HostPort":"443"
+                }
+             ],
+             "5671/tcp":[ 
+                { 
+                   "HostPort":"5671"
+                }
+             ]
+          }
+       }
     }
     ```
 1. Click **Save**.
@@ -122,16 +137,15 @@ There are three steps to create an IoT Edge deployment for Azure Security Center
 
 #### Step 2: Specify routes 
 
-1. In the **Specify Routes** tab, make sure you have a route (explicit or implicit) that will forward messages from the **azureiotsecurity** module to **$upstream**. 
-1. Click **Next**.
+1. In the **Specify Routes** tab, make sure you have a route (explicit or implicit) that will forward messages from the **azureiotsecurity** module to **$upstream** according to the following examples, only then click **Next**. 
 
-    ~~~Default implicit route
-    "route": "FROM /messages/* INTO $upstream" 
-    ~~~
+~~~Default implicit route
+"route": "FROM /messages/* INTO $upstream" 
+~~~
 
-    ~~~Explicit route
-    "ASCForIoTRoute": "FROM /messages/modules/azureiotsecurity/* INTO $upstream"
-    ~~~
+~~~Explicit route
+"ASCForIoTRoute": "FROM /messages/modules/azureiotsecurity/* INTO $upstream"
+~~~
 
 #### Step 3: Review deployment
 

articles/asc-for-iot/overview.md

@@ -18,6 +18,8 @@ ms.date: 09/26/2019
 ms.author: mlottner
 
 ---
+
+
 # Introducing Azure Security Center for IoT
 
 Unify security management and enable end-to-end threat detection and analysis across hybrid cloud workloads and your Azure IoT solution. 

articles/azure-functions/functions-host-json.md

@@ -112,9 +112,9 @@ Controls the [sampling feature in Application Insights](./functions-monitoring.m
 |---------|---------|---------| 
 |isEnabled|true|Enables or disables sampling.| 
 |maxTelemetryItemsPerSecond|5|The threshold at which sampling begins.| 
-|EnableLiveMetrics |true|Enables live metrics collection|
-|EnableDependencyTracking|true|Enables dependency tracking|
-|EnablePerformanceCountersCollection|true|Enables Kudu performance counters collection|
+|EnableLiveMetrics |true|Enables live metrics collection.|
+|EnableDependencyTracking|true|Enables dependency tracking.|
+|EnablePerformanceCountersCollection|true|Enables Kudu performance counters collection.|
 
 ## cosmosDb
 

articles/cognitive-services/Computer-vision/QuickStarts/CSharp-analyze.md

@@ -54,7 +54,7 @@ namespace CSHttpClientSample
         static string endpoint = Environment.GetEnvironmentVariable("COMPUTER_VISION_ENDPOINT");
 
         // the Analyze method endpoint
-        const string uriBase = endpoint + "vision/v2.0/analyze";
+        const string uriBase = endpoint + "vision/v2.1/analyze";
 
         static void Main()
         {

articles/cognitive-services/Computer-vision/QuickStarts/CSharp-hand-text.md

@@ -58,7 +58,7 @@ namespace CSHttpClientSample
         static string endpoint = Environment.GetEnvironmentVariable("COMPUTER_VISION_ENDPOINT");
 
         // the Batch Read method endpoint
-        const string uriBase = endpoint + "vision/v2.0/read/core/asyncBatchAnalyze";
+        const string uriBase = endpoint + "vision/v2.1/read/core/asyncBatchAnalyze";
 
         static void Main()
         {

articles/cognitive-services/Computer-vision/QuickStarts/CSharp-print-text.md

@@ -54,7 +54,7 @@ namespace CSHttpClientSample
         static string endpoint = Environment.GetEnvironmentVariable("COMPUTER_VISION_ENDPOINT");
 
         // the OCR method endpoint
-        const string uriBase = endpoint + "vision/v2.0/ocr";
+        const string uriBase = endpoint + "vision/v2.1/ocr";
 
         static void Main()
         {

articles/cognitive-services/Computer-vision/QuickStarts/CSharp-thumb.md

@@ -54,7 +54,7 @@ namespace CSHttpClientSample
         static string endpoint = Environment.GetEnvironmentVariable("COMPUTER_VISION_ENDPOINT");
 
         // the GenerateThumbnail method endpoint
-        const string uriBase = endpoint + "vision/v2.0/generateThumbnail";
+        const string uriBase = endpoint + "vision/v2.1/generateThumbnail";
 
         static void Main()
         {

articles/cognitive-services/Computer-vision/QuickStarts/curl-analyze.md

@@ -40,7 +40,7 @@ To create and run the sample, do the following steps:
 1. Paste the command from the text editor into the command prompt window, and then run the command.
 
 ```bash
-curl -H "Ocp-Apim-Subscription-Key: <subscriptionKey>" -H "Content-Type: application/json" "https://westcentralus.api.cognitive.microsoft.com/vision/v2.0/analyze?visualFeatures=Categories,Description&details=Landmarks&language=en" -d "{\"url\":\"http://upload.wikimedia.org/wikipedia/commons/3/3c/Shaki_waterfall.jpg\"}"
+curl -H "Ocp-Apim-Subscription-Key: <subscriptionKey>" -H "Content-Type: application/json" "https://westcentralus.api.cognitive.microsoft.com/vision/v2.1/analyze?visualFeatures=Categories,Description&details=Landmarks&language=en" -d "{\"url\":\"http://upload.wikimedia.org/wikipedia/commons/3/3c/Shaki_waterfall.jpg\"}"
 ```
 
 ## Examine the response