summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ssh_config.516
2 files changed, 13 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 4d289aa4c..7087d81f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -157,6 +157,9 @@
157 - jmc@cvs.openbsd.org 2006/02/24 10:33:54 157 - jmc@cvs.openbsd.org 2006/02/24 10:33:54
158 [sshd_config.5] 158 [sshd_config.5]
159 signpost to PATTERNS; 159 signpost to PATTERNS;
160 - jmc@cvs.openbsd.org 2006/02/24 10:37:07
161 [ssh_config.5]
162 tidy up the refs to PATTERNS;
160 163
16120060313 16420060313
162 - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong) 165 - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong)
@@ -4058,4 +4061,4 @@
4058 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 4061 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
4059 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 4062 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
4060 4063
4061$Id: ChangeLog,v 1.4183 2006/03/15 00:54:21 djm Exp $ 4064$Id: ChangeLog,v 1.4184 2006/03/15 00:54:36 djm Exp $
diff --git a/ssh_config.5 b/ssh_config.5
index 5f1ced5b6..a334e57dc 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -34,7 +34,7 @@
34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
36.\" 36.\"
37.\" $OpenBSD: ssh_config.5,v 1.80 2006/02/24 10:25:14 jmc Exp $ 37.\" $OpenBSD: ssh_config.5,v 1.81 2006/02/24 10:37:07 jmc Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSH_CONFIG 5 39.Dt SSH_CONFIG 5
40.Os 40.Os
@@ -141,13 +141,14 @@ A single
141.Ql \&* 141.Ql \&*
142as a pattern can be used to provide global 142as a pattern can be used to provide global
143defaults for all hosts. 143defaults for all hosts.
144See
145.Sx PATTERNS
146for more information on patterns.
147The host is the 144The host is the
148.Ar hostname 145.Ar hostname
149argument given on the command line (i.e., the name is not converted to 146argument given on the command line (i.e., the name is not converted to
150a canonicalized host name before matching). 147a canonicalized host name before matching).
148.Pp
149See
150.Sx PATTERNS
151for more information on patterns.
151.It Cm AddressFamily 152.It Cm AddressFamily
152Specifies which address family to use when connecting. 153Specifies which address family to use when connecting.
153Valid arguments are 154Valid arguments are
@@ -838,14 +839,15 @@ in
838.Xr sshd_config 5 839.Xr sshd_config 5
839for how to configure the server. 840for how to configure the server.
840Variables are specified by name, which may contain wildcard characters. 841Variables are specified by name, which may contain wildcard characters.
841See
842.Sx PATTERNS
843for more information on patterns.
844Multiple environment variables may be separated by whitespace or spread 842Multiple environment variables may be separated by whitespace or spread
845across multiple 843across multiple
846.Cm SendEnv 844.Cm SendEnv
847directives. 845directives.
848The default is not to send any environment variables. 846The default is not to send any environment variables.
847.Pp
848See
849.Sx PATTERNS
850for more information on patterns.
849.It Cm ServerAliveCountMax 851.It Cm ServerAliveCountMax
850Sets the number of server alive messages (see below) which may be 852Sets the number of server alive messages (see below) which may be
851sent without 853sent without