 @@ -1,14 +1,14 @@
-.\" 	$NetBSD: ftp.1,v 1.140 2020/07/15 17:36:38 uwe Exp $
+.\" 	$NetBSD: ftp.1,v 1.141 2020/07/15 19:23:44 uwe Exp $
 .\"
 .\" Copyright (c) 1996-2020 The NetBSD Foundation, Inc.
 .\" All rights reserved.
 .\"
 .\" This code is derived from software contributed to The NetBSD Foundation
 .\" by Luke Mewburn.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 @@ -465,38 +465,36 @@ output.
 If no local file is specified, or if
 .Ar local-file
 is
 .Sq Fl ,
 the output is sent to the terminal.
 .It Ic disconnect
 A synonym for
 .Ic close .
 .It Ic edit
 Toggle command line editing, and context sensitive command and file
 completion.
 This is automatically enabled if input is from a terminal, and
 disabled otherwise.
-.It Ic epsv epsv4 epsv6
+.It Ic epsv , epsv4 , epsv6
 Toggle the use of the extended
 .Dv EPSV
 and
 .Dv EPRT
 commands on all IP, IPv4, and IPv6 connections respectively.
 First try
-.Dv EPSV /
+.Dv EPSV Ns \^/\^ Ns Dv EPRT ,
 .Dv EPRT ,
 and then
-.Dv PASV /
+.Dv PASV Ns \^/\^ Ns Dv PORT .
 .Dv PORT .
 This is enabled by default.
 If an extended command fails then this option will be temporarily
 disabled for the duration of the current connection, or until
 .Ic epsv ,
 .Ic epsv4 ,
 or
 .Ic epsv6
 is executed again.
 .It Ic exit
 A synonym for
 .Ic bye .
 .It Ic features
 Display what features the remote server supports (using the
 @@ -579,27 +577,27 @@ Globbing for
 is done as in
 .Xr csh 1 .
 For
 .Ic mdelete ,
 .Ic mget ,
 and
 .Ic mreget ,
 each remote file name is expanded
 separately on the remote machine and the lists are not merged.
 Expansion of a directory name is likely to be
 different from expansion of the name of an ordinary file:
 the exact result depends on the foreign operating system and ftp server,
 and can be previewed by doing
-.Ql mls remote-files \-
+.Sq Li mls remote-files \- .
 Note:
 .Ic mget ,
 .Ic mput
 and
 .Ic mreget
 are not meant to transfer
 entire directory subtrees of files.
 That can be done by
 transferring a
 .Xr tar 1
 archive of the subtree (in binary mode).
 .It Ic hash Op Ar size
 Toggle hash-sign
 @@ -660,52 +658,52 @@ 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
 invoked with the next
 .Ic open
 command), and remain defined until a
 .Ic close
 command is executed.
 To invoke a macro, use the
 .Ic $
 command (see above).
 .Pp
 The macro processor interprets
-.Sq $
+.Ql $
 and
-.Sq \e
+.Ql \e
 as special characters.
+A
-.Sq $
+.Ql $
 followed by a number (or numbers) is replaced by the
 corresponding argument on the macro invocation command line.
+A
-.Sq $
+.Ql $
 followed by an
-.Sq i
+.Ql i
 signals the macro processor that the executing macro is to be
 looped.
 On the first pass
-.Dq $i
+.Ql $i
 is replaced by the first argument on the macro invocation command
 line, on the second pass it is replaced by the second argument,
 and so on.
+A
-.Sq \e
+.Ql \e
 followed by any character is replaced by that character.
 Use the
-.Sq \e
+.Ql \e
 to prevent special treatment of the
-.Sq $ .
+.Ql $ .
 .It Ic mdelete Op Ar remote-files
 Delete the
 .Ar remote-files
 on the remote machine.
 .It Ic mdir Ar remote-files local-file
 Like
 .Ic dir  ,
 except multiple remote files may be specified.
 If interactive prompting is on,
 .Nm
 will prompt the user to verify that the last argument is indeed the
 target local file for receiving
 .Ic mdir
 @@ -720,58 +718,58 @@ for each file name thus produced.
 See
 .Ic glob
 for details on the filename expansion.
 Resulting file names will then be processed according to
 .Ic case  ,
 .Ic ntrans ,
 and
 .Ic nmap
 settings.
 Files are transferred into the local working directory,
 which can be changed with
 .Ql lcd directory ;
 new local directories can be created with
