Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into ds-fixespr01

Author: davidsmatlak

articles/analysis-services/analysis-services-overview.md

@@ -4,7 +4,7 @@ description: Learn about Azure Analysis Services, a fully managed platform as a
 author: minewiskan
 ms.service: azure-analysis-services
 ms.topic: overview
-ms.date: 03/30/2020
+ms.date: 04/13/2020
 ms.author: owend
 ms.reviewer: minewiskan
 #Customer intent: As a BI developer, I want to determine if Azure Analysis Services is the best data modeling platform for our organization.
@@ -60,8 +60,6 @@ This tier is for mission-critical production applications that require elastic u
 |S1    |    100     |    25     |
 |S2    |    200     |    50     |
 |S4    |    400     |    100     |
-|S8*    |    320     |    200     |
-|S9*    |    640    |    400     |
 |S8v2*    |    640     |    200     |
 |S9v2*    |    1280    |    400     |
 
@@ -79,15 +77,15 @@ Azure Analysis Services is supported in regions throughout the world. Supported
 |Canada Central    |     B1, B2, S0, S1, S2, S4, D1    |     1    |
 |East US     |     B1, B2, S0, S1, S2, S4, D1    |    1     |
 |East US 2     |     B1, B2, S0, S1, S2, S4, D1   |    7    |
-|East US 2     |     S8, S9, S8v2, S9v2   |    1    |
+|East US 2     |     S8v2, S9v2   |    1    |
 |North Central US     |     B1, B2, S0, S1, S2, S4, D1     |    1     |
 |Central US     |    B1, B2, S0, S1, S2, S4, D1     |    1     |
 |South Central US     |    B1, B2, S0, S1, S2, S4, D1     |    1     |
 |West Central US   |     B1, B2, S0, S1, S2, S4, D1    |    3     |
 |West US     |    B1, B2, S0, S1, S2, S4, D1    |    7   |
-|West US     |    S8, S9, S8v2, S9v2   |    2  |
+|West US     |    S8v2, S9v2   |    2  |
 |West US2    |    B1, B2, S0, S1, S2, S4, D1    |    3   |
-|West US2    |    S8, S9, S8v2, S9v2  |    1     |
+|West US2    |    S8v2, S9v2  |    1     |
 
 ### Europe
 
@@ -97,17 +95,17 @@ Azure Analysis Services is supported in regions throughout the world. Supported
 |North Europe     |    S8v2, S9v2      |    3     |
 |UK South     |    B1, B2, S0, S1, S2, S4, D1      |     1    |
 |West Europe     |    B1, B2, S0, S1, S2, S4, D1   |    7    |
-|West Europe    |   S8, S9, S8v2, S9v2  |  1  |
+|West Europe    |   S8v2, S9v2  |  1  |
 
 ### Asia Pacific 
 
 |Region  | Supported plans | Query replicas (Standard plans only) |
 |---------|---------|:---------:|
 |Australia East     |    B1, B2, S0, S1, S2, S4     |    3     |
-|Australia East     |    S8, S9, S8v2, S9v2    |    1     |
+|Australia East     |    S8v2, S9v2    |    1     |
 |Australia Southeast     | B1, B2, S0, S1, S2, S4, D1       |    1     |
 |Japan East     |   B1, B2, S0, S1, S2, S4, D1       |    1     |
-|Southeast Asia     |     B1, B2, S0, S1, S2, S4, S8, S9, S8v2, S9v2, D1     |   1      |
+|Southeast Asia     |     B1, B2, S0, S1, S2, S4, S8v2, S9v2, D1     |   1      |
 |West India     |    B1, B2, S0, S1, S2, S4, D1     |    1     |
 
 ## Scale to your needs

articles/cloud-shell/persisting-shell-storage.md

@@ -46,7 +46,7 @@ By using the advanced option, you can associate existing resources. When selecti
 When the storage setup prompt appears, select **Show advanced settings** to view additional options. The populated storage options filter for locally redundant storage (LRS),  geo-redundant storage (GRS), and zone-redundant storage (ZRS) accounts. 
 
 > [!NOTE]
