Merge pull request #58144 from PatrickFarley/pafarley/master/region-clarify

Jak-MS · web-flow · commit 6c59198eedea · 2018-11-16T12:36:06.000-06:00
[Cog Serv] Pafarley/master/region clarify
diff --git a/articles/cognitive-services/Computer-vision/QuickStarts/CSharp-analyze.md b/articles/cognitive-services/Computer-vision/QuickStarts/CSharp-analyze.md
@@ -58,7 +58,7 @@ namespace CSHttpClientSample
         // from the West US region, replace "westcentralus" in the URL
         // below with "westus".
         //
-        // Free trial subscription keys are generated in the West Central US region.
+        // Free trial subscription keys are generated in the "westus" region.
         // If you use a free trial subscription key, you shouldn't need to change
         // this region.
         const string uriBase =
diff --git a/articles/cognitive-services/Computer-vision/QuickStarts/CSharp-hand-text.md b/articles/cognitive-services/Computer-vision/QuickStarts/CSharp-hand-text.md
@@ -62,7 +62,7 @@ namespace CSHttpClientSample
         // from the West US region, replace "westcentralus" in the URL
         // below with "westus".
         //
-        // Free trial subscription keys are generated in the West Central US region.
+        // Free trial subscription keys are generated in the "westus" region.
         // If you use a free trial subscription key, you shouldn't need to change
         // this region.
         const string uriBase =
diff --git a/articles/cognitive-services/Computer-vision/QuickStarts/CSharp-print-text.md b/articles/cognitive-services/Computer-vision/QuickStarts/CSharp-print-text.md
@@ -58,7 +58,7 @@ namespace CSHttpClientSample
         // from the West US region, replace "westcentralus" in the URL
         // below with "westus".
         //
-        // Free trial subscription keys are generated in the West Central US region.
+        // Free trial subscription keys are generated in the "westus" region.
         // If you use a free trial subscription key, you shouldn't need to change
         // this region.
         const string uriBase =
diff --git a/articles/cognitive-services/Computer-vision/QuickStarts/CSharp-thumb.md b/articles/cognitive-services/Computer-vision/QuickStarts/CSharp-thumb.md
@@ -58,7 +58,7 @@ namespace CSHttpClientSample
         // from the West US region, replace "westcentralus" in the URL
         // below with "westus".
         //
-        // Free trial subscription keys are generated in the West Central US region.
+        // Free trial subscription keys are generated in the "westus" region.
         // If you use a free trial subscription key, you shouldn't need to change
         // this region.
         const string uriBase =
