merge from VERSION_1_12:

[mandoc.git] / eqn.7

diff --git a/eqn.7 b/eqn.7
index 5ada9f532a3c57874dbe8dfb0131a3e1c8c3d8bf..dcbad41cc15bd865c1b9d356ba327a839dde1b4b 100644 (file)
--- a/eqn.7
+++ b/eqn.7
@@ -1,4 +1,4 @@
-.\"    $Id: eqn.7,v 1.24 2011/07/23 18:44:42 kristaps Exp $
+.\"    $Id: eqn.7,v 1.29 2013/07/13 19:41:16 schwarze Exp $

 .\"
 .\" Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
 .\"
 .\"
 .\" Copyright (c) 2011 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: July 23 2011 $
+.Dd $Mdocdate: July 13 2013 $

 .Dt EQN 7
 .Os
 .Sh NAME
 .Dt EQN 7
 .Os
 .Sh NAME


@@ -23,18 +23,21 @@
 .Sh DESCRIPTION
 The
 .Nm eqn
 .Sh DESCRIPTION
 The
 .Nm eqn

-language is a equation-formatting language.
+language is an equation-formatting language.

 It is used within
 .Xr mdoc 7
 and
 .Xr man 7
 .Ux
 manual pages.
 It is used within
 .Xr mdoc 7
 and
 .Xr man 7
 .Ux
 manual pages.

+It describes the
+.Em structure
+of an equation, not its mathematical meaning.

 This manual describes the
 .Nm
 language accepted by the
 .Xr mandoc 1
 This manual describes the
 .Nm
 language accepted by the
 .Xr mandoc 1

-utility, which correspond to the Second Edition eqn specification (see
+utility, which corresponds to the Second Edition eqn specification (see

 .Sx SEE ALSO
 for references).
 .Pp
 .Sx SEE ALSO
 for references).
 .Pp


@@ -114,7 +117,7 @@ partial (partial differential), inf (infinity), >> (much greater), <<
 The following control statements are available:
 .Bl -tag -width Ds
 .It Cm define
 The following control statements are available:
 .Bl -tag -width Ds
 .It Cm define

-Replace all occurances of a key with a value.
+Replace all occurrences of a key with a value.

 Its syntax is as follows:
 .Pp
 .D1 define Ar key cvalc
 Its syntax is as follows:
 .Pp
 .D1 define Ar key cvalc


@@ -129,7 +132,8 @@ This allows for arbitrary enclosure of terms (not just quotes), such as
 .D1 define Ar foo cbar bazc
 .Pp
 It is an error to have an empty
 .D1 define Ar foo cbar bazc
 .Pp
 It is an error to have an empty

-.Ar key or
+.Ar key
+or

 .Ar val .
 Note that a quoted
 .Ar key
 .Ar val .
 Note that a quoted
 .Ar key


@@ -272,4 +276,4 @@ was added in 2011.
 This
 .Nm
 reference was written by
 This
 .Nm
 reference was written by

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