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

Author: HeidiSteen

articles/data-factory/connector-azure-data-lake-storage.md

@@ -9,7 +9,7 @@ ms.reviewer: douglasl
 ms.service: data-factory
 ms.workload: data-services
 ms.topic: conceptual
-ms.date: 05/24/2019
+ms.date: 06/10/2019
 ms.author: jingwang
 
 ---
@@ -105,7 +105,7 @@ To use service principal authentication, follow these steps:
     - **As sink**, in Storage Explorer, grant at least **Write + Execute** permission to create child items in the folder. Alternatively, in Access control (IAM), grant at least **Storage Blob Data Contributor** role.
 
 >[!NOTE]
->To list folders starting from the account level or to test connection, you need to set the permission of the service principal being granted to **storage account with "Execute" permission in IAM**. This is true when you use the:
+>To list folders starting from the account level or to test connection, you need to set the permission of the service principal being granted to **storage account with "Storage Blob Data Reader" permission in IAM**. This is true when you use the:
 >- **Copy Data Tool** to author copy pipeline.
 >- **Data Factory UI** to test connection and navigating folders during authoring. 
 >If you have concern on granting permission at account level, you can skip test connection and input path manually during authoring. Copy activity will still work as long as the service principal is granted with proper permission at the files to be copied.
@@ -159,7 +159,7 @@ To use managed identities for Azure resources authentication, follow these steps
     - **As sink**, in Storage Explorer, grant at least **Write + Execute** permission to create child items in the folder. Alternatively, in Access control (IAM), grant at least **Storage Blob Data Contributor** role.
 
 >[!NOTE]
->To list folders starting from the account level or to test connection, you need to set the permission of the managed identity being granted to **storage account with "Execute" permission in IAM**. This is true when you use the:
+>To list folders starting from the account level or to test connection, you need to set the permission of the managed identity being granted to **storage account with "Storage Blob Data Reader" permission in IAM**. This is true when you use the:
 >- **Copy Data Tool** to author copy pipeline.
 >- **Data Factory UI** to test connection and navigating folders during authoring. 
 >If you have concern on granting permission at account level, you can skip test connection and input path manually during authoring. Copy activity will still work as long as the managed identity is granted with proper permission at the files to be copied.

articles/data-factory/connector-azure-sql-database-managed-insance.md

@@ -12,7 +12,7 @@ ms.workload: data-services
 ms.tgt_pltfrm: na
 
 ms.topic: conceptual
-ms.date: 04/08/2019
+ms.date: 06/10/2019
 ms.author: jingwang
 
 ---
@@ -26,7 +26,7 @@ You can copy data from Azure SQL Database Managed Instance to any supported sink
 
 Specifically, this Azure SQL Database Managed Instance connector supports:
 
-- Copying data by using SQL or Windows authentication.
+- Copying data by using SQL authentication.
 - As a source, retrieving data by using a SQL query or stored procedure.
 - As a sink, appending data to a destination table or invoking a stored procedure with custom logic during copy.
 
@@ -51,9 +51,7 @@ The following properties are supported for the Azure SQL Database Managed Instan
 | Property | Description | Required |
 |:--- |:--- |:--- |
 | type | The type property must be set to **SqlServer**. | Yes. |
-| connectionString |This property specifies the connectionString information that's needed to connect to the managed instance by using either SQL authentication or Windows authentication. For more information, see the following examples. <br/>Mark this field as a SecureString to store it securely in Data Factory. You can also put password in Azure Key Vault，and if it's SQL authentication pull the `password` configuration out of the connection string. See the JSON example below the table and [Store credentials in Azure Key Vault](store-credentials-in-key-vault.md) article with more details. |Yes. |
-| userName |This property specifies a user name if you use Windows authentication. An example is **domainname\\username**. |No. |
-| password |This property specifies a password for the user account you specified for the user name. Select **SecureString** to store the connectionString information securely in Data Factory, or [reference a secret stored in Azure Key Vault](store-credentials-in-key-vault.md). |No. |
+| connectionString |This property specifies the connectionString information that's needed to connect to the managed instance by using SQL authentication. For more information, see the following examples. <br/>Mark this field as a SecureString to store it securely in Data Factory. You can also put password in Azure Key Vault，and if it's SQL authentication pull the `password` configuration out of the connection string. See the JSON example below the table and [Store credentials in Azure Key Vault](store-credentials-in-key-vault.md) article with more details. |Yes. |
 | connectVia | This [integration runtime](concepts-integration-runtime.md) is used to connect to the data store. Provision the self-hosted integration runtime in the same virtual network as your managed instance. |Yes. |
 
 >[!TIP]
