summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--ssh.15
-rw-r--r--ssh_config.54
3 files changed, 9 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index dd191651f..35b1b7b38 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -29,6 +29,10 @@
29 - avoid line split in SYNOPSIS 29 - avoid line split in SYNOPSIS
30 - add args to -w 30 - add args to -w
31 - kill trailing whitespace 31 - kill trailing whitespace
32 - jmc@cvs.openbsd.org 2005/12/08 14:59:44
33 [ssh.1 ssh_config.5]
34 make `!command' a little clearer;
35 ok reyk
32 36
3320051201 3720051201
34 - (djm) [envpass.sh] Remove regress script that was accidentally committed 38 - (djm) [envpass.sh] Remove regress script that was accidentally committed
@@ -3421,4 +3425,4 @@
3421 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 3425 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
3422 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 3426 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
3423 3427
3424$Id: ChangeLog,v 1.4021 2005/12/13 08:30:05 djm Exp $ 3428$Id: ChangeLog,v 1.4022 2005/12/13 08:30:27 djm Exp $
diff --git a/ssh.1 b/ssh.1
index 246142319..9f89b9730 100644
--- a/ssh.1
+++ b/ssh.1
@@ -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.1,v 1.216 2005/12/07 10:52:13 jmc Exp $ 37.\" $OpenBSD: ssh.1,v 1.217 2005/12/08 14:59:44 jmc Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSH 1 39.Dt SSH 1
40.Os 40.Os
@@ -304,8 +304,7 @@ options (see below).
304It also allows the cancellation of existing remote port-forwardings 304It also allows the cancellation of existing remote port-forwardings
305using 305using
306.Fl KR Ar hostport . 306.Fl KR Ar hostport .
307The 307.Ic !\& Ns Ar command
308.Ic ! Ar command
309allows the user to execute a local command if the 308allows the user to execute a local command if the
310.Ic PermitLocalCommand 309.Ic PermitLocalCommand
311option is enabled in 310option is enabled in
diff --git a/ssh_config.5 b/ssh_config.5
index d1930baab..440a6d71d 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.65 2005/12/06 22:38:27 reyk Exp $ 37.\" $OpenBSD: ssh_config.5,v 1.66 2005/12/08 14:59:44 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
@@ -640,7 +640,7 @@ Default is 22.
640Allow local command execution via the 640Allow local command execution via the
641.Ic LocalCommand 641.Ic LocalCommand
642option or using the 642option or using the
643.Ic ! Ar command 643.Ic !\& Ns Ar command
644escape sequence in 644escape sequence in
645.Xr ssh 1 . 645.Xr ssh 1 .
646The argument must be 646The argument must be