-.Ql "\&! mkdir directory" .
+.Sq Li "\&! mkdir directory" .
 .It Ic mkdir Ar directory-name
 Make a directory on the remote machine.
 .It Ic mls Ar remote-files local-file
 Like
 .Ic ls  ,
 except multiple remote files may be specified,
 and the
 .Ar local-file
 must be specified.
 If interactive prompting is on,
 .Nm
 will prompt the user to verify that the last argument is indeed the
 target local file for receiving
 .Ic mls
 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)
 in a machine-parsable form, using
 .Dv MLSD .
 The format of display can be changed with
-.Sq "remopts mlst ..." .
+.Sq Li "remopts mlst ..." .
 .It Ic mlst Op Ar remote-path
 Display the details about
 .Ar remote-path
 (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 "remopts mlst ..." .
+.Sq Li "remopts mlst ..." .
 .It Ic mode Ar mode-name
 Set the file transfer
 .Ic mode
 to
 .Ar mode-name .
 The default (and only supported)
 mode is
 .Dq stream .
 .It Ic modtime Ar remote-file
 Show the last modification time of the file on the remote machine, in
 .Li RFC 2822
 format.
 .It Ic more Ar file
 @@ -797,124 +795,144 @@ but performs a
 .Ic reget
 instead of
 .Ic get .
 .It Ic msend Ar local-files
 A synonym for
 .Ic mput .
 .It Ic newer Ar remote-file Op Ar local-file
 Get the file only if the modification time of the remote file is more
 recent that the file on the current system.
 If the file does not
 exist on the current system, the remote file is considered
 .Ic newer .
 Otherwise, this command is identical to
-.Ar get .
+.Ic get .
 .It Ic nlist Op Ar remote-path Op Ar local-file
 A synonym for
 .Ic ls .
 .It Ic nmap Op Ar inpattern outpattern
 Set or unset the filename mapping mechanism.
 If no arguments are specified, the filename mapping mechanism is unset.
 If arguments are specified, remote filenames are mapped during
 .Ic mput
 commands and
 .Ic put
 commands issued without a specified remote target filename.
 If arguments are specified, local filenames are mapped during
 .Ic mget
 commands and
 .Ic get
 commands issued without a specified local target filename.
 This command is useful when connecting to a
 .No non\- Ns Ux
 remote computer
 with different file naming conventions or practices.
 The mapping follows the pattern set by
 .Ar inpattern
 and
 .Ar outpattern .
-.Op Ar Inpattern
+.Pp
 .Ar inpattern
 is a template for incoming filenames (which may have already been
 processed according to the
 .Ic ntrans
 and
 .Ic case
 settings).
 Variable templating is accomplished by including the
 sequences
-.Dq $1 ,
+.Ql $1 ,
-.Dq $2 ,
+.Ql $2 ,
-\&...
+\&...\|,
-.Dq $9
+.Ql $9
 in
 .Ar inpattern .
 Use
-.Sq \e
+.Ql \e
 to prevent this special treatment of the
-.Sq $
+.Ql $
 character.
 All other characters are treated literally, and are used to determine the
 .Ic nmap
 .Op Ar inpattern
 variable values.
 For example, given
 .Ar inpattern
-$1.$2 and the remote file name "mydata.data", $1 would have the value
+.Sq Li $1.$2
-"mydata", and $2 would have the value "data".
+and the remote file name
 .Sq Li mydata.data ,
 .Ql $1
 would have the value
 .Sq Li mydata ,
 and
 .Ql $2
 would have the value
 .Sq Li data .
 .Pp
 The
 .Ar outpattern
 determines the resulting mapped filename.
 The sequences
-.Dq $1 ,
+.Ql $1 ,
-.Dq $2 ,
+.Ql $2 ,
-\&...
+\&...\|,
-.Dq $9
+.Ql $9
 are replaced by any value resulting from the
 .Ar inpattern
 template.
 The sequence
-.Dq $0
+.Ql $0
 is replaced by the original filename.
 Additionally, the sequence
 .Dq Op Ar seq1 , Ar seq2
 is replaced by
-.Op Ar seq1
+.Ar seq1
 if
 .Ar seq1
 is not a null string; otherwise it is replaced by
 .Ar seq2 .
 For example, the command
 .Pp
-.Bd -literal -offset indent -compact
+.Dl nmap $1.$2.$3 [$1,$2].[$2,file]
 nmap $1.$2.$3 [$1,$2].[$2,file]
 .Ed
 .Pp
 would yield
-the output filename "myfile.data" for input filenames "myfile.data" and
+the output filename
-"myfile.data.old", "myfile.file" for the input filename "myfile", and
+.Sq Li myfile.data
-"myfile.myfile" for the input filename ".myfile".
+for input filenames
 .Sq Li myfile.data
 and
 .Sq Li myfile.data.old ,
 .Sq Li myfile.file
 for the input filename
 .Sq Li myfile ,
 and
 .Sq Li myfile.myfile
 for the input filename
 .Sq Li "\&.myfile" .
 Spaces may be included in
 .Ar outpattern  ,
 as in the example:
 .Pp
 .Dl nmap $1 sed "s/  *$//" > $1
 .Pp
 Use the
-.Sq \e
+.Ql \e
 character to prevent special treatment
 of the
-.Sq $ ,
+.Ql $ ,
-.Sq \&[ ,
+.Ql \&[ ,
-.Sq \&] ,
+.Ql \&] ,
 and
-.Sq \&,
+.Ql \&,
 characters.
 .It Ic ntrans Op Ar inchars Op Ar outchars
 Set or unset the filename character translation mechanism.
 If no arguments are specified, the filename character
 translation mechanism is unset.
 If arguments are specified, characters in
 remote filenames are translated during
 .Ic mput
 commands and
 .Ic put
 commands issued without a specified remote target filename.
 If arguments are specified, characters in
 local filenames are translated during
 @@ -1015,27 +1033,27 @@ Perform
 .Op Ar remote-path ,
 and display the result with the program specified by the
 .Ic "set pager"
 option.
 .It Ic preserve
 Toggle preservation of modification times on retrieved files.
 .It Ic progress
 Toggle display of transfer progress bar.
 The progress bar will be disabled for a transfer that has
 .Ar local-file
 as
 .Sq Fl
 or a command that starts with
-.Sq \&| .
+.Ql \&| .
 Refer to
 .Sx FILE NAMING CONVENTIONS
 for more information.
 Enabling
 .Ic progress
 disables
 .Ic hash .
 .It Ic prompt
 Toggle interactive prompting.
 Interactive prompting
 occurs during multiple file transfers to allow the
 user to selectively retrieve or store files.
 If prompting is turned off (default is on), any
 @@ -1078,31 +1096,33 @@ Display a help message.
 Any other response will answer
 .Sq yes
 to the current file.
 .It Ic proxy Ar ftp-command
 Execute an ftp command on a secondary control connection.
 This command allows simultaneous connection to two remote
 .Tn FTP
 servers for transferring files between the two servers.
 The first
 .Ic proxy
 command should be an
 .Ic open  ,
 to establish the secondary control connection.
-Enter the command "proxy ?" to see other
+Enter the command
 .Sq Li "proxy ?"
 to see other
 .Tn FTP
 commands executable on the secondary connection.
 The following commands behave differently when prefaced by
-.Ic proxy  :
+.Ic proxy\^  :
 .Ic open
 will not define new macros during the auto-login process,
 .Ic close
 will not erase existing macro definitions,
 .Ic get
 and
 .Ic mget
 transfer files from the host on the primary control connection
 to the host on the secondary control connection, and
 .Ic put  ,
 .Ic mput ,
 and
 .Ic append
 @@ -1127,54 +1147,54 @@ in naming the remote file.
 File transfer uses the
 current settings for
 .Ic type  ,
 .Ic format ,
 .Ic mode  ,
 and
 .Ic structure .
 .It Ic pwd
 Print the name of the current working directory on the remote
 machine.
 .It Ic quit
 A synonym for
 .Ic bye .
-.It Ic quote Ar arg1 arg2 ...
+.It Ic quote Op Ar arg ...
 The arguments specified are sent, verbatim, to the remote
 .Tn FTP
 server.
 .It Ic rate Ar direction Oo Ar maximum Oo Ar increment Oc Oc
 Throttle the maximum transfer rate to
 .Ar maximum
 bytes/second.
 If
 .Ar maximum
 is 0, disable the throttle.
 .Pp
 .Ar direction
 may be one of:
-.Bl -tag -width "all" -offset indent -compact
+.Bl -tag -width ".Cm all" -offset indent -compact
 .It Cm all
 Both directions.
 .It Cm get
 Incoming transfers.
 .It Cm put
 Outgoing transfers.
 .El
 .Pp
 .Ar maximum
 can be modified on the fly by
 .Ar increment
 bytes (default: 1024) each time a given signal is received:
-.Bl -tag -width "SIGUSR1" -offset indent
+.Bl -tag -width ".Dv SIGUSR1" -offset indent
 .It Dv SIGUSR1
 Increment
 .Ar maximum
 by
 .Ar increment
 bytes.
 .It Dv SIGUSR2
 Decrement
 .Ar maximum
 by
 .Ar increment
 bytes.
 The result must be a positive number.
 @@ -1212,27 +1232,27 @@ This command
 is useful when transferring very large files over networks that
 are prone to dropping connections.
 .It Ic remopts Ar command Op Ar command-options
 Set options on the remote
 .Tn FTP
 server for
 .Ar command
 to
 .Ar command-options
 (whose absence is handled on a command-specific basis).
 Remote
 .Tn FTP
 commands known to support options include:
-.Sq MLST
+.Dv MLST
 (used for
 .Dv MLSD
 and
 .Dv MLST ) .
 .It Ic rename Op Ar from Op Ar to
 Rename the file
 .Ar from
 on the remote machine, to the file
 .Ar to .
 .It Ic reset
 Clear reply queue.
 This command re-synchronizes command/reply sequencing with the remote
 .Tn FTP
 @@ -1265,30 +1285,36 @@ Delete a directory on the remote machine
 With no arguments, show status of remote machine.
 If
 .Ar remote-file
 is specified, show status of
 .Ar remote-file
 on remote machine.
 .It Ic runique
 Toggle storing of files on the local system with unique filenames.
 If a file already exists with a name equal to the target
 local filename for a
 .Ic get
 or
 .Ic mget
-command, a ".1" is appended to the name.
+command, a
 .Ql \&.1
 is appended to the name.
 If the resulting name matches another existing file,
 a ".2" is appended to the original name.
-If this process continues up to ".99", an error
+.Ql \&.2
 is appended to the original name.
 If this process continues up to
 .Ql .99 ,
 an error
 message is printed, and the transfer does not take place.
 The generated unique filename will be reported.
 Note that
 .Ic runique
 will not affect local files generated from a shell command
 (see below).
 The default value is off.
 .It Ic send Ar local-file Op Ar remote-file
 A synonym for
 .Ic put .
 .It Ic sendport
 Toggle the use of
 .Dv PORT
 @@ -1346,27 +1372,27 @@ Defaults to
 .It Cm no_proxy
 Defaults to
 .Ev $no_proxy .
 .It Cm pager
 Defaults to
 .Ev $PAGER .
 .It Cm prompt
 Defaults to
 .Ev $FTPPROMPT .
 .It Cm rprompt
 Defaults to
 .Ev $FTPRPROMPT .
 .El
-.It Ic site Ar arg1 arg2 ...
+.It Ic site Op Ar arg ...
 The arguments specified are sent, verbatim, to the remote
 .Tn FTP
 server as a
 .Dv SITE
 command.
 .It Ic size Ar remote-file
 Return size of
 .Ar remote-file
 on remote machine.
 .It Ic sndbuf Ar size
 Set the size of the socket send buffer to
 .Ar size .
 .It Ic status
 @@ -1467,27 +1493,27 @@ if verbose is on, when a file transfer c
 regarding the efficiency of the transfer are reported.
 By default,
 verbose is on.
 .It Ic xferbuf Ar size
 Set the size of the socket send and receive buffers to
 .Ar size .
 .It Ic \&? Op Ar command
 A synonym for
 .Ic help .
 .El
 .Pp
 Command arguments which have embedded spaces may be quoted with
 quote
-.Sq \&"
+.Ql \&\(dq
 marks.
 .Pp
 Commands which toggle settings can take an explicit
 .Ic on
 or
 .Ic off
 argument to force the setting appropriately.
 .Pp
 Commands which take a byte count as an argument
 (e.g.,
 .Ic hash ,
 .Ic rate ,
 and
 @@ -1502,27 +1528,27 @@ Causes no modification.
 .It Li k
 Kilo; multiply the argument by 1024
 .It Li m
 Mega; multiply the argument by 1048576
 .It Li g
 Giga; multiply the argument by 1073741824
 .El
 .Pp
 If
 .Nm
 receives a
 .Dv SIGINFO
 (see the
-.Dq status
+.Cm status
 argument of
 .Xr stty 1 )
 or
 .Dv SIGQUIT
 signal whilst a transfer is in progress, the current transfer rate
 statistics will be written to the standard error output, in the
 same format as the standard completion message.
 .Sh AUTO-FETCHING FILES
 In addition to standard commands, this version of
 .Nm
 supports an auto-fetch feature.
 To enable auto-fetch, simply pass the list of hostnames/files
 on the command line.
 @@ -1532,27 +1558,27 @@ The following formats are valid syntax f
 .\" [user@]host:[path][/]
 .It Oo Ar user Ns Li \&@ Oc Ns Ar host Ns Li \&: Ns Oo Ar path Oc \
 Ns Oo Li / Oc
 .Dq Classic
 .Tn FTP
 format.
 .Pp
 If
 .Ar path
 contains a glob character and globbing is enabled,
 (see
 .Ic glob ) ,
 then the equivalent of
-.Ql mget path
+.Sq Li mget path
 is performed.
 .Pp
 If the directory component of
 .Ar path
 contains no globbing characters,
 it is stored locally with the name basename (see
 .Xr basename 1 )
 of
 .Ic path ,
 in the current directory.
 Otherwise, the full remote name is used as the local name,
 relative to the local root directory.
 .\" ftp://[user[:password]@]host[:port]/path[/][;type=X]
 @@ -1571,40 +1597,40 @@ Otherwise, transfer the URL using
 via the proxy defined in
 .Ic "set ftp_proxy" .
 If
 .Ic "set ftp_proxy"
 isn't defined and
 .Ar user
 is given, login as
 .Ar user .
 In this case, use
 .Ar password
 if supplied, otherwise prompt the user for one.
 .Pp
 If a suffix of
-.Sq ;type=A
+.Sq Li \&;type=A
 or
-.Sq ;type=I
+.Sq Li \&;type=I
 is supplied, then the transfer type will take place as
 ascii or binary (respectively).
 The default transfer type is binary.
 .Pp
 In order to be compliant with
 .Li RFC 3986 ,
 .Nm
 interprets the
 .Ar path
 part of an
-.Dq ftp://
+.Sq Li ftp://
 auto-fetch URL as follows:
 .Bl -bullet
 .It
 The
 .Sq Li /
 immediately after the
 .Ar host Ns Oo Li \&: Ns Ar port Oc
 is interpreted as a separator before the
 .Ar path ,
 and not as part of the
 .Ar path
 itself.
 .It
 @@ -1664,52 +1690,52 @@ and
 .Sq Li ~ ) .
 .El
 .Pp
 The above interpretation has the following consequences:
 .Bl -bullet
 .It
 The path is interpreted relative to the
 default login directory of the specified user or of the
 .Sq anonymous
 user.
 If the
 .Pa /
 directory is required, use a leading path of
-.Dq %2F .
+.Sq Li \&%2F .
 If a user's home directory is required (and the remote server supports
 the syntax), use a leading path of
-.Dq %7Euser/ .
+.Sq Li \&%7E Ns Ar user Ns Li / .
 For example, to retrieve
 .Pa /etc/motd
 from
-.Sq localhost
+.Sq Li localhost
 as the user
-.Sq myname
+.Sq Li myname
 with the password
-.Sq mypass ,
+.Sq Li mypass ,
 use
-.Dq ftp://myname:mypass@localhost/%2fetc/motd
+.Sq Li ftp://myname:mypass@localhost/%2fetc/motd
 .It
 The exact
 .Ic cd
 and
 .Ic get
 commands can be controlled by careful choice of
 where to use
-.Sq /
+.Sq Li /
 and where to use
-.Sq %2F
+.Sq Li \&%2F
 (or
-.Sq %2f ) .
+.Sq Li %2f ) .
 For example, the following URLs correspond to the
 equivalents of the indicated commands:
 .Bl -tag -width "ftp://host/%2Fdir1%2Fdir2%2Ffile"
 .It ftp://host/dir1/dir2/file
 .Dq "cd dir1" ,
 .Dq "cd dir2" ,
 .Dq "get file" .
 .It ftp://host/%2Fdir1/dir2/file
 .Dq "cd /dir1" ,
 .Dq "cd dir2" ,
 .Dq "get file" .
 .It ftp://host/dir1%2Fdir2/file
 .Dq "cd dir1/dir2" ,
 @@ -1736,51 +1762,51 @@ An
 URL, retrieved using the
 .Tn HTTP
 protocol.
 If
 .Ic "set http_proxy"
 is defined, it is used as a URL to an
 .Tn HTTP
 proxy server.
 If
 .Tn HTTP
 authorization is required to retrieve
 .Ar path ,
 and
