Update to upstream util-linux 2.20.1

[framework/base/util-linux-ng.git] / mount / umount.8

diff --git a/mount/umount.8 b/mount/umount.8
index ca67e1d..934fb00 100644 (file)
--- a/mount/umount.8
+++ b/mount/umount.8
@@ -23,7 +23,7 @@
 .\" Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139,
 .\" USA.
 .\"
-.TH UMOUNT 8 "26 July 1997" "Linux 2.0" "Linux Programmer's Manual"
+.TH UMOUNT 8 "March 2010" "util-linux" "System Administration"
 .SH NAME
 umount \- unmount file systems
 .SH SYNOPSIS
@@ -119,6 +119,16 @@ Lazy unmount. Detach the filesystem from the filesystem hierarchy now,
 and cleanup all references to the filesystem as soon as it is not busy
 anymore.
 (Requires kernel 2.4.11 or later.)
+.IP "\fB\-\-no\-canonicalize\fP"
+Don't canonicalize paths. For more details about this option see the
+.B mount(8)
+man page.
+.IP "\fB\-\-fake\fP"
+Causes everything to be done except for the actual system call; this
+``fakes'' unmounting the filesystem.  It can  be used to remove
+entries from
+.I /etc/mtab
+that were unmounted earlier with the -n option.
 
 .SH "THE LOOP DEVICE"
 The
@@ -137,13 +147,20 @@ The syntax of external umount helpers is:
 .BI /sbin/umount. <suffix>
 .RI { dir | device }
 .RB [ \-nlfvr ]
+.RB [ \-t
+.IR type.subtype ]
 .br
 
-where the <suffix> is filesystem type or a value from "uhelper=" mtab option.
+where the <suffix> is filesystem type or a value from "uhelper=" or "helper="
+mtab option.  The \-t option is used  for filesystems with subtypes support
+(for example /sbin/mount.fuse -t fuse.sshfs).
 
-The uhelper (unprivileged umount helper) is possible to used when non-root user
+The uhelper= (unprivileged umount helper) is possible to use when non-root user
 wants to umount a mountpoint which is not defined in the /etc/fstab file (e.g
-devices mounted by HAL).
+devices mounted by udisk).
+
+The helper= mount option redirects all umount requests to the
+/sbin/umount.<helper> independently on UID.
 
 .SH FILES
 .I /etc/mtab
@@ -159,5 +176,5 @@ A
 .B umount
 command appeared in Version 6 AT&T UNIX.
 .SH AVAILABILITY
-The umount command is part of the util-linux-ng package and is available from
-ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/.
+The umount command is part of the util-linux package and is available from
+ftp://ftp.kernel.org/pub/linux/utils/util-linux/.