Merge branch 'upstream/wm8974' into for-2.6.33

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

diff --git a/Documentation/filesystems/isofs.txt b/Documentation/filesystems/isofs.txt
index 424585f..3c367c3 100644 (file)
--- a/Documentation/filesystems/isofs.txt
+++ b/Documentation/filesystems/isofs.txt
@@ -9,9 +9,9 @@ when using discs encoded using Microsoft's Joliet extensions.
   iocharset=name Character set to use for converting from Unicode to
                ASCII.  Joliet filenames are stored in Unicode format, but
                Unix for the most part doesn't know how to deal with Unicode.
-               There is also an option of doing UTF8 translations with the
+               There is also an option of doing UTF-8 translations with the
                utf8 option.
-  utf8          Encode Unicode names in UTF8 format. Default is no.
+  utf8          Encode Unicode names in UTF-8 format. Default is no.
 
 Mount options unique to the isofs filesystem.
   block=512     Set the block size for the disk to 512 bytes
@@ -23,7 +23,13 @@ Mount options unique to the isofs filesystem.
   map=off       Do not map non-Rock Ridge filenames to lower case
   map=normal    Map non-Rock Ridge filenames to lower case
   map=acorn     As map=normal but also apply Acorn extensions if present
-  mode=xxx      Sets the permissions on files to xxx
+  mode=xxx      Sets the permissions on files to xxx unless Rock Ridge
+               extensions set the permissions otherwise
+  dmode=xxx     Sets the permissions on directories to xxx unless Rock Ridge
+               extensions set the permissions otherwise
+  overriderockperm Set permissions on files and directories according to
+               'mode' and 'dmode' even though Rock Ridge extensions are
+               present.
   nojoliet      Ignore Joliet extensions if they are present.
   norock        Ignore Rock Ridge extensions if they are present.
   hide         Completely strip hidden files from the file system.