Sync section titles with OpenBSD.

[mandoc.git] / tbl.7

diff --git a/tbl.7 b/tbl.7
index 5adc6c5ee0f6a4558a62b2bc0138ce06c1d5cf61..d4c829bfddf53ca18d4e67b097944c899ac55752 100644 (file)
--- a/tbl.7
+++ b/tbl.7
@@ -1,6 +1,6 @@
-.\"    $Id: tbl.7,v 1.9 2011/01/11 14:12:01 kristaps Exp $
+.\"    $Id: tbl.7,v 1.18 2013/09/16 22:39:19 schwarze Exp $

 .\"
 .\"

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

 .\"
 .\" Permission to use, copy, modify, and distribute this software for any
 .\" purpose with or without fee is hereby granted, provided that the above
 .\"
 .\" Permission to use, copy, modify, and distribute this software for any
 .\" purpose with or without fee is hereby granted, provided that the above


@@ -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: January 11 2011 $
+.Dd $Mdocdate: September 16 2013 $

 .Dt TBL 7
 .Os
 .Sh NAME
 .Dt TBL 7
 .Os
 .Sh NAME


@@ -49,7 +49,7 @@ macro tags, whose precise syntax is documented in
 Tables consist of a series of options on a single line, followed by the
 table layout, followed by data.
 .Pp
 Tables consist of a series of options on a single line, followed by the
 table layout, followed by data.
 .Pp

-For example, the following creates a boxed table with digits centered in
+For example, the following creates a boxed table with digits centred in

 the cells.
 .Bd -literal -offset indent
 \&.TS
 the cells.
 .Bd -literal -offset indent
 \&.TS


@@ -180,8 +180,6 @@ Accepts a single-character argument.
 This character will be used as the decimal point with the
 .Cm n
 layout key.
 This character will be used as the decimal point with the
 .Cm n
 layout key.

-This option is not supported by
-.Xr mandoc 1 .

 .It Cm nospaces
 This option is not supported by
 .Xr mandoc 1 .
 .It Cm nospaces
 This option is not supported by
 .Xr mandoc 1 .


@@ -209,8 +207,8 @@ Justify a number around its last decimal point.
 If the decimal point is not found on the number, it's assumed to trail
 the number.
 .It Cm s
 If the decimal point is not found on the number, it's assumed to trail
 the number.
 .It Cm s

-Horizontally span columns from the last non-
-.Ns Cm s
+Horizontally span columns from the last
+.No non- Ns Cm s

 data cell.
 It is an error if spanning columns follow a
 .Cm \-
 data cell.
 It is an error if spanning columns follow a
 .Cm \-


@@ -222,10 +220,12 @@ This option is not supported by
 .It Cm a
 Left-justify a literal string and pad with one space.
 .It Cm ^
 .It Cm a
 Left-justify a literal string and pad with one space.
 .It Cm ^

-Vertically span rows from the last non-
-.Ns Cm ^
+Vertically span rows from the last
+.No non- Ns Cm ^

 data cell.
 It is an error to invoke a vertical span on the first layout row.
 data cell.
 It is an error to invoke a vertical span on the first layout row.

+Unlike a horizontal spanner, you must specify an empty cell (if it not
+empty, the data is discarded) in the corresponding data cell.

 .It Cm \-
 Replace the data cell (its contents will be lost) with a single
 horizontal line.
 .It Cm \-
 Replace the data cell (its contents will be lost) with a single
 horizontal line.


@@ -249,12 +249,21 @@ The following case-insensitive modifier keys are available:
 .Cm e ,
 .Cm t ,
 .Cm d ,
 .Cm e ,
 .Cm t ,
 .Cm d ,

-.Cm f ,

 .Cm b ,
 .Cm i ,
 .Cm b ,
 .Cm i ,

-.Cm b ,
+.Cm r ,

 and
 and

-.Cm i .
+.Cm f
+.Po
+followed by
+.Cm b ,
+.Cm i ,
+.Cm r ,
+.Cm 3 ,
+.Cm 2 ,
+or
+.Cm 1
+.Pc .

 All of these are ignored by
 .Xr mandoc 1 .
 .Pp
 All of these are ignored by
 .Xr mandoc 1 .
 .Pp


@@ -325,7 +334,7 @@ This formed the basis of the implementation that is part of the
 .Xr mandoc 1
 utility.
 .Sh AUTHORS
 .Xr mandoc 1
 utility.
 .Sh AUTHORS

-This partial
+This

 .Nm
 reference was written by
 .Nm
 reference was written by

-.An Kristaps Dzonsons Aq kristaps@bsd.lv .
+.An Kristaps Dzonsons Aq Mt kristaps@bsd.lv .