The semantics of .Bk was described incorrectly

[mandoc.git] / man.7

diff --git a/man.7 b/man.7
index 2bfbd7dacfb3af3322e8fea14f656bf5c00301b7..876f32a3122d3622cdb6cba39659f2e70b8a0b78 100644 (file)
--- a/man.7
+++ b/man.7
@@ -1,4 +1,4 @@
-.\"    $Id: man.7,v 1.91 2010/12/06 15:31:19 kristaps Exp $
+.\"    $Id: man.7,v 1.99 2011/03/07 01:35:51 schwarze Exp $

 .\"
 .\" Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
 .\"
 .\"
 .\" Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
 .\"


@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"

-.Dd $Mdocdate: December 6 2010 $
+.Dd $Mdocdate: March 7 2011 $

 .Dt MAN 7
 .Os
 .Sh NAME
 .Dt MAN 7
 .Os
 .Sh NAME


@@ -53,12 +53,12 @@ Other lines are interpreted within the current state.
 .Nm
 documents may contain only graphable 7-bit ASCII characters, the
 space character, and the tab character.
 .Nm
 documents may contain only graphable 7-bit ASCII characters, the
 space character, and the tab character.

-All manuals must have
-.Ux
-line termination.

 .Pp
 Blank lines are acceptable; where found, the output will assert a
 vertical space.
 .Pp
 Blank lines are acceptable; where found, the output will assert a
 vertical space.

+.Pp
+If the first character of a line is a space, that line is printed
+with a leading newline.

 .Ss Comments
 Text following a
 .Sq \e\*q ,
 .Ss Comments
 Text following a
 .Sq \e\*q ,


@@ -118,15 +118,6 @@ rendered as an empty line.
 .Pp
 In macro lines, whitespace delimits arguments and is discarded.
 If arguments are quoted, whitespace within the quotes is retained.
 .Pp
 In macro lines, whitespace delimits arguments and is discarded.
 If arguments are quoted, whitespace within the quotes is retained.

-.Ss Dates
-The
-.Sx \&TH
-macro is the only
-.Nm
-macro that requires a date.
-The form for this date is the ISO-8601
-standard
-.Cm YYYY-MM-DD .

 .Ss Scaling Widths
 Many macros support scaled widths for their arguments, such as
 stipulating a two-inch paragraph indentation with the following:
 .Ss Scaling Widths
 Many macros support scaled widths for their arguments, such as
 stipulating a two-inch paragraph indentation with the following:


@@ -370,6 +361,13 @@ Thus, the following are equivalent:
 \&.\ \ \ PP
 .Ed
 .Pp
 \&.\ \ \ PP
 .Ed
 .Pp

+To include space characters in macro arguments, arguments may be quoted;
+see the
+.Sq MACRO SYNTAX
+section in the
+.Xr roff 7
+manual for details.
+.Pp

 The
 .Nm
 macros are classified by scope: line scope or block scope.
 The
 .Nm
 macros are classified by scope: line scope or block scope.


@@ -424,11 +422,9 @@ The syntax is as follows:
 .It Sx \&br  Ta    0         Ta    current   Ta    compat
 .It Sx \&fi  Ta    0         Ta    current   Ta    compat
 .It Sx \&ft  Ta    1         Ta    current   Ta    compat
 .It Sx \&br  Ta    0         Ta    current   Ta    compat
 .It Sx \&fi  Ta    0         Ta    current   Ta    compat
 .It Sx \&ft  Ta    1         Ta    current   Ta    compat

-.It Sx \&i   Ta    n         Ta    current   Ta    compat

 .It Sx \&in  Ta    1         Ta    current   Ta    compat
 .It Sx \&na  Ta    0         Ta    current   Ta    compat
 .It Sx \&nf  Ta    0         Ta    current   Ta    compat
 .It Sx \&in  Ta    1         Ta    current   Ta    compat
 .It Sx \&na  Ta    0         Ta    current   Ta    compat
 .It Sx \&nf  Ta    0         Ta    current   Ta    compat

-.It Sx \&r   Ta    0         Ta    current   Ta    compat

 .It Sx \&sp  Ta    1         Ta    current   Ta    compat
 .El
 .Pp
 .It Sx \&sp  Ta    1         Ta    current   Ta    compat
 .El
 .Pp


@@ -509,12 +505,9 @@ The optional arguments specify which release it is from.
 Text is rendered in bold face.
 .Pp
 See also
 Text is rendered in bold face.
 .Pp
 See also

-.Sx \&I ,
-.Sx \&R ,
-.Sx \&b ,
-.Sx \&i ,
+.Sx \&I

 and
 and

-.Sx \&r .
+.Sx \&R .

 .Ss \&BI
 Text is rendered alternately in bold face and italic.
 Thus,
 .Ss \&BI
 Text is rendered alternately in bold face and italic.
 Thus,


@@ -532,7 +525,7 @@ Whitespace between arguments is omitted in output.
 .Pp
 Examples:
 .Pp
 .Pp
 Examples:
 .Pp

-.D1 \&.BI bold italic bold italic
+.Dl \&.BI bold italic bold italic

 .Pp
 The output of this example will be emboldened
 .Dq bold
 .Pp
 The output of this example will be emboldened
 .Dq bold


