# This change is Solaris-specific and thus is not being contributed back
# to the upstream community.  Details:
#
# OpenSSH uses the BSD/Linux man page scheme which is different from the SysV
# man page scheme used in Solaris.  In order to comply to the Solaris man page
# policy and also use the IPS mediator to switch between SunSSH and OpenSSH man
# pages, the section numbers of some OpenSSH man pages are changed to be the
# same as their corresponding ones in SunSSH.
#

diff -rupN old/moduli.5 new/moduli.5
--- old/moduli.5	2015-12-08 21:19:59.482474430 -0800
+++ new/moduli.5	2015-12-08 21:15:53.128029200 -0800
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .Dd $Mdocdate: September 26 2012 $
-.Dt MODULI 5
+.Dt MODULI 4
 .Os
 .Sh NAME
 .Nm moduli
@@ -23,7 +23,7 @@
 The
 .Pa /etc/moduli
 file contains prime numbers and generators for use by
-.Xr sshd 8
+.Xr sshd 1M
 in the Diffie-Hellman Group Exchange key exchange method.
 .Pp
 New moduli may be generated with
@@ -40,7 +40,7 @@ pass, using
 .Ic ssh-keygen -T ,
 provides a high degree of assurance that the numbers are prime and are
 safe for use in Diffie-Hellman operations by
-.Xr sshd 8 .
+.Xr sshd 1M .
 This
 .Nm
 format is used as the output from each pass.
@@ -70,7 +70,7 @@ are Sophie Germain primes (type 4).
 Further primality testing with
 .Xr ssh-keygen 1
 produces safe prime moduli (type 2) that are ready for use in
-.Xr sshd 8 .
+.Xr sshd 1M .
 Other types are not used by OpenSSH.
 .It tests
 Decimal number indicating the type of primality tests that the number
@@ -105,16 +105,16 @@ The modulus itself in hexadecimal.
 .El
 .Pp
 When performing Diffie-Hellman Group Exchange,
-.Xr sshd 8
+.Xr sshd 1M
 first estimates the size of the modulus required to produce enough
 Diffie-Hellman output to sufficiently key the selected symmetric cipher.
-.Xr sshd 8
+.Xr sshd 1M
 then randomly selects a modulus from
 .Fa /etc/moduli
 that best meets the size requirement.
 .Sh SEE ALSO
 .Xr ssh-keygen 1 ,
-.Xr sshd 8
+.Xr sshd 1M
 .Sh STANDARDS
 .Rs
 .%A M. Friedl
diff -rupN old/sftp-server.8 new/sftp-server.8
--- old/sftp-server.8	2015-12-08 21:04:19.872169630 -0800
+++ new/sftp-server.8	2015-12-08 21:36:18.267186200 -0800
@@ -23,7 +23,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .Dd $Mdocdate: December 11 2014 $
-.Dt SFTP-SERVER 8
+.Dt SFTP-SERVER 1M 
 .Os
 .Sh NAME
 .Nm sftp-server
@@ -47,7 +47,7 @@ is a program that speaks the server side
 to stdout and expects client requests from stdin.
 .Nm
 is not intended to be called directly, but from
-.Xr sshd 8
+.Xr sshd 1M
 using the
 .Cm Subsystem
 option.
@@ -58,7 +58,7 @@ should be specified in the
 .Cm Subsystem
 declaration.
 See
-.Xr sshd_config 5
+.Xr sshd_config 4
 for more information.
 .Pp
 Valid options are:
@@ -71,7 +71,7 @@ The pathname may contain the following t
 and %u is replaced by the username of that user.
 The default is to use the user's home directory.
 This option is useful in conjunction with the
-.Xr sshd_config 5
+.Xr sshd_config 4
 .Cm ChrootDirectory
 option.
 .It Fl e
@@ -147,13 +147,13 @@ must be able to access
 for logging to work, and use of
 .Nm
 in a chroot configuration therefore requires that
-.Xr syslogd 8
+.Xr syslogd 1M
 establish a logging socket inside the chroot directory.
 .Sh SEE ALSO
 .Xr sftp 1 ,
 .Xr ssh 1 ,
-.Xr sshd_config 5 ,
-.Xr sshd 8
+.Xr sshd_config 4 ,
+.Xr sshd 1M
 .Rs
 .%A T. Ylonen
 .%A S. Lehtinen
