diff --git a/usr.bin/ncplogin/ncplogin.1 b/usr.bin/ncplogin/ncplogin.1
index f44852687c2a..24b806af6834 100644
--- a/usr.bin/ncplogin/ncplogin.1
+++ b/usr.bin/ncplogin/ncplogin.1
@@ -45,23 +45,29 @@ server can be created and used independently of the
 command.
 Connections can be created by any user.
 Each user can have multiple
-connections, but each NetWareServer:NetWareUser pair should be unique.
+connections, but each
+.Ar NetWareServer Ns : Ns Ar NetWareUser
+pair should be unique.
 .Pp
 The
 .Nm
 command is used to create a permanent connection to a
 .Tn NetWare
 server.
-Permanent connections will stay connected even if no applications use them.
-This allows users to run different ncp* programs
+Permanent connections will stay open even if no application uses them.
+This allows users to run different
+.Pa ncp*
+programs
 without specifying a file server and user to use.
 Established connections can be destroyed with the
 .Xr ncplogout 1
 command.
 .Pp
-Upper case options described in this manual
-are common for other ncp* programs and are referred to as
-.Qq connection options .
+Upper case options described in this manual page
+are common for other
+.Pa ncp*
+programs and are referred to as
+.Dq connection options .
 Options
 .Fl U
 and
@@ -70,18 +76,18 @@ are mutually exclusive with the
 .No / Ns Ar server Ns : Ns Ar user
 syntax.
 .Pp
-The options are:
+The following options are available:
 .Bl -tag -width indent
 .It Fl S Ar server
 Specify the name of the
 .Tn NetWare
 server to connect to.
-This affect only
+This affects only
 .Tn IPX
 servers.
-For native
+For servers supporting
 .Tn IP
-servers, see the
+natively, see the
 .Fl A
 option.
 .It Fl U Ar user
@@ -106,13 +112,19 @@ program accepts this option.
 Try to use
 .Ar signature_level .
 Available values are:
-.Bd -literal -offset indent
-Value   Meaning
-0	disable signatures
-1	enable (use if required by server)
-2	request but do not require signing
-3	require signatures
-.Ed
+.Pp
+.Bl -tag -width ".Em Value" -offset indent -compact
+.It Em Value
+.Em Meaning
+.It 0
+disable signatures
+.It 1
+enable (use if required by server)
+.It 2
+request but do not require signing
+.It 3
+require signatures
+.El
 .Pp
 Note that only packet header signing is implemented.
 .It Fl M Ar mode
@@ -120,12 +132,20 @@ Share this connection.
 The bits in the
 .Ar mode
 argument are similar to standard file permissions:
-.Bd -literal -offset indent
-Mask    Meaning
-4	READ    - connection will be visible.
-2	WRITE   - connection can be closed/modified
-1	EXECUTE - user allowed to execute requests.
-.Ed
+.Pp
+.Bl -tag -width ".Em Mask" -offset indent -compact
+.It Em Mask
+.Em Meaning
+.It 4
+.Pq READ
+connection will be visible.
+.It 2
+.Pq WRITE
+connection can be closed/modified.
+.It 1
+.Pq EXECUTE
+user is allowed to execute requests.
+.El
 .Pp
 By default, the connection is created with
 .Ar mode
@@ -139,15 +159,16 @@ This would allow the group to perform
 requests,
 but not to destroy the connection.
 When a server is not explicitly specified,
-ncp* programs try to find a suitable connection in the following order:
+.Pa ncp*
+programs try to find a suitable connection in the following order:
 .Bl -enum -offset indent
 .It
 Try to find a connection owned by the user.
 If there is more than one such
 connection, try to determine which one is primary.
-The primary flag is set with the
+(The primary flag is set with the
 .Fl D
-option.
+option.)
 .It
 If the primary connection could not be determined,
 the first shared connection will be used.
@@ -170,7 +191,7 @@ Specify the
 and
 .Ar group
 attributes for the connection.
-Newly created connections take the
+By default, newly created connections take the
 .Ar owner
 attribute from the creating user's username and the
 .Ar group
@@ -184,7 +205,8 @@ Mark the connection as permanent.
 The
 .Nm
 utility always creates permanent connections.
-This option can be used in other ncp*
+This option can be useful in other
+.Pa ncp*
 programs.
 .It Fl R Ar retry_count
 Specify the number of retries to be performed
@@ -192,14 +214,14 @@ before dropping the connection.
 The default value is 10.
 .Pp
 Note: after a connection is marked
-.Sq BAD ,
+.Dq BAD ,
 each request will try to restore it.
 This process restores only the
 .Tn NCP
 connection;
 it does not reopen any files that were open
 at the time that the connection was marked
-.Sq BAD .
+.Dq BAD .
 .It Fl W Ar timeout
 Specify the server request timeout in seconds.
 The default is 5 seconds.
@@ -212,19 +234,19 @@ and
 options.
 .El
 .Sh IMPLEMENTATION NOTES
-Low level connection management is implemented in the
+Low-level connection management is implemented in the
 .Pa ncp.ko
-module.
+kernel module.
 The
 .Xr IPXrouted 8
 program is also required for
 .Tn IPX
 support.
 .Sh FILES
-.Bl -tag -width /var/log/wtmp -compact
+.Bl -tag -width ".Pa ~/.nwfsrc"
 .It Pa ~/.nwfsrc
-keeps static parameters for connections and other information
-See
+keeps static parameters for connections and other information;
+see
 .Pa /usr/share/examples/nwclient/dot.nwfsrc
 for details.
 .El
diff --git a/usr.bin/ncplogin/ncplogout.1 b/usr.bin/ncplogin/ncplogout.1
index c228de79d22e..bc220a7cf333 100644
--- a/usr.bin/ncplogin/ncplogout.1
+++ b/usr.bin/ncplogin/ncplogout.1
@@ -7,11 +7,11 @@
 .Nd schedule permanent connection to close
 .Sh SYNOPSIS
 .Nm
-.Op -S Ar server
-.Op -U Ar user
-.Op -c Ar handle
+.Op Fl S Ar server
+.Op Fl U Ar user
+.Op Fl c Ar handle
 .Nm
-.Op -c Ar handle
+.Op Fl c Ar handle
 .No / Ns Ar server Ns : Ns Ar user
 .Sh DESCRIPTION
 The
@@ -23,7 +23,8 @@ If the connection is busy (i.e., used by other processes) it will
 be closed when the last process using it is terminated.
 This command is similar to the
 .Tn DOS
-logout.exe command.
+.Pa logout.exe
+command.
 .Pp
 The options are:
 .Bl -tag -width indent
@@ -40,9 +41,8 @@ one connection active.
 .It Fl c Ar handle
 Close a connection by handle.
 A list of available handles can be obtained with the following command:
-.Bd -literal -offset indent
-	ncplist c
-.Ed
+.Pp
+.Dl "ncplist c"
 .El
 .Sh HISTORY
 The