diff options
-rw-r--r-- | scp.1 | 5 | ||||
-rw-r--r-- | sftp.1 | 5 | ||||
-rw-r--r-- | ssh.1 | 5 | ||||
-rw-r--r-- | ssh_config.5 | 8 |
4 files changed, 13 insertions, 10 deletions
@@ -8,9 +8,9 @@ | |||
8 | .\" | 8 | .\" |
9 | .\" Created: Sun May 7 00:14:37 1995 ylo | 9 | .\" Created: Sun May 7 00:14:37 1995 ylo |
10 | .\" | 10 | .\" |
11 | .\" $OpenBSD: scp.1,v 1.63 2015/01/16 16:20:23 schwarze Exp $ | 11 | .\" $OpenBSD: scp.1,v 1.64 2015/01/26 12:16:36 djm Exp $ |
12 | .\" | 12 | .\" |
13 | .Dd $Mdocdate: January 16 2015 $ | 13 | .Dd $Mdocdate: January 26 2015 $ |
14 | .Dt SCP 1 | 14 | .Dt SCP 1 |
15 | .Os | 15 | .Os |
16 | .Sh NAME | 16 | .Sh NAME |
@@ -179,6 +179,7 @@ For full details of the options listed below, and their possible values, see | |||
179 | .It StrictHostKeyChecking | 179 | .It StrictHostKeyChecking |
180 | .It TCPKeepAlive | 180 | .It TCPKeepAlive |
181 | .It UsePrivilegedPort | 181 | .It UsePrivilegedPort |
182 | .It UpdateHostKeys | ||
182 | .It User | 183 | .It User |
183 | .It UserKnownHostsFile | 184 | .It UserKnownHostsFile |
184 | .It VerifyHostKeyDNS | 185 | .It VerifyHostKeyDNS |
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: sftp.1,v 1.99 2014/04/22 14:16:30 jmc Exp $ | 1 | .\" $OpenBSD: sftp.1,v 1.100 2015/01/26 12:16:36 djm Exp $ |
2 | .\" | 2 | .\" |
3 | .\" Copyright (c) 2001 Damien Miller. All rights reserved. | 3 | .\" Copyright (c) 2001 Damien Miller. All rights reserved. |
4 | .\" | 4 | .\" |
@@ -22,7 +22,7 @@ | |||
22 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 22 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
23 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
24 | .\" | 24 | .\" |
25 | .Dd $Mdocdate: April 22 2014 $ | 25 | .Dd $Mdocdate: January 26 2015 $ |
26 | .Dt SFTP 1 | 26 | .Dt SFTP 1 |
27 | .Os | 27 | .Os |
28 | .Sh NAME | 28 | .Sh NAME |
@@ -243,6 +243,7 @@ For full details of the options listed below, and their possible values, see | |||
243 | .It ServerAliveCountMax | 243 | .It ServerAliveCountMax |
244 | .It StrictHostKeyChecking | 244 | .It StrictHostKeyChecking |
245 | .It TCPKeepAlive | 245 | .It TCPKeepAlive |
246 | .It UpdateHostKeys | ||
246 | .It UsePrivilegedPort | 247 | .It UsePrivilegedPort |
247 | .It User | 248 | .It User |
248 | .It UserKnownHostsFile | 249 | .It UserKnownHostsFile |
@@ -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.353 2014/12/22 09:26:31 jmc Exp $ | 36 | .\" $OpenBSD: ssh.1,v 1.354 2015/01/26 12:16:36 djm Exp $ |
37 | .Dd $Mdocdate: December 22 2014 $ | 37 | .Dd $Mdocdate: January 26 2015 $ |
38 | .Dt SSH 1 | 38 | .Dt SSH 1 |
39 | .Os | 39 | .Os |
40 | .Sh NAME | 40 | .Sh NAME |
@@ -484,6 +484,7 @@ For full details of the options listed below, and their possible values, see | |||
484 | .It TCPKeepAlive | 484 | .It TCPKeepAlive |
485 | .It Tunnel | 485 | .It Tunnel |
486 | .It TunnelDevice | 486 | .It TunnelDevice |
487 | .It UpdateHostKeys | ||
487 | .It UsePrivilegedPort | 488 | .It UsePrivilegedPort |
488 | .It User | 489 | .It User |
489 | .It UserKnownHostsFile | 490 | .It UserKnownHostsFile |
diff --git a/ssh_config.5 b/ssh_config.5 index 0d4cdf4c6..9c0b35795 100644 --- a/ssh_config.5 +++ b/ssh_config.5 | |||
@@ -33,7 +33,7 @@ | |||
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_config.5,v 1.200 2015/01/26 03:04:45 djm Exp $ | 36 | .\" $OpenBSD: ssh_config.5,v 1.201 2015/01/26 12:16:36 djm Exp $ |
37 | .Dd $Mdocdate: January 26 2015 $ | 37 | .Dd $Mdocdate: January 26 2015 $ |
38 | .Dt SSH_CONFIG 5 | 38 | .Dt SSH_CONFIG 5 |
39 | .Os | 39 | .Os |
@@ -1492,7 +1492,7 @@ is not specified, it defaults to | |||
1492 | .Dq any . | 1492 | .Dq any . |
1493 | The default is | 1493 | The default is |
1494 | .Dq any:any . | 1494 | .Dq any:any . |
1495 | .It Cm UpdateHostkeys | 1495 | .It Cm UpdateHostKeys |
1496 | Specifies whether | 1496 | Specifies whether |
1497 | .Xr ssh 1 | 1497 | .Xr ssh 1 |
1498 | should accept notifications of additional hostkeys from the server sent | 1498 | should accept notifications of additional hostkeys from the server sent |
@@ -1504,8 +1504,8 @@ The argument must be | |||
1504 | or | 1504 | or |
1505 | .Dq no . | 1505 | .Dq no . |
1506 | Enabling this option allows learning alternate hostkeys for a server | 1506 | Enabling this option allows learning alternate hostkeys for a server |
1507 | and supports graceful key rotation by allowing a server to public replacement | 1507 | and supports graceful key rotation by allowing a server to send replacement |
1508 | keys before old ones are removed. | 1508 | public keys before old ones are removed. |
1509 | Additional hostkeys are only accepted if the key used to authenticate the | 1509 | Additional hostkeys are only accepted if the key used to authenticate the |
1510 | host was already trusted or explicity accepted by the user. | 1510 | host was already trusted or explicity accepted by the user. |
1511 | .Pp | 1511 | .Pp |