From 84569bcdc5f3def08438f57911a469bb7f6ab39c Mon Sep 17 00:00:00 2001 From: Christian Poeschl Date: Sat, 30 Jan 2021 17:32:55 +0100 Subject: [PATCH 1/3] addresses https://github.com/QubesOS/qubes-issues/issues/6374 --- doc/vm-tools/{qvm-copy-to-vm.rst => qvm-copy.rst} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename doc/vm-tools/{qvm-copy-to-vm.rst => qvm-copy.rst} (68%) diff --git a/doc/vm-tools/qvm-copy-to-vm.rst b/doc/vm-tools/qvm-copy.rst similarity index 68% rename from doc/vm-tools/qvm-copy-to-vm.rst rename to doc/vm-tools/qvm-copy.rst index 6c4170a..6129c8f 100644 --- a/doc/vm-tools/qvm-copy-to-vm.rst +++ b/doc/vm-tools/qvm-copy.rst @@ -1,14 +1,14 @@ ============== -qvm-copy-to-vm +qvm-copy ============== NAME ==== -qvm-copy-to-vm - copy specified files to specified destination VM +qvm-copy - copy specified files to specified destination VM SYNOPSIS ======== -| qvm-copy-to-vm [--without-progress] dest_vmname file [file]+ +| qvm-copy [--without-progress] dest_vmname file [file]+ OPTIONS ======= From ddbfcac7e23c197403e32f33d8c0836c3b62466f Mon Sep 17 00:00:00 2001 From: ravachol <62061776+blockomat2100@users.noreply.github.com> Date: Sat, 30 Jan 2021 17:41:14 +0100 Subject: [PATCH 2/3] keep qvm-copy-to-vm but with deprecated note --- doc/vm-tools/qvm-copy.rst | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/doc/vm-tools/qvm-copy.rst b/doc/vm-tools/qvm-copy.rst index 6129c8f..69d36e8 100644 --- a/doc/vm-tools/qvm-copy.rst +++ b/doc/vm-tools/qvm-copy.rst @@ -14,6 +14,26 @@ OPTIONS ======= --without-progress Don't display progress info + + +============== +qvm-copy-to-vm +============== +**DEPRECATED** + +NAME +==== +qvm-copy-to-vm - copy specified files to specified destination VM + +SYNOPSIS +======== +| qvm-copy-to-vm [--without-progress] dest_vmname file [file]+ + +OPTIONS +======= +--without-progress + Don't display progress info + AUTHORS ======= From 0a40fd19392a488274f192ab8fa7eb56c2c43afa Mon Sep 17 00:00:00 2001 From: Chris P Date: Thu, 4 Feb 2021 12:47:09 +0100 Subject: [PATCH 3/3] remove trailing whitespaces; remove dest_vm argument --- doc/vm-tools/qvm-copy.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/vm-tools/qvm-copy.rst b/doc/vm-tools/qvm-copy.rst index 69d36e8..c4f68a0 100644 --- a/doc/vm-tools/qvm-copy.rst +++ b/doc/vm-tools/qvm-copy.rst @@ -4,18 +4,18 @@ qvm-copy NAME ==== -qvm-copy - copy specified files to specified destination VM +qvm-copy - copy specified files to a destination VM. Prompt user to select a destination VM. SYNOPSIS ======== -| qvm-copy [--without-progress] dest_vmname file [file]+ +| qvm-copy [--without-progress] file [file]+ OPTIONS ======= --without-progress Don't display progress info - - + + ============== qvm-copy-to-vm ==============