Fix forgotten bracket and duplicate option in usage()

Scratch the preceding patch, this one is more correct
(don't forget to 'git am --scissors' ;))
-- >8 --

Also reformat the strings in a saner layout

Signed-off-by: Christoph Lohmann <20h@r-36.net>

st.c

@@ -4333,12 +4333,14 @@ run(void)
 void
 usage(void)
 {
-	die("usage: %s "
+	die("usage: %s [-aiv] [-c class] [-f font] [-g geometry]"
-	"[-aiv] [-c class] [-f font] [-g geometry] [-n name] [-o file]\n       "
+	    " [-n name] [-o file]\n"
-	"   [-T title] [-t title] [-w windowid] [[-e] command [args ...]\n     "
+	    "          [-T title] [-t title] [-w windowid]"
-	"  %s [-aiv] [-c class] [-f font] [-g geometry] [-n name] [-o file]\n  "
+	    " [[-e] command [args ...]]\n"
-	"        [-o file] [-T title] [-t title] [-w windowid] -l line"
+	    "       %s [-aiv] [-c class] [-f font] [-g geometry]"
-	" [stty_args ...]\n", argv0, argv0);
+	    " [-n name] [-o file]\n"
+	    "          [-T title] [-t title] [-w windowid] -l line"
+	    " [stty_args ...]\n", argv0, argv0);
 }
 
 int