Resolving some conflicts in the shortcuts.

[surf.git] / surf.1

diff --git a/surf.1 b/surf.1
index 6d2a8e3..7e523f6 100644 (file)
--- a/surf.1
+++ b/surf.1
@@ -3,7 +3,16 @@
 surf \- simple webkit-based browser
 .SH SYNOPSIS
 .B surf
 surf \- simple webkit-based browser
 .SH SYNOPSIS
 .B surf

-.RB [ \-ehvx ]
+.RB [-c\ cookiefile]
+.RB [-e\ xid]
+.RB [-i]
+.RB [-p]
+.RB [-r\ scriptfile]
+.RB [-s]
+.RB [-t\ stylefile]
+.RB [-u\ useragent]
+.RB [-v]
+.RB [-x]

 .RB "URI"
 .SH DESCRIPTION
 surf is a simple Web browser based on WebKit/GTK+. It is able
 .RB "URI"
 .SH DESCRIPTION
 surf is a simple Web browser based on WebKit/GTK+. It is able


@@ -12,12 +21,29 @@ which makes it possible to embed it in another application. Furthermore,
 one can point surf to another URI by setting its XProperties.
 .SH OPTIONS
 .TP
 one can point surf to another URI by setting its XProperties.
 .SH OPTIONS
 .TP

-.B \-e
-Prints xid to standard output and waits until an application reparents the
-window.
+.B \-c cookiefile 
+Specify the cookiefile to use.

 .TP
 .TP

-.B \-h
-Prints usage information to standard output, then exits.
+.B \-e xid
+Reparents to window specified by xid.
+.TP
+.B \-i
+Disable Images
+.TP
+.B \-p
+Disable Plugins
+.TP
+.B \-r scriptfile 
+Specify the user scriptfile.
+.TP
+.B \-s
+Disable Javascript
+.TP
+.B \-t stylefile
+Specify the user stylefile.
+.TP
+.B \-u useragent 
+Specify the useragent which surf should use.

 .TP
 .B \-v
 Prints version information to standard output, then exits.
 .TP
 .B \-v
 Prints version information to standard output, then exits.


@@ -41,16 +67,34 @@ Scrolls page upwards.
 .B Ctrl\-j
 Scrolls page downwards.
 .TP
 .B Ctrl\-j
 Scrolls page downwards.
 .TP

-.B Ctrl\-Shift\-k
+.B Ctrl\-b
+Scroll up one whole page view.
+.TP
+.B Ctrl\-Space
+Scroll down one whole page view.
+.TP
+.B Ctrl\-i
+Scroll horizontally to the right.
+.TP
+.B Ctrl\-u
+Scroll horizontally to the left.
+.TP
+.B Ctrl\-Shift\-k or Ctrl\-+

 Zooms page in.
 .TP
 Zooms page in.
 .TP

-.B Ctrl\-Shift\-j
+.B Ctrl\-Shift\-j or Ctrl\--

 Zooms page out
 .TP
 Zooms page out
 .TP

-.B Ctrl\-Shift\-i
+.B Ctrl\-Shift\-q

 Resets Zoom
 .TP
 Resets Zoom
 .TP

-.B Ctrl\-/
+.B Ctrl\-h
+Navigate back one step in history.
+.TP
+.B Ctrl\-l
+Navigate forward one step in history.
+.TP
+.B Ctrl\-f and Ctrl\-\\

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


@@ -65,6 +109,9 @@ Opens the URL-bar.
 .B Ctrl\-p
 Loads URI from primary selection.
 .TP
 .B Ctrl\-p
 Loads URI from primary selection.
 .TP

+.B Esc
+Stop loading the page.
+.TP

 .B Ctrl\-Shift\-p
 Calls Printpage Dialog.
 .TP
 .B Ctrl\-Shift\-p
 Calls Printpage Dialog.
 .TP


@@ -78,9 +125,29 @@ Reloads the website without using cache.
 Copies current URI to primary selection.
 .TP
 .B Ctrl\-o
 Copies current URI to primary selection.
 .TP
 .B Ctrl\-o

-show the sourcecode of the current page.
+Show the sourcecode of the current page.
+.TP
+.B Ctrl\-Shift\-c
+Toggle caret browsing.
+.TP
+.B Ctrl\-Shift\-i
+Toggle auto-loading of images.
+.TP
+.B Ctrl\-Shift\-s
+Toggle script execution.
+.TP
+.B Ctrl\-Shift\-v
+Toggle the enabling of plugins on that surf instance.
+.SH ENVIRONMENT
+.TP
+.B SURF_USERAGENT
+If this variable is set upon startup, surf will use it as the useragent string
+.TP
+.B http_proxy
+If this variable is set and not empty upon startup, surf will use it as the http proxy

 .SH SEE ALSO
 .SH SEE ALSO

-.BR dmenu(1)
-.BR xprop(1)
+.BR dmenu(1),
+.BR xprop(1),
+.BR tabbed(1)

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