===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tftp/tftp.1,v
retrieving revision 1.7
retrieving revision 1.8
diff -c -r1.7 -r1.8
*** src/usr.bin/tftp/tftp.1	2003/06/03 02:56:18	1.7
--- src/usr.bin/tftp/tftp.1	2003/09/25 09:45:46	1.8
***************
*** 1,4 ****
! .\"	$OpenBSD: tftp.1,v 1.7 2003/06/03 02:56:18 millert Exp $
  .\"	$NetBSD: tftp.1,v 1.5 1995/08/18 14:45:44 pk Exp $
  .\"
  .\" Copyright (c) 1990, 1993, 1994
--- 1,4 ----
! .\"	$OpenBSD: tftp.1,v 1.8 2003/09/25 09:45:46 jmc Exp $
  .\"	$NetBSD: tftp.1,v 1.5 1995/08/18 14:45:44 pk Exp $
  .\"
  .\" Copyright (c) 1990, 1993, 1994
***************
*** 39,44 ****
--- 39,45 ----
  .Sh SYNOPSIS
  .Nm tftp
  .Op Ar host
+ .Op Ar port
  .Sh DESCRIPTION
  .Nm
  is the user interface to the Internet
***************
*** 47,57 ****
  which allows users to transfer files to and from a remote machine.
  The remote
  .Ar host
  may be specified on the command line, in which case
  .Nm
! uses
! .Ar host
! as the default host for future transfers (see the
  .Ic connect
  command below).
  .Sh COMMANDS
--- 48,58 ----
  which allows users to transfer files to and from a remote machine.
  The remote
  .Ar host
+ and
+ .Ar port
  may be specified on the command line, in which case
  .Nm
! uses them as the default for future transfers (see the
  .Ic connect
  command below).
  .Sh COMMANDS
***************
*** 67,77 ****
  .Pp
  .It Ic ascii
  Shorthand for
! .Ic mode ascii .
  .Pp
  .It Ic binary
  Shorthand for
! .Ic mode binary .
  .Pp
  .It Ic connect Ar host Op Ar port
  Set the
--- 68,78 ----
  .Pp
  .It Ic ascii
  Shorthand for
! .Ic mode Ar ascii .
  .Pp
  .It Ic binary
  Shorthand for
! .Ic mode Ar binary .
  .Pp
  .It Ic connect Ar host Op Ar port
  Set the
***************
*** 96,143 ****
  .Ic put
  commands.
  .Pp
! .It Ic get Ar filename
! .It Ic get Ar remotename localname
! .It Ic get Ar file Op Ar ...
! Get a file or set of files from the specified
! .Ar sources .
! .Ar source
! can be in one of two forms:
! a filename on the remote host, if the host has already been specified,
! or a string of the form
! .Ar hosts:filename
! to specify both a host and filename at the same time.
! If the latter form is used,
! the last hostname specified becomes the default for future transfers.
  .Pp
  .It Ic mode Ar transfer-mode
  Set the mode for transfers;
  .Ar transfer-mode
  may be one of
! .Ic ascii
  or
! .Ic binary .
  The default is
! .Ic ascii .
  .Pp
! .It Ic put Ar file
! .It Ic put Ar localfile remotefile
! .It Ic put Ar file1 file2 ... fileN remote-directory
! Put a file or set of files to the specified
! remote file or directory.
! The destination
! can be in one of two forms:
! a filename on the remote host, if the host has already been specified,
! or a string of the form
! .Ar hosts:filename
! to specify both a host and filename at the same time.
! If the latter form is used,
! the hostname specified becomes the default for future transfers.
! If the remote-directory form is used, the remote host is
! assumed to be a
  .Tn UNIX
  machine.
  .Pp
  .It Ic quit
  Exit
  .Nm tftp .
--- 97,175 ----
  .Ic put
  commands.
  .Pp
! .It Xo
! .Ic get Oo Ar host Ns : Oc Ns
! .Ar file Op Ar localname
! .Xc
! .It Xo
! .Ic get Oo Ar host1 Ns : Oc Ns
! .Ar file1
! .Oo Ar host2 Ns : Oc Ns
! .Ar file2
! .Ar ...
! .Oo Ar hostN Ns : Oc Ns
! .Ar fileN
! .Xc
! Get a file or set of files from the remote host.
! When using the
! .Ar host
! argument, the
! .Ar host
! will be used as the default host for future transfers.
! If
! .Ar localname
! is specified,
! the file is stored locally as
! .Ar localname ,
! otherwise the original filename is used.
  .Pp
+ Note that it is not possible to download two files at the same time;
+ only one, three, or more than three files
+ can be downloaded at the same time.
+ .Pp
  .It Ic mode Ar transfer-mode
  Set the mode for transfers;
  .Ar transfer-mode
  may be one of
! .Ar ascii
  or
! .Ar binary .
  The default is
! .Ar ascii .
  .Pp
! .It Xo
! .Ic put Ar file
! .Oo Oo Ar host Ns : Oc Ns
! .Ar remotename Oc
! .Xc
! .It Xo
! .Ic put Ar file1 file2 ... fileN
! .Oo Oo Ar host Ns : Oc Ns
! .Ar remote-directory Oc
! .Xc
! Put a file or set of files to the remote host.
! When using the
! .Ar host
! argument, the
! .Ar host
! will be used as the default host for future transfers.
! If
! .Ar remotename
! is specified, the file is stored remotely as
! .Ar remotename ,
! otherwise the original filename is used.
! If the
! .Ar remote-directory
! argument is used, the remote host is assumed to be a
  .Tn UNIX
  machine.
  .Pp
+ Note that files may only be written to if they already exist on the
+ remote host and are publicly writable.
+ See
+ .Xr tftpd 8
+ for further details.
+ .Pp
  .It Ic quit
  Exit
  .Nm tftp .
***************
*** 159,165 ****
  Toggle verbose mode.
  .El
  .Sh SEE ALSO
! .Xr ftp 1
  .Sh HISTORY
  The
  .Nm
--- 191,198 ----
  Toggle verbose mode.
  .El
  .Sh SEE ALSO
! .Xr ftp 1 ,
! .Xr tftpd 8
  .Sh HISTORY
  The
  .Nm
***************
*** 173,175 ****
--- 206,213 ----
  sort of file access restrictions in place.
  The exact methods are specific to each site and therefore
  difficult to document here.
+ .Pp
+ Files larger than 33488896 octets (65535 blocks) cannot be transferred
+ without client and server supporting blocksize negotiation (RFC 1783).
+ .Pp
+ Many tftp clients will not transfer files over 16744448 octets (32767 blocks).