diff -rupN old/ssh-keysign.8 new/ssh-keysign.8
--- old/ssh-keysign.8	2015-12-08 21:20:45.638888550 -0800
+++ new/ssh-keysign.8	2015-12-08 21:15:29.266139300 -0800
@@ -23,7 +23,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .Dd $Mdocdate: February 17 2016 $
-.Dt SSH-KEYSIGN 8
+.Dt SSH-KEYSIGN 1M
 .Os
 .Sh NAME
 .Nm ssh-keysign
@@ -52,7 +52,7 @@ is not intended to be invoked by the use
 See
 .Xr ssh 1
 and
-.Xr sshd 8
+.Xr sshd 1M
 for more information about host-based authentication.
 .Sh FILES
 .Bl -tag -width Ds -compact
@@ -83,8 +83,8 @@ information corresponding with the priva
 .Sh SEE ALSO
 .Xr ssh 1 ,
 .Xr ssh-keygen 1 ,
-.Xr ssh_config 5 ,
-.Xr sshd 8
+.Xr ssh_config 4 ,
+.Xr sshd 1M
 .Sh HISTORY
 .Nm
 first appeared in
diff -rupN old/ssh-pkcs11-helper.8 new/ssh-pkcs11-helper.8
--- old/ssh-pkcs11-helper.8	2015-12-08 21:18:49.511938140 -0800
+++ new/ssh-pkcs11-helper.8	2015-12-08 21:16:10.866823750 -0800
@@ -15,7 +15,7 @@
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
 .Dd $Mdocdate: July 16 2013 $
-.Dt SSH-PKCS11-HELPER 8
+.Dt SSH-PKCS11-HELPER 1M
 .Os
 .Sh NAME
 .Nm ssh-pkcs11-helper
--- old/sshd_config.5	2016-05-11 04:08:25.946753581 -0700
+++ new/sshd_config.5	2016-05-11 04:20:10.025546205 -0700
@@ -35,7 +35,7 @@
 .\"
 .\" $OpenBSD: sshd_config.5,v 1.220 2016/02/17 08:57:34 djm Exp $
 .Dd $Mdocdate: February 17 2016 $
-.Dt SSHD_CONFIG 5
+.Dt SSHD_CONFIG 4
 .Os
 .Sh NAME
 .Nm sshd_config
@@ -43,7 +43,7 @@
 .Sh SYNOPSIS
 .Nm /etc/ssh/sshd_config
 .Sh DESCRIPTION
-.Xr sshd 8
+.Xr sshd 1M
 reads configuration data from
 .Pa /etc/ssh/sshd_config
 (or the file specified with
@@ -68,7 +68,7 @@
 See
 .Cm SendEnv
 in
-.Xr ssh_config 5
+.Xr ssh_config 4
 for how to configure the client.
 The
 .Ev TERM
@@ -88,7 +88,7 @@
 The default is not to accept any environment variables.
 .It Cm AddressFamily
 Specifies which address family should be used by
-.Xr sshd 8 .
+.Xr sshd 1M .
 Valid arguments are
 .Dq any ,
 .Dq inet
@@ -121,7 +121,7 @@
 .Cm AllowGroups .
 .Pp
 See PATTERNS in
-.Xr ssh_config 5
+.Xr ssh_config 4
 for more information on patterns.
 .It Cm AllowTcpForwarding
 Specifies whether TCP forwarding is permitted.
@@ -181,7 +181,7 @@
 .Cm AllowGroups .
 .Pp
 See PATTERNS in
-.Xr ssh_config 5
+.Xr ssh_config 4
 for more information on patterns.
 .It Cm AuthenticationMethods
 Specifies the authentication methods that must be successfully completed
@@ -216,7 +216,7 @@
 If the
 .Dq publickey
 method is listed more than once,
-.Xr sshd 8
+.Xr sshd 1M
 verifies that keys that have been used successfully are not reused for
 subsequent authentications.
 For example, an
@@ -249,7 +249,7 @@
 .Pp
 The program should produce on standard output zero or
 more lines of authorized_keys output (see AUTHORIZED_KEYS in
-.Xr sshd 8 ) .
+.Xr sshd 1M ) .
 If a key supplied by AuthorizedKeysCommand does not successfully authenticate
 and authorize the user then public key authentication continues using the usual
 .Cm AuthorizedKeysFile
@@ -264,7 +264,7 @@
 is specified but
 .Cm AuthorizedKeysCommandUser
 is not, then
-.Xr sshd 8
+.Xr sshd 1M
 will refuse to start.
 .It Cm AuthorizedKeysFile
 Specifies the file that contains the public keys that can be used
