Merge pull request #19358 from markingmyname/dataprivacy

Data privacy | A few more tweaks to ADS usage article and SQL Server privacy article

Author: v-ccolin

docs/azure-data-studio/usage-data-collection.md

@@ -4,11 +4,11 @@ description: This article explains how to control if usage and crash reporting d
 ms.prod: azure-data-studio
 ms.technology: azure-data-studio
 ms.topic: how-to
-author: "markingmyname"
-ms.author: "maghan"
-ms.reviewer: "wopeter"
+author: yualan
+ms.author: alayu
+ms.reviewer: wopeter
 ms.custom: seo-lt-2019
-ms.date: 05/06/2021
+ms.date: 05/17/2021
 ---
 
 # Enable or disable usage data collection for Azure Data Studio
@@ -17,11 +17,15 @@ Azure Data Studio contains Internet-enabled features that can collect and send a
 
 Azure Data Studio may collect standard computer, use, and performance information that may be transmitted to Microsoft and analyzed to improve the quality, security, and reliability of Azure Data Studio.
 
-Azure Data Studio doesn't collect your name, address, or other data related to an identified or identifiable individual.
+Azure Data Studio doesn't collect your name or address, but Azure Data Studio gathers data that helps approximate a single user for diagnostic purposes (based on a hash of the network adapter NIC).
 
