summaryrefslogtreecommitdiffstats
path: root/Documentation/filesystems/ext3.txt
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-12-17 12:27:22 +0100
committerTakashi Iwai <tiwai@suse.de>2009-12-17 12:27:22 +0100
commit67cbf8a216259dceefe570f6dc14746f43b2e627 (patch)
tree1eca0b9922dee01b4d00dc0713b7ff434dddd44c /Documentation/filesystems/ext3.txt
parent6c941c8556dd9269be621cd8159fc60e955a91b3 (diff)
parent2fbe74b90bafebce615466b4c20f96b0465df1ae (diff)
downloadlinux-67cbf8a216259dceefe570f6dc14746f43b2e627.tar.gz
linux-67cbf8a216259dceefe570f6dc14746f43b2e627.tar.bz2
linux-67cbf8a216259dceefe570f6dc14746f43b2e627.zip
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'Documentation/filesystems/ext3.txt')
-rw-r--r--Documentation/filesystems/ext3.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/filesystems/ext3.txt b/Documentation/filesystems/ext3.txt
index 05d5cf1d743f..867c5b50cb42 100644
--- a/Documentation/filesystems/ext3.txt
+++ b/Documentation/filesystems/ext3.txt
@@ -32,8 +32,8 @@ journal_dev=devnum When the external journal device's major/minor numbers
identified through its new major/minor numbers encoded
in devnum.
-noload Don't load the journal on mounting. Note that this forces
- mount of inconsistent filesystem, which can lead to
+norecovery Don't load the journal on mounting. Note that this forces
+noload mount of inconsistent filesystem, which can lead to
various problems.
data=journal All data are committed into the journal prior to being