updating manpage, reformating help output.

This commit is contained in:
Enno Boland (tox) 2010-03-25 00:05:37 +01:00
parent 62dc599a04
commit a05bcc653e
2 changed files with 19 additions and 9 deletions

20
surf.1
View File

@ -3,8 +3,12 @@
surf \- simple webkit-based browser surf \- simple webkit-based browser
.SH SYNOPSIS .SH SYNOPSIS
.B surf .B surf
.RB [ \-hvx ] .RB [-e\ xid]
.RB [ \-e xid ] .RB [-i]
.RB [-p]
.RB [-s]
.RB [-v]
.RB [-x]
.RB "URI" .RB "URI"
.SH DESCRIPTION .SH DESCRIPTION
surf is a simple Web browser based on WebKit/GTK+. It is able 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 .SH OPTIONS
.TP .TP
.B \-e xid .B \-e xid
reparents to window specified by xid. Reparents to window specified by xid.
.TP .TP
.B \-h .B \-i
Prints usage information to standard output, then exits. Disable Images
.TP
.B \-p
Disable Plugins
.TP
.B \-s
Disable Javascript
.TP .TP
.B \-v .B \-v
Prints version information to standard output, then exits. Prints version information to standard output, then exits.

8
surf.c
View File

@ -837,7 +837,7 @@ updatewinid(Client *c) {
void void
usage(void) { usage(void) {
fputs("surf - simple browser\n", stderr); 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 void
@ -880,9 +880,6 @@ main(int argc, char *argv[]) {
break; break;
} }
switch(argv[i][1]) { switch(argv[i][1]) {
case 'x':
showxid = TRUE;
break;
case 'e': case 'e':
if(++i < argc) if(++i < argc)
embed = atoi(argv[i]); embed = atoi(argv[i]);
@ -898,6 +895,9 @@ main(int argc, char *argv[]) {
case 's': case 's':
script = 0; script = 0;
break; break;
case 'x':
showxid = TRUE;
break;
case 'v': case 'v':
die("surf-"VERSION", © 2009 surf engineers, see LICENSE for details\n"); die("surf-"VERSION", © 2009 surf engineers, see LICENSE for details\n");
default: default: