Merge remote-tracking branch 'origin/pr/451'

* origin/pr/451:
  Update docstring to better reflect diffeence between qvm-kill and qvm-shutdown --force

Pull request description:

Meant to address the first half of QubesOS/qubes-issues#10726

(note: after reading QubesOS/qubes-issues#10650 (comment) it seems that the above-mentioned issue is actually not about manpages but about the qubes-docs - still I believe this is helpful)

Author: marmarek

qubesadmin/tools/qvm_kill.py

@@ -18,15 +18,17 @@
 # You should have received a copy of the GNU Lesser General Public License along
 # with this program; if not, see <http://www.gnu.org/licenses/>.
 
-'''qvm-kill - forceful shutdown'''
+'''Immediately terminate a qube without a graceful shutdown sequence.'''
 
 
 import sys
 import qubesadmin.exc
 import qubesadmin.tools
 
 parser = qubesadmin.tools.QubesArgumentParser(
-    description='forceful shutdown of a domain', vmname_nargs='+')
+    description='immediately terminate a qube without a graceful shutdown'
+                ' sequence',
+    vmname_nargs='+')
 
 def main(args=None, app=None):
     '''Main routine of :program:`qvm-kill`.

qubesadmin/tools/qvm_shutdown.py

@@ -48,7 +48,9 @@
 parser.add_argument(
     '--force',
     action='store_true', default=False,
-    help='force shutdown regardless of connected domains; use with caution')
+    help='shut down even if other qubes depend on this one (e.g. as NetVM'
+         ' or AudioVM); does not affect how the qube itself is shut down;'
+         ' use with caution')
 
 parser.add_argument(
     '--dry-run',