summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2013-12-05 10:18:43 +1100
committerDamien Miller <djm@mindrot.org>2013-12-05 10:18:43 +1100
commitdec0393f7ee8aabc7d9d0fc2c5fddb4bc649112e (patch)
treed795dcd3bb1133bf2751cc8f75f48031523e32d9
parent8a073cf57940aabf85e49799f89f5d5e9b072c1b (diff)
downloadopenssh-git-dec0393f7ee8aabc7d9d0fc2c5fddb4bc649112e.tar.gz
- 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--ChangeLog6
-rw-r--r--ssh_config.53
-rw-r--r--sshd_config.53
3 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 8cf8a20a..9f2fb101 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+20131205
+ - (djm) OpenBSD CVS Sync
+ - jmc@cvs.openbsd.org 2013/11/21 08:05:09
+ [ssh_config.5 sshd_config.5]
+ no need for .Pp before displays;
+
20131121
- (djm) OpenBSD CVS Sync
- dtucker@cvs.openbsd.org 2013/11/08 11:15:19
diff --git a/ssh_config.5 b/ssh_config.5
index 9dbc76ca..0e6fd862 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -33,7 +33,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $OpenBSD: ssh_config.5,v 1.180 2013/11/21 00:45:44 djm Exp $
+.\" $OpenBSD: ssh_config.5,v 1.181 2013/11/21 08:05:09 jmc Exp $
.Dd $Mdocdate: November 21 2013 $
.Dt SSH_CONFIG 5
.Os
@@ -354,7 +354,6 @@ and
.Dq chacha20-poly1305@openssh.com .
.Pp
The default is:
-.Pp
.Bd -literal -offset 3n
aes128-ctr,aes192-ctr,aes256-ctr,arcfour256,arcfour128,
aes128-gcm@openssh.com,aes256-gcm@openssh.com,
diff --git a/sshd_config.5 b/sshd_config.5
index b9864fff..0418c86e 100644
--- a/sshd_config.5
+++ b/sshd_config.5
@@ -33,7 +33,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $OpenBSD: sshd_config.5,v 1.167 2013/11/21 00:45:44 djm Exp $
+.\" $OpenBSD: sshd_config.5,v 1.168 2013/11/21 08:05:09 jmc Exp $
.Dd $Mdocdate: November 21 2013 $
.Dt SSHD_CONFIG 5
.Os
@@ -355,7 +355,6 @@ and
.Dq chacha20-poly1305@openssh.com .
.Pp
The default is:
-.Pp
.Bd -literal -offset 3n
aes128-ctr,aes192-ctr,aes256-ctr,arcfour256,arcfour128,
aes128-gcm@openssh.com,aes256-gcm@openssh.com,