From 53c41b45c4b22466a25ec5629cb799e3c6387a12 Mon Sep 17 00:00:00 2001
From: mossy-nw <34462023+mossy-nw@users.noreply.github.com>
Date: Tue, 16 Jan 2018 23:43:17 +0000
Subject: [PATCH 1/2] Update copying-files.md

adding command line notes indicating qvm-copy-to-vm/qvm-move-to-vm tools deprecated.
---
 common-tasks/copying-files.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/common-tasks/copying-files.md b/common-tasks/copying-files.md
index 392310a6..61c4e668 100644
--- a/common-tasks/copying-files.md
+++ b/common-tasks/copying-files.md
@@ -32,8 +32,13 @@ GUI
 CLI
 ---
 
+qvm-copy [--without-progress] dest_vmname file [file]+
+
 [qvm-copy-to-vm](/doc/vm-tools/qvm-copy-to-vm/)
 
+note: qvm-copy-to-vm/qvm-move-to-vm tools are deprecated, use qvm-copy/qvm-move to avoid typing target qube name twice
+
+
 On inter-qube file copy security
 ----------------------------------
 

From d8018e10e06e475cbc3cf496c5871b41f51f3fea Mon Sep 17 00:00:00 2001
From: mossy-nw <34462023+mossy-nw@users.noreply.github.com>
Date: Thu, 18 Jan 2018 23:53:10 +0000
Subject: [PATCH 2/2] Update copying-files.md

moved R4.0 info to Qubes 4.0 section
---
 common-tasks/copying-files.md | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/common-tasks/copying-files.md b/common-tasks/copying-files.md
index 61c4e668..b92970bd 100644
--- a/common-tasks/copying-files.md
+++ b/common-tasks/copying-files.md
@@ -32,11 +32,17 @@ GUI
 CLI
 ---
 
-qvm-copy [--without-progress] dest_vmname file [file]+
+qvm-copy-to-vm [--without-progress] dest_vmname file [file]+
 
 [qvm-copy-to-vm](/doc/vm-tools/qvm-copy-to-vm/)
 
-note: qvm-copy-to-vm/qvm-move-to-vm tools are deprecated, use qvm-copy/qvm-move to avoid typing target qube name twice
+
+Qubes 4.0
+---------
+
+In Qubes 4.0, qvm-copy-to-vm and qvm-move-to-vm are deprecated (GUI behaviour is unchanged from Qubes 3.2).  In the command line, use qvm-copy or qvm-move to avoid typing target qube name twice.
+
+qvm-copy [--without-progress] file [file]+
 
 
 On inter-qube file copy security