summaryrefslogtreecommitdiff
path: root/ssh.1
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2018-04-06 03:34:27 +0000
committerDamien Miller <djm@mindrot.org>2018-04-06 14:20:33 +1000
commit8d6829be324452d2acd282d5f8ceb0adaa89a4de (patch)
treed24ba6a4282672e59d07f22c8eb880e299f2c2b8 /ssh.1
parent00c5222ddc0c8edcaa4ea45ac03befdc8013d137 (diff)
upstream: ssh does not accept -oInclude=... on the commandline, the
Include keyword is for configuration files only. bz#2840, patch from Jakub Jelen OpenBSD-Commit-ID: 32d052b4a7a7f22df35fe3f71c368c02b02cacb0
Diffstat (limited to 'ssh.1')
-rw-r--r--ssh.15
1 files changed, 2 insertions, 3 deletions
diff --git a/ssh.1 b/ssh.1
index b4078525b..82ec4a51f 100644
--- a/ssh.1
+++ b/ssh.1
@@ -33,8 +33,8 @@
33.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 33.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
34.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 34.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
35.\" 35.\"
36.\" $OpenBSD: ssh.1,v 1.391 2018/02/23 07:38:09 jmc Exp $ 36.\" $OpenBSD: ssh.1,v 1.392 2018/04/06 03:34:27 djm Exp $
37.Dd $Mdocdate: February 23 2018 $ 37.Dd $Mdocdate: April 6 2018 $
38.Dt SSH 1 38.Dt SSH 1
39.Os 39.Os
40.Sh NAME 40.Sh NAME
@@ -499,7 +499,6 @@ For full details of the options listed below, and their possible values, see
499.It IdentitiesOnly 499.It IdentitiesOnly
500.It IdentityAgent 500.It IdentityAgent
501.It IdentityFile 501.It IdentityFile
502.It Include
503.It IPQoS 502.It IPQoS
504.It KbdInteractiveAuthentication 503.It KbdInteractiveAuthentication
505.It KbdInteractiveDevices 504.It KbdInteractiveDevices