--- /Users/clay/Desktop/forrest-TRUNK/deploy.xml	2006-02-26 07:37:45.000000000 -0800
+++ /Users/clay/Desktop/deploy.xml	2006-02-26 07:56:45.000000000 -0800
@@ -17,6 +17,10 @@
 -->
 <project name="deploy">
 
+  <!-- ================================================================= -->
+  <!-- The deploy.local target                                           -->
+  <!-- ================================================================= -->
+  <!-- properties for deploy.local -->
   <property name="deploy.local.dir" location="sites/${ant.project.name}"/>
 
   <target name="deploy.local" unless="build.failed" description="FB: Deploy to a local location">
@@ -29,6 +33,7 @@
     <!-- set a property to be used in the notify target -->
     <property name="notify.deploy-location" value="${deploy.local.dir}"/>
   </target>
+  <!-- ================================================================= -->
 
 
   <!-- ================================================================= -->
@@ -55,7 +60,19 @@
   </target>
   <!-- ================================================================= -->
 
-  <property name="deploy.scp.dest" value=""/>
+
+  <!-- ================================================================= -->
+  <!-- The deploy.scp target                                             -->
+  <!-- ================================================================= -->
+  <!-- properties for deploy.scp -->
+	<property name="deploy.scp.localuser" value="me"/>
+	<property name="deploy.scp.localhome" value="~/${deploy.scp.localuser}"/>
+	<property name="deploy.scp.user" value=""/>
+	<property name="deploy.scp.host" value=""/>
+	<property name="deploy.scp.remotehome" value="/path/to/my-home-dir"/>
+  <property name="deploy.scp.dest" value="${deploy.scp.user}@${deploy.scp.host}:${deploy.scp.remotehome}"/>
+	<property name="deploy.scp.keyfile" value="${deploy.scp.localhome}/.ssh/id_dsa"/>
+	<property name="deploy.scp.password" value="my extremely secret passphrase"/>
   <target name="deploy.scp" unless="build.failed" description="FB: Deploy to a remote location via scp">
     <if>
       <not><isset property="deploy.scp.password"/></not>
@@ -63,11 +80,20 @@
         <input addproperty="deploy.scp.password" message="Enter password for scp to ${deploy.scp.dest}:"/>
       </then>
     </if>
-    <scp todir="${deploy.scp.dest}" password="${deploy.scp.password}">
+    <scp todir="${deploy.scp.dest}" password="${deploy.scp.password}"
+       keyfile="${deploy.scp.keyfile}"
+       passphrase="${deploy.scp.password}"
+       >
      <fileset dir="${build.site-dir}"/>
     </scp>
   </target>
+  <!-- ================================================================= -->
+
   
+  <!-- ================================================================= -->
+  <!-- The deploy.cvs target                                             -->
+  <!-- ================================================================= -->
+  <!-- properties for deploy.cvs -->
   <property name="deploy.cvs.user" value="anoncvs"/>
   <property name="deploy.cvs.password" value="anoncvs"/>
   <property name="deploy.cvs.root" value="/home/cvs"/>
@@ -105,8 +131,13 @@
       <arg value="-m '${deploy.cvs.commit-message}'"/>
     </exec>
   </target>
+  <!-- ================================================================= -->
 
 
+  <!-- ================================================================= -->
+  <!-- The deploy.svn target                                             -->
+  <!-- ================================================================= -->
+  <!-- properties for deploy.svn -->
   <property name="deploy.svn.user" value=""/>
   <property name="deploy.svn.password" value=""/>
   <property name="deploy.svn.url" value=""/>
@@ -129,7 +160,7 @@
       <fileset dir="${build.site-dir}"/>
     </copy>
     
-    <!-- add new files to CVS -->
+    <!-- add new files to SVN -->
     <!-- svnadd doesn't work (it doesn't change the working directory properly) -->
     <exec executable="svn" dir="${deploy.svn.svn-dir}" output="${deploy.svn.svn-filestoadd}" failonerror="true">
       <arg value="status"/>