===================================================================
RCS file: /cvs/mandoc/mdoc.7,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- mandoc/mdoc.7	2009/06/22 13:09:17	1.32
+++ mandoc/mdoc.7	2009/06/25 10:51:21	1.33
@@ -1,4 +1,4 @@
-.\"	$Id: mdoc.7,v 1.32 2009/06/22 13:09:17 kristaps Exp $
+.\"	$Id: mdoc.7,v 1.33 2009/06/25 10:51:21 kristaps Exp $
 .\"
 .\" Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
 .\"
@@ -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: June 22 2009 $
+.Dd $Mdocdate: June 25 2009 $
 .Dt MDOC 7
 .Os
 .\" SECTION
@@ -28,8 +28,8 @@ The
 language is used to format 
 .Bx 
 .Ux
-manuals.  In this reference document, we describe the syntax, ontology
-and structure of the 
+manuals.  In this reference document, we describe the syntax and
+structure of the 
 .Nm
 language.  Our reference implementation is
 .Xr mandoc 1 .
@@ -139,11 +139,27 @@ Characters may alternatively be escaped by a slash-ast
 with the same combinations as described above.  This form is deprecated.  
 .\" SECTION
 .Sh STRUCTURE
-Macros are classified in an ontology described by their scope rules.
-Some macros are allowed to deviate from their classifications to
-preserve backward-compatibility with old macro combinations still found
-in the manual corpus.  These are specifically noted on a per-macro
-basis.
+Each
+.Nm
+document must begin with the document prologue, containing, in order, 
+.Sq \&.Dd ,
+.Sq \&.Dt ,
+and
+.Sq \&.Os .
+Following these, the document body must begin with the NAME section
+containing at least one 
+.Sq \&.Nm
+followed by a
+.Sq \&.Nd
+macro.
+.Pp
+At least one free-form or macro line must follow this prologue.
+.\"
+.Ss Classification
+Macros are classified by their scope rules.  Some macros are allowed to
+deviate from their classifications to preserve backward-compatibility
+with old macro combinations still found in the manual corpus.  These are
+specifically noted on a per-macro basis.
 .\" SUB-SECTION
 .Ss Scope
 .Bl -inset 
@@ -279,26 +295,10 @@ In-lines have \(>=0 scoped arguments.
 \&.Yy \(lB\-arg \(lBval...\(rB\(rB arg0 arg1 argN
 .Ed
 .\" SECTION
-.Sh STRUCTURE
-Each
-.Nm
-document must begin with the document prologue, containing, in order, 
-.Sq \&.Dd ,
-.Sq \&.Dt ,
-and
-.Sq \&.Os .
-.Pp
-Following these, the document body must begin with the NAME section
-containing at least one 
-.Sq \&.Nm
-followed by a
-.Sq \&.Nd
-macro.
-.\" SECTION
 .Sh MACROS
 This section contains a complete list of all 
 .Nm
-macros, arranged ontologically.  A 
+macros, arranged by classification.  A 
 .Qq callable
 macro is invoked subsequent to the initial macro-line macro.  A
 .Qq parsable