Merge pull request #106145 from linda33wj/master

Update ADF copy content

Author: PRMerger18

articles/data-factory/connector-ftp.md

@@ -10,7 +10,7 @@ ms.reviewer: douglasl
 ms.service: data-factory
 ms.workload: data-services
 ms.topic: conceptual
-ms.date: 12/10/2019
+ms.date: 03/02/2020
 ms.author: jingwang
 
 ---
@@ -36,6 +36,8 @@ Specifically, this FTP connector supports:
 - Copying files using **Basic** or **Anonymous** authentication.
 - Copying files as-is or parsing files with the [supported file formats and compression codecs](supported-file-formats-and-compression-codecs.md).
 
+The FTP connector support FTP server running in passive mode. Active mode is not supported.
+
 ## Prerequisites
 
 [!INCLUDE [data-factory-v2-integration-runtime-requirements](../../includes/data-factory-v2-integration-runtime-requirements.md)]

articles/data-factory/connector-sftp.md

@@ -11,7 +11,7 @@ ms.service: data-factory
 ms.workload: data-services
 ms.topic: conceptual
 ms.custom: seo-lt-2019
-ms.date: 12/12/2019
+ms.date: 03/02/2020
 ---
 
 # Copy data from and to SFTP server using Azure Data Factory
@@ -282,8 +282,12 @@ The following properties are supported for SFTP under `storeSettings` settings i
 | type                     | The type property under `storeSettings` must be set to **SftpWriteSettings**. | Yes      |
 | copyBehavior             | Defines the copy behavior when the source is files from a file-based data store.<br/><br/>Allowed values are:<br/><b>- PreserveHierarchy (default)</b>: Preserves the file hierarchy in the target folder. The relative path of the source file to the source folder is identical to the relative path of the target file to the target folder.<br/><b>- FlattenHierarchy</b>: All files from the source folder are in the first level of the target folder. The target files have autogenerated names. <br/><b>- MergeFiles</b>: Merges all files from the source folder to one file. If the file name is specified, the merged file name is the specified name. Otherwise, it's an autogenerated file name. | No       |
 | maxConcurrentConnections | The number of connections to connect to the data store concurrently. Specify only when you want to limit the concurrent connection to the data store. | No       |
+| useTempFileRename | Indicate whether to upload to temporary file(s) and rename, or directly write to the target folder/file location. By default, ADF firstly write to temporary file(s) then do file rename upon upload completion, in order to 1) avoid conflict write resulting in corrupted file if you have other process writing to the same file, and 2) ensure the original version of the file exists during whole transfer. If your SFTP server doesn't support rename operation, disable this option and make sure you don't have concurrent write to the target file. See troubleshooting tip below this table. | No. Default value is true. |
 | operationTimeout | The wait time before each write request to SFTP server times out. Default value is 60 min (01:00:00).|No |
 
+>[!TIP]
+>If you hit error of "UserErrorSftpPathNotFound", "UserErrorSftpPermissionDenied" or "SftpOperationFail" when writing data into SFTP, and the SFTP user you use does have the proper permission, check if your SFTP server support file rename operation - if not, disable "Upload with temp file" (`useTempFileRename`) option and try again. Learn more about this property from above table. If you use Self-hosted Integration Runtime for copy, make sure you use version 4.6 or above.
+
 **Example:**
 
 ```json

articles/data-factory/control-flow-get-metadata-activity.md

@@ -13,7 +13,7 @@ ms.workload: data-services
 
 
 ms.topic: conceptual
-ms.date: 11/26/2019
+ms.date: 03/02/2020
 ms.author: jingwang
 
 ---
@@ -31,7 +31,7 @@ The following functionality is available in the control flow:
 
 ## Capabilities
 
-The Get Metadata activity takes a dataset as an input and returns metadata information as output. Currently, the following connectors and corresponding retrievable metadata are supported. The maximum size of returned metadata is 1 MB.
+The Get Metadata activity takes a dataset as an input and returns metadata information as output. Currently, the following connectors and corresponding retrievable metadata are supported. The maximum size of returned metadata is 2 MB.
 
 >[!NOTE]
 >If you run the Get Metadata activity on a self-hosted integration runtime, the latest capabilities are supported on version 3.6 or later.