Clean up docs after today's .br and .ft code cleanup; simpler.

3 files changed, 11 insertions, 33 deletions

diff --git a/share/man/man7/man.7 b/share/man/man7/man.7
index 0683dfb53f0..df24a4b0402 100644
--- a/share/man/man7/man.7
+++ b/share/man/man7/man.7
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: man.7,v 1.44 2015/01/29 00:33:14 schwarze Exp $
+.\"	$OpenBSD: man.7,v 1.45 2017/05/05 02:31:23 schwarze Exp $
 .\"
 .\" Copyright (c) 2009, 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
 .\" Copyright (c) 2011-2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -16,7 +16,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: January 29 2015 $
+.Dd $Mdocdate: May 5 2017 $
 .Dt MAN 7
 .Os
 .Sh NAME
@@ -266,7 +266,6 @@ in the alphabetical reference below.
 .It Sx TP Ta tagged paragraph: Op Ar width
 .It Sx HP Ta hanged paragraph: Op Ar width
 .It Sx PD Ta set vertical paragraph distance: Op Ar height
-.It Sx \&br Ta force output line break in text mode (no arguments)
 .It Sx \&sp Ta force vertical space: Op Ar height
 .It Sx fi , nf Ta fill mode and no-fill mode (no arguments)
 .It Sx in Ta additional indent: Op Ar width
@@ -748,12 +747,10 @@ The
 argument is a scaling width as described in
 .Xr roff 7 .
 If 0, this is equivalent to the
-.Sx \&br
-macro.
+.Xr roff 7
+.Ic \&br
+request.
 Defaults to 1, if unspecified.
-.Pp
-See also
-.Sx \&br .
 .Sh MACRO SYNTAX
 The
 .Nm
@@ -778,8 +775,6 @@ is equivalent to
 If next-line macros are invoked consecutively, only the last is used.
 If a next-line macro is followed by a non-next-line macro, an error is
 raised, except for
-.Sx \&br
-and
 .Sx \&sp .
 .Pp
 The syntax is as follows:
@@ -808,7 +803,6 @@ The syntax is as follows:
 .It Sx \&SM  Ta    n         Ta    next-line Ta    \&
 .It Sx \&TH  Ta    >1, <6    Ta    current   Ta    \&
 .It Sx \&UC  Ta    <=1       Ta    current   Ta    \&
-.It Sx \&br  Ta    0         Ta    current   Ta    compat
 .It Sx \&fi  Ta    0         Ta    current   Ta    compat
 .It Sx \&in  Ta    1         Ta    current   Ta    compat
 .It Sx \&nf  Ta    0         Ta    current   Ta    compat
diff --git a/share/man/man7/mdoc.7 b/share/man/man7/mdoc.7
index bee51ea28fd..7f36d5c15ce 100644
--- a/share/man/man7/mdoc.7
+++ b/share/man/man7/mdoc.7
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mdoc.7,v 1.150 2017/02/16 14:38:07 schwarze Exp $
+.\"	$OpenBSD: mdoc.7,v 1.151 2017/05/05 02:31:23 schwarze Exp $
 .\"
 .\" Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
 .\" Copyright (c) 2010, 2011, 2013-2017 Ingo Schwarze <schwarze@openbsd.org>
@@ -15,7 +15,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: February 16 2017 $
+.Dd $Mdocdate: May 5 2017 $
 .Dt MDOC 7
 .Os
 .Sh NAME
@@ -476,7 +476,6 @@ in the alphabetical
 .It Sx \&Ap Ta apostrophe without surrounding whitespace (no arguments)
 .It Sx \&Sm Ta switch horizontal spacing mode: Op Cm on | off
 .It Sx \&Bk , \&Ek Ta keep block: Fl words
-.It Sx \&br Ta force output line break in text mode (no arguments)
 .It Sx \&sp Ta force vertical space: Op Ar height
 .El
 .Ss Semantic markup for command line utilities:
@@ -2749,14 +2748,6 @@ Examples:
 .Dl \&.Xr mandoc 1
 .Dl \&.Xr mandoc 1 \&;
 .Dl \&.Xr mandoc 1 \&Ns s behaviour
-.Ss \&br
-Emits a line-break.
-This macro should not be used; it is implemented for compatibility with
-historical manuals.
-.Pp
-Consider using
-.Sx \&Pp
-in the event of natural paragraph breaks.
 .Ss \&sp
 Emits vertical space.
 This macro should not be used; it is implemented for compatibility with
@@ -3056,7 +3047,6 @@ then the macro accepts an arbitrary number of arguments.
 .It Sx \&Va  Ta    Yes      Ta    Yes      Ta    n
 .It Sx \&Vt  Ta    Yes      Ta    Yes      Ta    >0
 .It Sx \&Xr  Ta    Yes      Ta    Yes      Ta    2
-.It Sx \&br  Ta    \&No     Ta    \&No     Ta    0
 .It Sx \&sp  Ta    \&No     Ta    \&No     Ta    1
 .El
 .Ss Delimiters
diff --git a/share/man/man7/roff.7 b/share/man/man7/roff.7
index de9fc90084a..75cf0d421f4 100644
--- a/share/man/man7/roff.7
+++ b/share/man/man7/roff.7
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: roff.7,v 1.56 2017/02/21 23:44:39 schwarze Exp $
+.\"	$OpenBSD: roff.7,v 1.57 2017/05/05 02:31:23 schwarze Exp $
 .\"
 .\" Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
 .\" Copyright (c) 2010, 2011, 2013-2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -15,7 +15,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: February 21 2017 $
+.Dd $Mdocdate: May 5 2017 $
 .Dt ROFF 7
 .Os
 .Sh NAME
@@ -490,10 +490,6 @@ Define a frame and place a picture in it.
 This is a Heirloom extension and currently unsupported.
 .Ss \&br
 Break the output line.
-See
-.Xr man 7
-and
-.Xr mdoc 7 .
 .Ss \&break
 Break out of a
 .Sx \&while
@@ -948,10 +944,8 @@ switches to normal font
 switches back to the previous font
 .El
 .Pp
-This request takes effect only locally, may be overridden by macros
-and escape sequences, and is only supported in
-.Xr man 7
-for now.
+This request takes effect only locally and may be overridden
+by macros and escape sequences.
 .Ss \&ftr
 Translate font name.
 This is a groff extension and currently ignored.