Merge tag 'wireless-drivers-next-for-davem-2018-02-08' of git://git.kernel.org/pub...

[sfrench/cifs-2.6.git] / Documentation / filesystems / ext4.txt

diff --git a/Documentation/filesystems/ext4.txt b/Documentation/filesystems/ext4.txt
index 75236c0c2ac231151b98e8ee2e1cbfd2b2ae6451..7f628b9f7c4b4821589f357ec92b0ee91fa41b7b 100644 (file)
--- a/Documentation/filesystems/ext4.txt
+++ b/Documentation/filesystems/ext4.txt
@@ -202,15 +202,14 @@ inode_readahead_blks=n    This tuning parameter controls the maximum
                        the buffer cache.  The default value is 32 blocks.
 
 nouser_xattr           Disables Extended User Attributes.  See the
-                       attr(5) manual page and http://acl.bestbits.at/
-                       for more information about extended attributes.
+                       attr(5) manual page for more information about
+                       extended attributes.
 
 noacl                  This option disables POSIX Access Control List
                        support. If ACL support is enabled in the kernel
                        configuration (CONFIG_EXT4_FS_POSIX_ACL), ACL is
                        enabled by default on mount. See the acl(5) manual
-                       page and http://acl.bestbits.at/ for more information
-                       about acl.
+                       page for more information about acl.
 
 bsddf          (*)     Make 'df' act like BSD.
 minixdf                        Make 'df' act like Minix.
@@ -233,7 +232,7 @@ data_err=ignore(*)  Just print an error message if an error occurs
 data_err=abort         Abort the journal if an error occurs in a file
                        data buffer in ordered mode.
 
-grpid                  Give objects the same group ID as their creator.
+grpid                  New objects have the group ID of their parent.
 bsdgroups
 
 nogrpid                (*)     New objects have the group ID of their creator.