Merge branch 'fix/soundcore' into for-linus

[pandora-kernel.git] / Documentation / filesystems / vfat.txt

diff --git a/Documentation/filesystems/vfat.txt b/Documentation/filesystems/vfat.txt
index 3a5ddc9..b58b84b 100644 (file)
--- a/Documentation/filesystems/vfat.txt
+++ b/Documentation/filesystems/vfat.txt
@@ -124,14 +124,19 @@ sys_immutable -- If set, ATTR_SYS attribute on FAT is handled as
 flush         -- If set, the filesystem will try to flush to disk more
                 early than normal. Not set by default.
 
-rodir        -- FAT has the ATTR_RO (read-only) attribute. But on Windows,
-                the ATTR_RO of the directory will be just ignored actually,
-                and is used by only applications as flag. E.g. it's setted
-                for the customized folder.
+rodir        -- FAT has the ATTR_RO (read-only) attribute. On Windows,
+                the ATTR_RO of the directory will just be ignored,
+                and is used only by applications as a flag (e.g. it's set
+                for the customized folder).
 
                 If you want to use ATTR_RO as read-only flag even for
                 the directory, set this option.
 
+errors=panic|continue|remount-ro
+             -- specify FAT behavior on critical errors: panic, continue
+                without doing anything or remount the partition in
+                read-only mode (default behavior).
+
 <bool>: 0,1,yes,no,true,false
 
 TODO