summaryrefslogtreecommitdiffstats
path: root/Documentation/filesystems/isofs.txt
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pretzel.yyz.us>2005-06-27 05:42:30 +0200
committerJeff Garzik <jgarzik@pobox.com>2005-06-27 05:42:30 +0200
commitf45727d52d1581e9ff4df9d1a12a60789ad2d1eb (patch)
tree773ae25f98542e6d382c688f7e85e8137d065614 /Documentation/filesystems/isofs.txt
parentAutomatic merge of /spare/repo/netdev-2.6 branch we18-ieee80211 (diff)
parentMerge /spare/repo/linux-2.6/ (diff)
downloadlinux-f45727d52d1581e9ff4df9d1a12a60789ad2d1eb.tar.xz
linux-f45727d52d1581e9ff4df9d1a12a60789ad2d1eb.zip
Merge /spare/repo/netdev-2.6/ branch 'ieee80211'
Diffstat (limited to 'Documentation/filesystems/isofs.txt')
-rw-r--r--Documentation/filesystems/isofs.txt6
1 files changed, 5 insertions, 1 deletions
diff --git a/Documentation/filesystems/isofs.txt b/Documentation/filesystems/isofs.txt
index f64a10506689..424585ff6ea1 100644
--- a/Documentation/filesystems/isofs.txt
+++ b/Documentation/filesystems/isofs.txt
@@ -26,7 +26,11 @@ Mount options unique to the isofs filesystem.
mode=xxx Sets the permissions on files to xxx
nojoliet Ignore Joliet extensions if they are present.
norock Ignore Rock Ridge extensions if they are present.
- unhide Show hidden files.
+ hide Completely strip hidden files from the file system.
+ showassoc Show files marked with the 'associated' bit
+ unhide Deprecated; showing hidden files is now default;
+ If given, it is a synonym for 'showassoc' which will
+ recreate previous unhide behavior
session=x Select number of session on multisession CD
sbsector=xxx Session begins from sector xxx