@@ -109,32 +107,6 @@ The following properties are supported for the Azure SQL Database Managed Instan
 }
 ```
 
-**Example 3: Use Windows authentication**
-
-```json
-{
-    "name": "AzureSqlMILinkedService",
-    "properties": {
-        "type": "SqlServer",
-        "typeProperties": {
-            "connectionString": {
-                "type": "SecureString",
-                "value": "Data Source=<servername>\\<instance name if using named instance>;Initial Catalog=<databasename>;Integrated Security=True;"
-            },
-            "userName": "<domain\\username>",
-            "password": {
-                "type": "SecureString",
-                "value": "<password>"
-            }
-        },
-        "connectVia": {
-            "referenceName": "<name of Integration Runtime>",
-            "type": "IntegrationRuntimeReference"
-        }
-    }
-}
-```
-
 ## Dataset properties
 
 For a full list of sections and properties available for use to define datasets, see the datasets article. This section provides a list of properties supported by the Azure SQL Database Managed Instance dataset.

articles/data-factory/connector-salesforce-marketing-cloud.md

@@ -12,7 +12,7 @@ ms.workload: data-services
 ms.tgt_pltfrm: na
 
 ms.topic: conceptual
-ms.date: 01/09/2019
+ms.date: 06/10/2019
 ms.author: jingwang
 
 ---
@@ -27,7 +27,7 @@ This article outlines how to use the Copy Activity in Azure Data Factory to copy
 
 You can copy data from Salesforce Marketing Cloud to any supported sink data store. For a list of data stores that are supported as sources/sinks by the copy activity, see the [Supported data stores](copy-activity-overview.md#supported-data-stores-and-formats) table.
 
-Azure Data Factory provides a built-in driver to enable connectivity, therefore you don't need to manually install any driver using this connector.
+The Salesforce Marketing Cloud connector supports OAuth 2 authentication. It is built on top of the [Salesforce Marketing Cloud REST API](https://developer.salesforce.com/docs/atlas.en-us.mc-apis.meta/mc-apis/index-api.htm).
 
 >[!NOTE]
 >This connector doesn't support retrieving custom objects or custom data extensions.

articles/data-factory/connector-sap-table.md

@@ -12,7 +12,7 @@ ms.workload: data-services
 ms.tgt_pltfrm: na
 
 ms.topic: conceptual
-ms.date: 05/24/2018
+ms.date: 06/10/2018
 ms.author: jingwang
 
 ---
@@ -26,7 +26,13 @@ You can copy data from SAP Table to any supported sink data store. For a list of
 
 Specifically, this SAP Table connector supports:
 
-- Copying data from SAP Table in **SAP Business Suite with version 7.01 or higher** (in a recent SAP Support Package Stack released after the year 2015) or **S/4HANA**.
+- Copying data from SAP Table in:
+
+    - **SAP ECC** with version 7.01 or higher (in a recent SAP Support Package Stack released after the year 2015)
+	- **SAP BW** with version 7.01 or higher
+	- **SAP S/4HANA**
+	- **Other products in SAP Business Suite** with version 7.01 or higher 
+
 - Copying data from both **SAP Transparent Table** and **View**.
 - Copying data using **basic authentication** or **SNC** (Secure Network Communications) if SNC is configured.
 - Connecting to **Application Server** or **Message Server**.
@@ -200,7 +206,7 @@ To copy data from SAP Table, the following properties are supported.
 | type                             | The type property must be set to **SapTableSource**.       | Yes      |
 | rowCount                         | Number of rows to be retrieved.                              | No       |
 | rfcTableFields                   | Fields to copy from the SAP table. For example, `column0, column1`. | No       |
-| rfcTableOptions                  | Options to filter the rows in SAP Table. For example, `COLUMN0 EQ 'SOMEVALUE'`. | No       |
+| rfcTableOptions                  | Options to filter the rows in SAP Table. For example, `COLUMN0 EQ 'SOMEVALUE'`. See more description below this table. | No       |
 | customRfcReadTableFunctionModule | Custom RFC function module that can be used to read data from SAP Table. | No       |
 | partitionOption                  | The partition mechanism to read from SAP table. The supported options include: <br/>- **None**<br/>- **PartitionOnInt** (normal integer or integer values with zero padding on the left, such as 0000012345)<br/>- **PartitionOnCalendarYear** (4 digits in format "YYYY")<br/>- **PartitionOnCalendarMonth** (6 digits in format "YYYYMM")<br/>- **PartitionOnCalendarDate** (8 digits in format "YYYYMMDD") | No       |
 | partitionColumnName              | The name of the column to partition the data. | No       |
@@ -213,6 +219,18 @@ To copy data from SAP Table, the following properties are supported.
 >- Taking `partitionOption` as `partitionOnInt` as an example, the number of rows in each partition is calculated by (total rows falling between *partitionUpperBound* and *partitionLowerBound*)/*maxPartitionsNumber*.<br/>
 >- If you want to further run partitions in parallel to speed up copy, it is strongly recommended to make `maxPartitionsNumber` as a multiple of the value of `parallelCopies` (learn more from [Parallel Copy](copy-activity-performance.md#parallel-copy)).
 
+In `rfcTableOptions`, you can use e.g. the following common SAP query operators to filter the rows: 
+
+| Operator | Description |
+| :------- | :------- |
+| EQ | Equal to |
+| NE | Not equal to |
+| LT | Less than |
+| LE | Less than or equal to |
+| GT | Greater than |
+| GE | Greater than or equal to |
+| LIKE | As in LIKE 'Emma%' |
+
 **Example:**
 
 ```json

