Our groff does not handle all cases of nested displays properly, so

resolve the contradiction in the manual whether it's allowed or not
in favour of "not allowed" for now, shelving my diff to support
nested displays in mandoc(1) for later consideration.
Found by and unbreaking the build with mandoc(1).
Feedback and OK jmc@

4 files changed, 16 insertions, 16 deletions

diff --git a/share/man/man7/mdoc.samples.7 b/share/man/man7/mdoc.samples.7
index 9b1eabb9f1c..e619f65bc50 100644
--- a/share/man/man7/mdoc.samples.7
+++ b/share/man/man7/mdoc.samples.7
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mdoc.samples.7,v 1.84 2010/01/24 15:37:12 jmc Exp $
+.\"	$OpenBSD: mdoc.samples.7,v 1.85 2010/02/18 13:39:21 schwarze Exp $
 .\"	$NetBSD: mdoc.samples.7,v 1.5 1996/04/03 20:17:34 jtc Exp $
 .\"
 .\" Copyright (c) 1990, 1993
@@ -34,7 +34,7 @@
 .\" times and is guaranteed to give a worst case performance
 .\" for an already extremely slow package.
 .\"
-.Dd $Mdocdate: January 24 2010 $
+.Dd $Mdocdate: February 18 2010 $
 .Dt MDOC.SAMPLES 7
 .Os
 .Sh NAME
@@ -2770,7 +2770,7 @@ The
 display must end with the
 .Ql \&.Ed
 macro.
-Displays may be nested within displays and lists, but may
+Displays may be nested within lists, but may
 .Em not
 contain other displays; this also prohibits nesting of
 .Ql \&.D1
diff --git a/share/man/man8/intro.8 b/share/man/man8/intro.8
index 77f88a796a5..ac9eaf32724 100644
--- a/share/man/man8/intro.8
+++ b/share/man/man8/intro.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: intro.8,v 1.16 2008/06/08 03:03:37 jdixon Exp $
+.\"	$OpenBSD: intro.8,v 1.17 2010/02/18 13:39:21 schwarze Exp $
 .\"	$NetBSD: intro.8,v 1.3 1994/11/30 19:36:24 jtc Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"	@(#)intro.8	8.2 (Berkeley) 12/11/93
 .\"
-.Dd $Mdocdate: June 8 2008 $
+.Dd $Mdocdate: February 18 2010 $
 .Dt INTRO 8
 .Os
 .Sh NAME
@@ -76,7 +76,7 @@ For example the HTTP daemon
 is controlled by the following line from
 .Xr rc.conf 8 :
 .Bd -literal -offset indent
-.Dl httpd_flags=NO
+httpd_flags=NO
 .Ed
 .Pp
 Thus it is not started by default.
diff --git a/usr.bin/oldrdist/oldrdist.1 b/usr.bin/oldrdist/oldrdist.1
index d9702ed7353..4a517138d93 100644
--- a/usr.bin/oldrdist/oldrdist.1
+++ b/usr.bin/oldrdist/oldrdist.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: oldrdist.1,v 1.17 2007/05/31 19:20:14 jmc Exp $
+.\"	$OpenBSD: oldrdist.1,v 1.18 2010/02/18 13:39:21 schwarze Exp $
 .\"
 .\" Copyright (c) 1985, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\"	from: @(#)rdist.1	8.2 (Berkeley) 12/30/93
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: February 18 2010 $
 .Dt OLDRDIST 1
 .Os
 .Sh NAME
@@ -102,11 +102,11 @@ The equivalent distfile is as follows:
 .Li ->
 .Op Ar login@
 .Ar host
-.Bd -filled -offset indent -compact
+.Ed
+.Bd -filled -offset indent-two -compact
 .Li install
 .Op Ar dest ;
 .Ed
-.Ed
 .El
 .Pp
 Options common to both forms:
diff --git a/usr.sbin/openssl/openssl.1 b/usr.sbin/openssl/openssl.1
index e180ac82791..365fed721cb 100644
--- a/usr.sbin/openssl/openssl.1
+++ b/usr.sbin/openssl/openssl.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: openssl.1,v 1.66 2009/08/16 09:41:08 sobrado Exp $
+.\" $OpenBSD: openssl.1,v 1.67 2010/02/18 13:39:21 schwarze Exp $
 .\" ====================================================================
 .\" Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
 .\"
@@ -112,7 +112,7 @@
 .\"
 .\" OPENSSL
 .\"
-.Dd $Mdocdate: August 16 2009 $
+.Dd $Mdocdate: February 18 2010 $
 .Dt OPENSSL 1
 .Os
 .Sh NAME
@@ -2964,13 +2964,13 @@ a Netscape certificate sequence is created from a file of certificates.
 .El
 .Sh NSEQ EXAMPLES
 Output the certificates in a Netscape certificate sequence:
-.Bd -literal
-.Dl $ openssl nseq -in nseq.pem -out certs.pem
+.Bd -literal -offset indent
+$ openssl nseq -in nseq.pem -out certs.pem
 .Ed
 .Pp
 Create a Netscape certificate sequence:
-.Bd -literal
-.Dl $ openssl nseq -in certs.pem -toseq -out nseq.pem
+.Bd -literal -offset indent
+$ openssl nseq -in certs.pem -toseq -out nseq.pem
 .Ed
 .Sh NSEQ NOTES
 The PEM-encoded form uses the same headers and footers as a certificate: