merge

[surf.git] / surf.1

diff --git a/surf.1 b/surf.1
index 1964acf..b6684cd 100644 (file)
--- a/surf.1
+++ b/surf.1
@@ -4,8 +4,7 @@ surf \- simple webkit-based browser
 .SH SYNOPSIS
 .B surf
 .RB [ \-ehvx ]
 .SH SYNOPSIS
 .B surf
 .RB [ \-ehvx ]

-.RB [ \-f " FILE"]
-.RB [ \-u " URI"]
+.RB "URI"

 .SH DESCRIPTION
 surf is a simple Web browser based on WebKit/GTK+. It is able
 to display websites and follow links. It supports the XEmbed protocol
 .SH DESCRIPTION
 surf is a simple Web browser based on WebKit/GTK+. It is able
 to display websites and follow links. It supports the XEmbed protocol


@@ -17,16 +16,9 @@ one can point surf to another URI by setting its XProperties.
 Prints xid to standard output and waits until an application reparents the
 window.
 .TP
 Prints xid to standard output and waits until an application reparents the
 window.
 .TP

-.B \-f FILE
-Sets the browser's URI to FILE. It is also possible to read from standard
-input.
-.TP

 .B \-h
 Prints usage information to standard output, then exits.
 .TP
 .B \-h
 Prints usage information to standard output, then exits.
 .TP

-.B \-u URI
-Sets the browser's URI.
-.TP

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


@@ -35,10 +27,10 @@ Prints xid to standard output. This can be used to script the browser by using
 .BR xprop(1).
 .SH USAGE
 .TP
 .BR xprop(1).
 .SH USAGE
 .TP

-.B Ctrl\-Left
+.B Ctrl\-h

 Walks back the history.
 .TP
 Walks back the history.
 .TP

-.B Ctrl\-Right
+.B Ctrl\-l

 Walks forward the history.
 .TP
 .B Ctrl\-/
 Walks forward the history.
 .TP
 .B Ctrl\-/