> Date: Fri, 25 May 2012 21:47:23 +0100 > From: Jason McIntyre <[email protected]> > > the size of ftp's synopsis is making it very ugly. any objections to > shortening it? i.e. this diff is cosmetic.
Hmm, I'd say shortening srcaddr to src makes things less clear. > Index: ftp.1 > =================================================================== > RCS file: /cvs/src/usr.bin/ftp/ftp.1,v > retrieving revision 1.82 > diff -u -r1.82 ftp.1 > --- ftp.1 30 Apr 2012 13:41:26 -0000 1.82 > +++ ftp.1 25 May 2012 20:44:52 -0000 > @@ -39,17 +39,17 @@ > .Sh SYNOPSIS > .Nm ftp > .Op Fl 46AadEegimnptVv > -.Op Fl k Ar seconds > +.Op Fl k Ar sec > .Op Fl P Ar port > -.Op Fl r Ar seconds > -.Op Fl s Ar srcaddr > +.Op Fl r Ar sec > +.Op Fl s Ar src > .Op Ar host Op Ar port > .Nm ftp > .Op Fl C > -.Op Fl o Ar output > -.Op Fl s Ar srcaddr > +.Op Fl o Ar out > +.Op Fl s Ar src > .Sm off > -.No ftp:// Oo Ar user : password No @ > +.No ftp:// Oo Ar user : pass No @ > .Oc Ar host Oo : Ar port > .Oc No / Ar file Oo / > .Oc > @@ -58,8 +58,8 @@ > .Nm ftp > .Op Fl C > .Op Fl c Ar cookie > -.Op Fl o Ar output > -.Op Fl s Ar srcaddr > +.Op Fl o Ar out > +.Op Fl s Ar src > .Sm off > .No http:// Ar host Oo : Ar port > .Oc No / Ar file > @@ -68,8 +68,8 @@ > .Nm ftp > .Op Fl C > .Op Fl c Ar cookie > -.Op Fl o Ar output > -.Op Fl s Ar srcaddr > +.Op Fl o Ar out > +.Op Fl s Ar src > .Sm off > .No https:// Ar host Oo : Ar port > .Oc No / Ar file > @@ -77,16 +77,16 @@ > .Ar ... > .Nm ftp > .Op Fl C > -.Op Fl o Ar output > -.Op Fl s Ar srcaddr > +.Op Fl o Ar out > +.Op Fl s Ar src > .Sm off > .No file: Ar file > .Sm on > .Ar ... > .Nm ftp > .Op Fl C > -.Op Fl o Ar output > -.Op Fl s Ar srcaddr > +.Op Fl o Ar out > +.Op Fl s Ar src > .Sm off > .Ar host : No / Ar file Oo / > .Oc > @@ -167,11 +167,11 @@ > .It Fl i > Turns off interactive prompting during > multiple file transfers. > -.It Fl k Ar seconds > +.It Fl k Ar sec > When greater than zero, > -sends a byte after each > -.Ar seconds > -period over the control connection during long transfers, > +sends a byte after each period of > +.Ar sec > +seconds over the control connection during long transfers, > so that incorrectly configured network equipment won't > aggressively drop it. > The FTP protocol supports a > @@ -206,14 +206,14 @@ > will prompt for the remote machine login name (default is the user > identity on the local machine), and, if necessary, prompt for a password > and an account with which to log in. > -.It Fl o Ar output > +.It Fl o Ar out > When fetching a single file or URL, save the contents in > -.Ar output . > +.Ar out . > To make the contents go to stdout, > use > .Sq - > for > -.Ar output . > +.Ar out . > .It Fl P Ar port > Sets the port number to > .Ar port . > @@ -223,12 +223,13 @@ > .Nm > now tries to use passive mode by default, falling back to active mode > if the server does not support passive connections. > -.It Fl r Ar seconds > -Retry to connect if failed, pausing for number of > -.Ar seconds . > -.It Fl s Ar srcaddr > +.It Fl r Ar sec > +Retry to connect if failed, pausing for > +.Ar sec > +seconds. > +.It Fl s Ar src > Use > -.Ar srcaddr > +.Ar src > on the local machine as the source address > of the connection. > Only useful on systems with more than one address. > @@ -492,12 +493,12 @@ > If no argument is given, > .Nm > prints a list of the known commands. > -.It Ic idle Op Ar seconds > +.It Ic idle Op Ar sec > Set the inactivity timer on the remote server to > -.Ar seconds > +.Ar sec > seconds. > If > -.Ar seconds > +.Ar sec > is omitted, the current inactivity timer is printed. > .It Ic lcd Op Ar local-directory > Change the working directory on the local machine. > @@ -1193,12 +1194,12 @@ > .Ar newmask > is omitted, the current umask is printed. > .It Xo > -.Ic user Ar username > -.Op Ar password Op Ar account > +.Ic user Ar user > +.Op Ar pass Op Ar account > .Xc > Identify yourself to the remote FTP server. > -If the > -.Ar password > +If a password > +.Ar pass > is not specified and the server requires it, > .Nm > will prompt the user for it (after disabling local echo). > @@ -1264,20 +1265,20 @@ > .Dq Classic > .Nm > format. > -.It ftp://[user:password@]host[:port]/file[/] > +.It ftp://[user:pass@]host[:port]/file[/] > An FTP URL, retrieved using the FTP protocol if > .Ev ftp_proxy > isn't defined. > Otherwise, transfer using HTTP via the proxy defined in > .Ev ftp_proxy . > If > -.Ar user : Ns Ar password Ns @ > +.Ar user : Ns Ar pass Ns @ > is given and > .Ev ftp_proxy > isn't defined, log in as > .Ar user > with a password of > -.Ar password . > +.Ar pass . > .It http://host[:port]/file > An HTTP URL, retrieved using the HTTP protocol. > If > @@ -1328,11 +1329,11 @@ > of > .Ar file . > If > -.Fl o Ar output > +.Fl o Ar out > is specified, then > .Ar file > is stored as > -.Ar output . > +.Ar out . > Otherwise, the remote name is used as the local name. > .Sh ABORTING A FILE TRANSFER > To abort a file transfer, use the terminal interrupt key > Index: main.c > =================================================================== > RCS file: /cvs/src/usr.bin/ftp/main.c,v > retrieving revision 1.83 > diff -u -r1.83 main.c > --- main.c 19 May 2012 02:04:22 -0000 1.83 > +++ main.c 25 May 2012 20:44:52 -0000 > @@ -758,47 +758,44 @@ > { > (void)fprintf(stderr, "usage: %s " > #ifndef SMALL > - "[-46AadEegimnptVv] [-k seconds] [-P port] " > - "[-r seconds] [-s srcaddr]\n" > - " [host [port]]\n" > + "[-46AadEegimnptVv] [-k sec] [-P port] " > + "[-r sec] [-s src] [host [port]]\n" > " %s [-C] " > #endif /* !SMALL */ > - "[-o output] " > + "[-o out] " > #ifndef SMALL > - "[-s srcaddr]\n" > - " " > + "[-s src] " > #endif /* !SMALL */ > - "ftp://[user:password@]host[:port]/file[/] ...\n" > + "ftp://[user:pass@]host[:port]/file[/] ...\n" > " %s " > #ifndef SMALL > "[-C] [-c cookie] " > #endif /* !SMALL */ > - "[-o output] " > + "[-o out] " > #ifndef SMALL > - "[-s srcaddr] " > + "[-s src] " > #endif /* !SMALL */ > "http://host[:port]/file ...\n" > #ifndef SMALL > - " %s [-C] [-c cookie] [-o output] [-s srcaddr] " > - "https://host[:port]/file\n"; > - " ...\n" > + " %s [-C] [-c cookie] [-o out] [-s src] " > + "https://host[:port]/file ...\n" > #endif /* !SMALL */ > " %s " > #ifndef SMALL > "[-C] " > #endif /* !SMALL */ > - "[-o output] " > + "[-o out] " > #ifndef SMALL > - "[-s srcaddr] " > + "[-s src] " > #endif /* !SMALL */ > "file:file ...\n" > " %s " > #ifndef SMALL > "[-C] " > #endif /* !SMALL */ > - "[-o output] " > + "[-o out] " > #ifndef SMALL > - "[-s srcaddr] " > + "[-s src] " > #endif /* !SMALL */ > "host:/file[/] ...\n", > #ifndef SMALL
