summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjmc <jmc@openbsd.org>2014-12-21 23:35:14 +0000
committerjmc <jmc@openbsd.org>2014-12-21 23:35:14 +0000
commit6d7b51df36c7f38980da072508af3ce7e384407d (patch)
treeec012a764427c9ac0b493467daedb8804749e756
parentdocument FingerprintHash here too (diff)
downloadwireguard-openbsd-6d7b51df36c7f38980da072508af3ce7e384407d.tar.xz
wireguard-openbsd-6d7b51df36c7f38980da072508af3ce7e384407d.zip
tweak previous;
-rw-r--r--usr.bin/ssh/ssh-agent.c6
-rw-r--r--usr.bin/ssh/sshd_config.53
2 files changed, 4 insertions, 5 deletions
diff --git a/usr.bin/ssh/ssh-agent.c b/usr.bin/ssh/ssh-agent.c
index ca00a99f6e8..90716bc7fed 100644
--- a/usr.bin/ssh/ssh-agent.c
+++ b/usr.bin/ssh/ssh-agent.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-agent.c,v 1.192 2014/12/21 22:27:56 djm Exp $ */
+/* $OpenBSD: ssh-agent.c,v 1.193 2014/12/21 23:35:14 jmc Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1011,8 +1011,8 @@ static void
usage(void)
{
fprintf(stderr,
- "usage: ssh-agent [-c | -s] [-d] [-a bind_address] [-t life]\n"
- " [-E fingerprint_hash] [command [arg ...]]\n"
+ "usage: ssh-agent [-c | -s] [-d] [-a bind_address] [-E fingerprint_hash]\n"
+ " [-t life] [command [arg ...]]\n"
" ssh-agent [-c | -s] -k\n");
exit(1);
}
diff --git a/usr.bin/ssh/sshd_config.5 b/usr.bin/ssh/sshd_config.5
index f347658a5b7..057eeaf961f 100644
--- a/usr.bin/ssh/sshd_config.5
+++ b/usr.bin/ssh/sshd_config.5
@@ -33,7 +33,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: sshd_config.5,v 1.183 2014/12/21 22:27:55 djm Exp $
+.\" $OpenBSD: sshd_config.5,v 1.184 2014/12/21 23:35:14 jmc Exp $
.Dd $Mdocdate: December 21 2014 $
.Dt SSHD_CONFIG 5
.Os
@@ -494,7 +494,6 @@ and
.Dq sha256 .
The default is
.Dq sha256 .
-.Pp
.It Cm ForceCommand
Forces the execution of the command specified by
.Cm ForceCommand ,