diff --git a/articles/cognitive-services/Computer-vision/QuickStarts/go-analyze.md b/articles/cognitive-services/Computer-vision/QuickStarts/go-analyze.md
@@ -58,7 +58,7 @@ func main() {
     // from the West US region, replace "westcentralus" in the URL
     // below with "westus".
     //
-    // Free trial subscription keys are generated in the West Central US region.
+    // Free trial subscription keys are generated in the "westus" region.
     // If you use a free trial subscription key, you shouldn't need to change
     // this region.
     const uriBase =
diff --git a/articles/cognitive-services/Computer-vision/QuickStarts/go-print-text.md b/articles/cognitive-services/Computer-vision/QuickStarts/go-print-text.md
@@ -58,7 +58,7 @@ func main() {
     // from the West US region, replace "westcentralus" in the URL
     // below with "westus".
     //
-    // Free trial subscription keys are generated in the West Central US region.
+    // Free trial subscription keys are generated in the "westus" region.
     // If you use a free trial subscription key, you shouldn't need to change
     // this region.
     const uriBase =
diff --git a/articles/cognitive-services/Computer-vision/QuickStarts/go-thumb.md b/articles/cognitive-services/Computer-vision/QuickStarts/go-thumb.md
@@ -58,7 +58,7 @@ func main() {
     // from the West US region, replace "westcentralus" in the URL
     // below with "westus".
     //
-    // Free trial subscription keys are generated in the West Central US region.
+    // Free trial subscription keys are generated in the "westus" region.
     // If you use a free trial subscription key, you shouldn't need to change
     // this region.
     const uriBase =
diff --git a/articles/cognitive-services/Computer-vision/QuickStarts/java-analyze.md b/articles/cognitive-services/Computer-vision/QuickStarts/java-analyze.md
@@ -68,7 +68,7 @@ public class Main {
     // from the West US region, replace "westcentralus" in the URL
     // below with "westus".
     //
-    // Free trial subscription keys are generated in the West Central US region.
+    // Free trial subscription keys are generated in the "westus" region.
     // If you use a free trial subscription key, you shouldn't need to change
     // this region.
     private static final String uriBase =
diff --git a/articles/cognitive-services/Computer-vision/QuickStarts/java-hand-text.md b/articles/cognitive-services/Computer-vision/QuickStarts/java-hand-text.md
@@ -73,7 +73,7 @@ public class Main {
     // from the West US region, replace "westcentralus" in the URL
     // below with "westus".
     //
-    // Free trial subscription keys are generated in the West Central US region.
+    // Free trial subscription keys are generated in the "westus" region.
     // If you use a free trial subscription key, you shouldn't need to change
     // this region.
     private static final String uriBase =
diff --git a/articles/cognitive-services/Computer-vision/QuickStarts/java-print-text.md b/articles/cognitive-services/Computer-vision/QuickStarts/java-print-text.md
@@ -68,7 +68,7 @@ public class Main {
     // from the West US region, replace "westcentralus" in the URL
     // below with "westus".
     //
-    // Free trial subscription keys are generated in the West Central US region.
+    // Free trial subscription keys are generated in the "westus" region.
     // If you use a free trial subscription key, you shouldn't need to change
     // this region.
     private static final String uriBase =
diff --git a/articles/cognitive-services/Computer-vision/QuickStarts/java-thumb.md b/articles/cognitive-services/Computer-vision/QuickStarts/java-thumb.md
@@ -79,7 +79,7 @@ public class Main {
     // from the West US region, replace "westcentralus" in the URL
     // below with "westus".
     //
-    // Free trial subscription keys are generated in the West Central US region.
+    // Free trial subscription keys are generated in the "westus" region.
     // If you use a free trial subscription key, you shouldn't need to change
     // this region.
     private static final String uriBase =
diff --git a/articles/cognitive-services/Computer-vision/QuickStarts/javascript-analyze.md b/articles/cognitive-services/Computer-vision/QuickStarts/javascript-analyze.md
@@ -59,7 +59,7 @@ To create and run the sample, do the following steps:
         // from the West US region, replace "westcentralus" in the URL
         // below with "westus".
         //
-        // Free trial subscription keys are generated in the West Central US region.
+        // Free trial subscription keys are generated in the "westus" region.
         // If you use a free trial subscription key, you shouldn't need to change
         // this region.
         var uriBase =
diff --git a/articles/cognitive-services/Computer-vision/QuickStarts/javascript-hand-text.md b/articles/cognitive-services/Computer-vision/QuickStarts/javascript-hand-text.md
@@ -62,7 +62,7 @@ To create and run the sample, do the following steps:
         // from the West US region, replace "westcentralus" in the URL
         // below with "westus".
         //
-        // Free trial subscription keys are generated in the West Central US region.
+        // Free trial subscription keys are generated in the "westus" region.
         // If you use a free trial subscription key, you shouldn't need to change
         // this region.
         var uriBase =
diff --git a/articles/cognitive-services/Computer-vision/QuickStarts/javascript-print-text.md b/articles/cognitive-services/Computer-vision/QuickStarts/javascript-print-text.md
@@ -59,7 +59,7 @@ To create and run the sample, do the following steps:
         // from the West US region, replace "westcentralus" in the URL
         // below with "westus".
         //
-        // Free trial subscription keys are generated in the West Central US region.
+        // Free trial subscription keys are generated in the "westus" region.
         // If you use a free trial subscription key, you shouldn't need to change
         // this region.
         var uriBase =
diff --git a/articles/cognitive-services/Computer-vision/QuickStarts/javascript-thumb.md b/articles/cognitive-services/Computer-vision/QuickStarts/javascript-thumb.md
@@ -58,7 +58,7 @@ To create and run the sample, do the following steps:
         // from the West US region, replace "westcentralus" in the URL
         // below with "westus".
         //
-        // Free trial subscription keys are generated in the West Central US region.
+        // Free trial subscription keys are generated in the "westus" region.
         // If you use a free trial subscription key, you shouldn't need to change
         // this region.
         var uriBase =
diff --git a/articles/cognitive-services/Computer-vision/QuickStarts/python-analyze.md b/articles/cognitive-services/Computer-vision/QuickStarts/python-analyze.md
@@ -57,7 +57,7 @@ assert subscription_key
 # subscription keys. For example, if you got your subscription keys from
 # westus, replace "westcentralus" in the URI below with "westus".
 #
-# Free trial subscription keys are generated in the westcentralus region.
+# Free trial subscription keys are generated in the "westus" region.
 # If you use a free trial subscription key, you shouldn't need to change
 # this region.
 vision_base_url = "https://westcentralus.api.cognitive.microsoft.com/vision/v2.0/"
diff --git a/articles/cognitive-services/Computer-vision/QuickStarts/python-disk.md b/articles/cognitive-services/Computer-vision/QuickStarts/python-disk.md
@@ -56,7 +56,7 @@ assert subscription_key
 # subscription keys. For example, if you got your subscription keys from
 # westus, replace "westcentralus" in the URI below with "westus".
 #
-# Free trial subscription keys are generated in the westcentralus region.
+# Free trial subscription keys are generated in the "westus" region.
 # If you use a free trial subscription key, you shouldn't need to change
 # this region.
 vision_base_url = "https://westcentralus.api.cognitive.microsoft.com/vision/v2.0/"
diff --git a/articles/cognitive-services/Computer-vision/QuickStarts/python-domain.md b/articles/cognitive-services/Computer-vision/QuickStarts/python-domain.md
@@ -56,7 +56,7 @@ assert subscription_key
 # subscription keys. For example, if you got your subscription keys from
 # westus, replace "westcentralus" in the URI below with "westus".
 #
-# Free trial subscription keys are generated in the westcentralus region.
+# Free trial subscription keys are generated in the "westus" region.
 # If you use a free trial subscription key, you shouldn't need to change
 # this region.
 vision_base_url = "https://westcentralus.api.cognitive.microsoft.com/vision/v2.0/"
diff --git a/articles/cognitive-services/Computer-vision/QuickStarts/python-hand-text.md b/articles/cognitive-services/Computer-vision/QuickStarts/python-hand-text.md
@@ -61,7 +61,7 @@ assert subscription_key
 # subscription keys. For example, if you got your subscription keys from
 # westus, replace "westcentralus" in the URI below with "westus".
 #
-# Free trial subscription keys are generated in the westcentralus region.
+# Free trial subscription keys are generated in the "westus" region.
 # If you use a free trial subscription key, you shouldn't need to change
 # this region.
 vision_base_url = "https://westcentralus.api.cognitive.microsoft.com/vision/v2.0/"
diff --git a/articles/cognitive-services/Computer-vision/QuickStarts/python-print-text.md b/articles/cognitive-services/Computer-vision/QuickStarts/python-print-text.md
@@ -57,7 +57,7 @@ assert subscription_key
 # subscription keys. For example, if you got your subscription keys from
 # westus, replace "westcentralus" in the URI below with "westus".
 #
-# Free trial subscription keys are generated in the westcentralus region.
+# Free trial subscription keys are generated in the "westus" region.
 # If you use a free trial subscription key, you shouldn't need to change
 # this region.
 vision_base_url = "https://westcentralus.api.cognitive.microsoft.com/vision/v2.0/"
diff --git a/articles/cognitive-services/Computer-vision/QuickStarts/python-thumb.md b/articles/cognitive-services/Computer-vision/QuickStarts/python-thumb.md
@@ -60,7 +60,7 @@ assert subscription_key
 # subscription keys. For example, if you got your subscription keys from
 # westus, replace "westcentralus" in the URI below with "westus".
 #
-# Free trial subscription keys are generated in the westcentralus region.
+# Free trial subscription keys are generated in the "westus" region.
 # If you use a free trial subscription key, you shouldn't need to change
 # this region.
 vision_base_url = "https://westcentralus.api.cognitive.microsoft.com/vision/v2.0/"
diff --git a/articles/cognitive-services/Computer-vision/quickstarts-sdk/csharp-analyze-sdk.md b/articles/cognitive-services/Computer-vision/quickstarts-sdk/csharp-analyze-sdk.md
@@ -92,7 +92,7 @@ namespace ImageAnalyze
             // keys. For example, if you got your subscription keys from westus,
             // replace "westcentralus" with "westus".
             //
-            // Free trial subscription keys are generated in the westcentralus
+            // Free trial subscription keys are generated in the "westus"
             // region. If you use a free trial subscription key, you shouldn't
             // need to change the region.
 
diff --git a/articles/cognitive-services/Computer-vision/quickstarts-sdk/csharp-hand-text-sdk.md b/articles/cognitive-services/Computer-vision/quickstarts-sdk/csharp-hand-text-sdk.md
@@ -83,7 +83,7 @@ namespace ExtractText
             // keys. For example, if you got your subscription keys from westus,
             // replace "westcentralus" with "westus".
             //
-            // Free trial subscription keys are generated in the westcentralus
+            // Free trial subscription keys are generated in the "westus"
             // region. If you use a free trial subscription key, you shouldn't
             // need to change the region.
 
diff --git a/articles/cognitive-services/Computer-vision/quickstarts-sdk/csharp-thumb-sdk.md b/articles/cognitive-services/Computer-vision/quickstarts-sdk/csharp-thumb-sdk.md
@@ -79,7 +79,7 @@ namespace ImageThumbnail
             // keys. For example, if you got your subscription keys from westus,
             // replace "westcentralus" with "westus".
             //
-            // Free trial subscription keys are generated in the westcentralus
+            // Free trial subscription keys are generated in the "westus"
             // region. If you use a free trial subscription key, you shouldn't
             // need to change the region.
 
diff --git a/articles/cognitive-services/Face/QuickStarts/CSharp.md b/articles/cognitive-services/Face/QuickStarts/CSharp.md
@@ -48,7 +48,7 @@ using System.Text;
 
 ### Add essential fields
 
-Add the following fields to the **Program** class. This data specifies how to connect to the Face service and where to get the input data. You'll need to update the `subscriptionKey` field with the value of your subscription key, and you may need to change the `uriBase` string so that it contains the correct region identifier.
+Add the following fields to the **Program** class. This data specifies how to connect to the Face service and where to get the input data. You'll need to update the `subscriptionKey` field with the value of your subscription key, and you may need to change the `uriBase` string so that it contains the correct region identifier (see the [Face API docs](https://westus.dev.cognitive.microsoft.com/docs/services/563879b61984550e40cbbe8d/operations/563879b61984550f30395236) for a list of all region endpoints).
 
 
 ```csharp
@@ -60,7 +60,7 @@ const string subscriptionKey = "<Subscription Key>";
 // subscription keys from westus, replace "westcentralus" in the URL
 // below with "westus".
 //
-// Free trial subscription keys are generated in the westcentralus region.
+// Free trial subscription keys are generated in the "westus" region.
 // If you use a free trial subscription key, you shouldn't need to change
 // this region.
 const string uriBase =
diff --git a/articles/cognitive-services/Face/QuickStarts/Java.md b/articles/cognitive-services/Face/QuickStarts/Java.md
@@ -59,7 +59,7 @@ import org.json.JSONObject;
 
 ### Add essential fields
 
-Add the following fields to the **Main** class. This data specifies how to connect to the Face service and where to get the input data. You'll need to update the `subscriptionKey` field with the value of your subscription key, and you may need to change the `uriBase` string so that it contains the correct region identifier. You may also wish to set the `imageWithFaces` value to a path that points to a different image file.
+Add the following fields to the **Main** class. This data specifies how to connect to the Face service and where to get the input data. You'll need to update the `subscriptionKey` field with the value of your subscription key, and you may need to change the `uriBase` string so that it contains the correct region identifier (see the [Face API docs](https://westus.dev.cognitive.microsoft.com/docs/services/563879b61984550e40cbbe8d/operations/563879b61984550f30395236) for a list of all region endpoints). You may also wish to set the `imageWithFaces` value to a path that points to a different image file.
 
 The `faceAttributes` field is simply a list of certain types of attributes. It will specify which information to retrieve about the detected faces.
 
@@ -72,7 +72,7 @@ private static final String subscriptionKey = "<Subscription Key>";
 // subscription keys from westus, replace "westcentralus" in the URL
 // below with "westus".
 //
-// Free trial subscription keys are generated in the westcentralus region. If you
+// Free trial subscription keys are generated in the "westus" region. If you
 // use a free trial subscription key, you shouldn't need to change this region.
 private static final String uriBase =
     "https://westcentralus.api.cognitive.microsoft.com/face/v1.0/detect";
diff --git a/articles/cognitive-services/Face/QuickStarts/JavaScript.md b/articles/cognitive-services/Face/QuickStarts/JavaScript.md
@@ -33,10 +33,10 @@ method to detect faces in an image and return face attributes including:
 To run the sample, do the following steps:
 
 1. Copy the following and save it to a file such as `detectFaces.html`.
-2. Replace `<Subscription Key>` with your valid subscription key.
-3. Change the `uriBase` value to use the location where you obtained your subscription keys, if necessary.
-4. Drag-and-drop the file into your browser.
-5. Click the `Analyze faces` button.
+1. Replace `<Subscription Key>` with your valid subscription key.
+1. If necessary, change the `uriBase` value to use the location where you obtained your subscription keys (see the [Face API docs](https://westus.dev.cognitive.microsoft.com/docs/services/563879b61984550e40cbbe8d/operations/563879b61984550f30395236) for a list of all region endpoints).
+1. Drag-and-drop the file into your browser.
+1. Click the `Analyze faces` button.
 
 ### Face - Detect request
 
@@ -59,7 +59,7 @@ To run the sample, do the following steps:
         // subscription keys from westus, replace "westcentralus" in the URL
         // below with "westus".
         //
-        // Free trial subscription keys are generated in the westcentralus region.
+        // Free trial subscription keys are generated in the "westus" region.
         // If you use a free trial subscription key, you shouldn't need to change 
         // this region.
         var uriBase =
diff --git a/articles/cognitive-services/Face/QuickStarts/curl.md b/articles/cognitive-services/Face/QuickStarts/curl.md
@@ -36,7 +36,7 @@ Replace `<Subscription Key>` with your valid Face subscription key.
 
 ### Face endpoint URL
 
-The URL `https://westcentralus.api.cognitive.microsoft.com/face/v1.0/detect` indicates the Azure Face endpoint to query. You will need to change the first part of this URL to match the region that corresponds to your subscription key (unless it is already correct).
+The URL `https://westcentralus.api.cognitive.microsoft.com/face/v1.0/detect` indicates the Azure Face endpoint to query. You may need to change the first part of this URL to match the region that corresponds to your subscription key (see the [Face API docs](https://westus.dev.cognitive.microsoft.com/docs/services/563879b61984550e40cbbe8d/operations/563879b61984550f30395236) for a list of all region endpoints).
 
 ### URL query string
 
diff --git a/articles/cognitive-services/Face/QuickStarts/node.md b/articles/cognitive-services/Face/QuickStarts/node.md
@@ -78,7 +78,7 @@ Replace `<Subscription Key>` with your valid Face subscription key.
 
 ### Face endpoint URL
 
-The URL `https://westcentralus.api.cognitive.microsoft.com/face/v1.0/detect` indicates the Azure Face endpoint to query. You will need to change the first part of this URL to match the region that corresponds to your subscription key (unless it is already correct).
+The URL `https://westcentralus.api.cognitive.microsoft.com/face/v1.0/detect` indicates the Azure Face endpoint to query. You may need to change the first part of this URL to match the region that corresponds to your subscription key (see the [Face API docs](https://westus.dev.cognitive.microsoft.com/docs/services/563879b61984550e40cbbe8d/operations/563879b61984550f30395236) for a list of all region endpoints).
 
 ### URL query string
 
diff --git a/articles/cognitive-services/Face/Tutorials/FaceAPIinCSharpTutorial.md b/articles/cognitive-services/Face/Tutorials/FaceAPIinCSharpTutorial.md
@@ -64,7 +64,7 @@ Open *MainWindow.xaml.cs* and add the client library namespaces, along with othe
 
 [!code-csharp[](~/Cognitive-Face-CSharp-sample/FaceTutorialCS/FaceTutorialCS/MainWindow.xaml.cs?range=1-12)]
 
-Next, insert the following code in the **MainWindow** class. This creates a **FaceClient** instance using the subscription key, which you must enter yourself. You must also set the region string in `faceEndpoint` to the correct region for your subscription.
+Next, insert the following code in the **MainWindow** class. This creates a **FaceClient** instance using the subscription key, which you must enter yourself. You must also set the region string in `faceEndpoint` to the correct region for your subscription (see the [Face API docs](https://westus.dev.cognitive.microsoft.com/docs/services/563879b61984550e40cbbe8d/operations/563879b61984550f30395236) for a list of all region endpoints).
 
 [!code-csharp[](~/Cognitive-Face-CSharp-sample/FaceTutorialCS/FaceTutorialCS/MainWindow.xaml.cs?range=18-46)]
 
diff --git a/articles/cognitive-services/Face/Tutorials/FaceAPIinJavaForAndroidTutorial.md b/articles/cognitive-services/Face/Tutorials/FaceAPIinJavaForAndroidTutorial.md
@@ -89,11 +89,7 @@ Then, insert the following code in the **MainActivity** class, above the **onCre
 
 [!code-java[](~/cognitive-services-face-android-detect/FaceTutorial/app/src/main/java/com/contoso/facetutorial/MainActivity.java?range=17-27)]
 
-You will need to replace `<Subscription Key>` with your subscription key. Also, replace `<API endpoint>` with the your Face API endpoint, using the appropriate region identifier for your key. Free trial subscription keys are generated in the **westus** region. An example API endpoint value would be:
-
-```java
-apiEndpoint = "https://westus.api.cognitive.microsoft.com/face/v1.0";
-```
+You will need to replace `<Subscription Key>` with your subscription key. Also, replace `<API endpoint>` with your Face API endpoint, using the appropriate region identifier for your key (see the [Face API docs](https://westus.dev.cognitive.microsoft.com/docs/services/563879b61984550e40cbbe8d/operations/563879b61984550f30395236) for a list of all region endpoints). Free trial subscription keys are generated in the **westus** region.
 
 In the **Project** pane, expand **app**, then **manifests**, and open *AndroidManifest.xml*. Insert the following element as a direct child of the `manifest` element:
 
diff --git a/articles/cognitive-services/Face/Tutorials/FaceAPIinPythonTutorial.md b/articles/cognitive-services/Face/Tutorials/FaceAPIinPythonTutorial.md
