=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/sshd.8,v retrieving revision 1.242 retrieving revision 1.243 diff -u -r1.242 -r1.243 --- src/usr.bin/ssh/sshd.8 2008/06/10 04:50:25 1.242 +++ src/usr.bin/ssh/sshd.8 2008/06/10 08:17:40 1.243 @@ -34,7 +34,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $OpenBSD: sshd.8,v 1.242 2008/06/10 04:50:25 dtucker Exp $ +.\" $OpenBSD: sshd.8,v 1.243 2008/06/10 08:17:40 jmc Exp $ .Dd $Mdocdate: June 10 2008 $ .Dt SSHD 8 .Os @@ -44,7 +44,7 @@ .Sh SYNOPSIS .Nm sshd .Bk -words -.Op Fl 46DTdeiqt +.Op Fl 46DdeiqTt .Op Fl b Ar bits .Op Fl C Ar connection_spec .Op Fl f Ar config_file @@ -101,6 +101,24 @@ .It Fl b Ar bits Specifies the number of bits in the ephemeral protocol version 1 server key (default 768). +.It Fl C Ar connection_spec +Specify the connection parameters to use for the +.Fl T +extended test mode. +If provided, any +.Cm Match +directives in the configuration file +that would apply to the specified user, host, and address will be set before +the configuration is written to standard output. +The connection parameters are supplied as keyword=value pairs. +The keywords are +.Dq user , +.Dq host , +and +.Dq addr . +All are required and may be supplied in any order, either with multiple +.Fl C +options or as a comma-separated list. .It Fl D When this option is specified, .Nm @@ -192,12 +210,6 @@ Nothing is sent to the system log. Normally the beginning, authentication, and termination of each connection is logged. -.It Fl t -Test mode. -Only check the validity of the configuration file and sanity of the keys. -This is useful for updating -.Nm -reliably as configuration options may change. .It Fl T Extended test mode. Check the validity of the configuration file, output the effective configuration @@ -207,24 +219,12 @@ rules may be applied by specifying the connection parameters using one or more .Fl C options. -.It Fl C -Specify the connection parameters to use for the the -.Fl T -extended test mode. -If provided, any -.Cm Match -directives in the configuration file -that would apply to the specified user, host and address will be set before -the configuration is written to standard output. -The connection parameters are supplied as keyword=value pairs. -The keywords are -.Dq user , -.Dq host -and -.Dq addr -All are required and may be supplied in any order, either with multiple -.Fl C -options or as a comma-separated list. +.It Fl t +Test mode. +Only check the validity of the configuration file and sanity of the keys. +This is useful for updating +.Nm +reliably as configuration options may change. .It Fl u Ar len This option is used to specify the size of the field in the