[BACK]Return to ftp.1 CVS log [TXT][DIR] Up to [local] / src / usr.bin / ftp

Diff for /src/usr.bin/ftp/ftp.1 between version 1.98 and 1.99

version 1.98, 2015/03/13 19:58:41 version 1.99, 2015/09/25 13:51:52
Line 50 
Line 50 
 .Op Fl o Ar output  .Op Fl o Ar output
 .Op Fl s Ar srcaddr  .Op Fl s Ar srcaddr
 .Sm off  .Sm off
 .No ftp:// Oo Ar user : password No @  .Cm ftp No ://
 .Oc Ar host Oo : Ar port  .Op Ar user : password No @
 .Oc No / Ar file Oo /  .Ar host Op : Ar port
 .Oc  .No / Ar file Op /
 .Sm on  .Sm on
 .Ar ...  .Ar ...
 .Nm ftp  .Nm ftp
Line 64 
Line 64 
 .Op Fl s Ar srcaddr  .Op Fl s Ar srcaddr
 .Op Fl U Ar useragent  .Op Fl U Ar useragent
 .Sm off  .Sm off
 .No http[s]:// Oo Ar user : password No @  .Cm http Oo Cm s Oc ://
 .Oc Ar host Oo : Ar port  .Op Ar user : password No @
 .Oc No / Ar file  .Ar host Op : Ar port
   .No / Ar file
 .Sm on  .Sm on
 .Ar ...  .Ar ...
 .Nm ftp  .Nm ftp
 .Op Fl C  .Op Fl C
 .Op Fl o Ar output  .Op Fl o Ar output
 .Op Fl s Ar srcaddr  .Op Fl s Ar srcaddr
 .Sm off  .Cm file : Ns Ar
 .No file: Ar file  
 .Sm on  
 .Ar ...  
 .Nm ftp  .Nm ftp
 .Op Fl C  .Op Fl C
 .Op Fl o Ar output  .Op Fl o Ar output
 .Op Fl s Ar srcaddr  .Op Fl s Ar srcaddr
 .Sm off  .Ar host : Ns / Ns Ar file Ns Op /
 .Ar host : No / Ar file Oo /  
 .Oc  
 .Sm on  
 .Ar ...  .Ar ...
 .Sh DESCRIPTION  .Sh DESCRIPTION
 .Nm  .Nm
Line 1314 
Line 1309 
 .Pp  .Pp
 The following formats are valid syntax for an auto-fetch element:  The following formats are valid syntax for an auto-fetch element:
 .Bl -tag -width Ds  .Bl -tag -width Ds
 .It host:/file[/]  .It Ar host : Ns / Ns Ar file Ns Op /
 .Dq Classic  .Dq Classic
 .Nm  .Nm
 format.  format.
 .It ftp://[user:password@]host[:port]/file[/]  .Sm off
   .It Xo
   .Cm ftp No ://
   .Op Ar user : password No @
   .Ar host Op : Ar port
   .No / Ar file Op /
   .Xc
   .Sm on
 An FTP URL, retrieved using the FTP protocol if  An FTP URL, retrieved using the FTP protocol if
 .Ev ftp_proxy  .Ev ftp_proxy
 isn't defined.  isn't defined.
Line 1335 
Line 1337 
 .Ar user  .Ar user
 with a password of  with a password of
 .Ar password .  .Ar password .
 .It http://[user:password@]host[:port]/file  .Sm off
   .It Xo
   .Cm http No ://
   .Op Ar user : password No @
   .Ar host Op : Ar port
   .No / Ar file
   .Xc
   .Sm on
 An HTTP URL, retrieved using the HTTP protocol.  An HTTP URL, retrieved using the HTTP protocol.
 If  If
 .Ev http_proxy  .Ev http_proxy
Line 1352 
Line 1361 
 with a password of  with a password of
 .Ar password  .Ar password
 using Basic authentication.  using Basic authentication.
 .It https://[user:password@]host[:port]/file  .Sm off
   .It Xo
   .Cm https No ://
   .Op Ar user : password No @
   .Ar host Op : Ar port
   .No / Ar file
   .Xc
   .Sm on
 An HTTPS URL, retrieved using the HTTPS protocol.  An HTTPS URL, retrieved using the HTTPS protocol.
 If  If
 .Ev http_proxy  .Ev http_proxy
Line 1370 
Line 1386 
 with a password of  with a password of
 .Ar password  .Ar password
 using Basic authentication.  using Basic authentication.
 .It file:file  .It Cm file : Ns Ar file
 .Ar file  .Ar file
 is retrieved from a mounted file system.  is retrieved from a mounted file system.
 .El  .El

Legend:
Removed from v.1.98  
changed lines
  Added in v.1.99