-For details, see the [Microsoft Privacy Statement](https://privacy.microsoft.com/privacystatement), and [SQL Server Privacy supplement](../sql-server/sql-server-privacy.md).
+Several updates made to Azure Data Studio to help ensure data privacy.
+
+- Making it more accessible to opt-out of telemetry collection by placing a notification in the product for all existing and new users.
+- Reviewing and classifying the telemetry that we send.
+- Ensuring that we have valid data retention policies in place for any data we collect, for example, crash dumps.
 
-[!INCLUDE [gdpr-related-guidance](../includes/gdpr-intro-sentence.md)]
+For details, see the [Microsoft Privacy Statement](https://privacy.microsoft.com/privacystatement), and [SQL Server Privacy supplement](../sql-server/sql-server-privacy.md).
 
 ## Audit feature usage and diagnostic data
 
@@ -71,16 +75,6 @@ If you don't want to send, crash data to Microsoft, you can change the `enable-c
 
 Azure Data Studio lets you add features to the product by installing Microsoft and third-party extensions. These extensions may be collecting their own usage data and are not controlled by the `telemetry.enableTelemetry` setting. Consult the specific extension's documentation to learn about its telemetry reporting and whether it can be disabled.
 
-## Data privacy
-
-Several updates made to Azure Data Studio to help ensure data privacy.
-
-- Making it more accessible to opt-out of telemetry collection by placing a notification in the product for all existing and new users.
-- Reviewing and classifying the telemetry that we send.
-- Ensuring that we have valid data retention policies in place for any data we collect, for example, crash dumps.
-
-We expect people to ask to see the data we collect. However, Azure Data Studio doesn't have a way to collect personal data as Azure Data Studio doesn't have a *sign-in* experience that uniquely identifies a user. We send information that helps us approximate a single user for diagnostic purposes (this is based on a hash of the network adapter NIC), but this isn't guaranteed to be unique.  For example, virtual machines (VMs) often rotate NIC IDs or allocate from a pool. This technique is sufficient to help us when working through problems, but it's not reliable enough for us to *provide your data*.
-
 ## More resources
 
 - [Workspace and User settings](settings.md)

docs/dma/dma-diagnostic-data-collection.md

@@ -1,32 +1,31 @@
 ---
-title: "Enable and disable usage and diagnostic data collection"
+title: Enable and disable usage and diagnostic data collection
 description: Learn how to enable and disable usage and diagnostic data collection in Database Migration Assistant.
-author: aciortea
-
 ms.prod: sql
-ms.custom: ""
-ms.date: "04/23/2021"
-ms.reviewer: ""
 ms.technology: dma
 ms.topic: how-to
+author: aciortea
 ms.author: "aciortea"
+ms.reviewer: ""
+ms.custom: ""
+ms.date: "04/23/2021"
 ---
 
 # Enable and disable DMA usage and diagnostic data collection
 
 Database Migration Assistant contains Internet-enabled features that can collect and send anonymous feature usage and diagnostic data to Microsoft.
 
-This article teaches you to enable or disable DMA diagnostic data collection when using the GUI or the command line tool.
+This article teaches you to enable or disable DMA diagnostic data collection when using the GUI or the command-line tool.
 
 ## Collected data
 
-DMA may collect standard computer information and information about use and performance that may be transmitted to Microsoft and analyzed for purposes of improving the quality, security, and reliability of DMA. We do not collect your name, address, or other contact information. For details, see the [Microsoft Privacy Statement](https://privacy.microsoft.com/privacystatement), and [SQL Server Privacy supplement](../sql-server/sql-server-privacy.md).
+DMA may collect standard computer information and information about use and performance that may be transmitted to Microsoft and analyzed for purposes of improving the quality, security, and reliability of DMA. DMA doesn't collect your name, address, or any other data related to an identified or identifiable individual. For details, see the [Microsoft Privacy Statement](https://privacy.microsoft.com/privacystatement), and [SQL Server Privacy supplement](../sql-server/sql-server-privacy.md).
 
 ## Data Migration Assistant GUI
 
-In order to disable telemetry collection when using DMA GUI you need to comment out the `AppInsightsInstrumentionKey` line in the Dma.exe.config.
+To disable telemetry collection when using DMA GUI, you need to comment out the `AppInsightsInstrumentionKey` line in the Dma.exe.config.
 
- In order to do so follow these steps:
+To do so follow these steps:
 
 1. Navigate to the DMA installation folder in your file system. The default location is `%ProgramFiles%\Microsoft Data Migration Assistant\`.
 
@@ -42,9 +41,9 @@ To re-enable telemetry, remove the comment around the line.
 
 ## Data Migration Assistant Command Line
 
-In order to disable telemetry collection when using the DMA command line tool you need to comment out the `AppInsightsInstrumentionKey` line in the DmaCmd.exe.config.
+In order to disable telemetry collection when using the DMA command-line tool you need to comment out the `AppInsightsInstrumentionKey` line in the DmaCmd.exe.config.
 
- In order to do so follow these steps:
+To do so follow these steps:
 
 1. Navigate to the DMA installation folder in your file system. The default location is `%ProgramFiles%\Microsoft Data Migration Assistant\`.
 
@@ -60,4 +59,4 @@ To re-enable telemetry, remove the comment around the line.
 
 ## Next steps
 
-Now that you have modified your telemetry setting you can get started by creating a [DMA assessment project](dma-assesssqlonprem.md).
+Now that you've modified your telemetry setting you can get started by creating a [DMA assessment project](dma-assesssqlonprem.md).

docs/sql-server/sql-server-privacy.md

@@ -24,9 +24,9 @@ Refer to the [Microsoft Privacy Statement](https://go.microsoft.com/fwlink/?Link
 The data classification in this article only applies to versions of the SQL Server on-premises product.
 
 It doesn't apply to the items listed below:
+- [Azure Data Studio](../azure-data-studio/usage-data-collection.md)
 - [SQL Server Management Studio (SSMS)](../ssms/sql-server-management-studio-telemetry-ssms.md)
 - [SQL Server Data Tools (SSDT)](../ssdt/anonymous-usage-data.md)
-- [Azure Data Studio](../azure-data-studio/usage-data-collection.md)
 - [Database Migration Assistant (DMA)](../dma/dma-diagnostic-data-collection.md)
 - [SQL Server Migration Assistant (SSMA)](../ssma/ssma-diagnostic-data-collection.md)
 

docs/ssdt/anonymous-usage-data.md

@@ -21,4 +21,4 @@ For more information about the VSCEIP, including how to opt in or opt out, see t
 For more information about the system-generated diagnostic logs collected, see the documentation on [system-generated logs](https://docs.microsoft.com/visualstudio/ide/diagnostic-data-collection).
 
 
-We don't collect your name, address, or any other data that relates to an identified or identifiable individual. For more information about the information collected, processed, or transmitted by the VSCEIP, see the [Microsoft Privacy Statement](https://privacy.microsoft.com/privacystatement).
+SSDT doesn't collect your name, address, or any other data related to an identified or identifiable individual. For more information about the information collected, processed, or transmitted by the VSCEIP, see the [Microsoft Privacy Statement](https://privacy.microsoft.com/privacystatement).

docs/ssma/ssma-diagnostic-data-collection.md

@@ -1,15 +1,14 @@
 ---
-title: "SSMA usage and diagnostic data collection"
+title: SQL Server Migration Assistant (SSMA) usage and diagnostic data collection
 description: Learn about usage and diagnostic data collection in SQL Server Migration Assistant.
-author: nahk-ivanov
-
 ms.prod: sql
-ms.custom: ""
-ms.date: "04/02/2021"
-ms.reviewer: ""
 ms.technology: ssma
 ms.topic: conceptual
-ms.author: "alexiva"
+author: nahk-ivanov
+ms.author: alexiva
+ms.reviewer: ""
+ms.custom: ""
+ms.date: 04/02/2021
 ---
 
 # SSMA usage and diagnostic data collection
@@ -18,7 +17,7 @@ SQL Server Migration Assistant (SSMA) contains Internet-enabled features that ca
 
 ## Collected data
 
-SSMA may collect standard computer information and information about use and performance that may be transmitted to Microsoft and analyzed for purposes of improving the quality, security, and reliability of SSMA. We do not collect your name, address, or other contact information. For details, see the [Microsoft Privacy Statement](https://privacy.microsoft.com/privacystatement), and [SQL Server Privacy supplement](../sql-server/sql-server-privacy.md).
+SSMA may collect standard computer information and information about use and performance that may be transmitted to Microsoft and analyzed for purposes of improving the quality, security, and reliability of SSMA. SSMA doesn't collect your name, address, or any other data related to an identified or identifiable individual. For details, see the [Microsoft Privacy Statement](https://privacy.microsoft.com/privacystatement), and [SQL Server Privacy supplement](../sql-server/sql-server-privacy.md).
 ## Enable or disable usage and diagnostic data collection in SSMA
 
 Following registry entry allows you to opt in or out of data collection: