setcert: check uri before adding a certificate

[surf.git] / surf.1

diff --git a/surf.1 b/surf.1
index 4418419..fe149ba 100644 (file)
--- a/surf.1
+++ b/surf.1
@@ -3,12 +3,12 @@
 surf \- simple webkit-based browser
 .SH SYNOPSIS
 .B surf
 surf \- simple webkit-based browser
 .SH SYNOPSIS
 .B surf

-.RB [-bBfFgGiIkKnNpPsSvx]
+.RB [-bBdDfFgGiIkKmMnNpPsStTvx]

 .RB [-a\ cookiepolicies]
 .RB [-c\ cookiefile]
 .RB [-a\ cookiepolicies]
 .RB [-c\ cookiefile]

+.RB [-C\ stylefile]

 .RB [-e\ xid]
 .RB [-r\ scriptfile]
 .RB [-e\ xid]
 .RB [-r\ scriptfile]

-.RB [-t\ stylefile]

 .RB [-u\ useragent]
 .RB [-z\ zoomlevel]
 .RB "URI"
 .RB [-u\ useragent]
 .RB [-z\ zoomlevel]
 .RB "URI"


@@ -35,20 +35,31 @@ Disable Scrollbars
 .B \-B
 Enable Scrollbars
 .TP
 .B \-B
 Enable Scrollbars
 .TP

-.B \-c cookiefile 
+.B \-c cookiefile

 Specify the
 .I cookiefile
 to use.
 .TP
 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
+.B \-D
+Enable the disk cache.
+.TP

 .B \-e xid
 Reparents to window specified by
 .I xid.
 .TP
 .B \-f
 .B \-e xid
 Reparents to window specified by
 .I xid.
 .TP
 .B \-f

-Run surf in fullscreen mode.
+Start surf in windowed mode (not fullscreen).

 .TP
 .B \-F
 .TP
 .B \-F

-Disable to run in fullscreen by default.
+Start surf in fullscreen mode.

 .TP
 .B \-g
 Disable giving the geolocation to websites.
 .TP
 .B \-g
 Disable giving the geolocation to websites.


@@ -68,6 +79,12 @@ Disable kiosk mode (disable key strokes and right click)
 .B \-K
 Enable kiosk mode (disable key strokes and right click)
 .TP
 .B \-K
 Enable kiosk mode (disable key strokes and right click)
 .TP

+.B \-m
+Disable application of user style sheets.
+.TP
+.B \-M
+Enable application of user style sheets.
+.TP

 .B \-n
 Disable the Web Inspector (Developer Tools).
 .TP
 .B \-n
 Disable the Web Inspector (Developer Tools).
 .TP


@@ -80,7 +97,7 @@ Disable Plugins
 .B \-P
 Enable Plugins
 .TP
 .B \-P
 Enable Plugins
 .TP

-.B \-r scriptfile 
+.B \-r scriptfile

 Specify the user
 .I scriptfile.
 .TP
 Specify the user
 .I scriptfile.
 .TP


@@ -90,11 +107,13 @@ Disable Javascript
 .B \-S
 Enable Javascript
 .TP
 .B \-S
 Enable Javascript
 .TP

-.B \-t stylefile
-Specify the user
-.I stylefile.
+.B \-t
+Disable strict TLS check

 .TP
 .TP

-.B \-u useragent 
+.B \-T
+Enable strict TLS check
+.TP
+.B \-u useragent

 Specify the
 .I useragent
 which surf should use.
 Specify the
 .I useragent
 which surf should use.


@@ -102,12 +121,18 @@ which surf should use.
 .B \-v
 Prints version information to standard output, then exits.
 .TP
 .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
 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.
 Specify the
 .I zoomlevel
 which surf should use.


@@ -149,7 +174,7 @@ Zooms page out
 .B Ctrl\-Shift\-q
 Resets Zoom
 .TP
 .B Ctrl\-Shift\-q
 Resets Zoom
 .TP

-.B Ctrl\-f and Ctrl\-\e
+.B Ctrl\-f and Ctrl\-/

 Opens the search-bar.
 .TP
 .B Ctrl\-n
 Opens the search-bar.
 .TP
 .B Ctrl\-n


@@ -179,6 +204,9 @@ Copies current URI to primary selection.
 .B Ctrl\-o
 Show the sourcecode of the current page.
 .TP
 .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.
 .B Ctrl\-Shift\-a
 Toggle through the the
 .I cookie policies.


@@ -195,7 +223,7 @@ Toggle auto-loading of images. This will reload the page.
 .TP
 .B Ctrl\-Shift\-m
 Toggle if the
 .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
 file should be loaded. This will reload the page.
 .TP
 .B Ctrl\-Shift\-o


@@ -204,12 +232,76 @@ 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\-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.
 .TP
 .B F11
 Toggle fullscreen mode.
 .B Ctrl\-Shift\-v
 Toggle the enabling of plugins on that surf instance. This will reload the
 page.
 .TP
 .B F11
 Toggle fullscreen mode.

+.SH INDICATORS OF OPERATION
+Surf is showing indicators of operation in front of the site title.
+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
+.TP
+.B a
+no cookies accepted
+.TP
+.B @
+all except third-party cookies accepted
+.TP
+.B c C
+caret browsing
+.TP
+.B g G
+geolocation
+.TP
+.B d D
+disk cache
+.TP
+.B i I
+images
+.TP
+.B s S
+scripts
+.TP
+.B v V
+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
+.TP
+.B -
+unencrypted
+.TP
+.B T
+encrypted (TLS)
+.TP
+.B U
+attempted encryption but failed
+.SS Second character: proxying
+.TP
+.B -
+no proxy
+.TP
+.B P
+using proxy

 .SH ENVIRONMENT
 .B SURF_USERAGENT
 If this variable is set upon startup, surf will use it as the
 .SH ENVIRONMENT
 .B SURF_USERAGENT
 If this variable is set upon startup, surf will use it as the


@@ -233,6 +325,7 @@ will help you.
 .BR dmenu(1),
 .BR xprop(1),
 .BR tabbed(1),
 .BR dmenu(1),
 .BR xprop(1),
 .BR tabbed(1),

-.BR nspluginwrapper(1)
+.BR nspluginwrapper(1),
+.BR xdotool(1)

 .SH BUGS
 Please report them!
 .SH BUGS
 Please report them!