@@ -272,7 +272,7 @@
 The format is described in the
 AUTHORIZED_KEYS FILE FORMAT
 section of
-.Xr sshd 8 .
+.Xr sshd 1M .
 .Cm AuthorizedKeysFile
 may contain tokens of the form %T which are substituted during connection
 setup.
@@ -323,7 +323,7 @@
 is specified but
 .Cm AuthorizedPrincipalsCommandUser
 is not, then
-.Xr sshd 8
+.Xr sshd 1M
 will refuse to start.
 .It Cm AuthorizedPrincipalsFile
 Specifies a file that lists principal names that are accepted for
@@ -334,7 +334,7 @@
 to be accepted for authentication.
 Names are listed one per line preceded by key options (as described
 in AUTHORIZED_KEYS FILE FORMAT in
-.Xr sshd 8 ) .
+.Xr sshd 1M ) .
 Empty lines and comments starting with
 .Ql #
 are ignored.
@@ -364,7 +364,7 @@
 though the
 .Cm principals=
 key option offers a similar facility (see
-.Xr sshd 8
+.Xr sshd 1M
 for details).
 .It Cm Banner
 The contents of the specified file are sent to the remote user before
@@ -384,11 +384,11 @@
 .Xr chroot 2
 to after authentication.
 At session startup
-.Xr sshd 8
+.Xr sshd 1M
 checks that all components of the pathname are root-owned directories
 which are not writable by any other user or group.
 After the chroot,
-.Xr sshd 8
+.Xr sshd 1M
 changes the working directory to the user's home directory.
 .Pp
 The pathname may contain the following tokens that are expanded at runtime once
@@ -420,14 +420,14 @@
 though sessions which use logging may require
 .Pa /dev/log
 inside the chroot directory on some operating systems (see
-.Xr sftp-server 8
+.Xr sftp-server 1M
 for details).
 .Pp
 For safety, it is very important that the directory hierarchy be
 prevented from modification by other processes on the system (especially
 those outside the jail).
 Misconfiguration can lead to unsafe environments which
-.Xr sshd 8
+.Xr sshd 1M
 cannot detect.
 .Pp
 The default is
@@ -493,7 +493,7 @@
 .It Cm ClientAliveCountMax
 Sets the number of client alive messages (see below) which may be
 sent without
-.Xr sshd 8
+.Xr sshd 1M
 receiving any messages back from the client.
 If this threshold is reached while client alive messages are being sent,
 sshd will disconnect the client, terminating the session.
@@ -519,7 +519,7 @@
 .It Cm ClientAliveInterval
 Sets a timeout interval in seconds after which if no data has been received
 from the client,
-.Xr sshd 8
+.Xr sshd 1M
 will send a message through the encrypted
 channel to request a response from the client.
 The default
@@ -549,7 +549,7 @@
 .Cm AllowGroups .
 .Pp
 See PATTERNS in
-.Xr ssh_config 5
+.Xr ssh_config 4
 for more information on patterns.
 .It Cm DenyUsers
 This keyword can be followed by a list of user name patterns, separated
@@ -568,7 +568,7 @@
 .Cm AllowGroups .
 .Pp
 See PATTERNS in
-.Xr ssh_config 5
+.Xr ssh_config 4
 for more information on patterns.
 .It Cm FingerprintHash
 Specifies the hash algorithm used when logging key fingerprints.
@@ -603,7 +603,7 @@
 Specifies whether remote hosts are allowed to connect to ports
 forwarded for the client.
 By default,
-.Xr sshd 8
+.Xr sshd 1M
 binds remote port forwardings to the loopback address.
 This prevents other remote hosts from connecting to forwarded ports.
 .Cm GatewayPorts
@@ -684,7 +684,7 @@
 A setting of
 .Dq yes
 means that
-.Xr sshd 8
+.Xr sshd 1M
 uses the name supplied by the client rather than
 attempting to resolve the name from the TCP connection itself.
 The default is
@@ -695,7 +695,7 @@
 by
 .Cm HostKey .
 The default behaviour of
-.Xr sshd 8
+.Xr sshd 1M
 is not to load any certificates.
 .It Cm HostKey
 Specifies a file containing a private host key
@@ -711,12 +711,12 @@
 for protocol version 2.
 .Pp
 Note that
-.Xr sshd 8
+.Xr sshd 1M
 will refuse to use a file if it is group/world-accessible
 and that the
 .Cm HostKeyAlgorithms
 option restricts which of the keys are actually used by
