summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakob Unterwurzacher2015-11-14 21:31:39 +0100
committerJakob Unterwurzacher2015-11-14 21:31:39 +0100
commit066c2c90eb0a156efe9d1a407b32350673a09fed (patch)
tree55600dee7eb4eb6d797abdb741c68785d6266f8e
parent58592330dc33e194e55fa942d3f375124839f058 (diff)
MANPAGE: add "-config" flag
Also, "-plaintextnames" can be used with -zerokey. Fix the incorrect description.
-rw-r--r--MANPAGE.md5
-rw-r--r--main.go2
2 files changed, 5 insertions, 2 deletions
diff --git a/MANPAGE.md b/MANPAGE.md
index 7ed5e1e..2f72169 100644
--- a/MANPAGE.md
+++ b/MANPAGE.md
@@ -30,6 +30,9 @@ DESCRIPTION
Options:
+**-config string**
+: Use specified config file instead of CIPHERDIR/gocryptfs.conf
+
**-cpuprofile string**
: Write cpu profile to specified file
@@ -58,7 +61,7 @@ Options:
: Change password
**-plaintextnames**
-: Do not encrypt file names - can only be used together with -init
+: Do not encrypt file names
**-q**
: Quiet - silence informational messages
diff --git a/main.go b/main.go
index ece032e..e9eef33 100644
--- a/main.go
+++ b/main.go
@@ -134,7 +134,7 @@ func main() {
flagSet.BoolVar(&args.foreground, "f", false, "Stay in the foreground")
flagSet.BoolVar(&args.version, "version", false, "Print version and exit")
flagSet.BoolVar(&args.plaintextnames, "plaintextnames", false, "Do not encrypt "+
- "file names - can only be used together with -init")
+ "file names")
flagSet.BoolVar(&args.quiet, "q", false, "Quiet - silence informational messages")
flagSet.StringVar(&args.masterkey, "masterkey", "", "Mount with explicit master key")
flagSet.StringVar(&args.cpuprofile, "cpuprofile", "", "Write cpu profile to specified file")