Merge branch 'upstream'

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

diff --git a/utils/exportfs/exports.man b/utils/exportfs/exports.man
index 4cddc793d24b69c1eab0781cd01e58d327119e24..d57b8b41cccaf302be0b00cdf752177bf59763cf 100644 (file)
--- a/utils/exportfs/exports.man
+++ b/utils/exportfs/exports.man
@@ -29,9 +29,6 @@ double quotes. You can also specify spaces or other unusual character in
 the export name using a backslash followed by the character code as three
 octal digits.
 .PP
 the export name using a backslash followed by the character code as three
 octal digits.
 .PP

-To apply changes to this file, run exportfs -ra or /etc/init.d/nfs-kernel-server
-reload (the latter being a distribution-specific extension).
-.PP

 .SS Machine Name Formats
 NFS clients may be specified in a number of ways:
 .IP "single host
 .SS Machine Name Formats
 NFS clients may be specified in a number of ways:
 .IP "single host


@@ -91,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 .


@@ -119,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
-default.  In this and future releases,
+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.
 .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


@@ -220,6 +217,16 @@ The default of having subtree checks enabled, can be explicitly
 requested with
 .IR subtree_check .
 
 requested with
 .IR subtree_check .
 

+From release 1.1.0 of nfs-utils onwards, the default will be
+.I no_subtree_check
+as subtree_checking tends to cause more problems than it is worth.
+If you genuinely require subtree checking, you should explicitly put
+that option in the
+.B exports
+file.  If you put neither option,
+.I exportfs
+will warn you that the change is pending.
+

 .TP
 .IR insecure_locks
 .TP
 .TP
 .IR insecure_locks
 .TP


@@ -290,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