-.Xr sshd 8 .
+.Xr sshd 1M .
 .Pp
 It is possible to have multiple host key files.
 .Dq rsa1
@@ -777,7 +777,7 @@
 .Dq yes .
 .It Cm IgnoreUserKnownHosts
 Specifies whether
-.Xr sshd 8
+.Xr sshd 1M
 should ignore the user's
 .Pa ~/.ssh/known_hosts
 during
@@ -912,7 +912,7 @@
 The default is 3600 (seconds).
 .It Cm ListenAddress
 Specifies the local addresses
-.Xr sshd 8
+.Xr sshd 1M
 should listen on.
 The following forms may be used:
 .Pp
@@ -952,7 +952,7 @@
 The default is 120 seconds.
 .It Cm LogLevel
 Gives the verbosity level that is used when logging messages from
-.Xr sshd 8 .
+.Xr sshd 1M .
 The possible values are:
 QUIET, FATAL, ERROR, INFO, VERBOSE, DEBUG, DEBUG1, DEBUG2, and DEBUG3.
 The default is INFO.
@@ -1057,7 +1057,7 @@
 The match patterns may consist of single entries or comma-separated
 lists and may use the wildcard and negation operators described in the
 PATTERNS section of
-.Xr ssh_config 5 .
+.Xr ssh_config 4 .
 .Pp
 The patterns in an
 .Cm Address
@@ -1156,7 +1156,7 @@
 the three colon separated values
 .Dq start:rate:full
 (e.g. "10:30:60").
-.Xr sshd 8
+.Xr sshd 1M
 will refuse connection attempts with a probability of
 .Dq rate/100
 (30%)
@@ -1276,7 +1276,7 @@
 options in
 .Pa ~/.ssh/authorized_keys
 are processed by
-.Xr sshd 8 .
+.Xr sshd 1M .
 The default is
 .Dq no .
 Enabling environment processing may enable users to bypass access
@@ -1297,7 +1297,7 @@
 .Pa /var/run/sshd.pid .
 .It Cm Port
 Specifies the port number that
-.Xr sshd 8
+.Xr sshd 1M
 listens on.
 The default is 22.
 Multiple options of this type are permitted.
@@ -1305,14 +1305,14 @@
 .Cm ListenAddress .
 .It Cm PrintLastLog
 Specifies whether
-.Xr sshd 8
+.Xr sshd 1M
 should print the date and time of the last user login when a user logs
 in interactively.
 On Solaris this option is always ignored since pam_unix_session(5)
 reports the last login time.
 .It Cm PrintMotd
 Specifies whether
-.Xr sshd 8
+.Xr sshd 1M
 should print
 .Pa /etc/motd
 when a user logs in interactively.
@@ -1323,7 +1323,7 @@
 .Dq yes .
 .It Cm Protocol
 Specifies the protocol versions
-.Xr sshd 8
+.Xr sshd 1M
 supports.
 The possible values are
 .Sq 1
@@ -1450,7 +1450,7 @@
 .Dq no .
 .It Cm StrictModes
 Specifies whether
-.Xr sshd 8
+.Xr sshd 1M
 should check file modes and ownership of the
 user's files and home directory before accepting login.
 This is normally desirable because novices sometimes accidentally leave their
@@ -1466,7 +1466,7 @@
 to execute upon subsystem request.
 .Pp
 The command
-.Xr sftp-server 8
+.Xr sftp-server 1M
 implements the
 .Dq sftp
 file transfer subsystem.
@@ -1483,7 +1483,7 @@
 By default no subsystems are defined.
 .It Cm SyslogFacility
 Gives the facility code that is used when logging messages from
-.Xr sshd 8 .
+.Xr sshd 1M .
 The possible values are: DAEMON, USER, AUTH, LOCAL0, LOCAL1, LOCAL2,
 LOCAL3, LOCAL4, LOCAL5, LOCAL6, LOCAL7.
 The default is AUTH.
@@ -1526,7 +1526,7 @@
 .Xr ssh-keygen 1 .
 .It Cm UseDNS
 Specifies whether
-.Xr sshd 8
+.Xr sshd 1M
 should look up the remote host name, and to check that
 the resolved host name for the remote IP address maps back to the
 very same IP address.
@@ -1580,13 +1580,13 @@
 If
 .Cm UsePAM
 is enabled, you will not be able to run
-.Xr sshd 8
+.Xr sshd 1M
 as a non-root user.
 The default is
 .Dq no .
 .It Cm UsePrivilegeSeparation
 Specifies whether
