[src/netbsd-10]: src/usr.bin/ftp Pull up following revision(s) (requested by ...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e437e6b83903
branches:  netbsd-10
changeset: 375844:e437e6b83903
user:      martin <martin%NetBSD.org@localhost>
date:      Tue May 16 16:20:27 2023 +0000

description:
Pull up following revision(s) (requested by lukem in ticket #172):

        usr.bin/ftp/ftp.1: revision 1.149

ftp(1): minor markup tweaks

Use .Ql instead of .Sq Li, add some missing ones.  Use .Pq instead of
explicit () for longer phrases - these are easier to read in the
postscript output b/c of extra spacing.

diffstat:

 usr.bin/ftp/ftp.1 |  220 +++++++++++++++++++++++++++++++----------------------
 1 files changed, 127 insertions(+), 93 deletions(-)

diffs (truncated from 580 to 300 lines):

diff -r c390f7051f96 -r e437e6b83903 usr.bin/ftp/ftp.1
--- a/usr.bin/ftp/ftp.1 Tue May 16 16:16:00 2023 +0000
+++ b/usr.bin/ftp/ftp.1 Tue May 16 16:20:27 2023 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: ftp.1,v 1.147.2.1 2023/05/16 16:16:00 martin Exp $
+.\"    $NetBSD: ftp.1,v 1.147.2.2 2023/05/16 16:20:27 martin Exp $
 .\"
 .\" Copyright (c) 1996-2023 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -77,9 +77,9 @@
 .Oo
 .Fl T Xo
 .Sm off
-.Ar dir ,
+.Ar dir Cm \&,
 .Ar max
-.Op , Ar inc
+.Op Cm \&, Ar inc
 .Sm on
 .Xc
 .Oc
@@ -239,11 +239,14 @@ will check the
 an account on the remote machine.
 If no entry exists,
 .Nm
-will prompt for the remote machine login name (default is the user
-identity on the local machine), and, if necessary, prompt for a password
+will prompt for the remote machine login name
+.Pq default is the user identity on the local machine ,
+and, if necessary, prompt for a password
 and an account with which to login.
 To override the auto-login for auto-fetch transfers, specify the
-username (and optionally, password) as appropriate.
+username
+.Pq and optionally, password
+as appropriate.
 .It Fl o Ar output
 When auto-fetching files, save the contents in
 .Ar output .
@@ -254,9 +257,9 @@ below.
 If
 .Ar output
 is not
-.Sq -
+.Sq Fl
 or doesn't start with
-.Sq \&| ,
+.Sq Cm \&| ,
 then only the first file specified will be retrieved into
 .Ar output ;
 all other files will be retrieved into the basename of their
@@ -286,7 +289,7 @@ Uses
 as the local IP address for all connections.
 .It Fl t
 Enables packet tracing.
-.It Fl T Ar direction Ns , Ns Ar maximum Ns Oo , Ns Ar increment Oc
+.It Fl T Ar direction Ns Cm \&, Ns Ar maximum\| Ns Oo Cm \&, Ns Ar increment Oc
 Set the maximum transfer rate for
 .Ar direction
 to
@@ -304,9 +307,10 @@ Upload files on the command line to
 where
 .Ar url
 is one of the
-.Sq Li ftp://
+.Ql ftp://
 URL types as supported by auto-fetch
-(with an optional target filename for single file uploads), and
+.Pq with an optional target filename for single file uploads ,
+and
 .Ar file
 is one or more local files to be uploaded.
 .It Fl V
@@ -320,10 +324,13 @@ Enable
 .Ic verbose
 and
 .Ic progress .
-This is the default if output is to a terminal (and in the case of
+This is the default if output is to a terminal
+.Po
+and in the case of
 .Ic progress ,
 .Nm
-is the foreground process).
+is the foreground process
+.Pc .
 Forces
 .Nm
 to show all responses from the remote server, as well
@@ -334,7 +341,7 @@ Set the size of the socket send and rece
 Refer to
 .Ic xferbuf
 for more information.
-.It Fl ?
+.It Fl \&?
 Display help to stdout, and exit.
 .El
 .Pp
@@ -356,7 +363,7 @@ is awaiting commands from the user the p
 is provided to the user.
 The following commands are recognized
 by
-.Nm ftp :
+.Nm :
 .Bl -tag -width Ic
 .It Ic \&! Op Ar command Op Ar args
 Invoke an interactive shell on the local machine.
@@ -454,7 +461,7 @@ sequence to conform with the
 single linefeed record
 delimiter.
 Records on
-.Pf non\- Ns Ux
+.Pf non\- Ux
 remote systems may contain single linefeeds;
 when an ascii type transfer is made, these linefeeds may be
 distinguished from a record delimiter only when
@@ -527,9 +534,8 @@ is executed again.
 A synonym for
 .Ic bye .
 .It Ic features
-Display what features the remote server supports (using the
-.Dv FEAT
-command).
+Display what features the remote server supports
+.Pq using the Dv FEAT No command .
 .It Ic fget Ar localfile
 Retrieve the files listed in
 .Ar localfile ,
@@ -541,7 +547,7 @@ to
 .Ar format .
 The default (and only supported)
 format is
-.Dq non-print .
+.Ql non-print .
 .It Ic ftp Ar host Op Ar port
 A synonym for
 .Ic open .
@@ -551,9 +557,11 @@ TIS FWTK and Gauntlet
 .Tn FTP
 proxies.
 This will not be permitted if the gate-ftp server hasn't been set
-(either explicitly by the user, or from the
+.Po
+either explicitly by the user, or from the
 .Ev FTPSERVER
-environment variable).
+environment variable
+.Pc .
 If
 .Ar host
 is given,
@@ -625,7 +633,7 @@ transferring a
 archive of the subtree (in binary mode).
 .It Ic hash Op Ar size
 Toggle hash-sign
-.Pq Sq #
+.Pq Ql #
 printing for each data block transferred.
 The size of a data block defaults to 1024 bytes.
 This can be changed by specifying
@@ -675,16 +683,24 @@ A synonym for
 Define a macro.
 Subsequent lines are stored as the macro
 .Ar macro-name  ;
-a null line (consecutive newline characters in a file or carriage
-returns from the terminal) terminates macro input mode.
+a null line
+.Po
+consecutive newline characters in a file or carriage
+returns from the terminal
+.Pc
+terminates macro input mode.
 There is a limit of 16 macros and 4096 total characters in all
 defined macros.
 Macro names can be a maximum of 8 characters.
 Macros are only applicable to the current session they are
-defined within (or if defined outside a session, to the session
+defined within
+.Po
+or if defined outside a session, to the session
 invoked with the next
 .Ic open
-command), and remain defined until a
+command
+.Pc ,
+and remain defined until a
 .Ic close
 command is executed.
 To invoke a macro, use the
@@ -750,9 +766,9 @@ and
 settings.
 Files are transferred into the local working directory,
 which can be changed with
-.Ql lcd directory ;
+.Ic lcd Ar directory ;
 new local directories can be created with
-.Sq Li "\&! mkdir directory" .
+.Ic \&! mkdir Ar directory .
 .It Ic mkdir Ar directory-name
 Make a directory on the remote machine.
 .It Ic mls Ar remote-files local-file
@@ -771,27 +787,28 @@ output.
 .It Ic mlsd Op Ar remote-path
 Display the contents of
 .Ar remote-path
-(which should default to the current directory if not given)
+.Pq which should default to the current directory if not given
 in a machine-parsable form, using
 .Dv MLSD .
 The format of display can be changed with
-.Sq Li "remopts mlst ..." .
+.Sq Ic remopts mlst Ar \&... .
 .It Ic mlst Op Ar remote-path
 Display the details about
 .Ar remote-path
-(which should default to the current directory if not given)
+.Pq which should default to the current directory if not given
 in a machine-parsable form, using
 .Dv MLST .
 The format of display can be changed with
-.Sq Li "remopts mlst ..." .
+.Sq Ic remopts mlst Ar \&... .
 .It Ic mode Ar mode-name
 Set the file transfer
 .Ic mode
 to
 .Ar mode-name .
-The default (and only supported)
+The default
+.Pq and only supported
 mode is
-.Dq stream .
+.Ql stream .
 .It Ic modtime Ar remote-file
 Show the last modification time of the file on the remote machine, in
 .Li RFC 2822
@@ -856,12 +873,14 @@ and
 .Ar outpattern .
 .Pp
 .Ar inpattern
-is a template for incoming filenames (which may have already been
-processed according to the
+is a template for incoming filenames
+.Po
+which may have already been processed according to the
 .Ic ntrans
 and
 .Ic case
-settings).
+settings
+.Pc .
 Variable templating is accomplished by including the
 sequences
 .Ql $1 ,
@@ -881,16 +900,16 @@ All other characters are treated literal
 variable values.
 For example, given
 .Ar inpattern
-.Sq Li $1.$2
+.Ql $1.$2
 and the remote file name
-.Sq Li mydata.data ,
+.Ql mydata.data ,
 .Ql $1
 would have the value
-.Sq Li mydata ,
+.Ql mydata ,
 and
 .Ql $2
 would have the value
-.Sq Li data .
+.Ql data .
 .Pp
 The
 .Ar outpattern
@@ -907,7 +926,9 @@ The sequence
 .Ql $0
 is replaced by the original filename.
 Additionally, the sequence
-.Dq Op Ar seq1 , Ar seq2
+.Sm off
+.Li \&[ Ar seq1 Li \&, Ar seq2 Li \&]
+.Sm on
 is replaced by
 .Ar seq1
 if
@@ -920,18 +941,18 @@ For example, the command
 .Pp
 would yield
 the output filename
-.Sq Li myfile.data
+.Ql myfile.data
 for input filenames
-.Sq Li myfile.data
+.Ql myfile.data
 and
-.Sq Li myfile.data.old ,
-.Sq Li myfile.file
+.Ql myfile.data.old ,
+.Ql myfile.file