Merge branch 'upstream'

[nfs-utils.git] / utils / exportfs / exports.man

diff --git a/utils/exportfs/exports.man b/utils/exportfs/exports.man
index 7aa60fc0b132d3e38992d5aca16a9201aa34709c..d57b8b41cccaf302be0b00cdf752177bf59763cf 100644 (file)
--- a/utils/exportfs/exports.man
+++ b/utils/exportfs/exports.man
@@ -88,7 +88,7 @@ rpcsec_gss and to make requirements on the IP address of the client.
 understands the following export options:
 .TP
 .IR secure "\*d
 understands the following export options:
 .TP
 .IR secure "\*d

-This option requires that requests originate on an internet port less
+This option requires that requests originate on an Internet port less

 than IPPORT_RESERVED (1024). This option is on by default. To turn it
 off, specify
 .IR insecure .
 than IPPORT_RESERVED (1024). This option is on by default. To turn it
 off, specify
 .IR insecure .


@@ -116,13 +116,13 @@ storage (see
 .IR async
 above).
 
 .IR async
 above).
 

-In releases of nfs-utils upto and including 1.0.0, this option was the
+In releases of nfs-utils up to and including 1.0.0, this option was the

 default.  In all subsequence releases,
 .I sync
 is the default, and
 .I async
 must be explicit requested if needed.
 default.  In all subsequence releases,
 .I sync
 is the default, and
 .I async
 must be explicit requested if needed.

-To help make system adminstrators aware of this change, 'exportfs'
+To help make system administrators aware of this change, 'exportfs'

 will issue a warning if neither
 .I sync
 nor
 will issue a warning if neither
 .I sync
 nor


@@ -297,7 +297,7 @@ if, for example, the filesystem failed to mount due to a disc error.
 
 If a path is given (e.g.
 .IR mountpoint= "/path or " mp= /path)
 
 If a path is given (e.g.
 .IR mountpoint= "/path or " mp= /path)

-then the nominted path must be a mountpoint for the exportpoint to be
+then the nominated path must be a mountpoint for the exportpoint to be

 exported.
 
 .TP
 exported.
 
 .TP


@@ -402,8 +402,11 @@ Here's the complete list of mapping options:
 .TP
 .IR root_squash
 Map requests from uid/gid 0 to the anonymous uid/gid. Note that this does
 .TP
 .IR root_squash
 Map requests from uid/gid 0 to the anonymous uid/gid. Note that this does

-not apply to any other uids that might be equally sensitive, such as user
-.IR bin .
+not apply to any other uids or gids that might be equally sensitive, such as
+user
+.IR bin 
+or group
+.IR staff .

 .TP
 .IR no_root_squash
 Turn off root squashing. This option is mainly useful for diskless clients.
 .TP
 .IR no_root_squash
 Turn off root squashing. This option is mainly useful for diskless clients.