Merge pull request #201328 from MicrosoftDocs/main

4 P.M. Sunday Publish, 6/12/22

Author: hmacgregor1

articles/app-service/configure-connect-to-azure-storage.md

@@ -165,7 +165,7 @@ The following features are supported for Linux containers:
     | **Storage accounts** | Azure Storage account. It must contain an Azure Files share. |
     | **Share name** | Files share to mount. |
     | **Access key** (Advanced only) | [Access key](../storage/common/storage-account-keys-manage.md) for your storage account. |
-    | **Mount path** | Directory inside your file/blob storage that you want to mount. Only `/mounts/pathname` is supported.|
+    | **Mount path** | Directory inside your app service that you want to mount. Only `/mounts/pathname` is supported.|
     ::: zone-end
     ::: zone pivot="container-windows"
     | Setting | Description |
@@ -175,7 +175,7 @@ The following features are supported for Linux containers:
     | **Storage accounts** | Azure Storage account. It must contain an Azure Files share. |
     | **Share name** | Files share to mount. |
     | **Access key** (Advanced only) | [Access key](../storage/common/storage-account-keys-manage.md) for your storage account. |
-    | **Mount path** | Directory inside your file/blob storage that you want to mount. Do not use a root directory (`[C-Z]:\` or `/`) or the `home` directory (`[C-Z]:\home`, or `/home`).|
+    | **Mount path** | Directory inside your Windows container that you want to mount. Do not use a root directory (`[C-Z]:\` or `/`) or the `home` directory (`[C-Z]:\home`, or `/home`).|
     ::: zone-end
     ::: zone pivot="container-linux"
     | Setting | Description |

articles/communication-services/quickstarts/includes/telemetry-app-insights-java.md

@@ -93,7 +93,7 @@ Initialize a `CommunicationIdentityClient` with your connection string. Learn ho
         .buildClient();
 ```
 
-First, in order to create the span that will allow you to trace the requests in the Azure Monitor, you will have to create an instance of an `AzureMonitorTraceExporter` object. You will need to provide the connection string from your Application Insights Resource.
+First, in order to create the span that will allow you to trace the requests in the Azure Monitor, you will have to create an instance of an `AzureMonitorTraceExporter` object. You will need to provide the [connection string](../../../azure-monitor/app/sdk-connection-string.md) from your Application Insights Resource.
 
 ```java
     AzureMonitorTraceExporter exporter = new AzureMonitorExporterBuilder()

articles/communication-services/quickstarts/includes/telemetry-app-insights-net.md

@@ -131,7 +131,7 @@ After the SDK calls have been wrapped with Activities, you can add the OpenTelem
 
 You have the option of defining a dictionary with some resource attributes that will show up in Application Insights.
 Then, call `AddSource` and use the same Activity Source name that was defined in `TracedSample`.
-You will also need to grab the connection string from your Application Insights resource and pass it to `AddAzureMonitorTraceExporter()`. This will funnel the telemetry data to your Application Insights resource.
+You will also need to grab the [connection string](../../../azure-monitor/app/sdk-connection-string.md) from your Application Insights resource and pass it to `AddAzureMonitorTraceExporter()`. This will funnel the telemetry data to your Application Insights resource.
 
 Lastly, call and await the `TracedSample()` function where we have our SDK calls.
 

articles/communication-services/quickstarts/includes/telemetry-app-insights-python.md

@@ -69,7 +69,7 @@ connection_string = os.environ["COMMUNICATION_SERVICES_CONNECTION_STRING"]
 identity_client = CommunicationIdentityClient.from_connection_string(connection_string)
 ```
 
-First, in order to create the span that will allow you to trace the requests in the Azure Monitor, you will have to create an instance of an `AzureMonitorTraceExporter` object. You will need to provide the connection string from your Application Insights Resource.
+First, in order to create the span that will allow you to trace the requests in the Azure Monitor, you will have to create an instance of an `AzureMonitorTraceExporter` object. You will need to provide the [connection string](../../../azure-monitor/app/sdk-connection-string.md) from your Application Insights Resource.
 
 ```python
 exporter = AzureMonitorTraceExporter.from_connection_string(

articles/compliance/index.yml

@@ -15,7 +15,7 @@ metadata:
   author: TerryLanfear
   ms.author: terrylan
   manager: rkarlin
-  ms.date: 03/22/2022
+  ms.date: 06/12/2022
 
 conceptualContent:
 # itemType: architecture | concept | deploy | download | get-started | how-to-guide | learn | overview | quickstart | reference | sample | tutorial | video | whats-new
@@ -374,6 +374,9 @@ conceptualContent:
         - url: /compliance/regulatory/offering-bir-2012-netherlands
           itemType: concept
           text: Netherlands BIR 2012
+        - url: /azure/compliance/offerings/offering-qatar-nia
+          itemType: concept
+          text: Qatar NIA
 
     # Card
     - title: Regional - EMEA

articles/defender-for-cloud/enhanced-security-features-overview.md

@@ -2,7 +2,7 @@
 title: Understand the enhanced security features of Microsoft Defender for Cloud 
 description: Learn about the benefits of enabling enhanced security in Microsoft Defender for Cloud
 ms.topic: overview
-ms.date: 05/31/2022
+ms.date: 06/12/2022
 ms.custom: references_regions
 ---
 
@@ -119,7 +119,7 @@ Yes. When you enable [Microsoft Defender for Servers](defender-for-servers-intro
 
 ### If a Log Analytics agent reports to multiple workspaces, will I be charged twice?
 
-No you will not be charged twice.
+If a machine reports to multiple workspaces, and all of them have Defender for Servers enabled, the machines will be billed for each attached workspace.
 
 ### If a Log Analytics agent reports to multiple workspaces, is the 500 MB free data ingestion available on all of them?
 

articles/virtual-machines/ecasv5-ecadsv5-series.md

@@ -92,15 +92,15 @@ This series supports Standard SSD, Standard HDD, and Premium SSD disk types. Bil
 
 | Size | vCPU | Memory: GiB | Temp storage (SSD) GiB | Max data disks | Max temp storage throughput: IOPS/MBps | Max uncached disk throughput: IOPS/MBps | Max NICs |
 |---|---|---|---|---|---|---|---|
-| Standard_E2ads_v5  | 2  | 16  | 75   | 4  | 9000 / 125    | 3750/82      | 2 |
-| Standard_E4ads_v5  | 4  | 32  | 150  | 8  | 19000 / 250   | 6400/144     | 2 |
-| Standard_E8ads_v5  | 8  | 64  | 300  | 16 | 38000 / 500   | 12800/200    | 4 |
-| Standard_E16ads_v5 | 16 | 128 | 600  | 32 | 75000 / 1000  | 25600/384    | 4 |
-| Standard_E20ads_v5 | 20 | 160 | 750  | 32 | 94000 / 1250  | 32000/480    | 8 |
-| Standard_E32ads_v5 | 32 | 256 | 1200 | 32 | 150000 / 2000 | 51200/768    | 8 |
-| Standard_E48ads_v5 | 48 | 384 | 1800 | 32 | 225000 / 3000 | 76800/1152   | 8 |
-| Standard_E64ads_v5 | 64 | 512 | 2400 | 32 | 300000 / 4000 | 80000/1200   | 8 |
-| Standard_E96ads_v5 | 96 | 672 | 3600 | 32 | 450000 / 4000 | 80000/1600   | 8 |
+| Standard_EC2ads_v5  | 2  | 16  | 75   | 4  | 9000 / 125    | 3750/82      | 2 |
+| Standard_EC4ads_v5  | 4  | 32  | 150  | 8  | 19000 / 250   | 6400/144     | 2 |
+| Standard_EC8ads_v5  | 8  | 64  | 300  | 16 | 38000 / 500   | 12800/200    | 4 |
+| Standard_EC16ads_v5 | 16 | 128 | 600  | 32 | 75000 / 1000  | 25600/384    | 4 |
+| Standard_EC20ads_v5 | 20 | 160 | 750  | 32 | 94000 / 1250  | 32000/480    | 8 |
+| Standard_EC32ads_v5 | 32 | 256 | 1200 | 32 | 150000 / 2000 | 51200/768    | 8 |
+| Standard_EC48ads_v5 | 48 | 384 | 1800 | 32 | 225000 / 3000 | 76800/1152   | 8 |
+| Standard_EC64ads_v5 | 64 | 512 | 2400 | 32 | 300000 / 4000 | 80000/1200   | 8 |
+| Standard_EC96ads_v5 | 96 | 672 | 3600 | 32 | 450000 / 4000 | 80000/1600   | 8 |
 
 > [!NOTE]
 > To achieve these IOPs, use [Gen2 VMs](generation-2.md).