Rename more things from fuse to fuse3

4 files changed, 20 insertions, 19 deletions

diff --git a/doc/Makefile.am b/doc/Makefile.am
index f92214b..8801da2 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
 
-dist_man_MANS = fusermount.1 mount.fuse.8
+dist_man_MANS = fusermount3.1 mount.fuse.8
 
 EXTRA_DIST = kernel.txt Doxyfile html README.NFS
diff --git a/doc/fusermount.1 b/doc/fusermount3.1
index 9f4cd5a..6f94e42 100644
--- a/doc/fusermount.1
+++ b/doc/fusermount3.1
@@ -1,18 +1,18 @@
-.TH FUSERMOUNT 1 2011\-10\-23 2.8.6 "Filesystem in Userspace (FUSE)"
+.TH FUSERMOUNT3 1 2011\-10\-23 2.8.6 "Filesystem in Userspace (FUSE)"
 
 .SH NAME
-\fBfusermount\fR \- mount and unmount FUSE filesystems
+\fBfusermount3\fR \- mount and unmount FUSE filesystems
 
 .SH SYNOPSIS
-\fBfusermount\fR [\fIOPTIONS\fR] \fIMOUNTPOINT\fR
+\fBfusermount3\fR [\fIOPTIONS\fR] \fIMOUNTPOINT\fR
 
 .SH DESCRIPTION
 Filesystem in Userspace (FUSE) is a simple interface for userspace programs to export a virtual filesystem to the Linux kernel. It also aims to provide a secure method for non privileged users to create and mount their own filesystem implementations.
 .PP
-\fBfusermount\fR is a program to mount and unmount FUSE
+\fBfusermount3\fR is a program to mount and unmount FUSE
 filesystems. It should be called directly only for unmounting FUSE
 file systems. To allow mounting and unmounting by unprivileged users,
-\fBfusermount\fR needs to be installed set-uid root.
+\fBfusermount3\fR needs to be installed set-uid root.
 .SH OPTIONS
 .IP "\-h" 4
 print help.
@@ -32,7 +32,7 @@ lazy unmount.
 \fImount.fuse\fR(8),
 
 .SH HOMEPAGE
-More information about fusermount and the FUSE project can be found at <\fIhttp://fuse.sourceforge.net/\fR>.
+More information about fusermount3 and the FUSE project can be found at <\fIhttp://fuse.sourceforge.net/\fR>.
 
 .SH AUTHORS
 .LP
diff --git a/doc/kernel.txt b/doc/kernel.txt
index 7938aab..e73484f 100644
--- a/doc/kernel.txt
+++ b/doc/kernel.txt
@@ -39,7 +39,7 @@ What is FUSE?
 
 FUSE is a userspace filesystem framework.  It consists of a kernel
 module (fuse.ko), a userspace library (libfuse.*) and a mount utility
-(fusermount).
+(fusermount3).
 
 One of the most important features of FUSE is allowing secure,
 non-privileged mounts.  This opens up new possibilities for the use of
@@ -176,7 +176,7 @@ How do non-privileged mounts work?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Since the mount() system call is a privileged operation, a helper
-program (fusermount) is needed, which is installed setuid root.
+program (fusermount3) is needed, which is installed setuid root.
 
 The implication of providing non-privileged mounts is that the mount
 owner must not be able to use this capability to compromise the
@@ -204,7 +204,7 @@ How are requirements fulfilled?
 
     The solution is not to allow opening device files and ignore
     setuid and setgid bits when executing programs.  To ensure this
-    fusermount always adds "nosuid" and "nodev" to the mount options
+    fusermount3 always adds "nosuid" and "nodev" to the mount options
     for non-privileged mounts.
 
  B) If another user is accessing files or directories in the
@@ -222,7 +222,7 @@ How are requirements fulfilled?
         owner could otherwise not be able to modify (or could only
         make limited modifications).
 
-        This is solved in fusermount, by checking the access
+        This is solved in fusermount3, by checking the access
         permissions on the mountpoint and only allowing the mount if
         the mount owner can do unlimited modification (has write
         access to the mountpoint, and mountpoint is not a "sticky"
diff --git a/doc/mount.fuse.8 b/doc/mount.fuse.8
index 81c498e..c42894b 100644
--- a/doc/mount.fuse.8
+++ b/doc/mount.fuse.8
@@ -16,14 +16,14 @@ kernel.
 \fBlibfuse\fP
 The shared library that most (user-space) filesystems use to
 communicate with FUSE (the kernel filesystem). libfuse also provides
-the \fBfusermount\fP helper to allow non-privileged users to mount
-filesystems.
+the \fBfusermount3\fP (or \fBfusermount\fP if you have older version of
+libfuse) helper to allow non-privileged users to mount filesystems.
 .TP
 \fBfilesystem owner\fP
 The user that starts the filesystem and instructs the kernel to
 associate it with a particular mountpoint. The latter is typically done
 by the filesystem itself on start-up. When using libfuse, this is done
-by calling the \fBfusermount\fP utility.
+by calling the \fBfusermount3\fP utility.
 .TP
 \fBclient\fP
 Any process that interacts with the mountpoint.
@@ -37,7 +37,7 @@ Set the maximum number of FUSE mounts allowed to non-root users. The default is
 Allow non-root users to specify the \fBallow_other\fP or
 \fBallow_root\fP mount options (see below).
 .TP
-These limits are enforced by the \fBfusermount\fP helper, so they can be avoided by filesystems that run as root.
+These limits are enforced by the \fBfusermount3\fP helper, so they can be avoided by filesystems that run as root.
 .SH OPTIONS
 Most of the generic mount options described in \fBmount\fP are
 supported (\fBro\fP, \fBrw\fP, \fBsuid\fP, \fBnosuid\fP, \fBdev\fP,
@@ -217,7 +217,7 @@ Transform absolute symlinks into relative
 \fBnorellinks\fP
 Do not transform absolute symlinks into relative.  This is the default.
 .SH SECURITY
-The fusermount program is installed set-user-gid to fuse. This is done to allow users from fuse group to mount
+The fusermount3 program is installed set-user-gid to fuse. This is done to allow users from fuse group to mount
 their own filesystem implementations.
 There must however be some limitations, in order to prevent Bad User from
 doing nasty things.  Currently those limitations are:
@@ -228,7 +228,7 @@ The mountpoint is not a sticky directory which isn't owned by the user (like \fI
 .IP 3.
 No other user (including root) can access the contents of the mounted filesystem.
 .SH NOTE
-FUSE filesystems are unmounted using the \fBfusermount\fP(1) command (\fBfusermount -u mountpoint\fP).
+FUSE filesystems are unmounted using the \fBfusermount3\fP(1) command (\fBfusermount3 -u mountpoint\fP).
 .SH "AUTHORS"
 .LP
 FUSE is currently maintained by Nikolaus Rath <Nikolaus@rath.org>
@@ -238,5 +238,6 @@ The original author of FUSE is Miklos Szeredi <mszeredi@inf.bme.hu>.
 This man page was originally written by Bastien Roucaries <roucaries.bastien+debian@gmail.com> for the
 Debian GNU/Linux distribution.
 .SH SEE ALSO
-fusermount(1)
-mount(8)
+.BR fusermount3 (1)
+.BR fusermount (1)
+.BR mount (8)