-> Using GRS or ZRS storage accounts are recommended for additional resiliency for your backing file share. Which type of redundancy depends on your goals and price preference. [Learn more about replication options for Azure Storage accounts](https://docs.microsoft.com/azure/storage/common/storage-redundancy).
+> Using GRS or ZRS storage accounts are recommended for additional resiliency for your backing file share. Which type of redundancy depends on your goals and price preference. [Learn more about replication options for Azure Storage accounts](../storage/common/storage-redundancy.md).
 
 ![The Resource group setting](media/persisting-shell-storage/advanced-storage.png)
 
@@ -166,5 +166,5 @@ For example: . .\MyFunctions.ps1
 
 ## Next steps
 [Cloud Shell Quickstart](quickstart.md) <br>
-[Learn about Microsoft Azure Files storage](https://docs.microsoft.com/azure/storage/storage-introduction) <br>
+[Learn about Microsoft Azure Files storage](../storage/files/storage-files-introduction.md) <br>
 [Learn about storage tags](https://docs.microsoft.com/azure/azure-resource-manager/resource-group-using-tags) <br>

articles/cognitive-services/Content-Moderator/text-moderation-api.md

@@ -16,7 +16,7 @@ ms.author: pafarley
 
 # Learn text moderation concepts
 
-Use Content Moderator’s machine-assisted text moderation and [human review](Review-Tool-User-Guide/human-in-the-loop.md) capabilities to moderate text content.
+Use Content Moderator's machine-assisted text moderation and [human review](Review-Tool-User-Guide/human-in-the-loop.md) capabilities to moderate text content.
 
 You either block, approve or review the content based on your policies and thresholds. Use it to augment human moderation of environments where partners, employees and consumers generate text content. These include chat rooms, discussion boards, chatbots, e-commerce catalogs, and documents. 
 
@@ -33,13 +33,13 @@ The service response includes the following information:
 
 If the API detects any profane terms in any of the [supported languages](Text-Moderation-API-Languages.md), those terms are included in the response. The response also contains their location (`Index`) in the original text. The `ListId` in the following sample JSON refers to terms found in [custom term lists](try-terms-list-api.md) if available.
 
-	"Terms": [
-	{
-		"Index": 118,
-		"OriginalIndex": 118,
-		"ListId": 0,
-		"Term": "crap"
-	}
+    "Terms": [
+    {
+        "Index": 118,
+        "OriginalIndex": 118,
+        "ListId": 0,
+        "Term": "crap"
+    }
 
 > [!NOTE]
 > For the **language** parameter, assign `eng` or leave it empty to see the machine-assisted **classification** response (preview feature). **This feature supports English only**.
@@ -48,22 +48,22 @@ If the API detects any profane terms in any of the [supported languages](Text-Mo
 
 ## Classification
 
-Content Moderator’s machine-assisted **text classification feature** supports **English only**, and helps detect potentially undesired content. The flagged content may be assessed as inappropriate depending on context. It conveys the likelihood of each category and may recommend a human review. The feature uses a trained model to identify possible abusive, derogatory or discriminatory language. This includes slang, abbreviated words, offensive, and intentionally misspelled words for review. 
+Content Moderator's machine-assisted **text classification feature** supports **English only**, and helps detect potentially undesired content. The flagged content may be assessed as inappropriate depending on context. It conveys the likelihood of each category and may recommend a human review. The feature uses a trained model to identify possible abusive, derogatory or discriminatory language. This includes slang, abbreviated words, offensive, and intentionally misspelled words for review. 
 
 The following extract in the JSON extract shows an example output:
 
-	"Classification": {
-    	"ReviewRecommended": true,
-    	"Category1": {
-      		"Score": 1.5113095059859916E-06
-    		},
-    	"Category2": {
-      		"Score": 0.12747249007225037
-    		},
-    	"Category3": {
-      		"Score": 0.98799997568130493
-    	}
-	}
+    "Classification": {
+        "ReviewRecommended": true,
+        "Category1": {
+              "Score": 1.5113095059859916E-06
+            },
+        "Category2": {
+              "Score": 0.12747249007225037
+            },
+        "Category3": {
+              "Score": 0.98799997568130493
+        }
+    }
 
 ### Explanation
 
@@ -78,86 +78,57 @@ The following extract in the JSON extract shows an example output:
 The personal data feature detects the potential presence of this information:
 
 - Email address
-- US Mailing address
+- US mailing address
 - IP address
-- US Phone number
-- UK Phone number
-- Social Security Number (SSN)
+- US phone number
 
 The following example shows a sample response:
 
 ```json
-"PII":{ 
-  "Email":[ 
-    { 
-      "Detected":"[email protected]",
-      "SubType":"Regular",
-      "Text":"[email protected]",
-      "Index":32
-    }
+"pii":{
+  "email":[
+      {
+        "detected":"[email protected]",
+        "sub_type":"Regular",
+        "text":"[email protected]",
+        "index":32
+      }
   ],
-  "IPA":[ 
-    { 
-      "SubType":"IPV4",
-      "Text":"255.255.255.255",
-      "Index":72
-    }
+  "ssn":[
+
   ],
-  "Phone":[ 
-    { 
-      "CountryCode":"US",
-      "Text":"4255550111",
-      "Index":56
-    },
-    { 
-      "CountryCode":"US",
-      "Text":"425 555 0111",
-      "Index":212
-    },
-    { 
-      "CountryCode":"UK",
-      "Text":"+123 456 7890",
-      "Index":208
-    },
-    { 
-      "CountryCode":"UK",
-      "Text":"0234 567 8901",
-      "Index":228
-    },
-    { 
-      "CountryCode":"UK",
-      "Text":"0456 789 0123",
-      "Index":245
-    }
+  "ipa":[
+      {
+        "sub_type":"IPV4",
+        "text":"255.255.255.255",
+        "index":72
+      }
   ],
-  "Address":[ 
-    { 
-      "Text":"1234 Main Boulevard, Panapolis WA 96555",
-      "Index":89
-    }
+  "phone":[
+      {
+        "country_code":"US",
+        "text":"6657789887",
+        "index":56
+      }
   ],
-  "SSN":[ 
-    { 
-      "Text":"999999999",
-      "Index":56
-    },
-    { 
-      "Text":"999-99-9999",
-      "Index":267
-    }
+  "address":[
+      {
+        "text":"1 Microsoft Way, Redmond, WA 98052",
+        "index":89
+      }
   ]
 }
 ```
 
 ## Auto-correction
 
-Suppose the input text is (the ‘lzay’ and 'f0x' are intentional):
+Suppose the input text is (the 'lzay' and 'f0x' are intentional):
 
-	The qu!ck brown f0x jumps over the lzay dog.
+    The qu!ck brown f0x jumps over the lzay dog.
 
 If you ask for auto-correction, the response contains the corrected version of the text:
 
-	The quick brown fox jumps over the lazy dog.
+    The quick brown fox jumps over the lazy dog.
 
 ## Creating and managing your custom lists of terms
 
@@ -169,13 +140,13 @@ While the default, global list of terms works great for most cases, you may want
 
 The following example shows the matching List ID:
 
-	"Terms": [
-	{
-		"Index": 118,
-		"OriginalIndex": 118,
-		"ListId": 231.
-		"Term": "crap"
-	}
+    "Terms": [
+    {
+        "Index": 118,
+        "OriginalIndex": 118,
+        "ListId": 231.
+        "Term": "crap"
+    }
 
 The Content Moderator provides a [Term List API](https://westus.dev.cognitive.microsoft.com/docs/services/57cf755e3f9b070c105bd2c2/operations/57cf755e3f9b070868a1f67f) with operations for managing custom term lists. Start with the [Term Lists API Console](try-terms-list-api.md) and use the REST API code samples. Also check out the [Term Lists .NET quickstart](term-lists-quickstart-dotnet.md) if you are familiar with Visual Studio and C#.