summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ssh_config.54
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 26b7251bd..df1e00318 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,9 @@
19 - stevesk@cvs.openbsd.org 2005/12/17 21:13:05 19 - stevesk@cvs.openbsd.org 2005/12/17 21:13:05
20 [ssh_config.5 session.c] 20 [ssh_config.5 session.c]
21 spelling: fowarding, fowarded 21 spelling: fowarding, fowarded
22 - stevesk@cvs.openbsd.org 2005/12/17 21:36:42
23 [ssh_config.5]
24 spelling: intented -> intended
22 25
2320051219 2620051219
24 - (dtucker) [cipher-aes.c cipher-ctr.c cipher.c configure.ac 27 - (dtucker) [cipher-aes.c cipher-ctr.c cipher.c configure.ac
@@ -3493,4 +3496,4 @@
3493 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 3496 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
3494 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 3497 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
3495 3498
3496$Id: ChangeLog,v 1.4037 2005/12/20 05:14:15 dtucker Exp $ 3499$Id: ChangeLog,v 1.4038 2005/12/20 05:15:14 dtucker Exp $
diff --git a/ssh_config.5 b/ssh_config.5
index 56fc65ed0..89b219c28 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.70 2005/12/17 21:13:05 stevesk Exp $ 37.\" $OpenBSD: ssh_config.5,v 1.71 2005/12/17 21:36:42 stevesk 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
@@ -530,7 +530,7 @@ The argument to this keyword must be
530.Dq yes 530.Dq yes
531or 531or
532.Dq no . 532.Dq no .
533This option is intented for situations where 533This option is intended for situations where
534.Nm ssh-agent 534.Nm ssh-agent
535offers many different identities. 535offers many different identities.
536The default is 536The default is