summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@openbsd.org>2017-05-05 02:31:35 +0000
committerIngo Schwarze <schwarze@openbsd.org>2017-05-05 02:31:35 +0000
commit15bf890a36f565c8fdfdcc05f8aea480a1026b98 (patch)
tree004b1f7ba2ad597c13a7fc5279302f3b8a6c26fd
parentff9971487e60c2e6e8f7858745eea6520b1c0aa5 (diff)
downloadmandoc-15bf890a36f565c8fdfdcc05f8aea480a1026b98.tar.gz
Clean up docs after today's .br and .ft code cleanup; simpler.
-rw-r--r--man.712
-rw-r--r--mdoc.710
-rw-r--r--roff.710
3 files changed, 5 insertions, 27 deletions
diff --git a/man.7 b/man.7
index 9fda75b6..72037b44 100644
--- a/man.7
+++ b/man.7
@@ -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/mdoc.7 b/mdoc.7
index a9be2fca..4cace45a 100644
--- a/mdoc.7
+++ b/mdoc.7
@@ -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:
@@ -2736,14 +2735,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
@@ -3043,7 +3034,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/roff.7 b/roff.7
index 9d2df34a..172a3166 100644
--- a/roff.7
+++ b/roff.7
@@ -492,10 +492,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
@@ -950,10 +946,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.