Merge branch 'maint' into next

[thirdparty/e2fsprogs.git] / misc / mke2fs.conf.5.in

diff --git a/misc/mke2fs.conf.5.in b/misc/mke2fs.conf.5.in
index cb4e2f75a04c86a9acbd02855c160c9d304d64e6..cdebf08cf2686b51f0ea000afdff26e92dfadfc8 100644 (file)
--- a/misc/mke2fs.conf.5.in
+++ b/misc/mke2fs.conf.5.in
@@ -97,6 +97,10 @@ The following relations are defined in the
 .I [options]
 stanza.
 .TP
+.I fname_encoding
+This relation defines the file name encoding to be used by mke2fs, in
+case the user doesn't specify an encoding in the command line.
+.TP
 .I proceed_delay
 If this relation is set to a positive integer, then mke2fs will
 wait