=================================================================== RCS file: /cvs/mandoc/man.7,v retrieving revision 1.87 retrieving revision 1.97 diff -u -p -r1.87 -r1.97 --- mandoc/man.7 2010/08/29 11:28:09 1.87 +++ mandoc/man.7 2011/01/25 00:40:14 1.97 @@ -1,4 +1,4 @@ -.\" $Id: man.7,v 1.87 2010/08/29 11:28:09 kristaps Exp $ +.\" $Id: man.7,v 1.97 2011/01/25 00:40:14 schwarze Exp $ .\" .\" Copyright (c) 2009, 2010 Kristaps Dzonsons .\" @@ -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. .\" -.Dd $Mdocdate: August 29 2010 $ +.Dd $Mdocdate: January 25 2011 $ .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. -All manuals must have -.Ux -line termination. .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 , @@ -227,13 +227,14 @@ Documents are generally structured as follows: \&.SH DESCRIPTION The \efBfoo\efR utility processes files... \&.\e\*q .SH IMPLEMENTATION NOTES +\&.\e\*q Not used in OpenBSD. \&.\e\*q .SH RETURN VALUES \&.\e\*q For sections 2, 3, & 9 only. \&.\e\*q .SH ENVIRONMENT \&.\e\*q For sections 1, 6, 7, & 8 only. \&.\e\*q .SH FILES \&.\e\*q .SH EXIT STATUS -\&.\e\*q For sections 1 & 8 only. +\&.\e\*q For sections 1, 6, & 8 only. \&.\e\*q .SH EXAMPLES \&.\e\*q .SH DIAGNOSTICS \&.\e\*q For sections 1, 4, 6, 7, & 8 only. @@ -369,6 +370,13 @@ Thus, the following are equivalent: \&.\ \ \ 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. @@ -413,7 +421,6 @@ The syntax is as follows: .It Sx \&I Ta n Ta next-line Ta \& .It Sx \&IB Ta n Ta current Ta \& .It Sx \&IR Ta n Ta current Ta \& -.\" .It Sx \&PD Ta n Ta current Ta compat .It Sx \&R Ta n Ta next-line Ta \& .It Sx \&RB Ta n Ta current Ta \& .It Sx \&RI Ta n Ta current Ta \& @@ -423,15 +430,11 @@ The syntax is as follows: .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 \&i Ta n Ta current Ta compat +.It Sx \&ft Ta 1 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 -.\" .It Sx \&Sp Ta <1 Ta current Ta compat -.\" .It Sx \&Vb Ta <1 Ta current Ta compat -.\" .It Sx \&Ve Ta 0 Ta current Ta compat .El .Pp Macros marked as @@ -511,12 +514,9 @@ The optional arguments specify which release it is fro Text is rendered in bold face. .Pp See also -.Sx \&I , -.Sx \&R , -.Sx \&b , -.Sx \&i , +.Sx \&I and -.Sx \&r . +.Sx \&R . .Ss \&BI Text is rendered alternately in bold face and italic. Thus, @@ -534,7 +534,7 @@ Whitespace between arguments is omitted in output. .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 @@ -593,12 +593,9 @@ and Text is rendered in italics. .Pp See also -.Sx \&B , -.Sx \&R , -.Sx \&b , -.Sx \&i , +.Sx \&B and -.Sx \&r . +.Sx \&R . .Ss \&IB Text is rendered alternately in italics and bold face. Whitespace between arguments is omitted in output. @@ -694,12 +691,9 @@ and Text is rendered in roman (the default font). .Pp See also -.Sx \&I , -.Sx \&B , -.Sx \&b , -.Sx \&i , +.Sx \&I 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. @@ -794,7 +788,7 @@ 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 @@ -820,12 +814,6 @@ See also .Sx \&P , and .Sx \&PP . -.\" . -.\" . -.\" .Ss \&PD -.\" Has no effect. Included for compatibility. -.\" . -.\" . .Ss \&UC Sets the volume for the footer for compatibility with man pages from BSD releases. @@ -839,18 +827,11 @@ See also .Ss \&fi End literal mode begun by .Sx \&nf . -.Ss \&i -Italicise arguments. -Synonym for -.Sx \&I . -.Pp -See also -.Sx \&B , -.Sx \&I , -.Sx \&R . -.Sx \&b , -and -.Sx \&r . +.Ss \&ft +Change the current font mode. +See +.Sx Text Decoration +for a listing of available font modes. .Ss \&in Indent relative to the current indentation: .Pp @@ -868,16 +849,6 @@ Begin literal mode: all subsequent free-form lines hav 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 @@ -896,21 +867,6 @@ Defaults to 1, if unspecified. .Pp See also .Sx \&br . -.\" .Ss \&Sp -.\" A synonym for -.\" .Sx \&sp -.\" .Cm 0.5v . -.\" . -.\" .Ss \&Vb -.\" A synonym for -.\" .Sx \&nf . -.\" Accepts an argument (the height of the formatted space) which is -.\" disregarded. -.\" . -.\" .Ss \&Ve -.\" A synonym for -.\" .Sx \&fi . -.\" . .Sh COMPATIBILITY This section documents areas of questionable portability between implementations of the @@ -961,8 +917,12 @@ macro does not accept negative values in mandoc. In GNU troff, this would result in strange behaviour. .El .Sh SEE ALSO +.Xr man 1 , .Xr mandoc 1 , -.Xr mandoc_char 7 +.Xr mandoc_char 7 , +.Xr mdoc 7 , +.Xr roff 7 , +.Xr tbl 7 .Sh HISTORY The .Nm