diff --git a/ChangeLog b/ChangeLog index 508745b89..b16ff26ef 100644 --- a/ChangeLog +++ b/ChangeLog @@ -48,6 +48,9 @@ restricted by the PermitTunnel (yes|point-to-point|ethernet|no) option in sshd_config(5). ok djm@, man page bits by jmc@ + - jmc@cvs.openbsd.org 2005/12/08 21:37:50 + [ssh_config.5] + new sentence, new line; 20051201 - (djm) [envpass.sh] Remove regress script that was accidentally committed @@ -3440,4 +3443,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -$Id: ChangeLog,v 1.4024 2005/12/13 08:33:19 djm Exp $ +$Id: ChangeLog,v 1.4025 2005/12/13 08:33:37 djm Exp $ diff --git a/ssh_config.5 b/ssh_config.5 index 68061182c..50df0d432 100644 --- a/ssh_config.5 +++ b/ssh_config.5 @@ -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: ssh_config.5,v 1.68 2005/12/08 18:34:11 reyk Exp $ +.\" $OpenBSD: ssh_config.5,v 1.69 2005/12/08 21:37:50 jmc Exp $ .Dd September 25, 1999 .Dt SSH_CONFIG 5 .Os @@ -911,9 +911,9 @@ with older servers. .It Cm Tunnel Request starting .Xr tun 4 -device forwarding between the client and the server. This option also -allows requesting layer 2 (ethernet) instead of layer 3 -(point-to-point) tunneling from the server. +device forwarding between the client and the server. +This option also allows requesting layer 2 (ethernet) +instead of layer 3 (point-to-point) tunneling from the server. The argument must be .Dq yes , .Dq point-to-point ,