3 files changed, 8 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 8cf8a20ac..9f2fb1017 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 9dbc76ca9..0e6fd8627 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 b9864fff2..0418c86ed 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,