summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjmc@openbsd.org <jmc@openbsd.org>2015-11-05 09:48:05 +0000
committerDamien Miller <djm@mindrot.org>2015-11-09 14:25:35 +1100
commit8b29008bbe97f33381d9b4b93fcfa304168d0286 (patch)
tree7a3165160deb0b8c4544a33decd30d96d5c2c175
parent996b24cebf20077fbe5db07b3a2c20c2d9db736e (diff)
upstream commit
"commandline" -> "command line", since there are so few examples of the former in the pages, so many of the latter, and in some of these pages we had multiple spellings; prompted by tj Upstream-ID: 78459d59bff74223f8139d9001ccd56fc4310659
-rw-r--r--ssh-agent.16
-rw-r--r--ssh-keygen.16
2 files changed, 6 insertions, 6 deletions
diff --git a/ssh-agent.1 b/ssh-agent.1
index d0aa712f1..5a521cb56 100644
--- a/ssh-agent.1
+++ b/ssh-agent.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: ssh-agent.1,v 1.59 2015/04/24 06:26:49 jmc Exp $ 1.\" $OpenBSD: ssh-agent.1,v 1.60 2015/11/05 09:48:05 jmc Exp $
2.\" 2.\"
3.\" Author: Tatu Ylonen <ylo@cs.hut.fi> 3.\" Author: Tatu Ylonen <ylo@cs.hut.fi>
4.\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4.\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -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.Dd $Mdocdate: April 24 2015 $ 37.Dd $Mdocdate: November 5 2015 $
38.Dt SSH-AGENT 1 38.Dt SSH-AGENT 1
39.Os 39.Os
40.Sh NAME 40.Sh NAME
@@ -130,7 +130,7 @@ overrides this value.
130Without this option the default maximum lifetime is forever. 130Without this option the default maximum lifetime is forever.
131.El 131.El
132.Pp 132.Pp
133If a commandline is given, this is executed as a subprocess of the agent. 133If a command line is given, this is executed as a subprocess of the agent.
134When the command dies, so does the agent. 134When the command dies, so does the agent.
135.Pp 135.Pp
136The idea is that the agent is run in the user's local PC, laptop, or 136The idea is that the agent is run in the user's local PC, laptop, or
diff --git a/ssh-keygen.1 b/ssh-keygen.1
index ed17a08fa..ffa946b38 100644
--- a/ssh-keygen.1
+++ b/ssh-keygen.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: ssh-keygen.1,v 1.127 2015/08/20 19:20:06 naddy Exp $ 1.\" $OpenBSD: ssh-keygen.1,v 1.128 2015/11/05 09:48:05 jmc Exp $
2.\" 2.\"
3.\" Author: Tatu Ylonen <ylo@cs.hut.fi> 3.\" Author: Tatu Ylonen <ylo@cs.hut.fi>
4.\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4.\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -35,7 +35,7 @@
35.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 35.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
36.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 36.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
37.\" 37.\"
38.Dd $Mdocdate: August 20 2015 $ 38.Dd $Mdocdate: November 5 2015 $
39.Dt SSH-KEYGEN 1 39.Dt SSH-KEYGEN 1
40.Os 40.Os
41.Sh NAME 41.Sh NAME
@@ -781,7 +781,7 @@ It is also possible, given a KRL, to test whether it revokes a particular key
781(or keys). 781(or keys).
782The 782The
783.Fl Q 783.Fl Q
784flag will query an existing KRL, testing each key specified on the commandline. 784flag will query an existing KRL, testing each key specified on the command line.
785If any key listed on the command line has been revoked (or an error encountered) 785If any key listed on the command line has been revoked (or an error encountered)
786then 786then
787.Nm 787.Nm