aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2016-04-28 18:01:27 +0200
committerHans Nilsson <[email protected]>2016-04-28 18:01:27 +0200
commit90b6445aedd3b1f84b72caf89781c9e3482e4316 (patch)
tree906ca4b9d5b6a7dbf1f9343a5928fc5e68b902d8
parent45c7b17713635bbe66f08d924e682c4fd78b3401 (diff)
parent581a973dc3130a22219ec3d1c7e9fbf5db60fbc5 (diff)
downloadotp-90b6445aedd3b1f84b72caf89781c9e3482e4316.tar.gz
otp-90b6445aedd3b1f84b72caf89781c9e3482e4316.tar.bz2
otp-90b6445aedd3b1f84b72caf89781c9e3482e4316.zip
Merge branch 'stuart-thackray/ssh/doc_not_valid_term/PR-1021'
-rw-r--r--lib/ssh/doc/src/ssh.xml2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/ssh/doc/src/ssh.xml b/lib/ssh/doc/src/ssh.xml
index 850557444d..33aacb8ffe 100644
--- a/lib/ssh/doc/src/ssh.xml
+++ b/lib/ssh/doc/src/ssh.xml
@@ -241,6 +241,7 @@
{server2client,['aes128-cbc','3des-cbc']}]},
{mac,['hmac-sha2-256','hmac-sha1']},
{compression,[none,zlib]}
+ ]
}
</code>
<p>The example specifies different algorithms in the two directions (client2server and server2client),
@@ -460,6 +461,7 @@
{server2client,['aes128-cbc','3des-cbc']}]},
{mac,['hmac-sha2-256','hmac-sha1']},
{compression,[none,zlib]}
+ ]
}
</code>
<p>The example specifies different algorithms in the two directions (client2server and server2client),