updating manpage, reformating help output.

2 files changed, 19 insertions, 9 deletions

diff --git a/surf.1 b/surf.1
index 11c1292..f66913b 100644
--- a/surf.1
+++ b/surf.1
@@ -3,8 +3,12 @@
 surf \- simple webkit-based browser
 .SH SYNOPSIS
 .B surf
-.RB [ \-hvx ]
-.RB [ \-e xid ]
+.RB [-e\ xid]
+.RB [-i]
+.RB [-p]
+.RB [-s]
+.RB [-v]
+.RB [-x]
 .RB "URI"
 .SH DESCRIPTION
 surf is a simple Web browser based on WebKit/GTK+. It is able
@@ -14,10 +18,16 @@ one can point surf to another URI by setting its XProperties.
 .SH OPTIONS
 .TP
 .B \-e xid
-reparents to window specified by xid.
+Reparents to window specified by xid.
 .TP
-.B \-h
-Prints usage information to standard output, then exits.
+.B \-i
+Disable Images
+.TP
+.B \-p
+Disable Plugins
+.TP
+.B \-s
+Disable Javascript
 .TP
 .B \-v
 Prints version information to standard output, then exits.
diff --git a/surf.c b/surf.c
index aa29780..a046a5a 100644
--- a/surf.c
+++ b/surf.c
@@ -837,7 +837,7 @@ updatewinid(Client *c) {
 void
 usage(void) {
 	fputs("surf - simple browser\n", stderr);
-	die("usage: surf [-e Window] [-x] [-i] [-p] [-s] [uri]\n");
+	die("usage: surf [-e xid] [-i] [-p] [-s] [-v] [-x] [uri]\n");
 }
 
 void
@@ -880,9 +880,6 @@ main(int argc, char *argv[]) {
 			break;
 		}
 		switch(argv[i][1]) {
-		case 'x':
-			showxid = TRUE;
-			break;
 		case 'e':
 			if(++i < argc)
 				embed = atoi(argv[i]);
@@ -898,6 +895,9 @@ main(int argc, char *argv[]) {
 		case 's':
 			script = 0;
 			break;
+		case 'x':
+			showxid = TRUE;
+			break;
 		case 'v':
 			die("surf-"VERSION", © 2009 surf engineers, see LICENSE for details\n");
 		default: