Merge branch 'upstream'

Conflicts:
	configure

diff --combined utils/exportfs/exports.man
index 4cddc793d24b69c1eab0781cd01e58d327119e24,7aa60fc0b132d3e38992d5aca16a9201aa34709c..5800b56325a352d885cbc5eb0a1fac85e2e01efb
--- 1/utils/exportfs/exports.man
--- 2/utils/exportfs/exports.man
+++ b/utils/exportfs/exports.man
@@@ -29,9 -29,6 +29,9 @@@ double quotes. You can also specify spa
  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
@@@ -120,7 -117,7 +120,7 @@@ storage (se
  above).
  
  In releases of nfs-utils upto and including 1.0.0, this option was the
- default.  In this and future releases,
+ default.  In all subsequence releases,
  .I sync
  is the default, and
  .I async
@@@ -220,6 -217,16 +220,16 @@@ The default of having subtree checks en
  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
@@@ -395,11 -402,8 +405,11 @@@ Here's the complete list of mapping opt
  .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.