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

Author: HeidiSteen

articles/cosmos-db/sql-query-keywords.md

@@ -4,24 +4,25 @@ description: Learn about SQL keywords for Azure Cosmos DB.
 author: markjbrown
 ms.service: cosmos-db
 ms.topic: conceptual
-ms.date: 06/20/2019
+ms.date: 03/17/2020
 ms.author: mjbrown
 
 ---
 # Keywords in Azure Cosmos DB
+
 This article details keywords which may be used in Azure Cosmos DB SQL queries.
 
 ## BETWEEN
 
-As in ANSI SQL, you can use the BETWEEN keyword to express queries against ranges of string or numerical values. For example, the following query returns all items in which the first child's grade is 1-5, inclusive.
+You can use the `BETWEEN` keyword to express queries against ranges of string or numerical values. For example, the following query returns all items in which the first child's grade is 1-5, inclusive.
 
 ```sql
     SELECT *
     FROM Families.children[0] c
     WHERE c.grade BETWEEN 1 AND 5
 ```
 
-Unlike in ANSI SQL, you can also use the BETWEEN clause in the FROM clause, as in the following example.
+You can also use the `BETWEEN` keyword in the `SELECT` clause, as in the following example.
 
 ```sql
     SELECT (c.grade BETWEEN 0 AND 10)
@@ -31,11 +32,11 @@ Unlike in ANSI SQL, you can also use the BETWEEN clause in the FROM clause, as i
 In SQL API, unlike ANSI SQL, you can express range queries against properties of mixed types. For example, `grade` might be a number like `5` in some items and a string  like `grade4` in others. In these cases, as in JavaScript, the comparison between the two different types results in `Undefined`, so the item is skipped.
 
 > [!TIP]
-> For faster query execution times, create an indexing policy that uses a range index type against any numeric properties or paths that the BETWEEN clause filters.
+> For faster query execution times, create an indexing policy that uses a range index type against any numeric properties or paths that the `BETWEEN` clause filters.
 
 ## DISTINCT
 
-The DISTINCT keyword eliminates duplicates in the query's projection.
+The `DISTINCT` keyword eliminates duplicates in the query's projection.
 
 In this example, the query projects values for each last name:
 
@@ -97,7 +98,7 @@ The results are:
 ]
 ```
 
-Queries with an aggregate system function and a subquery with DISTINCT are not supported. For example, the following query is not supported:
+Queries with an aggregate system function and a subquery with `DISTINCT` are not supported. For example, the following query is not supported:
 
 ```sql
 SELECT COUNT(1) FROM (SELECT DISTINCT f.lastName FROM f)
@@ -127,7 +128,7 @@ If you include your partition key in the `IN` filter, your query will automatica
 
 ## TOP
 
-The TOP keyword returns the first `N` number of query results in an undefined order. As a best practice, use TOP with the ORDER BY clause to limit results to the first `N` number of ordered values. Combining these two clauses is the only way to predictably indicate which rows TOP affects.
+The TOP keyword returns the first `N` number of query results in an undefined order. As a best practice, use TOP with the `ORDER BY` clause to limit results to the first `N` number of ordered values. Combining these two clauses is the only way to predictably indicate which rows TOP affects.
 
 You can use TOP with a constant value, as in the following example, or with a variable value using parameterized queries.
 

articles/databox/data-box-deploy-copy-data-from-vhds.md

@@ -18,11 +18,11 @@ This tutorial describes how to use the Azure Data Box to migrate you on-premises
 In this tutorial, you learn how to:
 
 > [!div class="checklist"]
+>
 > * Review prerequisites
 > * Connect to Data Box
 > * Copy data to Data Box
 
-
 ## Prerequisites
 
 Before you begin, make sure that:
@@ -35,6 +35,8 @@ Before you begin, make sure that:
     - Supported [managed disk sizes in Azure object size limits](data-box-limits.md#azure-object-size-limits).
     - [Introduction to Azure managed disks](/azure/virtual-machines/windows/managed-disks-overview). 
 
+5. You've maintained a copy of the source data until you've confirmed that the Data Box transferred your data into Azure Storage.
+
 ## Connect to Data Box
 
 Based on the resource groups specified, Data Box creates one share for each associated resource group. For example, if `mydbmdrg1` and `mydbmdrg2` were created when placing the order, the following shares are created:
@@ -88,7 +90,7 @@ If using a Windows Server host computer, follow these steps to connect to the Da
 
     ```
     C:\>net use \\169.254.250.200\mydbmdrgl_MDisk /u:mdisk
