summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2011-05-05 14:16:56 +1000
committerDamien Miller <djm@mindrot.org>2011-05-05 14:16:56 +1000
commit8cb1cda1e3a24c6f73b96822f36762c1c80ae147 (patch)
treeb47add33eed9be46e999b265ef4351bd70cae39d
parent6c3eec7ab23d58157ded8a0e6283f93e45390d07 (diff)
- djm@cvs.openbsd.org 2011/04/18 00:46:05
[ssh-keygen.c] certificate options are supposed to be packed in lexical order of option name (though we don't actually enforce this at present). Move one up that was out of sequence
-rw-r--r--ChangeLog5
-rw-r--r--ssh.18
2 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index ddee8e5d..7cc6a234 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -60,6 +60,11 @@
allow graceful shutdown of multiplexing: request that a mux server
removes its listener socket and refuse future multiplexing requests;
ok markus@
+ - djm@cvs.openbsd.org 2011/04/18 00:46:05
+ [ssh-keygen.c]
+ certificate options are supposed to be packed in lexical order of
+ option name (though we don't actually enforce this at present).
+ Move one up that was out of sequence
20110221
- (dtucker) [contrib/cygwin/ssh-host-config] From Corinna: revamp of the
diff --git a/ssh.1 b/ssh.1
index 1b0bcb78..a51742f5 100644
--- a/ssh.1
+++ b/ssh.1
@@ -33,8 +33,8 @@
.\" (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.1,v 1.317 2011/04/17 22:42:41 djm Exp $
-.Dd $Mdocdate: April 17 2011 $
+.\" $OpenBSD: ssh.1,v 1.318 2011/04/18 00:21:11 jmc Exp $
+.Dd $Mdocdate: April 18 2011 $
.Dt SSH 1
.Os
.Sh NAME
@@ -392,9 +392,9 @@ Valid commands are:
.Dq check
(check that the master process is running),
.Dq forward
-(request forwardings without command execution) and
+(request forwardings without command execution),
.Dq exit
-(request the master to exit).
+(request the master to exit), and
.Dq stop
(request the master to stop accepting further multiplexing requests).
.It Fl o Ar option