Add new flags to manpage

README.md

@@ -45,7 +45,7 @@ the gophersphere.
         -h, --help                Show this screen
         -v, --version             Show phetch version
 
-    Commandline options always override options set in phetch.conf.
+    Command line options always override options set in phetch.conf.
 
     Once you've launched phetch, use `ctrl-h` to view the on-line help.
 

doc/phetch.1

@@ -52,14 +52,35 @@ Print the raw Gopher server response of \fIURL\fR and exit.
 Attempt to fetch all pages securely over TLS.
 .P
 .RE
+\fB-S\fR, \fB--no-tls\fR
+.RS 4
+Do not use TLS for connections. This can be used to cancel out an
+option set in the config file, for instance.
+.P
+.RE
 \fB-o\fR, \fB--tor\fR
 .RS 4
 Make all connections using a local Tor proxy.
-Tor is the Onion Router.
+Tor is The Onion Router.
 Set the TOR_PROXY env variable to use an address other than the
 Tor default of 127.0.0.1:9050.
 .P
 .RE
+\fB-O\fR, \fB--no-tor\fR
+.RS 4
+Disable Tor.
+.P
+.RE
+\fB-c\fR, \fB--config\fR \fIFILE\fR
+.RS 4
+Use \fIFILE\fR instead of \fI~/.config/phetch/phetch.conf\fR
+.P
+.RE
+\fB-C\fR, \fB--no-config\fR
+.RS 4
+Do not use any config file.
+.P
+.RE
 \fB-h\fR, \fB--help\fR
 .RS 4
 Print a help summary and exit.
@@ -79,6 +100,8 @@ Without a \fIURL\fR, \fBphetch\fR will show a builtin dashboard with easy
 access to online help, bookmarks and history, and enter interactive
 mode.
 .P
+Command line options always override options set in phetch.conf.
+.P
 .SH NAVIGATION
 .P
 .SS KEYBOARD SHORTCUTS

doc/phetch.1.md

@@ -36,12 +36,25 @@ If no URL is given, however, *phetch* will launch and open its default
 *-s*, *--tls*
 	Attempt to fetch all pages securely over TLS.
 
+*-S*, *--no-tls*
+	Do not use TLS for connections. This can be used to cancel out an
+	option set in the config file, for instance.
+
 *-o*, *--tor*
 	Make all connections using a local Tor proxy.
-	Tor is the Onion Router.
+	Tor is The Onion Router.
 	Set the TOR_PROXY env variable to use an address other than the
 	Tor default of 127.0.0.1:9050.
 
+*-O*, *--no-tor*
+	Disable Tor.
+
+*-c*, *--config* _FILE_
+	Use _FILE_ instead of _~/.config/phetch/phetch.conf_
+
+*-C*, *--no-config*
+	Do not use any config file.
+
 *-h*, *--help*
 	Print a help summary and exit.
 
@@ -57,6 +70,8 @@ Without a _URL_, *phetch* will show a builtin dashboard with easy
 access to online help, bookmarks and history, and enter interactive
 mode.
 
+Command line options always override options set in phetch.conf.
+
 # NAVIGATION
 
 ## KEYBOARD SHORTCUTS

src/main.rs

@@ -233,7 +233,7 @@ Options:
     -h, --help                Show this screen
     -v, --version             Show phetch version
 
-Commandline options always override options set in phetch.conf.
+Command line options always override options set in phetch.conf.
 
 Once you've launched phetch, use `ctrl-h` to view the on-line help."
     );