setcert: check uri before adding a certificate

[surf.git] / surf.1

diff --git a/surf.1 b/surf.1
index 3457a55..fe149ba 100644 (file)
--- a/surf.1
+++ b/surf.1
@@ -3,12 +3,12 @@
 surf \- simple webkit-based browser
 .SH SYNOPSIS
 .B surf
-.RB [-bBdDfFgGiIkKmMnNpPsSvx]
+.RB [-bBdDfFgGiIkKmMnNpPsStTvx]
 .RB [-a\ cookiepolicies]
 .RB [-c\ cookiefile]
+.RB [-C\ stylefile]
 .RB [-e\ xid]
 .RB [-r\ scriptfile]
-.RB [-t\ stylefile]
 .RB [-u\ useragent]
 .RB [-z\ zoomlevel]
 .RB "URI"
@@ -35,11 +35,16 @@ Disable Scrollbars
 .B \-B
 Enable Scrollbars
 .TP
-.B \-c cookiefile 
+.B \-c cookiefile
 Specify the
 .I cookiefile
 to use.
 .TP
+.B \-C stylefile
+Specify the user
+.I stylefile.
+This does disable the site-specific styles.
+.TP
 .B \-d
 Disable the disk cache.
 .TP
@@ -75,10 +80,10 @@ Disable kiosk mode (disable key strokes and right click)
 Enable kiosk mode (disable key strokes and right click)
 .TP
 .B \-m
-Disable the site-specific styles.
+Disable application of user style sheets.
 .TP
 .B \-M
-Enable the site-specific styles.
+Enable application of user style sheets.
 .TP
 .B \-n
 Disable the Web Inspector (Developer Tools).
@@ -92,7 +97,7 @@ Disable Plugins
 .B \-P
 Enable Plugins
 .TP
-.B \-r scriptfile 
+.B \-r scriptfile
 Specify the user
 .I scriptfile.
 .TP
@@ -102,12 +107,13 @@ Disable Javascript
 .B \-S
 Enable Javascript
 .TP
-.B \-t stylefile
-Specify the user
-.I stylefile.
-This does disable the site-specific styles.
+.B \-t
+Disable strict TLS check
+.TP
+.B \-T
+Enable strict TLS check
 .TP
-.B \-u useragent 
+.B \-u useragent
 Specify the
 .I useragent
 which surf should use.
@@ -115,12 +121,18 @@ which surf should use.
 .B \-v
 Prints version information to standard output, then exits.
 .TP
-.B \-x
+.B \-w
 Prints xid to standard output. This can be used to script the browser in for
 example
 .BR xdotool(1).
 .TP
-.B \-z zoomlevel 
+.B -x
+Disable custom certificates.
+.TP
+.B -X
+Enable custom certificates.
+.TP
+.B \-z zoomlevel
 Specify the
 .I zoomlevel
 which surf should use.
@@ -192,6 +204,9 @@ Copies current URI to primary selection.
 .B Ctrl\-o
 Show the sourcecode of the current page.
 .TP
+.B Ctrl\-x
+Display the current TLS certificate in a popup window.
+.TP
 .B Ctrl\-Shift\-a
 Toggle through the the
 .I cookie policies.
@@ -208,7 +223,7 @@ Toggle auto-loading of images. This will reload the page.
 .TP
 .B Ctrl\-Shift\-m
 Toggle if the
-.I stylefile 
+.I stylefile
 file should be loaded. This will reload the page.
 .TP
 .B Ctrl\-Shift\-o
@@ -217,6 +232,9 @@ Open the Web Inspector (Developer Tools) window for the current page.
 .B Ctrl\-Shift\-s
 Toggle script execution. This will reload the page.
 .TP
+.B Ctrl\-Shift\-t
+Toggle strict TLS check. This will reload the page.
+.TP
 .B Ctrl\-Shift\-v
 Toggle the enabling of plugins on that surf instance. This will reload the
 page.
@@ -225,7 +243,7 @@ page.
 Toggle fullscreen mode.
 .SH INDICATORS OF OPERATION
 Surf is showing indicators of operation in front of the site title.
-For all indicators, unless otherwsie specified, a lower case letter means disabled and an upper case letter means enabled.
+For all indicators, unless otherwise specified, a lower case letter means disabled and an upper case letter means enabled.
 .TP
 .B A
 all cookies accepted
@@ -256,6 +274,15 @@ plugins
 .TP
 .B m M
 styles
+.TP
+.B f F
+frame flattening
+.TP
+.B x X
+custom certificates
+.TP
+.B t T
+strict TLS
 .SH INDICATORS OF WEB PAGE
 The second part of the indicators specifies modes of the web page itself.
 .SS First character: encryption
@@ -264,7 +291,7 @@ The second part of the indicators specifies modes of the web page itself.
 unencrypted
 .TP
 .B T
-encrypted (SSL)
+encrypted (TLS)
 .TP
 .B U
 attempted encryption but failed