summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ssh_config.56
2 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 3d7f5806b..084e073e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
5 Make it clear that the example entries in ssh_config are only some of the 5 Make it clear that the example entries in ssh_config are only some of the
6 commonly-used options and refer the user to ssh_config(5) for more 6 commonly-used options and refer the user to ssh_config(5) for more
7 details; ok djm@ 7 details; ok djm@
8 - jmc@cvs.openbsd.org 2005/01/28 15:05:43
9 [ssh_config.5]
10 grammar;
8 11
920050208 1220050208
10 - (dtucker) [regress/test-exec.sh] Bug #912: Set _POSIX2_VERSION for the 13 - (dtucker) [regress/test-exec.sh] Bug #912: Set _POSIX2_VERSION for the
@@ -2094,4 +2097,4 @@
2094 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 2097 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
2095 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 2098 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
2096 2099
2097$Id: ChangeLog,v 1.3640 2005/02/08 22:46:47 dtucker Exp $ 2100$Id: ChangeLog,v 1.3641 2005/02/08 22:48:57 dtucker Exp $
diff --git a/ssh_config.5 b/ssh_config.5
index bd0e3e4bd..adef452cc 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.39 2004/10/07 10:10:24 djm Exp $ 37.\" $OpenBSD: ssh_config.5,v 1.40 2005/01/28 15:05:43 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
@@ -120,9 +120,9 @@ Specifies which address family to use when connecting.
120Valid arguments are 120Valid arguments are
121.Dq any , 121.Dq any ,
122.Dq inet 122.Dq inet
123(Use IPv4 only) or 123(use IPv4 only) or
124.Dq inet6 124.Dq inet6
125(Use IPv6 only.) 125(use IPv6 only).
126.It Cm BatchMode 126.It Cm BatchMode
127If set to 127If set to
128.Dq yes , 128.Dq yes ,