Index: vws
==================================================================
--- vws
+++ vws
@@ -607,11 +607,10 @@
                     pass
                     sock.shutdown(socket.SHUT_RDWR)
                     sock.close()
         if not options.wait:
             return
-        print "%d machines left running" % count
         if count>0:
             time.sleep(10)
 
 
 TEMPLATE = """#!/bin/sh

Index: vws.mkd
==================================================================
--- vws.mkd
+++ vws.mkd
@@ -10,21 +10,21 @@
 SYNOPSIS
 ========
 
 **vws create** *name* [ **--install** *isoimage* ]
 
-**vws list**  [**--state**] [**--usb** ]
+**vws list**  \[**--state**\] \[**--usb**\]
 
-**vws start** *name* [**--no-gui**] [**--cdrom** *iso-image*]
+**vws start** *name* [**--no-gui**] \[**--cdrom** *iso-image*\]
 
 **vws stop** *name* [**--hard**]
 
 **vws save** *name*
 
 **vws reset** *name*
 
-**vws cdrom** [ **--id** *id* ] [ *iso-image* | **--eject *]
+**vws cdrom** \[**--id** *id*\] \[*iso-image*|**--eject**\]
 
 **vws usb insert** *name*  *pattern*
 
 **vws usb remove** *name*  *pattern*
 
@@ -38,10 +38,14 @@
 
 **vws commit** *name*
 
 **vws snapshots**  *name*
 
+**vws autostart**
+
+**vws shutdown** \[**--wait**\] \[**--timeout** *sec*\]
+
 **vws screenshot** *name* *filename.ppm*
 
 **vws record** *name* *filename.wav*
 
 **vws stoprecord**  *name*
@@ -207,10 +211,32 @@
 command would restore this state.
 
 **vws reset** *machine*
 
 Requests the reboot of guest OS via ACPI.
+
+AUTOSTART AND SHUTDOWN
+----------------------
+
+Machines, placed into system wide directory specified in the
+configuration (see **Configuration
+File** below) would be automatically started at system startup (provided
+that **vws** service is enabled). This is performed using
+
+**vws autostart**
+
+command, which starts all the VMs in autostart directory. It starts VMs
+under special user, specified in the configuration file.
+
+**vws shutdown**  \[**--wait**\] \[**--timeout** *sec*\]
+
+Does more than just stop autostarted VMs. Actually it tries to shut down
+gracefully all the VMs, it found running. If **--wait** option is
+specifed, it repeats scan for running VMs each ten second until
+**--timeout** (default 90) seconds expired. When timeout expired, it
+forcibly stops all remaining VMs. 
+
 
 
 REMOVABLE DEVICE MANAGEMENT
 ---------------------------