[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.83 and 1.84

version 1.83, 2012/08/14 20:47:08 version 1.84, 2012/08/26 02:16:02
Line 61 
Line 61 
 .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 http:// Oo Ar user : password No @  .No http[s]:// Oo Ar user : password No @
 .Oc Ar host Oo : Ar port  .Oc Ar host Oo : Ar port
 .Oc No / Ar file  .Oc No / Ar file
 .Sm on  .Sm on
 .Ar ...  .Ar ...
 .Nm ftp  .Nm ftp
 .Op Fl C  .Op Fl C
 .Op Fl c Ar cookie  
 .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 https:// Oo Ar user : password No @  
 .Oc Ar host Oo : Ar port  
 .Oc No / Ar file  
 .Sm on  
 .Ar ...  
 .Nm ftp  
 .Op Fl C  
 .Op Fl o Ar output  
 .Op Fl s Ar srcaddr  
 .Sm off  
 .No file: Ar file  .No file: Ar file
 .Sm on  .Sm on
 .Ar ...  .Ar ...
Line 102 
Line 91 
 The program allows a user to transfer files to and from a  The program allows a user to transfer files to and from a
 remote network site.  remote network site.
 .Pp  .Pp
 The latter five usage formats will fetch a file using either the  The latter four usage formats will fetch a file using either the
 FTP, HTTP, or HTTPS protocols into the current directory.  FTP, HTTP, or HTTPS protocols into the current directory.
 This is ideal for scripts.  This is ideal for scripts.
 Refer to  Refer to
Line 1272 
Line 1261 
 isn't defined.  isn't defined.
 Otherwise, transfer using HTTP via the proxy defined in  Otherwise, transfer using HTTP via the proxy defined in
 .Ev ftp_proxy .  .Ev ftp_proxy .
 If  If a
 .Ar user : Ns Ar password Ns @  .Ar user
 is given and  and
   .Ar password
   are given and
 .Ev ftp_proxy  .Ev ftp_proxy
 isn't defined, log in as  isn't defined,
   log in as
 .Ar user  .Ar user
 with a password of  with a password of
 .Ar password .  .Ar password .
Line 1285 
Line 1277 
 If  If
 .Ev http_proxy  .Ev http_proxy
 is defined, it is used as a URL to an HTTP proxy server.  is defined, it is used as a URL to an HTTP proxy server.
   If a
   .Ar user
   and
   .Ar password
   are given and
   .Ev http_proxy
   isn't defined,
   log in as
   .Ar user
   with a password of
   .Ar password
   using Basic authentication.
 .It https://[user:password@]host[:port]/file  .It https://[user:password@]host[:port]/file
 An HTTPS URL, retrieved using the HTTPS protocol.  An HTTPS URL, retrieved using the HTTPS protocol.
 If  If
 .Ev http_proxy  .Ev http_proxy
 is defined, this HTTPS proxy server will be used to fetch the  is defined, this HTTPS proxy server will be used to fetch the
 file using the CONNECT method.  file using the CONNECT method.
   If a
   .Ar user
   and
   .Ar password
   are given and
   .Ev http_proxy
   isn't defined,
   log in as
   .Ar user
   with a password of
   .Ar password
   using Basic authentication.
 .It file:file  .It file:file
 .Ar file  .Ar file
 is retrieved from a mounted file system.  is retrieved from a mounted file system.
Legend:
Removed from v.1.83  
changed lines
  Added in v.1.84