fix documentation and man page

This commit is contained in:
Kristján Valur Jónsson 2019-02-20 11:24:29 +00:00
parent 3c97c1b251
commit 4c41eac29c
2 changed files with 12 additions and 4 deletions

View File

@ -306,6 +306,14 @@ If you specify no argument as an option, objects older than 24 hours(24H) will b
You can specify an optional date format.
It can be specified as year, month, day, hour, minute, second, and it is expressed as "Y", "M", "D", "h", "m", "s" respectively.
For example, "1Y6M10D12h30m30s".
.TP
\fB\-o\fR use_wtf8 - support arbitrary file system encoding.
S3 requires all object names to be valid utf-8. But some
clients, notably Windows NFS clients, use their own encoding.
This option re-encodes invalid utf-8 object names into valid
utf-8 by mapping offending codes into a 'private' codepage of the
Unicode set.
Useful on clients not using utf-8 as their file system encoding.
.SH FUSE/MOUNT OPTIONS
.TP
Most of the generic mount options described in 'man mount' are supported (ro, rw, suid, nosuid, dev, nodev, exec, noexec, atime, noatime, sync async, dirsync). Filesystems are mounted with '\-onodev,nosuid' by default, which can only be overridden by a privileged user.

View File

@ -1340,13 +1340,13 @@ void show_help ()
" Please use this option when the directory in the bucket is\n"
" only \"dir/\" object.\n"
"\n"
" use_wtf8 - allow encoding of non-utf-8 path information.\n"
" use_wtf8 - support arbitrary file system encoding.\n"
" S3 requires all object names to be valid utf-8. But some\n"
" clients, notably Windows NFS clients, use their own encoding.\n"
" This option re-encodes invalid utf-8 object names into valid\n"
" utf-8 S3 by mapping them into a 'private' codepage of the\n"
" Unicode set. Useful if the file system is being re-exported via\n"
" NFS and used by such clients.\n"
" utf-8 by mapping offending codes into a 'private' codepage of the\n"
" Unicode set.\n"
" Useful on clients not using utf-8 as their file system encoding.\n"
"\n"
" notsup_compat_dir (not support compatibility directory types)\n"
" As a default, s3fs supports objects of the directory type as\n"