Merge branch 'maint' into next

2 files changed, 5 insertions, 3 deletions

diff --git a/misc/badblocks.8.in b/misc/badblocks.8.in
index a5042e07..f507f63b 100644
--- a/misc/badblocks.8.in
+++ b/misc/badblocks.8.in
@@ -184,7 +184,8 @@ are specified then all blocks will be tested with one pattern
 before proceeding to the next pattern.
 .TP
 .B \-v
-Verbose mode.
+Verbose mode.  Will write the number of read errors, write errors and data-
+corruptions to stderr.
 .TP
 .B \-w
 Use write-mode test. With this option,
diff --git a/misc/mke2fs.8.in b/misc/mke2fs.8.in
index 821222eb..0dc03e1f 100644
--- a/misc/mke2fs.8.in
+++ b/misc/mke2fs.8.in
@@ -345,7 +345,8 @@ Create an internal journal (i.e., stored inside the filesystem) of size
 megabytes.
 The size of the journal must be at least 1024 filesystem blocks
 (i.e., 1MB if using 1k blocks, 4MB if using 4k blocks, etc.)
-and may be no more than 102,400 filesystem blocks.
+and may be no more than 10,240,000 filesystem blocks or half the total
+file system size (whichever is smaller)
 @JDEV@.TP
 @JDEV@.BI device= external-journal
 @JDEV@Attach the filesystem to the journal block device located on
@@ -608,7 +609,7 @@ option is used to explicitly add or remove filesystem options that
 should be set in the newly created filesystem, the
 resulting filesystem may not be supported by the requested
 .IR fs-type .
-(e.g., "\fBmke2fs \-t ext3 \-O extents /dev/sdXX\fR" will create a
+(e.g., "\fBmke2fs \-t ext3 \-O extent /dev/sdXX\fR" will create a
 filesystem that is not supported by the ext3 implementation as found in
 the Linux kernel; and "\fBmke2fs \-t ext3 \-O ^has_journal /dev/hdXX\fR"
 will create a filesystem that does not have a journal and hence will not