articles/data-factory/quickstart-create-data-factory-rest-api.md

@@ -12,7 +12,7 @@ ms.workload: data-services
 ms.tgt_pltfrm: 
 ms.devlang: rest-api
 ms.topic: quickstart
-ms.date: 02/20/2019
+ms.date: 06/10/2019
 ms.author: jingwang
 ---
 # Quickstart: Create an Azure data factory and pipeline by using the REST API
@@ -75,7 +75,7 @@ Run the following commands to authenticate with Azure Active Directory (AAD):
 ```powershell
 $AuthContext = [Microsoft.IdentityModel.Clients.ActiveDirectory.AuthenticationContext]"https://login.microsoftonline.com/${tenantId}"
 $cred = New-Object -TypeName Microsoft.IdentityModel.Clients.ActiveDirectory.ClientCredential -ArgumentList ($appId, $authKey)
-$result = $AuthContext.AcquireToken("https://management.core.windows.net/", $cred)
+$result = $AuthContext.AcquireTokenAsync("https://management.core.windows.net/", $cred).GetAwaiter().GetResult()
 $authHeader = @{
 'Content-Type'='application/json'
 'Accept'='application/json'

articles/machine-learning/service/breadcrumb/toc.yml

@@ -0,0 +1,48 @@
+- name: Azure
+  tocHref: /azure/
+  topicHref: /azure/index
+  items:
+  - name: Machine Learning
+    tocHref: /azure/open-datasets/
+    topicHref: /azure/machine-learning/index
+    items:
+    - name: Service
+      tocHref: /azure/open-datasets/
+      topicHref: /azure/machine-learning/service/index
+      items: 
+      - name: Open Datasets
+        tocHref: /azure/open-datasets/
+        topicHref: /azure/open-datasets/index
+  
+- name: Azure
+  tocHref: /azure/
+  topicHref: /azure/index
+  items:
+  - name: Machine Learning
+    tocHref: /azure/iot-edge/
+    topicHref: /azure/machine-learning/index
+    items:
+    - name: Service
+      tocHref: /azure/iot-edge/
+      topicHref: /azure/machine-learning/service/index
+      items:
+      - name: IoT Edge
+        tocHref: /azure/iot-edge/
+        topicHref: /azure/iot-edge/index
+
+- name: Azure
+  tocHref: /azure/
+  topicHref: /azure/index
+  items:
+  - name: Machine Learning
+    tocHref: /azure/architecture/
+    topicHref: /azure/machine-learning/index
+    items:
+    - name: Service
+      tocHref: /azure/architecture/data-guide/technology-choices/
+      topicHref: /azure/machine-learning/service/index
+      items:
+      - name: ML Products
+        tocHref: /azure/architecture/data-guide/technology-choices/
+        topicHref: /azure/architecture/data-guide/technology-choices/data-science-and-machine-learning
+

articles/machine-learning/service/context/ml-context.yml

@@ -0,0 +1,4 @@
+### YamlMime:ContextObject
+brand: azure
+breadcrumb_path: ../breadcrumb/toc.yml
+toc_rel: ../toc.yml