-.Xr sshd 8
+.Xr sshd 1M
 separates privileges by creating an unprivileged child process
 to deal with incoming network traffic.
 After successful authentication, another process will be created that has
@@ -1613,7 +1613,7 @@
 .Dq none .
 .It Cm X11DisplayOffset
 Specifies the first display number available for
-.Xr sshd 8 Ns 's
+.Xr sshd 1M Ns 's
 X11 forwarding.
 This prevents sshd from interfering with real X11 servers.
 The default is 10.
@@ -1628,7 +1628,7 @@
 .Pp
 When X11 forwarding is enabled, there may be additional exposure to
 the server and to client displays if the
-.Xr sshd 8
+.Xr sshd 1M
 proxy display is configured to listen on the wildcard address (see
 .Cm X11UseLocalhost
 below), though this is not the default.
@@ -1639,7 +1639,7 @@
 forwarding (see the warnings for
 .Cm ForwardX11
 in
-.Xr ssh_config 5 ) .
+.Xr ssh_config 4 ) .
 A system administrator may have a stance in which they want to
 protect clients that may expose themselves to attack by unwittingly
 requesting X11 forwarding, which can warrant a
@@ -1653,7 +1653,7 @@
 is enabled.
 .It Cm X11UseLocalhost
 Specifies whether
-.Xr sshd 8
+.Xr sshd 1M
 should bind the X11 forwarding server to the loopback address or to
 the wildcard address.
 By default,
@@ -1686,7 +1686,7 @@
 .Pa /usr/X11R6/bin/xauth .
 .El
 .Sh TIME FORMATS
-.Xr sshd 8
+.Xr sshd 1M
 command-line arguments and configuration file options that specify time
 may be expressed using a sequence of the form:
 .Sm off
@@ -1730,12 +1730,12 @@
 .Bl -tag -width Ds
 .It Pa /etc/ssh/sshd_config
 Contains configuration data for
-.Xr sshd 8 .
+.Xr sshd 1M .
 This file should be writable by root only, but it is recommended
 (though not necessary) that it be world-readable.
 .El
 .Sh SEE ALSO
-.Xr sshd 8 ,
+.Xr sshd 1M ,
 .Xr pam_unix_session 5
 .Sh AUTHORS
 OpenSSH is a derivative of the original and free
--- old/ssh_config.5	2016-03-09 10:04:48.000000000 -0800
+++ new/ssh_config.5	2016-05-11 04:27:03.379064284 -0700
@@ -35,7 +35,7 @@
 .\"
 .\" $OpenBSD: ssh_config.5,v 1.228 2016/02/20 23:01:46 sobrado Exp $
 .Dd $Mdocdate: February 20 2016 $
-.Dt SSH_CONFIG 5
+.Dt SSH_CONFIG 4
 .Os
 .Sh NAME
 .Nm ssh_config
@@ -639,7 +639,7 @@
 .Dq Fl O No exit
 option).
 If set to a time in seconds, or a time in any of the formats documented in
-.Xr sshd_config 5 ,
+.Xr sshd_config 4 ,
 then the backgrounded master connection will automatically terminate
 after it has remained idle (with no client connections) for the
 specified time.
@@ -681,7 +681,7 @@
 in the global client configuration file
 .Pa /etc/ssh/ssh_config
 enables the use of the helper program
-.Xr ssh-keysign 8
+.Xr ssh-keysign 1M
 during
 .Cm HostbasedAuthentication .
 The argument must be
@@ -692,7 +692,7 @@
 .Dq no .
 This option should be placed in the non-hostspecific section.
 See
-.Xr ssh-keysign 8
+.Xr ssh-keysign 1M
 for more information.
 .It Cm EscapeChar
 Sets the escape character (default:
@@ -773,7 +773,7 @@
 Specify a timeout for untrusted X11 forwarding
 using the format described in the
 TIME FORMATS section of
-.Xr sshd_config 5 .
+.Xr sshd_config 4 .
 X11 connections received by
 .Xr ssh 1
 after this time will be refused.
@@ -838,7 +838,7 @@
 These hashed names may be used normally by
 .Xr ssh 1
 and
-.Xr sshd 8 ,
+.Xr sshd 1M ,
 but they do not reveal identifying information should the file's contents
 be disclosed.
 The default is
@@ -1287,7 +1287,7 @@
 The command can be basically anything,
 and should read from its standard input and write to its standard output.
 It should eventually connect an
-.Xr sshd 8
+.Xr sshd 1M
 server running on some machine, or execute
 .Ic sshd -i
 somewhere.
@@ -1366,7 +1366,7 @@
 The optional second value is specified in seconds and may use any of the
 units documented in the
 TIME FORMATS section of
-.Xr sshd_config 5 .
+.Xr sshd_config 4 .
 The default value for
 .Cm RekeyLimit
 is
@@ -1409,7 +1409,7 @@
 will only succeed if the server's
 .Cm GatewayPorts
 option is enabled (see
-.Xr sshd_config 5 ) .
+.Xr sshd_config 4 ) .
 .It Cm RequestTTY
 Specifies whether to request a pseudo-tty for the session.
 The argument may be one of:
