Merge pull request #1076 from gaul/doc/man-help

Add documentation for use_session_token and use_rrs
This commit is contained in:
Takeshi Nakatani 2019-07-07 15:45:42 +09:00 committed by GitHub
commit 9bf34e2fda
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 0 deletions

View File

@ -303,6 +303,11 @@ utf-8 by mapping offending codes into a 'private' codepage of the
Unicode set. Unicode set.
Useful on clients not using utf-8 as their file system encoding. Useful on clients not using utf-8 as their file system encoding.
.TP .TP
\fB\-o\fR use_session_token - indicate that session token should be provided.
If credentials are provided by environment variables this switch
forces presence check of AWSSESSIONTOKEN variable.
Otherwise an error is returned.
.TP
\fB\-o\fR dbglevel (default="crit") \fB\-o\fR dbglevel (default="crit")
Set the debug message level. set value as crit (critical), err (error), warn (warning), info (information) to debug level. default debug level is critical. Set the debug message level. set value as crit (critical), err (error), warn (warning), info (information) to debug level. default debug level is critical.
If s3fs run with "-d" option, the debug level is set information. If s3fs run with "-d" option, the debug level is set information.

View File

@ -1039,6 +1039,12 @@ void show_help ()
" - store object with specified storage class. Possible values:\n" " - store object with specified storage class. Possible values:\n"
" standard, standard_ia, onezone_ia and reduced_redundancy.\n" " standard, standard_ia, onezone_ia and reduced_redundancy.\n"
"\n" "\n"
" use_rrs (default is disable)\n"
" - use Amazon's Reduced Redundancy Storage.\n"
" this option can not be specified with use_sse.\n"
" (can specify use_rrs=1 for old version)\n"
" this option has been replaced by new storage_class option.\n"
"\n"
" use_sse (default is disable)\n" " use_sse (default is disable)\n"
" - Specify three type Amazon's Server-Site Encryption: SSE-S3,\n" " - Specify three type Amazon's Server-Site Encryption: SSE-S3,\n"
" SSE-C or SSE-KMS. SSE-S3 uses Amazon S3-managed encryption\n" " SSE-C or SSE-KMS. SSE-S3 uses Amazon S3-managed encryption\n"