-.Sq user
+.Ar user
 (and optionally
-.Sq password )
+.Ar password\^ )
 is in the URL, use them for the first attempt to authenticate.
 .\" https://[user[:password]@]host[:port]/path
 .It Li https:// Ns Oo Ar user Ns Oo Li \&: Ns Ar password Oc Ns Li \&@ Oc \
 Ns Ar host Ns Oo Li \&: Ns Ar port Oc Ns Li / Ns Ar path
 An
 .Tn HTTPS
 URL, retrieved using the
 .Tn HTTPS
 protocol.
 If
 .Ic "set https_proxy"
 is defined, it is used as a URL to an
 .Tn HTTPS
 proxy server.
 If
 .Tn HTTPS
 authorization is required to retrieve
 .Ar path ,
 and
-.Sq user
+.Ar user
 (and optionally
-.Sq password )
+.Ar password\^ )
 is in the URL, use them for the first attempt to authenticate.
 There is currently no certificate validation and verification.
 .\" file:///path
 .It Li file:/// Ns Ar path
 A local URL, copied from
 .Pa / Ns Ar path
 on the local host.
 .\" about:
 .It Li about: Ns Ar topic
 Display information regarding
 .Ar topic ;
 no file is retrieved for this auto-fetched element.
 Supported values include:
 @@ -1803,27 +1829,27 @@ of
 .Ar path .
 Note that if a
 .Tn HTTP
 redirect is received, the fetch is retried using the new target URL
 supplied by the server, with a corresponding new
 .Ar path .
 Using an explicit
 .Fl o Ar output
 is recommended, to avoid writing to unexpected file names.
 .Pp
 If a classic format or an
 .Tn FTP
 URL format has a trailing
