--- src/sbin/hammer/hammer.8	2008/07/17 23:58:08	1.38.2.1
+++ src/sbin/hammer/hammer.8	2008/07/19 18:49:08	1.38.2.2
@@ -313,8 +313,9 @@ A PFS can only be truly destroyed with t
 directive.
 Removing the softlink will not destroy the underlying PFS.
 .It Ar pfs-upgrade Ar dirpath
-Upgrade a PFS from slave to master operation.  The PFS becomes writable.
-A master id must already be assigned to the PFS.
+Upgrade a PFS from slave to master operation.  The PFS will be rolled back
+to the current end synchronization tid (removing any partial synchronizations),
+and will then becomes writable.
 .Pp
 WARNING!  HAMMER currently supports only single masters and using
 this command can easily result in filesystem corruption if you don't
@@ -370,29 +371,6 @@ to corruption of the mirroring target.
 .It unique-uuid=<uuid>
 Set the unique UUID for this filesystem.  This UUID should not be used
 anywhere else, even on exact copies of the filesystem.
-.It master=<num>
-Set the master id for multi-master mirroring.  Only values between 0 and 15
-inclusive may be specified.  All masters sharing the same
-.Ar shared-uuid
-must have different ids.
-Up to 16 masters will eventually be supported.
-.Pp
-Multi-master mirroring is not supported yet and the master id should be
-set to 0 on the single master when mirroring to one or more slaves.
-.Pp
-The master id may only be changed if the PFS is in master mode.  A PFS
-slave cannot be upgraded to a master at this time.
-.It no-mirror
-This disables the ability to use this filesystem as a mirroring source
-or target.  You can still do full scans with mirror-read but incremental
-scans will not work.  This option may only be set on masters.
-.It slave
-Sets slave mode, allowing the mirror to be used as a slave.  Except for
-the mirror-write directive all accesses to the mirror will be made read-only
-and will be as-of the
-.Ar sync-beg-tid .
-This option is currently not supported, slave mode must be specified
-when creating the PFS and cannot be changed on the fly.
 .It label=<string>
 Set a descriptive label for this filesystem.
 .El