Module Name:    othersrc
Committed By:   lukem
Date:           Wed May 20 13:52:59 UTC 2009

Modified Files:
        othersrc/usr.bin/tnftp/src: ftp.cat1

Log Message:
regen from ftp.1


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 othersrc/usr.bin/tnftp/src/ftp.cat1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: othersrc/usr.bin/tnftp/src/ftp.cat1
diff -u othersrc/usr.bin/tnftp/src/ftp.cat1:1.5 othersrc/usr.bin/tnftp/src/ftp.cat1:1.6
--- othersrc/usr.bin/tnftp/src/ftp.cat1:1.5	Mon Aug  6 04:40:51 2007
+++ othersrc/usr.bin/tnftp/src/ftp.cat1	Wed May 20 13:52:59 2009
@@ -4,8 +4,8 @@
      ffttpp -- Internet file transfer program
 
 SSYYNNOOPPSSIISS
-     ffttpp [--4466AAaaddeeffggiinnppRRttvvVV] [--NN _n_e_t_r_c] [--oo _o_u_t_p_u_t] [--PP _p_o_r_t] [--qq _q_u_i_t_t_i_m_e]
-         [--ss _s_r_c_a_d_d_r] [--rr _r_e_t_r_y] [--TT _d_i_r,_m_a_x[,_i_n_c]] [[_u_s_e...@]_h_o_s_t [_p_o_r_t]]
+     ffttpp [--4466AAaaddeeffggiinnppRRttVVvv] [--NN _n_e_t_r_c] [--oo _o_u_t_p_u_t] [--PP _p_o_r_t] [--qq _q_u_i_t_t_i_m_e]
+         [--rr _r_e_t_r_y] [--ss _s_r_c_a_d_d_r] [--TT _d_i_r,_m_a_x[,_i_n_c]] [[_u_s_e...@]_h_o_s_t [_p_o_r_t]]
          [[_u_s_e...@]_h_o_s_t:[_p_a_t_h][/]] [file:///_p_a_t_h]
          [ftp://[_u_s_e_r[:_p_a_s_s_w_o_r_...@]_h_o_s_t[:_p_o_r_t]/_p_a_t_h[/][;type=_X]]
          [http://[_u_s_e_r[:_p_a_s_s_w_o_r_...@]_h_o_s_t[:_p_o_r_t]/_p_a_t_h] [_._._.]
@@ -50,6 +50,9 @@
      --ii          Turns off interactive prompting during multiple file trans-
                  fers.
 
+     --NN _n_e_t_r_c    Use _n_e_t_r_c instead of _~_/_._n_e_t_r_c.  Refer to _T_H_E _._n_e_t_r_c _F_I_L_E for
+                 more information.
+
      --nn          Restrains ffttpp from attempting ``auto-login'' upon initial
                  connection for non auto-fetch transfers.  If auto-login is
                  enabled, ffttpp will check the _._n_e_t_r_c (see below) file in the
@@ -61,9 +64,6 @@
                  auto-login for auto-fetch transfers, specify the username
                  (and optionally, password) as appropriate.
 
-     --NN _n_e_t_r_c    Use _n_e_t_r_c instead of _~_/_._n_e_t_r_c.  Refer to _T_H_E _._n_e_t_r_c _F_I_L_E for
-                 more information.
-
      --oo _o_u_t_p_u_t   When auto-fetching files, save the contents in _o_u_t_p_u_t.
                  _o_u_t_p_u_t is parsed according to the _F_I_L_E _N_A_M_I_N_G _C_O_N_V_E_N_T_I_O_N_S
                  below.  If _o_u_t_p_u_t is not `-' or doesn't start with `|', then
@@ -71,21 +71,21 @@
                  all other files will be retrieved into the basename of their
                  remote name.
 
+     --PP _p_o_r_t     Sets the port number to _p_o_r_t.
+
      --pp          Enable passive mode operation for use behind connection fil-
                  tering firewalls.  This option has been deprecated as ffttpp now
                  tries to use passive mode by default, falling back to active
                  mode if the server does not support passive connections.
 
-     --PP _p_o_r_t     Sets the port number to _p_o_r_t.
-
      --qq _q_u_i_t_t_i_m_e
                  Quit if the connection has stalled for _q_u_i_t_t_i_m_e seconds.
 
+     --RR          Restart all non-proxied auto-fetches.
+
      --rr _w_a_i_t     Retry the connection attempt if it failed, pausing for _w_a_i_t
                  seconds.
 
-     --RR          Restart all non-proxied auto-fetches.
-
      --ss _s_r_c_a_d_d_r  Uses _s_r_c_a_d_d_r as the local IP address for all connections.
 
      --tt          Enables packet tracing.
@@ -101,15 +101,15 @@
                  optional target filename for single file uploads), and _f_i_l_e
                  is one or more local files to be uploaded.
 
+     --VV          Disable vveerrbboossee and pprrooggrreessss, overriding the default of
+                 enabled when output is to a terminal.
+
      --vv          Enable vveerrbboossee and pprrooggrreessss.  This is the default if output
                  is to a terminal (and in the case of pprrooggrreessss, ffttpp is the
                  foreground process).  Forces ffttpp to show all responses from
                  the remote server, as well as report on data transfer statis-
                  tics.
 
-     --VV          Disable vveerrbboossee and pprrooggrreessss, overriding the default of
-                 enabled when output is to a terminal.
-
      The client host with which ffttpp is to communicate may be specified on the
      command line.  If this is done, ffttpp will immediately attempt to establish
      a connection to an FTP server on that host; otherwise, ffttpp will enter its
@@ -181,12 +181,6 @@
                  may be distinguished from a record delimiter only when ccrr is
                  off.
 
-     ffttpp__ddeebbuugg [_f_t_p___d_e_b_u_g_-_v_a_l_u_e]
-                 Toggle debugging mode.  If an optional _f_t_p___d_e_b_u_g_-_v_a_l_u_e is
-                 specified it is used to set the debugging level.  When debug-
-                 ging is on, ffttpp prints each command sent to the remote
-                 machine, preceded by the string `-->'
-
      ddeelleettee _r_e_m_o_t_e_-_f_i_l_e
                  Delete the file _r_e_m_o_t_e_-_f_i_l_e on the remote machine.
 
@@ -208,12 +202,13 @@
                  and file completion.  This is automatically enabled if input
                  is from a terminal, and disabled otherwise.
 
-     eeppssvv44       Toggle the use of the extended EPSV and EPRT commands on IPv4
-                 connections; first try EPSV / EPRT, and then PASV / PORT.
-                 This is enabled by default.  If an extended command fails
-                 then this option will be temporarily disabled for the dura-
-                 tion of the current connection, or until eeppssvv44 is executed
-                 again.
+     eeppssvv eeppssvv44 eeppssvv66
+                 Toggle the use of the extended EPSV and EPRT commands on all
+                 IP, IPv4, and IPv6 connections respectively.  First try EPSV
+                 / EPRT, and then PASV / PORT.  This is enabled by default.
+                 If an extended command fails then this option will be tempo-
+                 rarily disabled for the duration of the current connection,
+                 or until eeppssvv, eeppssvv44, or eeppssvv66 is executed again.
 
      eexxiitt        A synonym for bbyyee.
 
@@ -231,6 +226,12 @@
      ffttpp _h_o_s_t [_p_o_r_t]
                  A synonym for ooppeenn.
 
+     ffttpp__ddeebbuugg [_f_t_p___d_e_b_u_g_-_v_a_l_u_e]
+                 Toggle debugging mode.  If an optional _f_t_p___d_e_b_u_g_-_v_a_l_u_e is
+                 specified it is used to set the debugging level.  When debug-
+                 ging is on, ffttpp prints each command sent to the remote
+                 machine, preceded by the string `-->'.
+
      ggaattee [_h_o_s_t [_p_o_r_t]]
                  Toggle gate-ftp mode, which used to connect through the TIS
                  FWTK and Gauntlet ftp proxies.  This will not be permitted if
@@ -994,11 +995,11 @@
                a blank line (consecutive new-line characters) is encountered.
                Like the other tokens in the _._n_e_t_r_c file, a mmaaccddeeff is applica-
                ble only to the mmaacchhiinnee definition preceding it.  A mmaaccddeeff
-               entry cannot be utilized by multiple mmaacchhiinnee definitions;
-               rather, it must be defined following each mmaacchhiinnee it is
-               intended to be used with.  If a macro named iinniitt is defined, it
-               is automatically executed as the last step in the auto-login
-               process.  For example,
+               entry cannot be used by multiple mmaacchhiinnee definitions; rather,
+               it must be defined following each mmaacchhiinnee it is intended to be
+               used with.  If a macro named iinniitt is defined, it is automati-
+               cally executed as the last step in the auto-login process.  For
+               example,
 
                      default
                      macdef init
@@ -1180,4 +1181,4 @@
      uses a SIIT translator for IPv6-to-IPv4 translation, ffttpp is unable to
      support your configuration.
 
-NetBSD 3.1.1                     July 18, 2007                    NetBSD 3.1.1
+NetBSD 3.1_STABLE                May 10, 2008                NetBSD 3.1_STABLE

Reply via email to