diff options
author | Damien Miller <djm@mindrot.org> | 2013-12-05 10:18:43 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2013-12-05 10:18:43 +1100 |
commit | dec0393f7ee8aabc7d9d0fc2c5fddb4bc649112e (patch) | |
tree | d795dcd3bb1133bf2751cc8f75f48031523e32d9 | |
parent | 8a073cf57940aabf85e49799f89f5d5e9b072c1b (diff) |
- jmc@cvs.openbsd.org 2013/11/21 08:05:09
[ssh_config.5 sshd_config.5]
no need for .Pp before displays;
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | ssh_config.5 | 3 | ||||
-rw-r--r-- | sshd_config.5 | 3 |
3 files changed, 8 insertions, 4 deletions
@@ -1,3 +1,9 @@ | |||
1 | 20131205 | ||
2 | - (djm) OpenBSD CVS Sync | ||
3 | - jmc@cvs.openbsd.org 2013/11/21 08:05:09 | ||
4 | [ssh_config.5 sshd_config.5] | ||
5 | no need for .Pp before displays; | ||
6 | |||
1 | 20131121 | 7 | 20131121 |
2 | - (djm) OpenBSD CVS Sync | 8 | - (djm) OpenBSD CVS Sync |
3 | - dtucker@cvs.openbsd.org 2013/11/08 11:15:19 | 9 | - dtucker@cvs.openbsd.org 2013/11/08 11:15:19 |
diff --git a/ssh_config.5 b/ssh_config.5 index 9dbc76ca9..0e6fd8627 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.180 2013/11/21 00:45:44 djm Exp $ | 36 | .\" $OpenBSD: ssh_config.5,v 1.181 2013/11/21 08:05:09 jmc Exp $ |
37 | .Dd $Mdocdate: November 21 2013 $ | 37 | .Dd $Mdocdate: November 21 2013 $ |
38 | .Dt SSH_CONFIG 5 | 38 | .Dt SSH_CONFIG 5 |
39 | .Os | 39 | .Os |
@@ -354,7 +354,6 @@ and | |||
354 | .Dq chacha20-poly1305@openssh.com . | 354 | .Dq chacha20-poly1305@openssh.com . |
355 | .Pp | 355 | .Pp |
356 | The default is: | 356 | The default is: |
357 | .Pp | ||
358 | .Bd -literal -offset 3n | 357 | .Bd -literal -offset 3n |
359 | aes128-ctr,aes192-ctr,aes256-ctr,arcfour256,arcfour128, | 358 | aes128-ctr,aes192-ctr,aes256-ctr,arcfour256,arcfour128, |
360 | aes128-gcm@openssh.com,aes256-gcm@openssh.com, | 359 | aes128-gcm@openssh.com,aes256-gcm@openssh.com, |
diff --git a/sshd_config.5 b/sshd_config.5 index b9864fff2..0418c86ed 100644 --- a/sshd_config.5 +++ b/sshd_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: sshd_config.5,v 1.167 2013/11/21 00:45:44 djm Exp $ | 36 | .\" $OpenBSD: sshd_config.5,v 1.168 2013/11/21 08:05:09 jmc Exp $ |
37 | .Dd $Mdocdate: November 21 2013 $ | 37 | .Dd $Mdocdate: November 21 2013 $ |
38 | .Dt SSHD_CONFIG 5 | 38 | .Dt SSHD_CONFIG 5 |
39 | .Os | 39 | .Os |
@@ -355,7 +355,6 @@ and | |||
355 | .Dq chacha20-poly1305@openssh.com . | 355 | .Dq chacha20-poly1305@openssh.com . |
356 | .Pp | 356 | .Pp |
357 | The default is: | 357 | The default is: |
358 | .Pp | ||
359 | .Bd -literal -offset 3n | 358 | .Bd -literal -offset 3n |
360 | aes128-ctr,aes192-ctr,aes256-ctr,arcfour256,arcfour128, | 359 | aes128-ctr,aes192-ctr,aes256-ctr,arcfour256,arcfour128, |
361 | aes128-gcm@openssh.com,aes256-gcm@openssh.com, | 360 | aes128-gcm@openssh.com,aes256-gcm@openssh.com, |