This patch, put together by Manuel Novoa III, is a merge of work

done by Evin Robertson (bug#1105) and work from Manuel to make
usage messages occupy less space and simplify how usage messages
are displayed.

networking/telnet.c

@@ -498,7 +498,7 @@ extern int telnet_main(int argc, char** argv)
 
 	cfmakeraw(&G.termios_raw);
 	
-	if (argc < 2)	usage(telnet_usage);
+	if (argc < 2)	show_usage();
 	port = (argc > 2)? getport(argv[2]): 23;
 	
 	G.buf = xmalloc(DATABUFSIZE);