-    Enter the password for ‘mdisk’ to connect to '169.254.250.200':
+    Enter the password for 'mdisk' to connect to '169.254.250.200':
     The command completed successfully.
     C: \>
     ```

articles/databox/data-box-deploy-copy-data-via-copy-service.md

@@ -24,6 +24,7 @@ Use the data copy service:
 In this tutorial, you learn how to:
 
 > [!div class="checklist"]
+>
 > * Copy data to Data Box
 
 ## Prerequisites
@@ -39,9 +40,13 @@ Before you begin, make sure that:
 
 After you're connected to the NAS device, the next step is to copy your data. Before you begin the data copy, review the following considerations:
 
-- While copying data, make sure that the data size conforms to the size limits described in the article [Azure storage and Data Box limits](data-box-limits.md).
-- If data uploaded by Data Box is concurrently uploaded by other applications outside Data Box, upload-job failures and data corruption might result.
-- If the data is being modified as the data copy service is reading it, you might see failures or corruption of data.
+* While copying data, make sure that the data size conforms to the size limits described in the article [Azure storage and Data Box limits](data-box-limits.md).
+
+* If data uploaded by Data Box is concurrently uploaded by other applications outside Data Box, upload-job failures and data corruption might result.
+
+* If the data is being modified as the data copy service is reading it, you might see failures or corruption of data.
+
+* Make sure that you maintain a copy of the source data until you can confirm that the Data Box has transferred your data into Azure Storage.
 
 To copy data by using the data copy service, you need to create a job:
 

articles/databox/data-box-deploy-copy-data-via-nfs.md

@@ -18,6 +18,7 @@ This tutorial describes how to connect to and copy data from your host computer
 In this tutorial, you learn how to:
 
 > [!div class="checklist"]
+>
 > * Prerequisites
 > * Connect to Data Box
 > * Copy data to Data Box
@@ -79,17 +80,17 @@ If you are using a Linux host computer, perform the following steps to configure
 
 Once you are connected to the Data Box shares, the next step is to copy data. Before you begin the data copy, review the following considerations:
 
-- Ensure that you copy the data to shares that correspond to the appropriate data format. For instance, copy the block blob data to the share for block blobs. Copy VHDs to page blobs. If the data format does not match the appropriate share type, then at a later step, the data upload to Azure will fail.
--  While copying data, ensure that the data size conforms to the size limits described in the [Azure storage and Data Box limits](data-box-limits.md). 
-- If data, which is being uploaded by Data Box, is concurrently uploaded by other applications outside of Data Box, then this could result in upload job failures and data corruption.
-- We recommend that you do not use both SMB and NFS concurrently or copy same data to same end destination on Azure. In such cases, the final outcome cannot be determined.
-- **Always create a folder for the files that you intend to copy under the share and then copy the files to that folder**. The folder created under block blob and page blob shares represents a container to which data is uploaded as blobs. You cannot copy files directly to *root* folder in the storage account.
-- If ingesting case-sensitive directory and file names from an NFS share to NFS on Data Box: 
-    - The case is preserved in the name.
-    - The files are case-insensitive.
-    
-    For example, if copying `SampleFile.txt` and `Samplefile.Txt`, the case will be preserved in the name when copied to Data Box but the second file will overwrite the first one as these are considered the same file.
+* Ensure that you copy the data to shares that correspond to the appropriate data format. For instance, copy the block blob data to the share for block blobs. Copy VHDs to page blobs. If the data format does not match the appropriate share type, then at a later step, the data upload to Azure will fail.
+*  While copying data, ensure that the data size conforms to the size limits described in the [Azure storage and Data Box limits](data-box-limits.md). 
+* If data, which is being uploaded by Data Box, is concurrently uploaded by other applications outside of Data Box, then this could result in upload job failures and data corruption.
+* We recommend that you do not use both SMB and NFS concurrently or copy same data to same end destination on Azure. In such cases, the final outcome cannot be determined.
+* **Always create a folder for the files that you intend to copy under the share and then copy the files to that folder**. The folder created under block blob and page blob shares represents a container to which data is uploaded as blobs. You cannot copy files directly to *root* folder in the storage account.
+* If ingesting case-sensitive directory and file names from an NFS share to NFS on Data Box:
+  * The case is preserved in the name.
+  * The files are case-insensitive.
 
+    For example, if copying `SampleFile.txt` and `Samplefile.Txt`, the case will be preserved in the name when copied to Data Box but the second file will overwrite the first one as these are considered the same file.
+* Make sure that you maintain a copy of the source data until you can confirm that the Data Box has transferred your data into Azure Storage.
 
 If you're using a Linux host computer, use a copy utility similar to Robocopy. Some of the alternatives available in Linux are [rsync](https://rsync.samba.org/), [FreeFileSync](https://www.freefilesync.org/), [Unison](https://www.cis.upenn.edu/~bcpierce/unison/), or [Ultracopier](https://ultracopier.first-world.info/).  
 

articles/databox/data-box-deploy-copy-data-via-rest.md

@@ -20,6 +20,7 @@ This tutorial describes procedures to connect to Azure Data Box Blob storage via
 In this tutorial, you learn how to:
 
 > [!div class="checklist"]
+>
 > * Prerequisites
 > * Connect to Data Box Blob storage via *http* or *https*
 > * Copy data to Data Box
@@ -88,7 +89,7 @@ Use the Azure portal to download certificate.
 
 ### Import certificate 
 
-Accessing Data Box Blob storage over HTTPS requires an SSL certificate for the device. The way in which this certificate is made available to the client application varies from application to application and across operating systems and distributions. Some applications can access the certificate after it is imported into the system’s certificate store, while other applications do not make use of that mechanism.
+Accessing Data Box Blob storage over HTTPS requires an SSL certificate for the device. The way in which this certificate is made available to the client application varies from application to application and across operating systems and distributions. Some applications can access the certificate after it is imported into the system's certificate store, while other applications do not make use of that mechanism.
 
 Specific information for some applications is mentioned in this section. For more information on other applications, consult the documentation for the application and the operating system used.
 
@@ -105,16 +106,16 @@ Follow these steps to import the `.cer` file into the root store of a Windows or
 
 #### Use Windows Server UI
 
-1.	Right-click the `.cer` file and select **Install certificate**. This action starts the Certificate Import Wizard.
-2.	For **Store location**, select **Local Machine**, and then click **Next**.
+1.   Right-click the `.cer` file and select **Install certificate**. This action starts the Certificate Import Wizard.
+2.   For **Store location**, select **Local Machine**, and then click **Next**.
 
     ![Import certificate using PowerShell](media/data-box-deploy-copy-data-via-rest/import-cert-ws-1.png)
 
-3.	Select **Place all certificates in the following store**, and then click **Browse**. Navigate to the root store of your remote host, and then click **Next**.
+3.   Select **Place all certificates in the following store**, and then click **Browse**. Navigate to the root store of your remote host, and then click **Next**.
 
     ![Import certificate using PowerShell](media/data-box-deploy-copy-data-via-rest/import-cert-ws-2.png)
 
-4.	Click **Finish**. A message that tells you that the import was successful appears.
+4.   Click **Finish**. A message that tells you that the import was successful appears.
 
     ![Import certificate using PowerShell](media/data-box-deploy-copy-data-via-rest/import-cert-ws-3.png)
 
@@ -146,8 +147,9 @@ Follow the steps to [Configure partner software that you used while connecting o
 
 Once you are connected to the Data Box Blob storage, the next step is to copy data. Prior to data copy, review the following considerations:
 
--  While copying data, ensure that the data size conforms to the size limits described in the [Azure storage and Data Box limits](data-box-limits.md).
-- If data, which is being uploaded by Data Box, is concurrently uploaded by other applications outside of Data Box, this may result in upload job failures and data corruption.
+* While copying data, ensure that the data size conforms to the size limits described in the [Azure storage and Data Box limits](data-box-limits.md).
+* If data, which is being uploaded by Data Box, is concurrently uploaded by other applications outside of Data Box, this may result in upload job failures and data corruption.
+* Make sure that you maintain a copy of the source data until you can confirm that the Data Box has transferred your data into Azure Storage.
 
 In this tutorial, AzCopy is used to copy data to Data Box Blob storage. You can also use Azure Storage Explorer (if you prefer a GUI-based tool) or a partner software to copy the data.
 

articles/databox/data-box-deploy-copy-data.md

@@ -105,22 +105,21 @@ If using a Windows Server host computer, follow these steps to connect to the Da
 If using a Linux client, use the following command to mount the SMB share. The "vers" parameter below is the version of SMB that your Linux host supports. Plug in the appropriate version in the command below. For versions of SMB that the Data Box supports see [Supported file systems for Linux clients](https://docs.microsoft.com/azure/databox/data-box-system-requirements#supported-file-systems-for-linux-clients) 
 
     `sudo mount -t nfs -o vers=2.1 10.126.76.172:/devicemanagertest1_BlockBlob /home/databoxubuntuhost/databox`
-    
-
 
 ## Copy data to Data Box
 
 Once you're connected to the Data Box shares, the next step is to copy data. Before you begin the data copy, review the following considerations:
 
-- Make sure that you copy the data to shares that correspond to the appropriate data format. For instance, copy the block blob data to the share for block blobs. Copy the VHDs to page blob. If the data format doesn't match the appropriate share type, then at a later step, the data upload to Azure will fail.
--  While copying data, make sure that the data size conforms to the size limits described in the [Azure storage and Data Box limits](data-box-limits.md).
-- If data, which is being uploaded by Data Box, is concurrently uploaded by other applications outside of Data Box, then this could result in upload job failures and data corruption.
-- We recommend that:
-    - You don't use both SMB and NFS at the same time.
-    - Copy the same data to same end destination on Azure. 
-     
+* Make sure that you copy the data to shares that correspond to the appropriate data format. For instance, copy the block blob data to the share for block blobs. Copy the VHDs to page blob. If the data format doesn't match the appropriate share type, then at a later step, the data upload to Azure will fail.
+*  While copying data, make sure that the data size conforms to the size limits described in the [Azure storage and Data Box limits](data-box-limits.md).
+* If data, which is being uploaded by Data Box, is concurrently uploaded by other applications outside of Data Box, then this could result in upload job failures and data corruption.
+* We recommend that:
+  * You don't use both SMB and NFS at the same time.
+  * Copy the same data to same end destination on Azure.
+
   In these cases, the final outcome can't be determined.
-- Always create a folder for the files that you intend to copy under the share and then copy the files to that folder. The folder created under block blob and page blob shares represents a container to which the data is uploaded as blobs. You cannot copy files directly to *root* folder in the storage account.
+* Always create a folder for the files that you intend to copy under the share and then copy the files to that folder. The folder created under block blob and page blob shares represents a container to which the data is uploaded as blobs. You cannot copy files directly to *root* folder in the storage account.
+* Make sure that you maintain a copy of the source data until you can confirm that the Data Box has transferred your data into Azure Storage.
 
 After you've connected to the SMB share, begin data copy. You can use any SMB compatible file copy tool such as Robocopy to copy your data. Multiple copy jobs can be initiated using Robocopy. Use the following command:
     

articles/virtual-wan/TOC.yml

@@ -52,26 +52,28 @@
       href: virtual-wan-site-to-site-portal.md
   - name: User VPN (point-to-site)
     items:
-    - name: Create User VPN (point-to-site) connections
+    - name: Create a User VPN connection
       href: virtual-wan-point-to-site-portal.md
-    - name: Configure certificates for User VPN
+    - name: Configure certificates
       href: certificates-point-to-site.md
-    - name: Configure Azure AD tenant for User VPN
+    - name: Configure Azure AD tenant
       href: openvpn-azure-ad-tenant.md
-    - name: Configure Always On VPN user tunnel
-      href: ../vpn-gateway/vpn-gateway-howto-always-on-user-tunnel.md?toc=%2fazure%2fvirtual-wan%2ftoc.json
-    - name: Configure Always On VPN device tunnel
-      href: ../vpn-gateway/vpn-gateway-howto-always-on-device-tunnel.md?toc=%2fazure%2fvirtual-wan%2ftoc.json
+    - name: Download a VPN profile
+      href: ../vpn-gateway/about-vpn-profile-download.md?toc=%2fazure%2fvirtual-wan%2ftoc.json
+    - name: Download global and hub-based profiles
+      href: global-hub-profile.md
     - name: Configure OpenVPN clients
       href: ../vpn-gateway/vpn-gateway-howto-openvpn-clients.md?toc=%2fazure%2fvirtual-wan%2ftoc.json
-    - name: Enable Multi-Factor Authentication(MFA) for User VPN
+    - name: Configure Always On VPN user tunnel
+      href: howto-always-on-user-tunnel.md
+    - name: Configure Always On VPN device tunnel
+      href: howto-always-on-device-tunnel.md
+    - name: Enable Multi-Factor Authentication(MFA)
       href: openvpn-azure-ad-mfa.md   
-    - name: Configure Azure AD authentication for User VPN
+    - name: Configure Azure AD authentication
       href: virtual-wan-point-to-site-azure-ad.md
-    - name: Configure Multi-application Azure AD authentication for User VPN
+    - name: Configure Multi-application Azure AD authentication
       href: openvpn-azure-ad-tenant-multi-app.md  
-    - name: Download global and hub-based User VPN profiles
-      href: global-hub-profile.md
   - name: Configure routing
     items:
     - name: Route traffic from a virtual hub to an NVA