@@ -1474,7 +1474,7 @@
 Refer to
 .Cm AcceptEnv
 in
-.Xr sshd_config 5
+.Xr sshd_config 4
 for how to configure the server.
 Variables are specified by name, which may contain wildcard characters.
 Multiple environment variables may be separated by whitespace or spread
@@ -1662,7 +1662,7 @@
 and will be disabled if it is enabled.
 .Pp
 Presently, only
-.Xr sshd 8
+.Xr sshd 1M
 from OpenSSH 6.8 and greater support the
 .Dq hostkeys@openssh.com
 protocol extension used to inform the client of all the server's hostkeys.
--- old/sshd.8	2016-03-09 10:04:48.000000000 -0800
+++ new/sshd.8	2016-05-11 05:04:07.228783462 -0700
@@ -35,7 +35,7 @@
 .\"
 .\" $OpenBSD: sshd.8,v 1.284 2016/02/17 07:38:19 jmc Exp $
 .Dd $Mdocdate: February 17 2016 $
-.Dt SSHD 8
+.Dt SSHD 1M
 .Os
 .Sh NAME
 .Nm sshd
@@ -77,7 +77,7 @@
 .Nm
 can be configured using command-line options or a configuration file
 (by default
-.Xr sshd_config 5 ) ;
+.Xr sshd_config 4 ) ;
 command-line options override values specified in the
 configuration file.
 .Nm
@@ -204,7 +204,7 @@
 This is useful for specifying options for which there is no separate
 command-line flag.
 For full details of the options, and their values, see
-.Xr sshd_config 5 .
+.Xr sshd_config 4 .
 .It Fl p Ar port
 Specifies the port on which the server listens for connections
 (default 22).
@@ -274,7 +274,7 @@
 though this can be changed via the
 .Cm Protocol
 option in
-.Xr sshd_config 5 .
+.Xr sshd_config 4 .
 Protocol 1 should not be used
 and is only offered to support legacy devices.
 .Pp
@@ -397,14 +397,14 @@
 See the
 .Cm PermitUserEnvironment
 option in
-.Xr sshd_config 5 .
+.Xr sshd_config 4 .
 .It
 Changes to user's home directory.
 .It
 If
 .Pa ~/.ssh/rc
 exists and the
-.Xr sshd_config 5
+.Xr sshd_config 4
 .Cm PermitUserRC
 option is set, runs it; else if
 .Pa /etc/ssh/sshrc
@@ -551,7 +551,7 @@
 environment variable.
 Note that this option applies to shell, command or subsystem execution.
 Also note that this command may be superseded by either a
-.Xr sshd_config 5
+.Xr sshd_config 4
 .Cm ForceCommand
 directive or a command embedded in a certificate.
 .It Cm environment="NAME=value"
@@ -952,7 +952,7 @@
 Contains configuration data for
 .Nm sshd .
 The file format and configuration options are described in
-.Xr sshd_config 5 .
+.Xr sshd_config 4 .
 .Pp
 .It Pa /etc/ssh/sshrc
 Similar to
@@ -986,11 +986,12 @@
 .Xr ssh-keygen 1 ,
 .Xr ssh-keyscan 1 ,
 .Xr chroot 2 ,
+.Xr hosts_access 5 ,
 .Xr login.conf 5 ,
-.Xr moduli 5 ,
-.Xr sshd_config 5 ,
-.Xr inetd 8 ,
-.Xr sftp-server 8
+.Xr moduli 4 ,
+.Xr sshd_config 4 ,
+.Xr inetd 1M ,
+.Xr sftp-server 1M
 .Sh AUTHORS
 OpenSSH is a derivative of the original and free
 ssh 1.2.12 release by Tatu Ylonen.
