diff --git a/docs/manual/OptionalTasks/scp.html b/docs/manual/OptionalTasks/scp.html
index dc8c03cbf..da9417e01 100644
--- a/docs/manual/OptionalTasks/scp.html
+++ b/docs/manual/OptionalTasks/scp.html
@@ -28,14 +28,18 @@ for more information.
file |
The file to copy. This can be a local path or a
- remote path of the form user:password@host:/directory/path. |
+ remote path of the form user[:password]@host:/directory/path.
+ :password can be ommitted if you use key based
+ authentication or specify the password attribute.
Yes, unless a nested
<fileset> element is used. |
todir |
The directory to copy to. This can be a local path
- or a remote path of the form user:password@host:/directory/path |
+ or a remote path of the form user[:password]@host:/directory/path.
+ :password can be ommitted if you use key based
+ authentication or specify the password attribute.
Yes |
@@ -63,6 +67,25 @@ for more information.
No; defaults to true. |
+
+ password |
+ The password. |
+ Not if you are using key based
+ authentication or the password has been given in the file or
+ todir attribute. |
+
+
+ keyfile |
+ Location of the file holding the private key. |
+ Yes, if you are using key based
+ authentication. |
+
+
+ passphrase |
+ Passphrase for your private key. |
+ Yes, if you are using key based
+ authentication. |
+
Parameters specified as nested elements
@@ -76,6 +99,23 @@ sets of files to copy.
<scp file="myfile.txt" todir="user:password@somehost:/home/chuck"/>
+
+Copy a single local file to a remote machine with separate
+password attribute
+
+ <scp file="myfile.txt" todir="user@somehost:/home/chuck" password="password"/>
+
+
+Copy a single local file to a remote machine using key base
+authentication.
+
+ <scp file="myfile.txt"
+ todir="user@somehost:/home/chuck"
+ keyfile="${user.home}/.ssh/id_dsa"
+ passphrase="my extremely secret passphrase"
+ />
+
+
Copy a single remote file to a local directory
<scp file="user:password@somehost:/home/chuck/myfile.txt" todir="../some/other/dir"/>