-.Sq /
+.Ql /
 or an empty
 .Ar path
 component, then
 .Nm
 will connect to the site and
 .Ic cd
 to the directory given as the path, and leave the user in interactive
 mode ready for further input.
 This will not work if
 .Ic "set ftp_proxy"
 is being used.
 .Pp
 Direct
 @@ -1851,96 +1877,97 @@ instead of
 For
 .Tn HTTP ,
 this is implemented by using the
 .Sq "Range: bytes="
 .Tn "HTTP/1.1"
 directive.
 .Pp
 If WWW or proxy WWW authentication is required, you will be prompted
 to enter a username and password to authenticate with.
 .Pp
 When specifying IPv6 numeric addresses in a URL, you need to
 surround the address in square brackets.
 E.g.:
-.Dq ftp://[::1]:21/ .
+.Sq Li ftp://[::1]:21/ .
 This is because colons are used in IPv6 numeric address as well as
 being the separator for the port number.
 .Sh ABORTING A FILE TRANSFER
 To abort a file transfer, use the terminal interrupt key
 (usually Ctrl-C).
 Sending transfers will be immediately halted.
 Receiving transfers will be halted by sending an
 .Tn FTP
 protocol
 .Dv ABOR
 command to the remote server, and discarding any further data received.
 The speed at which this is accomplished depends upon the remote
 server's support for
 .Dv ABOR
 processing.
 If the remote server does not support the
 .Dv ABOR
 command, the prompt will not appear until the remote server has completed
 sending the requested file.
 .Pp
 If the terminal interrupt key sequence is used whilst
 .Nm
