X-Git-Url: https://git.danieliu.xyz/?p=surf.git;a=blobdiff_plain;f=surf.1;h=fe149ba74ea20fa78fac0e257102931613d7f8dd;hp=5b194ecf2ed51856ecab864cc0719c5d98cbe026;hb=edddfbc14ac3a4413f38171e8fd7767ae56e27bf;hpb=780cca964ca0cf622746ad6e8cae8beb8047d1df

diff --git a/surf.1 b/surf.1
index 5b194ec..fe149ba 100644
--- a/surf.1
+++ b/surf.1
@@ -3,12 +3,12 @@
 surf \- simple webkit-based browser
 .SH SYNOPSIS
 .B surf
-.RB [-bBfFgGiIkKnNpPsSvx]
+.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"
@@ -27,7 +27,7 @@ redefined in the
 .I config.h,
 with "A" meaning to
 accept all cookies, "a" to deny all cookies and "@", which tells surf to
-accept all third party cookies.
+accept no third party cookies.
 .TP
 .B \-b
 Disable Scrollbars
@@ -35,20 +35,31 @@ 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
+.B \-D
+Enable the disk cache.
+.TP
 .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
-Disable to run in fullscreen by default.
+Start surf in fullscreen mode.
 .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 \-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
@@ -80,7 +97,7 @@ Disable Plugins
 .B \-P
 Enable Plugins
 .TP
-.B \-r scriptfile 
+.B \-r scriptfile
 Specify the user
 .I scriptfile.
 .TP
@@ -90,11 +107,13 @@ Disable Javascript
 .B \-S
 Enable Javascript
 .TP
-.B \-t stylefile
-Specify the user
-.I stylefile.
+.B \-t
+Disable strict TLS check
 .TP
-.B \-u useragent 
+.B \-T
+Enable strict TLS check
+.TP
+.B \-u useragent
 Specify the
 .I useragent
 which surf should use.
@@ -102,10 +121,18 @@ which surf should use.
 .B \-v
 Prints version information to standard output, then exits.
 .TP
-.B \-x
-Prints xid to standard output. This can be used to script the browser by using
+.B \-w
+Prints xid to standard output. This can be used to script the browser in for
+example
+.BR xdotool(1).
+.TP
+.B -x
+Disable custom certificates.
 .TP
-.B \-z zoomlevel 
+.B -X
+Enable custom certificates.
+.TP
+.B \-z zoomlevel
 Specify the
 .I zoomlevel
 which surf should use.
@@ -147,7 +174,7 @@ Zooms page out
 .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
@@ -157,7 +184,7 @@ Go to next search result.
 Go to previous search result.
 .TP
 .B Ctrl\-g
-Opens the URL-bar.
+Opens the URL-bar (requires dmenu installed).
 .TP
 .B Ctrl\-p
 Loads URI from primary selection.
@@ -177,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.
@@ -193,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
@@ -202,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\-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.
+.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
@@ -231,6 +325,7 @@ will help you.
 .BR dmenu(1),
 .BR xprop(1),
 .BR tabbed(1),
-.BR nspluginwrapper(1)
+.BR nspluginwrapper(1),
+.BR xdotool(1)
 .SH BUGS
 Please report them!