===================================================================
RCS file: /cvs/mandoc/man.7,v
retrieving revision 1.44
retrieving revision 1.46
diff -u -p -r1.44 -r1.46
--- mandoc/man.7	2009/11/02 09:53:15	1.44
+++ mandoc/man.7	2009/11/02 17:07:30	1.46
@@ -1,4 +1,4 @@
-.\"	$Id: man.7,v 1.44 2009/11/02 09:53:15 kristaps Exp $
+.\"	$Id: man.7,v 1.46 2009/11/02 17:07:30 kristaps Exp $
 .\"
 .\" Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
 .\"
@@ -547,11 +547,9 @@ and
 render in italics.  Whitespace between arguments is omitted in output.
 .Pp
 Examples:
-.Bd -filled -offset indent
-.Pf \. Sx \&BI
-bold italic bold italic
-.Ed
 .Pp
+.D1 \&.BI bold italic bold italic
+.Pp
 The output of this example will be emboldened
 .Dq bold
 and italicised
@@ -604,12 +602,12 @@ If specified, it's saved for later paragraph left-marg
 saved or default width is used.
 .Pp
 See also
-.Sx IP ,
-.Sx LP ,
-.Sx P ,
-.Sx PP ,
+.Sx \&IP ,
+.Sx \&LP ,
+.Sx \&P ,
+.Sx \&PP ,
 and
-.Sx TP .
+.Sx \&TP .
 .
 .
 .Ss \&I
@@ -661,12 +659,12 @@ argument is used as a leading term, flushed to the lef
 useful for bulleted paragraphs and so on.
 .Pp
 See also
-.Sx HP ,
-.Sx LP ,
-.Sx P ,
-.Sx PP ,
+.Sx \&HP ,
+.Sx \&LP ,
+.Sx \&P ,
+.Sx \&PP ,
 and
-.Sx TP .
+.Sx \&TP .
 .
 .
 .Ss \&IR
@@ -692,12 +690,12 @@ subsequent paragraph, sub-section, section, or end of 
 paragraph left-margin width is re-set to the default.
 .Pp
 See also
-.Sx HP ,
-.Sx IP ,
-.Sx P ,
-.Sx PP ,
+.Sx \&HP ,
+.Sx \&IP ,
+.Sx \&P ,
+.Sx \&PP ,
 and
-.Sx TP .
+.Sx \&TP .
 .
 .
 .Ss \&P
@@ -705,12 +703,12 @@ Synonym for
 .Sx \&LP .
 .Pp
 See also
-.Sx HP ,
-.Sx IP ,
-.Sx LP ,
-.Sx PP ,
+.Sx \&HP ,
+.Sx \&IP ,
+.Sx \&LP ,
+.Sx \&PP ,
 and
-.Sx TP .
+.Sx \&TP .
 .
 .
 .Ss \&PP
@@ -718,12 +716,12 @@ Synonym for
 .Sx \&LP .
 .Pp
 See also
-.Sx HP ,
-.Sx IP ,
-.Sx LP ,
-.Sx P ,
+.Sx \&HP ,
+.Sx \&IP ,
+.Sx \&LP ,
+.Sx \&P ,
 and
-.Sx TP .
+.Sx \&TP .
 .
 .
 .Ss \&R
@@ -841,9 +839,8 @@ string replaces the default rendered volume, which is 
 manual section.
 .Pp
 Examples:
-.Bd -filled -offset indent
-\&.TH CVS 5 "1992-02-12" GNU
-.Ed
+.Pp
+.D1 \&.TH CVS 5 "1992-02-12" GNU
 .
 .
 .Ss \&TP
@@ -864,12 +861,12 @@ If specified, it's saved for later paragraph left-marg
 unspecified, the saved or default width is used.
 .Pp
 See also
-.Sx HP ,
-.Sx IP ,
-.Sx LP ,
-.Sx P ,
+.Sx \&HP ,
+.Sx \&IP ,
+.Sx \&LP ,
+.Sx \&P ,
 and
-.Sx PP .
+.Sx \&PP .
 .
 .
 .Ss \&PD