summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--ssh.14
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 5091d4a75..ecee054c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
5 [bufaux.c] 5 [bufaux.c]
6 allow buffer_get_int_ret/buffer_get_int64_ret to take a NULL pointer 6 allow buffer_get_int_ret/buffer_get_int64_ret to take a NULL pointer
7 argument to allow skipping past values in a buffer 7 argument to allow skipping past values in a buffer
8 - jmc@cvs.openbsd.org 2010/03/26 06:54:36
9 [ssh.1]
10 tweak previous;
8 11
920100410 1220100410
10 - (dtucker) [configure.ac] Put the check for the existence of getaddrinfo 13 - (dtucker) [configure.ac] Put the check for the existence of getaddrinfo
diff --git a/ssh.1 b/ssh.1
index c03771a3e..34bddbcbc 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.303 2010/03/26 00:26:58 djm Exp $ 37.\" $OpenBSD: ssh.1,v 1.304 2010/03/26 06:54:36 jmc Exp $
38.Dd $Mdocdate: March 26 2010 $ 38.Dd $Mdocdate: March 26 2010 $
39.Dt SSH 1 39.Dt SSH 1
40.Os 40.Os
@@ -558,7 +558,7 @@ argument is
558the listen port will be dynamically allocated on the server and reported 558the listen port will be dynamically allocated on the server and reported
559to the client at run time. 559to the client at run time.
560.It Fl S Ar ctl_path 560.It Fl S Ar ctl_path
561Specifies the location of a control socket for connection sharing 561Specifies the location of a control socket for connection sharing,
562or the string 562or the string
563.Dq none 563.Dq none
564to disable connection sharing. 564to disable connection sharing.