-is awaiting a reply from the remote server for the ABOR processing,
+is awaiting a reply from the remote server for the
 .Dv ABOR
 processing,
 then the connection will be closed.
 This is different from the traditional behaviour (which ignores the
 terminal interrupt during this phase), but is considered more useful.
 .Sh FILE NAMING CONVENTIONS
 Files specified as arguments to
 .Nm
 commands are processed according to the following rules.
 .Bl -enum
 .It
 If the file name
 .Sq Fl
 is specified, the
-.Ar stdin
+.Va stdin
 (for reading) or
-.Ar stdout
+.Va stdout
 (for writing) is used.
 .It
 If the first character of the file name is
-.Sq \&| ,
+.Ql \&| ,
 the
 remainder of the argument is interpreted as a shell command.
 .Nm
 then forks a shell, using
 .Xr popen 3
 with the argument supplied, and reads (writes) from the stdout
 (stdin).
 If the shell command includes spaces, the argument
 must be quoted; e.g.
-.Dq Qq Li \&| ls\ \-lt .
+.Sq Li \(dq|\~ls\~\-lt\(dq .
 A particularly
 useful example of this mechanism is:
-.Dq Li dir \&"\&" \&|more .
+.Sq Li dir\~\(dq\(dq\~|more .
 .It
-Failing the above checks, if
+Failing the above checks, if globbing
 .Dq globbing
 is enabled, local file names are expanded according to the rules
 used in the
 .Xr csh 1 ;
 see the
 .Ic glob
 command.
 If the
 .Nm
 command expects a single local file (e.g.
 .Ic put  ) ,
-only the first filename generated by the "globbing" operation is used.
+only the first filename generated by the globbing operation is used.
 .It
 For
 .Ic mget
 commands and
 .Ic get
 commands with unspecified local file names, the local filename is
 the remote filename, which may be altered by a
 .Ic case  ,
 .Ic ntrans ,
 or
 .Ic nmap
 setting.
 The resulting filename may then be altered if
 @@ -2121,150 +2148,149 @@ followed by a blank line.
 supports interactive command line editing, via the
 .Xr editline 3
 library.
 It is enabled with the
 .Ic edit
 command, and is enabled by default if input is from a tty.
 Previous lines can be recalled and edited with the arrow keys,
 and other GNU Emacs-style editing keys may be used as well.
 .Pp
 The
 .Xr editline 3
 library is configured with a
 .Pa .editrc
-file - refer to
+file \(em refer to
 .Xr editrc 5
 for more information.
 .Pp
 An extra key binding is available to
 .Nm
 to provide context sensitive command and filename completion
 (including remote file completion).
 To use this, bind a key to the
 .Xr editline 3
 command
 .Ic ftp-complete .
 By default, this is bound to the TAB key.
 .Sh COMMAND LINE PROMPT
 By default,
 .Nm
 displays a command line prompt of
-.Dq "ftp> "
+.Sq Li ftp>\~
 to the user.
 This can be changed with the
 .Ic "set prompt"
 command.
 .Pp
 A prompt can be displayed on the right side of the screen (after the
 command input) with the
 .Ic "set rprompt"
 command.
 .Pp
 The following formatting sequences are replaced by the given
 information:
 .Bl -tag -width "%% " -offset indent
 .It Li \&%/
 The current remote working directory.
 .\" %c[[0]n], %.[[0]n]
-.It \&%c Ns Oo Oo Li 0 Oc Ns Ar n Oc , Ns Li \&%. Ns Oo Oo Li 0 Oc Ns Ar n Oc
+.It Li \&%c Ns Oo Oo Li 0 Oc Ns Ar n Oc , Li \&%. Ns Oo Oo Li 0 Oc Ns Ar n Oc
 The trailing component of the current remote working directory, or
-.Em n
+.Ar n
 trailing components if a digit
-.Em n
+.Ar n
 is given.
 If
-.Em n
+.Ar n
 begins with
-.Sq 0 ,
+.Ql 0 ,
 the number of skipped components precede the trailing component(s) in
 the format
 .\" ``/<number>trailing''
 .Do
 .Sm off
-.Li / Li < Va number Li >
+.Li / Li < Ar number Li >
-.Va trailing
+.Ar trailing
 .Sm on
 .Dc
 (for
-.Sq \&%c )
+.Ql \&%c )
 or
 .\" ``...trailing''
-.Dq Li \&... Ns Va trailing
+.Dq Li \&... Ns Ar trailing
 (for
-.Sq \&%. ) .
+.Ql \&%. ) .
 .It Li \&%M
 The remote host name.
 .It Li \&%m
-The remote host name, up to the first
+The remote host name, up to the first dot
-.Sq \&. .
+.Ql \&. .
 .It Li \&%n
 The remote user name.
 .It Li \&%%
-A single
+A single percent character
-.Sq % .
+.Ql % .
 .El
 .Sh ENVIRONMENT
 .Nm
 uses the following environment variables.
 .Bl -tag -width "FTPSERVERPORT"
 .It Ev FTPANONPASS
 Password to send in an anonymous
 .Tn FTP
 transfer.
 Defaults to
-.Dq Li `whoami`@ .
+.Dq Li \&\`whoami\`@ .
 .It Ev FTPMODE
 Overrides the default operation mode.
 Support values are:
 .Bl -tag -width "passive"
 .It Cm active
 active mode
 .Tn FTP
 only
 .It Cm auto
 automatic determination of passive or active (this is the default)
 .It Cm gate
 gate-ftp mode
 .It Cm passive
 passive mode
 .Tn FTP
 only
 .El
 .It Ev FTPPROMPT
 Command-line prompt to use.
 Defaults to
-.Dq "ftp> " .
+.Sq Li ftp>\~ .
 Refer to
 .Sx COMMAND LINE PROMPT
 for more information.
 .It Ev FTPRPROMPT
 Command-line right side prompt to use.
-Defaults to
+Defaults to empty string.
 .Dq "" .
 Refer to
 .Sx COMMAND LINE PROMPT
 for more information.
 .It Ev FTPSERVER
 Host to use as gate-ftp server when
 .Ic gate
 is enabled.
 .It Ev FTPSERVERPORT
 Port to use when connecting to gate-ftp server when
 .Ic gate
 is enabled.
 Default is port returned by a
-.Fn getservbyname
+.Xr getservbyname 3
 lookup of
-.Dq ftpgate/tcp .
+.Dq Li ftpgate/tcp .
 .It Ev FTPUSERAGENT
 The value to send for the
 .Tn HTTP
 User-Agent
 header.
 .It Ev HOME
 For default location of a
 .Pa .netrc
 file, if one exists.
 .It Ev NETRC
 An alternate location of the
 .Pa .netrc
 file.
 @@ -2292,49 +2318,51 @@ for further notes about proxy use.
 URL of
 .Tn HTTP
 proxy to use when making
 .Tn HTTP
 URL requests.
 If proxy authentication is required and there is a username and
 password in this URL, they will automatically be used in the first
 attempt to authenticate to the proxy.
 .Pp
 If
 .Dq unsafe
 URL characters are required in the username or password
 (for example
-.Sq @
+.Ql @
 or
-.Sq / ) ,
+.Ql / ) ,
 encode them with
 .Li RFC 3986
 .Sq Li \&% Ns Ar XX
 encoding.
 .Pp
 Note that the use of a username and password in
 .Ev ftp_proxy
 and
 .Ev http_proxy
 may be incompatible with other programs that use it
 (such as
 .Xr lynx 1 ) .
 .Pp
 .Em NOTE :
 this is not used for interactive sessions, only for command-line
 fetches.
 .It Ev no_proxy
 A space or comma separated list of hosts (or domains) for which
 proxying is not to be used.
-Each entry may have an optional trailing ":port", which restricts
+Each entry may have an optional trailing
 .Sq Li \&: Ns Ar port ,
 which restricts
 the matching to connections to that port.
 .El
 .Sh EXTENDED PASSIVE MODE AND FIREWALLS
 Some firewall configurations do not allow
 .Nm
 to use extended passive mode.
 If you find that even a simple
 .Ic ls
 appears to hang after printing a message such as this:
 .Pp
 .Dl 229 Entering Extended Passive Mode (|||58551|)
 .Pp
 then you will need to disable extended passive mode with