Merge remote-tracking branch 'qubesos/pr/25'

* qubesos/pr/25:
  Add missing options to qvm-backup-restore doc.
  Fix --rename-conflicting option.

Fixes QubesOS/qubes-issues#1883

doc/qvm-tools/qvm-backup-restore.rst

@@ -16,6 +16,8 @@ OPTIONS
 =======
 -h, --help
     Show this help message and exit
+--verify-only
+    Do not restore the data, only verify backup integrity
 --skip-broken
     Do not restore VMs that have missing templates or netvms
 --ignore-missing
@@ -32,6 +34,14 @@ OPTIONS
     Do not restore dom0 user home dir
 --ignore-username-mismatch
     Ignore dom0 username mismatch while restoring homedir
+-d APPVM, --dest-vm=APPVM
+    The AppVM to send backups to
+-e, --encrypted
+    The backup is encrypted
+-z, --compressed
+    The backup is compressed
+--debug
+    Enable (a lot of) debug output
 
 AUTHORS
 =======

qvm-tools/qvm-backup-restore

@@ -115,6 +115,8 @@ def main():
         restore_options['use-default-netvm'] = True
     if options.replace_template:
         restore_options['replace-template'] = options.replace_template
+    if options.rename_conflicting:
+        restore_options['rename-conflicting'] = True
     if not options.dom0_home:
         restore_options['dom0-home'] = False
     if options.ignore_username_mismatch: