From d266a891084fa69adc889527b62a55ac3f22cbb9 Mon Sep 17 00:00:00 2001
From: Alex Iverson <alexjiverson@gmail.com>
Date: Mon, 18 May 2020 17:59:08 -0500
Subject: [PATCH 1/2] added documentation for nixops scp subcommand

---
 doc/manual/nixops.xml   | 81 +++++++++++++++++++++++++++++++++++++++++
 doc/manual/overview.xml |  6 +++
 2 files changed, 87 insertions(+)

diff --git a/doc/manual/nixops.xml b/doc/manual/nixops.xml
index 510f805e6..55b100749 100644
--- a/doc/manual/nixops.xml
+++ b/doc/manual/nixops.xml
@@ -1315,6 +1315,87 @@ $ nixops ssh-for-each -p reboot</screen>
 
 </refsection>
 
+<refsection><title>Command <option>nixops scp</option></title>
+
+<refsection><title>Synopsis</title>
+
+<cmdsynopsis>
+  <command>nixops scp</command>
+  <arg>
+    <group choice='req'>
+      <arg choice='plain'><option>--to</option></arg>
+      <arg choice='plain'><option>--from</option></arg>
+    </group>
+  </arg>
+  <arg choice='plain'>
+    <replaceable>machine</replaceable>
+  </arg>
+  <arg choice='plain'>
+    <replaceable>sourcepath</replaceable>
+  </arg>
+  <arg choice='plain'>
+    <replaceable>destpath</replaceable>
+  </arg>
+</cmdsynopsis>
+
+</refsection>
+
+<refsection><title>Description</title>
+
+<para>This command copies files to or from a specified machine in the deployment</para>
+
+</refsection>
+
+<refsection><title>Options</title>
+
+<variablelist>
+  <varlistentry><term><option>--to</option> / <option>--from</option></term>
+
+  <listitem><para>Choose whether to copy to or from the remote
+  machine.</para></listitem>
+  </varlistentry>
+
+  <varlistentry><term><replaceable>machine</replaceable></term>
+
+  <listitem><para>The name of the machine in the deployment to copy
+  to/from.</para></listitem>
+  </varlistentry>
+
+  <varlistentry><term><replaceable>sourcepath</replaceable></term>
+
+  <listitem><para>The path to the source file on the machine the file is being
+  copied from. This path may be on the local or remote machine depending on the
+  direction of the copy.</para></listitem>
+
+  </varlistentry>
+
+  <varlistentry><term><replaceable>destpath</replaceable></term>
+
+  <listitem><para>The path to the destination on the machine the file is being
+  copied to. This path may be on the local or remote machine depending on the
+  direction of the copy.</para></listitem>
+
+  </varlistentry>
+</variablelist>
+
+<refsection><title>Examples</title>
+
+<para>To copy the file app.sqlite to the app server:
+
+<screen>
+$ nixops scp --to app app.sqlite /var/app/app.sqlite</screen>
+
+</para>
+
+<para>To retrieve a log file from the web server:
+
+<screen>
+$ nixops scp --from web /var/app/logs.txt weblogs.txt</screen>
+
+</para>
+</refsection>
+
+</refsection>
 
 <refsection><title>Command <option>nixops mount</option></title>
 
diff --git a/doc/manual/overview.xml b/doc/manual/overview.xml
index 0775a5ad8..93d8b37ec 100644
--- a/doc/manual/overview.xml
+++ b/doc/manual/overview.xml
@@ -47,6 +47,12 @@ backend2...> /dev/xvdb      153899044 192084 145889336   1% /tmp
 By default, the command is executed sequentially on each machine.  You
 can add the flag <option>-p</option> to execute it in parallel.</para>
 
+<para>You can copy extra files to and from individual machines using
+<literal>nixops scp --to <replaceable>machine</replaceable>
+<replaceable>sourcefile</replaceable>
+<replaceable>destfile</replaceable></literal> and the corresponding
+<literal>--from</literal> command.</para>
+
 </section>
 
 

From 738986aa05780d654a1709e121d442281c6732b0 Mon Sep 17 00:00:00 2001
From: Alex Iverson <alexjiverson@gmail.com>
Date: Mon, 18 May 2020 18:35:33 -0500
Subject: [PATCH 2/2] added a missing closing tag

---
 doc/manual/nixops.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/manual/nixops.xml b/doc/manual/nixops.xml
index 55b100749..367ef49ba 100644
--- a/doc/manual/nixops.xml
+++ b/doc/manual/nixops.xml
@@ -1377,6 +1377,7 @@ $ nixops ssh-for-each -p reboot</screen>
 
   </varlistentry>
 </variablelist>
+</refsection>
 
 <refsection><title>Examples</title>