@@ -591,12 +584,9 @@ and
 Text is rendered in italics.
 .Pp
 See also
 Text is rendered in italics.
 .Pp
 See also

-.Sx \&B ,
-.Sx \&R ,
-.Sx \&b ,
-.Sx \&i ,
+.Sx \&B

 and
 and

-.Sx \&r .
+.Sx \&R .

 .Ss \&IB
 Text is rendered alternately in italics and bold face.
 Whitespace between arguments is omitted in output.
 .Ss \&IB
 Text is rendered alternately in italics and bold face.
 Whitespace between arguments is omitted in output.


@@ -692,12 +682,9 @@ and
 Text is rendered in roman (the default font).
 .Pp
 See also
 Text is rendered in roman (the default font).
 .Pp
 See also

-.Sx \&I ,
-.Sx \&B ,
-.Sx \&b ,
-.Sx \&i ,
+.Sx \&I

 and
 and

-.Sx \&r .
+.Sx \&B .

 .Ss \&RB
 Text is rendered alternately in roman (the default font) and bold face.
 Whitespace between arguments is omitted in output.
 .Ss \&RB
 Text is rendered alternately in roman (the default font) and bold face.
 Whitespace between arguments is omitted in output.


@@ -767,32 +754,33 @@ The paragraph left-margin width is reset to the default.
 Sets the title of the manual page with the following syntax:
 .Bd -filled -offset indent
 .Pf \. Sx \&TH
 Sets the title of the manual page with the following syntax:
 .Bd -filled -offset indent
 .Pf \. Sx \&TH

-.Cm title section
-.Op Cm date Op Cm source Op Cm volume
+.Ar title section date
+.Op Ar source Op Ar volume

 .Ed
 .Pp
 .Ed
 .Pp

-At least the upper-case document
-.Cm title
-and the manual
-.Cm section
-arguments must be provided.
-The
-.Cm date
-argument should be formatted as described in
-.Sx Dates ,
-but will be printed verbatim if it is not.
-If the date is not specified, the current date is used.
-The
-.Cm source
+Conventionally, the document
+.Ar title
+is given in all caps.
+The recommended
+.Ar date
+format is
+.Sy YYYY-MM-DD
+as specified in the ISO-8601 standard;
+if the argument does not conform, it is printed verbatim.
+If the
+.Ar date
+is empty or not specified, the current date is used.
+The optional
+.Ar source

 string specifies the organisation providing the utility.
 The
 string specifies the organisation providing the utility.
 The

-.Cm volume
+.Ar volume

 string replaces the default rendered volume, which is dictated by the
 manual section.
 .Pp
 Examples:
 .Pp
 string replaces the default rendered volume, which is dictated by the
 manual section.
 .Pp
 Examples:
 .Pp

-.D1 \&.TH CVS 5 "1992-02-12" GNU
+.Dl \&.TH CVS 5 "1992-02-12" GNU

 .Ss \&TP
 Begin a paragraph where the head, if exceeding the indentation width, is
 followed by a newline; if not, the body follows on the same line after a
 .Ss \&TP
 Begin a paragraph where the head, if exceeding the indentation width, is
 followed by a newline; if not, the body follows on the same line after a


@@ -836,18 +824,6 @@ Change the current font mode.
 See
 .Sx Text Decoration
 for a listing of available font modes.
 See
 .Sx Text Decoration
 for a listing of available font modes.

-.Ss \&i
-Italicise arguments.
-Synonym for
-.Sx \&I .
-.Pp
-See also
-.Sx \&B ,
-.Sx \&I ,
-.Sx \&R .
-.Sx \&b ,
-and
-.Sx \&r .

 .Ss \&in
 Indent relative to the current indentation:
 .Pp
 .Ss \&in
 Indent relative to the current indentation:
 .Pp


@@ -865,16 +841,6 @@ Begin literal mode: all subsequent free-form lines have their end of
 line boundaries preserved.
 May be ended by
 .Sx \&fi .
 line boundaries preserved.
 May be ended by
 .Sx \&fi .

-.Ss \&r
-Fonts and styles (bold face, italics) reset to roman (default font).
-.Pp
-See also
-.Sx \&B ,
-.Sx \&I ,
-.Sx \&R ,
-.Sx \&b ,
-and
-.Sx \&i .

 .Ss \&sp
 Insert vertical spaces into output with the following syntax:
 .Bd -filled -offset indent
 .Ss \&sp
 Insert vertical spaces into output with the following syntax:
 .Bd -filled -offset indent


@@ -945,8 +911,11 @@ In GNU troff, this would result in strange behaviour.
 .Sh SEE ALSO
 .Xr man 1 ,
 .Xr mandoc 1 ,
 .Sh SEE ALSO
 .Xr man 1 ,
 .Xr mandoc 1 ,

+.Xr eqn 7 ,

 .Xr mandoc_char 7 ,
 .Xr mandoc_char 7 ,

-.Xr mdoc 7
+.Xr mdoc 7 ,
+.Xr roff 7 ,
+.Xr tbl 7

 .Sh HISTORY
 The
 .Nm
 .Sh HISTORY
 The
 .Nm