groff-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[groff] 01/01: Html documentation cleanup


From: Peter Schaffter
Subject: [groff] 01/01: Html documentation cleanup
Date: Mon, 25 Oct 2021 12:53:41 -0400 (EDT)

PTPi pushed a commit to branch master
in repository groff.

commit 8ae25163dccece9df6bcbc3cfa007d790219edbe
Author: Peter Schaffter <peter@schaffter.ca>
AuthorDate: Mon Oct 25 12:51:56 2021 -0400

    Html documentation cleanup
---
 contrib/mom/momdoc/appendices.html         |   2 +-
 contrib/mom/momdoc/color.html              |  85 +++---
 contrib/mom/momdoc/cover.html              |  89 +++---
 contrib/mom/momdoc/definitions.html        |  16 +-
 contrib/mom/momdoc/docelement.html         | 447 +++++++++++++++--------------
 contrib/mom/momdoc/docprocessing.html      | 159 +++++-----
 contrib/mom/momdoc/goodies.html            |  97 ++++---
 contrib/mom/momdoc/graphical.html          |  26 +-
 contrib/mom/momdoc/headfootpage.html       |  97 ++++---
 contrib/mom/momdoc/images.html             | 109 +++----
 contrib/mom/momdoc/inlines.html            | 184 +++++++-----
 contrib/mom/momdoc/intro.html              |   6 +-
 contrib/mom/momdoc/rectoverso.html         |  26 +-
 contrib/mom/momdoc/refer.html              |  39 +--
 contrib/mom/momdoc/stylesheet.css          |   5 +-
 contrib/mom/momdoc/tables-of-contents.html |  27 +-
 contrib/mom/momdoc/typesetting.html        | 322 +++++++++++----------
 contrib/mom/momdoc/version-2.html          | 182 +++++-------
 18 files changed, 985 insertions(+), 933 deletions(-)

diff --git a/contrib/mom/momdoc/appendices.html 
b/contrib/mom/momdoc/appendices.html
index 70f9556..9f43ba9 100644
--- a/contrib/mom/momdoc/appendices.html
+++ b/contrib/mom/momdoc/appendices.html
@@ -184,7 +184,7 @@ passing <kbd>.FT</kbd> the lengthy family+fontname (.e.g.
 
 <p>
 Fortunately, groff provides a mechanism whereby it&#8217;s possible
-to extend the basic <b>R</b>, <b>I</b>, <b>B</b> and <b>BI</b> fonts
+to extend the basic <b>R</b>, <b>I</b>, <b>B</b>, and <b>BI</b> fonts
 (&#8220;styles&#8221; in groff-speak) so that one can, in fact,
 create extensive type families, and access all the fonts in them
 with <kbd>.ft</kbd> (groff) or <kbd>.FT</kbd> (mom).
diff --git a/contrib/mom/momdoc/color.html b/contrib/mom/momdoc/color.html
index debb6a4..8d1fb11 100644
--- a/contrib/mom/momdoc/color.html
+++ b/contrib/mom/momdoc/color.html
@@ -57,8 +57,8 @@ or
 Afterwards, any time you want text to be coloured, you either colour
 it with an
 <a href="definitions.html#inlines">inline escape</a>
-that contains the colour name (e.g. <kbd>\*[red]</kbd>
-or <kbd>\*[blue]</kbd>) or invoke the macro
+that contains the colour name (e.g. <kbd><nobr>\*[red]</nobr></kbd>
+or <kbd><nobr>\*[blue]</nobr></kbd>) or invoke the macro
 <a href="#color">COLOR</a>
 with the name of the colour you want.
 </p>
@@ -89,7 +89,7 @@ If you use NEWCOLOR, you might enter:
 
 <p id="color-example2" style="margin-top: -1em;">
 After defining or initializing the colour yellow you&#8217;d
-colourize the name, Jack, either with an inline escape
+colourise the name, Jack, either with an inline escape
 <br/>
 <span class="pre-in-pp">
   All work and no play makes \*[yellow]Jack\*[black] a dull boy.
@@ -177,7 +177,7 @@ mom doesn&#8217;t have a clue what you mean when you 
reference a
 colour (with
 <a href="#color">COLOR</a>
 or
-<a href="#color-inline"><kbd>\*[&lt;colour name&gt;]</kbd></a>).
+<a href="#color-inline"><kbd><nobr>\*[&lt;colour name&gt;]</nobr></kbd></a>).
 </p>
 
 <p>
@@ -226,7 +226,7 @@ could enter one of the following:
 After you&#8217;ve told mom about a colour, you can then get her to
 set text in that colour either with the
 <a href="definitions.html#inlines">inline escape</a>,
-<a href="#color-inline"><kbd>\*[&lt;colourname&gt;]</kbd></a>,
+<a href="#color-inline"><kbd><nobr>\*[&lt;colourname&gt;]</nobr></kbd></a>,
 or the macro
 <a href="#color">COLOR</a>.
 (See the
@@ -241,9 +241,9 @@ The colourname you give to NEWCOLOR may be used with 
groff&#8217;s
 <kbd>\m[&lt;colourname&gt;]</kbd> inline escape (the <kbd>\m</kbd>
 escape is used to set text and rule colours).  Thus, assuming
 a colourname &#8220;blueblack&#8221; set with NEWCOLOR,
-<kbd>\*[blueblack]</kbd> and <kbd>\m[blueblack]</kbd> are
-equivalent.  Furthermore, the colourname can be given as an argument
-to <b>groff</b>&#8217;s
+<kbd><nobr>\*[blueblack]</nobr></kbd> and <kbd>\m[blueblack]</kbd>
+are equivalent.  Furthermore, the colourname can be given as an
+argument to <b>groff</b>&#8217;s
 <a href="definitions.html#primitives">primitive</a>
 request, <kbd>.gcolor</kbd> (which does the same thing as
 <kbd>\m[&lt;colourname&gt;]</kbd>).
@@ -321,12 +321,12 @@ Afterwards
   .COLOR coral
 </span>
 
-will colourize subsequent text coral until you instruct mom to
+will colourise subsequent text coral until you instruct mom to
 return to black, or some other pre-defined, initialized colour.
 (The
 <a href="definitions.html#inlines">inline escape</a>
-<kbd>\*[coral]</kbd> will equally colourize text coral after
-you&#8217;ve initialized the colour with XCOLOR.)
+<kbd><nobr>\*[coral]</nobr></kbd> will equally colourise text coral
+after you&#8217;ve initialized the colour with XCOLOR.)
 </p>
 
 <p>
@@ -363,10 +363,11 @@ or
 <span class="pre-in-pp">
   .XCOLOR mediumspringgreen MYGREEN
 </span>
-so that whenever you want text mediumspringgreen-ed, you
-can use either <kbd>.COLOR mygreen</kbd> (or
-<kbd>.COLOR MYGREEN</kbd>) or the inline escape
-<kbd>\*[mygreen]</kbd> (or <kbd>\*[MYGREEN]</kbd>.)
+so that whenever you want text mediumspringgreen-ed, you can use
+either <kbd>.COLOR&nbsp;mygreen</nobr></kbd> (or <kbd><nobr>.COLOR
+MYGREEN</nobr></kbd>) or the inline escape
+<kbd><nobr>\*[mygreen]</nobr></kbd> (or
+<kbd><nobr>\*[MYGREEN]</nobr></kbd>.)
 </p>
 
 <h3 id="xcolor-names" class="docs">Finding X colour names</h3>
@@ -401,14 +402,17 @@ Both the colourname and the alias you give to XCOLOR may 
be
 used with groff&#8217;s <kbd>\m[&lt;colourname&gt;]</kbd>
 inline escape (the <kbd>\m</kbd> escape is used to set
 text and rule colours).  Thus, assuming an X-colourname
-&#8220;mediumspringgreen&#8221; set with XCOLOR, and an alias,
-&#8220;mygreen&#8221;, <kbd>\*[mediumspringgreen]</kbd>,
-<kbd>\m[mediumspringgreen]</kbd>, <kbd>\*[mygreen]</kbd> and
-<kbd>\m[mygreen]</kbd> are all equivalent.  Furthermore, both the
-colourname and the alias can be given as an argument to groff&#8217;s
+&#8220;mediumspringgreen&#8221; set with
+XCOLOR, and an alias, &#8220;mygreen&#8221;,
+<kbd><nobr>\*[mediumspringgreen]</nobr></kbd>,
+<kbd><nobr>\m[mediumspringgreen]</nobr></kbd>,
+<kbd><nobr>\*[mygreen]</nobr></kbd> and
+<kbd><nobr>\m[mygreen]</nobr></kbd> are all equivalent.
+Furthermore, both the colourname and the alias can be given as an
+argument to groff&#8217;s
 <a href="definitions.html#primitives">primitive</a>
 request, <kbd>.gcolor</kbd> (which does the same thing as
-<kbd>\m[&lt;colourname&gt;]</kbd>).
+<kbd><nobr>\m[&lt;colourname&gt;]</nobr></kbd>).
 </p>
 
 <p class="tip-bottom">
@@ -443,8 +447,8 @@ or
 <a href="#xcolor">XCOLOR</a>,
 you use either the macro COLOR or the
 <a href="definitions.html#inlines">inline escape</a>,
-<kbd>\*[&lt;colourname&gt;]</kbd>, to cause mom to
-set subsequent text in that colour.  See the
+<kbd><nobr>\*[&lt;colourname&gt;]</nobr></kbd>, to cause mom to set
+subsequent text in that colour.  See the
 <a href="#color-example2">example</a>,
 above, which shows both in action.
 </p>
@@ -452,35 +456,32 @@ above, which shows both in action.
 <div class="box-tip">
 <p class="tip-top">
 <span class="note">Note:</span>
-You can use the <kbd>\*[&lt;colourname&gt;]</kbd> inline escape in
-any
+You can use the <kbd><nobr>\*[&lt;colourname&gt;]</nobr></kbd>
+inline escape in any
 <a href="docprocessing.html#top">document processing</a>
 macro that takes a
 <a href="definitions.html#stringargument">string argument</a>.
 However, you must remember to reset the colour at the end of the
-argument (typically with <kbd>\*[black]</kbd>) unless you want all
-subsequent invocations of that particular macro to be colourized.
+argument (typically with <kbd><nobr>\*[black]</nobr></kbd>) unless
+you want all subsequent invocations of that particular macro to be
+colourised.
 </p>
 
 <p>
-Furthermore, if you use <kbd>\*[&lt;colourname&gt;]</kbd> in the
-string argument passed to
-<a href="docelement.html#head">HEAD</a>,
-<a href="docelement.html#subhead">SUBHEAD</a>
-or
-<a href="docelement.html#parahead">PARAHEAD</a>,
-and you&#8217;ve requested that any of these types of heads be
-numbered, the numbers themselves will not be coloured, only the text
-you passed the macro.  If you wish the numbers to be colourized as
-well, you must explicitly tell mom that you wish all of the head(s),
-subhead(s) or parahead(s), including the numbers, colourized by
-invoking the appropriate
-<a href="docelement.html#docelement-control">control macro</a>.
+Furthermore, if you use
+<kbd><nobr>\*[&lt;colourname&gt;]</nobr></kbd> in the string
+argument passed to
+<a href="docelement.html#heading">HEADING&nbsp;&lt;n&gt;</a>
+and you&#8217;ve requested that the heading level be numbered, the
+numbers themselves will not be colourised, only the text you pass to
+the macro.  If you wish the numbers to be colourised along with the
+text, you must explicitly tell mom with
+<a href="docelement.html#heading-style">HEADING_STYLE&nbsp;&lt;n&gt;</a>.
 </p>
 
 <p class="tip-bottom">
-For colourizing underscored text, see
-<a href="goodies.html#underscore-color">Colourizing underscored text</a>
+For colourising underscored text, see
+<a href="goodies.html#underscore-color">Colourising underscored text</a>
 in the notes at the end of
 <a href="goodies.html#underscore">UNDERSCORE</a>.
 </p>
diff --git a/contrib/mom/momdoc/cover.html b/contrib/mom/momdoc/cover.html
index a855615..343fb00 100644
--- a/contrib/mom/momdoc/cover.html
+++ b/contrib/mom/momdoc/cover.html
@@ -59,7 +59,7 @@ FDL in the main directory of the groff source package.
   <ul style="margin-left: -.5em; list-style-type: disc;">
     <li><a href="#cover">DOC_COVER / COVER</a>
     <ul style="margin-left: -1.25em; list-style-type: circle;">
-      <li><a href="#cover-args">The argument list: saying what goes on 
doc-cover and cover pages</a></li>
+      <li><a href="#cover-args">The argument list: saying what goes on doc 
cover and cover pages</a></li>
       <li><a href="#meanings">What the arguments mean</a></li>
       <li><a href="#chapter">How the CHAPTER argument and friends work</a></li>
     </ul></li>
@@ -70,12 +70,12 @@ FDL in the main directory of the groff source package.
     </li>
     <li><a href="#coverimage">DOC_COVER_IMAGE / COVER_IMAGE</a>
       <ul style="margin-left: -1.25em; list-style-type: circle;">
-        <li><a href="#positioning">Positioning of doc-cover and cover 
images</a></li>
+        <li><a href="#positioning">Positioning of doc cover and cover 
images</a></li>
       </ul>
     </li>
   </ul></li>
   <li><a href="#on-off">Enabling/disabling automatic generation of cover 
pages</a></li>
-  <li><a href="#cover-control">Control macros for covers and 
doc-covers</a></li>
+  <li><a href="#cover-control">Control macros for covers and doc 
covers</a></li>
 </ul>
 </div>
 
@@ -85,15 +85,16 @@ FDL in the main directory of the groff source package.
 
 <p>
 Though identical in treatment, mom provides two kinds of cover
-pages: document cover pages (&#8221;doc-covers&#8221;), and section
-cover pages (which I shall refer to simply as cover pages).
+pages: document cover pages (&#8221;doc covers&#8221;) and section
+cover pages (&#8220;covers&#8221;).  Section cover pages are
+analogous to title pages.
 </p>
 
 <p>
-A doc-cover is what you&#8217;d most likely use at the start of a
+A doc cover is what you&#8217;d most likely use at the start of a
 collated document, where you might want the name of the complete
 document, the author(s) and the copyright line to appear.  Another
-place you might use a doc-cover is for a novel, where you want the
+place you might use a doc cover is for a novel, where you want the
 title of the novel, not the chapter title or chapter number, as the
 first cover page.
 </p>
@@ -101,26 +102,26 @@ first cover page.
 <p>
 A cover is what you&#8217;d use for pages that separate sections
 of a collated document, i.e. title pages.  A cover page (but not a
-doc-cover) in a collated document could, for example, simply read:
+doc cover) in a collated document could, for example, simply read:
 &#8221;PART 1&#8221;.
 </p>
 
 <p>
 In non-collated documents (say, an essay) you can use either a cover
-or doc-cover to generate the cover sheet.
+or doc cover to generate the cover sheet.
 </p>
 
 <p>
-In addition, nothing prevents you from generating both a doc-cover
+In addition, nothing prevents you from generating both a doc cover
 and a cover for every document in a collated document.  Or you can
-selectively disable the automatic generation of either doc-covers or
+selectively disable the automatic generation of either doc covers or
 covers in a collated document on-the-fly.
 </p>
 
 <div id="important-note" class="box-important">
 <p class="tip">
 <span class="important">Important note:</span>
-Automatic generation of covers or doc-covers after the first one(s)
+Automatic generation of covers or doc covers after the first one(s)
 only takes place if you are working with collated documents.  Mom
 provides no mechanism for saying &#8221;print a section cover
 here even though I&#8217;m still working on the same (non-collated)
@@ -131,7 +132,7 @@ document.&#8221;
 <h3 id="desc" class="docs">Description of cover pages</h3>
 
 <p>
-By default, mom typesets covers and doc-covers  identically to
+By default, mom typesets covers and doc covers  identically to
 <a href="definitions.html#docheader">docheaders</a>
 (see
 <a href="docprocessing.html#docheader-control">How to change the look of 
docheaders</a>
@@ -142,7 +143,7 @@ differences are
   <li>the position on the page where the information is output</li>
   <li>the (optional) addition of copyright and miscellaneous information</li>
   <li>there&#8217;s no running text underneath, although you can add text
-      to a cover or doc-cover (for example, an Abstract) with
+      to a cover or doc cover (for example, an Abstract) with
       <a href="#covertext">COVERTEXT</a>
    </li>
 </ul>
@@ -158,12 +159,12 @@ Provided you have already given mom the appropriate 
reference macros
 <a href="docprocessing.html#title">TITLE</a>
 or
 <a href="docprocessing.html#author">AUTHOR</a>),
-she will output covers and doc-covers identically to how she
+she will output covers and doc covers identically to how she
 would output docheaders containing the same information.
 </p>
 
 <p>
-By default, mom starts covers and doc-covers one-third of the way
+By default, mom starts covers and doc covers one-third of the way
 down the page.  This can be changed through the use of the control
 macros DOC_COVER_START_POS / COVER_START_POS (or DOC_COVER_ADVANCE /
 COVER_ADVANCE).
@@ -175,7 +176,7 @@ reference macro
 <a href="docprocessing.html#copyright">COPYRIGHT</a>)
 she sets it, by default, in a smaller
 <a href="definitions.html#ps">point size</a>
-in the bottom right hand corner of the cover or doc-cover.  The
+in the bottom right hand corner of the cover or doc cover.  The
 position, as well as all of the standard typesetting parameters, can be
 altered via control macros.
 </p>
@@ -185,7 +186,7 @@ Similarly, if you request miscellaneous information (and 
have
 already given mom the reference macro
 <a href="docprocessing.html#misc">MISC</a>)
 she sets it, by default, in a smaller point size in the bottom left
-hand corner of the cover or doc-cover.  As with the copyright, the
+hand corner of the cover or doc cover.  As with the copyright, the
 position and type specs can be altered via control macros.
 </p>
 
@@ -197,7 +198,7 @@ Mom does not set any
 or
 <a href="definitions.html#footer">footers</a>
 on cover pages.  Neither does she set any page numbers.  From
-the point of view of pagination, covers and doc-covers are by
+the point of view of pagination, covers and doc covers are by
 default considered &#8221;null&#8221; pages.  If you wish them to
 be included in the pagination scheme (even though no page numbers
 appear), you must tell mom that&#8217;s what you want by invoking
@@ -225,7 +226,7 @@ block using mom&#8217;s typesetting macros to format the 
text.
 
 <p>
 Doc-cover and cover data&mdash;that is to say, the strings passed to
-reference macros that appear on doc-cover and cover
+reference macros that appear on doc cover and cover
 pages&mdash;does not persist after
 <a href="docprocessing.html#start">START</a>,
 however the formatting of the various parts (TITLE, AUTHOR,
@@ -237,16 +238,16 @@ COPYRIGHT, etc.) does.
 <ul class="macro-list">
   <li><a href="#cover">DOC_COVER and COVER</a>
   <ul style="margin-left: -.5em; list-style-type: disc;">
-    <li><a href="#cover-args">The arguments: saying what goes on doc-cover and 
cover pages</a></li>
+    <li><a href="#cover-args">The arguments: saying what goes on doc cover and 
cover pages</a></li>
   </ul></li>
   <li><a href="#covertext">DOC_COVERTEXT / COVERTEXT</a></li>
   <li><a href="#coverimage">DOC_COVER_IMAGE / COVER_IMAGE</a></li>
   <li><a href="#on-off">Enabling/disabling automatic generation of cover 
pages</a>
   <ul style="margin-left: -.5em; list-style-type: disc;">
-    <li><a href="#doc-covers">DOC_COVERS</a></li>
+    <li><a href="#doc covers">DOC_COVERS</a></li>
     <li><a href="#covers">COVERS</a></li>
   </ul></li>
-  <li><a href="#cover-control">Control macros for doc-covers and 
covers</a></li>
+  <li><a href="#cover-control">Control macros for doc covers and 
covers</a></li>
 </ul>
 </div>
 
@@ -256,7 +257,7 @@ COPYRIGHT, etc.) does.
 <h3 id="cover" class="macro-id">DOC_COVER and COVER</h3>
 </div>
 
-<div id="doc-cover" class="box-macro-args">
+<div id="doc cover" class="box-macro-args">
 Macro: <b>DOC_COVER</b> <kbd class="macro-args">(see argument list, 
below)</kbd>
 </div>
 
@@ -328,7 +329,7 @@ what you want on the cover page:
     </dd>
   <dt class="params">DOC_COVERTITLE / COVERTITLE</dt>
     <dd class="cover-args">&ndash; the string(s) you gave to
-      <a href="docprocessing.html#doc-covertitle">DOC_COVERTITLE</a>
+      <a href="docprocessing.html#doc covertitle">DOC_COVERTITLE</a>
       or
       <a href="docprocessing.html#covertitle">COVERTITLE</a>
     </dd>
@@ -371,7 +372,7 @@ what you want on the cover page:
   <dt class="params">PDF_OUTLINE_LABEL &lt;label&gt;</dt>
     <dd class="cover-args">
       <span style="display:block; margin-left: 1em">
-      By default, mom identifies doc-covers in the outline panel of PDF
+      By default, mom identifies doc covers in the outline panel of PDF
       viewers with the prepended label, &#8220;Cover:&#8221;, and covers
       with the label &#8220;Title Page:&#8221;.  If you would like
       to change the label, give the <kbd>PDF_OUTLINE_LABEL</kbd>
@@ -385,7 +386,7 @@ what you want on the cover page:
     <dd class="cover-args">
       <span style="display:block; margin-left: 1em">
       If the final argument to DOC_COVER or COVER is <kbd>BLANKPAGE</kbd>,
-      mom will insert a blank page after the doc-cover or cover.  This is
+      mom will insert a blank page after the doc cover or cover.  This is
       particularly useful if you intend to print your document two-sided,
       since, in two-sided printing, there may be instances where you do
       not want text on the reverse side of cover or title pages
@@ -416,7 +417,7 @@ appropriate string on the appropriate cover page.  Thus,
   .DOC_COVER TITLE
   .COVER TITLE
 </span>
-will print &#8220;Collected Essays&#8221; on the doc-cover page,
+will print &#8220;Collected Essays&#8221; on the doc cover page,
 &#8220;1985-2015&#8221; on the cover page, and, assuming the
 docheader hasn&#8217;t been disabled, &#8220;Neo-liberalism: Who
 Did They Think They Were Fooling?&#8221; as the title in the
@@ -517,7 +518,7 @@ Macro: <b>COVERTEXT</b> <kbd class="macro-args">[START 
&lt;starting position&gt;
 
 <p>
 <kbd>DOC_COVERTEXT</kbd> and <kbd>COVERTEXT</kbd> allow you to add
-text to doc-covers and covers in addition to, or instead of, what is
+text to doc covers and covers in addition to, or instead of, what is
 generated by mom from the arguments you give to
 <a href="#doccover">DOC_COVER</a>
 and
@@ -546,7 +547,7 @@ is the only allowed document element tag.
 <h4 id="placement" class="docs">Placement</h4>
 
 <p>
-If you do not instruct mom to put anything on doc-cover or cover
+If you do not instruct mom to put anything on doc cover or cover
 pages except <kbd>DOC_COVERTEXT</kbd> or <kbd>COVERTEXT</kbd>, the
 cover text will begin at the document&#8217;s top margin.
 Equally, if only <kbd>COPYRIGHT</kbd> and/or <kbd>MISC</kbd> are
@@ -638,7 +639,7 @@ for instructions on converting various image types to PDF, 
and
 for instructions on obtaining image dimensions.
 </p>
 
-<h4 id="positioning" class="docs">Positioning of doc-cover and cover 
images</h4>
+<h4 id="positioning" class="docs">Positioning of doc cover and cover 
images</h4>
 
 <p>
 With no arguments other than <kbd>&lt;file name&gt;</kbd>,
@@ -652,7 +653,7 @@ size,
   .DOC_COVER_IMAGE image.pdf 612p 792p
   .DOC_COVER TITLE AUTHOR DOC_COVER_IMAGE
 </span>
-will fill the doc-cover page with &#8220;image.pdf&#8221; and set
+will fill the doc cover page with &#8220;image.pdf&#8221; and set
 the title and author in their usual locations.
 </p>
 
@@ -677,7 +678,7 @@ the printer sheet
 
 <p>
 The positioning of images does not effect the placement of type on
-doc-cover and cover pages.
+doc cover and cover pages.
 </p>
 
 <div class="box-tip">
@@ -698,7 +699,7 @@ own specifications.
 Macro: <b>COVERS</b> <kbd class="macro-args">&lt;toggle&gt;</kbd>
 </div>
 
-<div id="doc-covers" class="box-macro-args" style="margin-top: 1em;">
+<div id="doc covers" class="box-macro-args" style="margin-top: 1em;">
 Macro: <b>DOC_COVERS</b> <kbd class="macro-args">&lt;toggle&gt;</kbd>
 </div>
 
@@ -706,8 +707,8 @@ Macro: <b>DOC_COVERS</b> <kbd 
class="macro-args">&lt;toggle&gt;</kbd>
 By default, if you give mom a
 <a href="#cover">COVER</a>
 or
-<a href="#doc-cover">DOC_COVER</a>
-directive, she will print the cover or doc-cover.  In a document
+<a href="#doc cover">DOC_COVER</a>
+directive, she will print the cover or doc cover.  In a document
 that contains sections, articles or chapters formerly treated as
 &#8221;one-off&#8217;s&#8221; but now being
 <a href="rectoverso.html#collate-intro">collated</a>,
@@ -716,11 +717,11 @@ such behaviour may not be desirable.
 
 <p>
 Mom lets you selectively enable or disable the generation of covers
-and/or doc-covers with the toggle macros, COVERS and DOC_COVERS.
+and/or doc covers with the toggle macros, COVERS and DOC_COVERS.
 Because they&#8217;re toggle macros, simply invoking them by
-themselves enables automatic cover or doc-cover generation, while
+themselves enables automatic cover or doc cover generation, while
 invoking them with any argument at all (<kbd>OFF, QUIT, X</kbd>,
-etc) disables cover or doc-cover generation. </p>
+etc) disables cover or doc cover generation. </p>
 
 <div class="box-tip">
 <p class="tip">
@@ -739,10 +740,10 @@ instances of START.
 
 <div class="rule-short"><hr/></div>
 
-<h2 id="cover-control" class="macro-group">Control macros for doc-covers and 
covers</h2>
+<h2 id="cover-control" class="macro-group">Control macros for doc covers and 
covers</h2>
 
 <p>
-The default typographic appearance of the items on a doc-cover or
+The default typographic appearance of the items on a doc cover or
 cover is identical to that of the items in a
 <a href="definitions.html#docheader">docheader</a>.
 (See
@@ -771,7 +772,7 @@ characteristics:
 </ul>
 
 <p>
-The defaults for the entirety of doc-covers and covers, and all the
+The defaults for the entirety of doc covers and covers, and all the
 elements thereon, can be changed with control macros whose defaults
 and arguments are identical to the corresponding
 <a href="docprocessing.html#index-docheader-control">Control macros for 
docheaders</a>
@@ -783,8 +784,8 @@ part/parameter.
 </p>
 
 <p>
-Thus, to change the overall family, color, leading, quad and
-starting position of a doc-cover, you&#8217;d do
+Thus, to change the overall family, color, leading, quad, and
+starting position of a doc cover, you&#8217;d do
 <br/>
 <span class="pre-in-pp">
   .DOC_COVER_FAMILY  H
diff --git a/contrib/mom/momdoc/definitions.html 
b/contrib/mom/momdoc/definitions.html
index b545760..b669ea5 100644
--- a/contrib/mom/momdoc/definitions.html
+++ b/contrib/mom/momdoc/definitions.html
@@ -703,13 +703,15 @@ or concept you&#8217;re not familiar with.
   
   <dt id="preprocessor">Pre-processor</dt>
   <dd>
-  Pre-processors are used by groff to generate tables (tbl),
-  diagrams (pic), and equations (eqn).  These pre-processors are
-  fully supported by mom.  In addition, the &#8220;refer&#8221;
-  pre-processor is used to generate bibliographies and lists of
-  cited works.  The PDF_IMAGE macro, which allows insertion of
-  graphics into a document, is not strictly a pre-processor but
-  behaves similarly to tbl, pic, and eqn.
+  Pre-processors are used by groff to generate tables
+  (<strong>tbl</strong>), diagrams (<strong>pic</strong>), graphs
+  (<strong>grap</strong>), and equations (<strong>eqn</strong>).
+  These pre-processors are fully supported by mom.  In addition,
+  the &#8220;refer&#8221; pre-processor is used to generate
+  bibliographies and lists of cited works.  The PDF_IMAGE macro,
+  which allows insertion of graphics into a document, is not
+  strictly a pre-processor but behaves similarly to tbl, pic, and
+  eqn.
   </dd>
   
   <dt id="primitives">Primitives</dt>
diff --git a/contrib/mom/momdoc/docelement.html 
b/contrib/mom/momdoc/docelement.html
index 8ef8a89..1e03f86 100644
--- a/contrib/mom/momdoc/docelement.html
+++ b/contrib/mom/momdoc/docelement.html
@@ -284,7 +284,7 @@ to be red, once you&#8217;ve defined or initialized the 
colour, red,
 will turn them red.
 </p>
 
-<h4 id="lead" class="docs" style="margin-top: -.5em; margin-bottom: 
-.75em;">Lead/linespacing</h4>
+<h4 id="lead" class="docs" style="margin-top: -.5em; margin-bottom: 
-.75em;">Lead / linespacing</h4>
 
 <p>
 Control macros that end in _AUTOLEAD take the same argument as
@@ -357,27 +357,27 @@ regardless of the paragraph indent.
 </span>
 </p>
 
-<h4 id="quad" class="docs" style="margin-top: -1em; margin-bottom: 
-.75em;">Quad/justification style</h4>
+<h4 id="quad" class="docs" style="margin-top: -1em; margin-bottom: 
-.75em;">Quad / justification style</h4>
 
 <p>
 Control macros that end in _QUAD take the same arguments as
 <a href="typesetting.html#quad">QUAD</a>.
 </p>
 
-<h4 id="underline" class="docs" style="margin-bottom: -.75em;">Underline 
style, rule weight</h4>
+<h4 id="underscore" class="docs" style="margin-bottom: -.75em;">Underscore 
style, rule weight</h4>
 
 <p>
-If mom gives the option to underline a document element, the weight
+If mom gives the option to underscore a document element, the weight
 of the underline and its distance from the
 <a href="definitions.html#baseline">baseline</a>
-are controlled by macros that end in _UNDERSCORE or _UNDERLINE.
-These macros take the following arguments:
+are controlled by macros that end in _UNDERSCORE or _UNDERLINE, the
+two being synonymous.  These macros take the following arguments:
 <br/>
 <span class="pre-in-pp">
   DOUBLE     - double underscore
   &lt;weight&gt;   - the underscore weight (in points, no unit of measure 
required
   &lt;distance&gt; - distance from baseline (unit of measure required)
-  &lt;rule gap&gt; - distance between double underscore rules (unit of measure 
required_
+  &lt;rule gap&gt; - distance between double underscore rules (unit of measure 
required)
 </span>
 <kbd>DOUBLE</kbd> by itself will double-underscore the element.  The
 remaining arguments must be entered in the order given.  You may not
@@ -389,13 +389,13 @@ skip over any of them, which means that if you only wish 
to change
 <p>
 Page elements that are separated from
 <a href="definitions.html#running">running text</a>
-by a rule (i.e. page headers, page footers and footnotes) are
+by a rule (i.e. page headers, page footers, and footnotes) are
 controlled by macros that end in _RULE_WEIGHT.
 </p>
 
 <p>
-The weight argument to _UNDERLINE macros is the same as the argument
-to
+The weight argument to _UNDERSCORE macros is the same as the
+argument to
 <a href="inlines.html#rule-weight">RULE_WEIGHT</a>,
 as is the argument to _RULE_WEIGHT macros.
 </p>
@@ -435,14 +435,25 @@ Not all the control macros for a particular tag may be 
available
 with an <kbd>&lt;element&gt;_STYLE</kbd> macro.  Generally speaking,
 though, if a tag has control macros for
 <br/>
-<span class="pre-in-pp">
-  FAMILY FONT SIZE
-  LEAD AUTOLEAD
-  QUAD INDENT
-  COLOR
-  CAPS SMALLCAPS
-  UNDERLINE/UNDERSCORE
-</span>
+<table style="font-family: monospace; font-weight: bold; margin-left: 5em; 
margin-top: -1em">
+  <tr>
+  <td style="padding-right: 1em">FAMILY</td>
+  <td style="padding-right: 1em">LEAD</td>
+  <td style="padding-right: 1em">INDENT</td>
+  <td style="padding-right: 1em">SMALLCAPS</td>
+  </tr>
+  <tr>
+  <td style="padding-right: 1em">FONT</td>
+  <td style="padding-right: 1em">AUTOLEAD</td>
+  <td style="padding-right: 1em">COLOR</td>
+  <td style="padding-right: 1em">UNDERSCORE or UNDERLINE</td>
+  </tr>
+  <tr>
+  <td style="padding-right: 1em">SIZE</td>
+  <td style="padding-right: 1em">QUAD</td>
+  <td style="padding-right: 1em">CAPS</td>
+  </tr>
+<table>
 those parameters may be used within an
 <kbd>&lt;element&gt;_STYLE</kbd> macro.
 </p>
@@ -453,7 +464,7 @@ those parameters may be used within an
 If you need to reverse the sense of <kbd>CAPS</kbd>,
 <kbd>SMALLCAPS</kbd> or <kbd>UNDERSCORE/UNDERLINE</kbd>, which
 do not take a value after the keyword, use <kbd>NO_CAPS</kbd>,
-<kbd>NO_SMALLCAPS</kbd> and <kbd>NO_UNDERSCORE/NO_UNDERLINE</kbd>.
+<kbd>NO_SMALLCAPS</kbd>, and <kbd>NO_UNDERSCORE/NO_UNDERLINE</kbd>.
 </p>
 </div>
 
@@ -542,8 +553,8 @@ or
 <p class="tip">
 <span class="tip">Tips on vertical spacing around epigraphs:</span>
 If you wish to change the vertical position of an epigraph with
-<a href="typesetting.html#space">SPACE</a>/
-<a href="typesetting.html#ald">ALD</a>/
+<a href="typesetting.html#space">SPACE</a>,
+<a href="typesetting.html#ald">ALD</a>, or
 <a href="typesetting.html#rld">RLD</a>,
 do so before invoking <kbd>.EPIGRAPH</kbd>, like this:
 <br/>
@@ -670,20 +681,6 @@ break these one-liners&mdash;if they fall at the bottom of 
the
 page&mdash;to a new page, which is not what you want.
 </p>
 
-<div class="box-tip">
-<p class="tip">
-<span class="tip">Tip:</span>
-If you would prefer not to clutter up your files with
-<kbd>.PP</kbd>s, you can use groff&#8217;s &#8220;blank line
-macro&#8221; to instruct groff to interpret blank lines as
-<kbd>.PP</kbd>&#8217;s, like this:
-<br/>
-<span class="pre-in-pp">
-  .blm PP
-</span>
-</p>
-</div>
-
 <!-- -PP- -->
 
 <div class="macro-id-overline">
@@ -812,12 +809,12 @@ italic.  Neither persists past the end of the paragraph.
 <h4 id="pp-color" class="docs" style="margin-top: -.25em;">3. Paragraph 
colour</h4>
 
 <p>
-Mom has no special control macro for colourizing paragraphs.  If you
-wish a colourized paragraph, you must use the macro
+Mom has no special control macro for colourising paragraphs.  If you
+wish a colourised paragraph, you must use the macro
 <a href="color.html#color">COLOR</a>
 or the
 <a href="definitions.html#inline">inline escape</a>,
-<a href="color.html#color-inline"><kbd>\*[&lt;colourname&gt;]</kbd></a>,
+<a 
href="color.html#color-inline"><kbd><nobr>\*[&lt;colourname&gt;]</nobr></kbd></a>,
 <i>after</i> <kbd>.PP</kbd>.  The colour must be one pre-defined (or
 &#8220;initialized&#8221;) with
 <a href="color.html#newcolor">NEWCOLOR</a>
@@ -877,9 +874,9 @@ paragraph whose leading you wish to change.
 <div class="box-tip">
 <p class="tip">
 <span class="note">Warning:</span>
-Changing a paragraph&#8217;s leading will almost certainly screw
-up mom&#8217;s ability to balance the bottom margin of pages.
-Should you absolutely require a change of paragraph&#8217;s leading and
+Changing a paragraph&#8217;s leading will almost certainly screw up
+mom&#8217;s ability to balance the bottom margin of pages.  Should
+you absolutely require a change to a paragraph&#8217;s leading and
 need to get mom back on track leading-wise afterwards, use the
 <a href="docprocessing.html#shim">SHIM</a>
 or
@@ -895,7 +892,7 @@ Mom&#8217;s default paragraph leading (document leading)
 is 16 points, adjusted to fill the page.
 </p>
 
-<h4 id="pp-just-quad" class="docs" style="margin-top: -.25em;">5. 
Justification/quad</h4>
+<h4 id="pp-just-quad" class="docs" style="margin-top: -.25em;">5. 
Justification / quad</h4>
 
 <p>
 The justification/quad-direction of regular text paragraphs (i.e.
@@ -1007,12 +1004,12 @@ that run to more than one paragraph.
 
 <p>
 If you wish to have first paragraphs indented, invoke the macro
-<kbd>.INDENT_FIRST_PARAS</kbd> without an argument, either before or
-after
+INDENT_FIRST_PARAS without an argument, either before or after
 <a href="docprocessing.html#start">START</a>.
 INDENT_FIRST_PARAS is a toggle macro, therefore passing it any
-argument (<b>OFF, QUIT, Q, X</b>...) cancels its effect, meaning
-that first paragraphs will once again not be indented.
+argument (<kbd>OFF</kbd>, <kbd>QUIT</kbd>, <kbd>Q</kbd>,
+<kbd>X</kbd>...) cancels its effect, meaning that first paragraphs
+will once again not be indented.
 </p>
 
 <h4 id="pp-space" class="docs">8. Inter-paragraph spacing</h4>
@@ -1020,11 +1017,12 @@ that first paragraphs will once again not be indented.
 <p>
 By default, mom does not insert a blank line between
 paragraphs.  If you would like her to do so, invoke the macro
-<kbd>.PARA_SPACE</kbd> without an argument, either before or after
+PARA_SPACE without an argument, either before or after
 <a href="docprocessing.html#start">START</a>.
 PARA_SPACE is a toggle macro, therefore passing it any argument
-(<b>OFF, QUIT, Q, X</b>...) cancels its effect, meaning that
-paragraphs will once again not be separated by a blank line.
+(<kbd>OFF</kbd>, <kbd>QUIT</kbd>, <kbd>Q</kbd>, <kbd>X</kbd>...)
+cancels its effect, meaning that paragraphs will once again not be
+separated by a blank line.
 </p>
 
 <p>
@@ -1105,11 +1103,12 @@ expect the blank line to appear.
 </ul>
 
 <p>
-Heads, subheads, and deeper levels of section headings are handled by 
-a single macro HEADING to which you pass an argument stating the
-desired level.  <kbd>.HEADING 1 &quot;&lt;text&gt;&quot;</kbd>, for
-example, would be a main head; <kbd>.HEADING 2
-&quot;&lt;text&gt;&quot;</kbd> would be a subhead; etc.
+Heads, subheads, and deeper levels of section headings are
+handled by a single macro, HEADING, to which you pass an
+argument stating the desired level. <kbd><nobr>.HEADING 1
+&quot;&lt;text&gt;&quot;</nobr></kbd>, for example, would be a main
+head; <kbd><nobr>.HEADING 2 &quot;&lt;text&gt;&quot;</nobr></kbd>
+would be a subhead; etc.
 </p>
 
 <p>
@@ -1140,7 +1139,7 @@ By default, a blank line precedes headings, regardless of 
the level.
 Mom initially sets up a very basic style for nine levels of heading,
 of which you can have an infinite number, although as has been said,
 if you need more than four levels of heading, you should consider
-re-organizing your material.  The pared-down style of mom&#8217;s
+re-organising your material.  The pared-down style of mom&#8217;s
 defaults is intentional; it is expected that you will design
 headings to your own specifications with the
 <a href="definitions.html#controlmacro">control macro</a>,
@@ -1338,7 +1337,7 @@ which may be given in any order:
 <p>
 You may enter your entire argument list on a single line, or, if it
 is very long, break it into shorter lines with the
-&#8220;line-continued&#8221; backslash {<kbd>\</kbd>), as shown
+&#8220;line-continued&#8221; backslash (<kbd>\</kbd>), as shown
 above.
 </p>
 
@@ -1468,7 +1467,7 @@ Macro: <b>PREFIX_CHAPTER_NUMBER</b> <kbd 
class="macro-args">&lt;none&gt; | &lt;c
 
 <p>
 If, in addition to numbering heads, you want mom to prepend the
-chapter number, invoke <kbd>PREFIX_CHAPTER_NUMBER</kbd>.
+chapter number, invoke <kbd>.PREFIX_CHAPTER_NUMBER</kbd>.
 </p>
 
 <p>
@@ -1531,11 +1530,11 @@ numbered head element of each collated document).
 
 <p>
 PREFIX_CHAPTER_NUMBER can be disabled by passing it any argument
-other than a digit (e.g. <b>OFF, QUIT, END, X</b>, etc), although,
-as noted above, mom will keep, and&mdash;in the case of collated
-documents&mdash;increment the chapter number, allowing you to turn
-prefixing of chapter numbers to numbered head elements off and on
-according to your needs or whims.
+other than a digit (e.g. (<kbd>OFF</kbd>, <kbd>QUIT</kbd>, <kbd>Q</kbd>,
+<kbd>X</kbd>...), although, as noted above, mom will keep,
+and&mdash;in the case of collated documents&mdash;increment the
+chapter number, allowing you to turn prefixing of chapter numbers to
+numbered head elements off and on according to your needs or whims.
 </p>
 
 <div class="box-tip">
@@ -1918,7 +1917,7 @@ The second argument is the number of times to repeat the 
character.
 </p>
 
 <p>
-The third argument is a +|-value by which to raise (+) or lower (-)
+The third argument is a +|-value by which to raise (-) or lower (+)
 the character in order to make it appear visually centred between
 sections of text.  This lets you make vertical adjustments to
 characters that don&#8217;t sit on the
@@ -1939,7 +1938,7 @@ Mom&#8217;s default for LINEBREAK_CHAR is
 <span class="pre-in-pp">
   .LINEBREAK_CHAR * 3 -3p
 </span>
-ie three asterisks, lowered 3 points from their normal vertical
+i.e. three asterisks, raised 3 points from their normal vertical
 position (for
 <a href="docprocessing.html#printstyle">PRINTSTYLE <kbd>TYPESET</kbd></a>;
 the vertical adjustment is -2 points for
@@ -2075,11 +2074,11 @@ The text of quotes and blockquotes is output 
immediately, and may therefore
 start on one page and finish on the next.  If you wish to keep the
 text together as a block, deferred to the following page if the
 block doesn&#8217;t all fit on one page, wrap
-(BLOCK)QUOTE&nbsp;/&nbsp;(BLOCK)QUOTE&nbsp;OFF
+<kbd><nobr>(BLOCK)QUOTE...(BLOCK)QUOTE&nbsp;OFF</nobr></kbd>
 inside a
-<a href="images.html#floats-intro">float</a>.  If you further wish to
-force a page break before the floated quote or blockquote (leaving
-whitespace at the bottom of the page, pass
+<a href="images.html#floats-intro">float</a>.
+If you further wish to force a page break before the floated quote
+or blockquote (leaving whitespace at the bottom of the page, pass
 <a href="images.html#float">FLOAT</a>
 the <kbd>FORCE</kbd> argument.
 <span class="pre-in-pp">
@@ -2102,7 +2101,9 @@ Quotes and blockquotes may be labelled and/or captioned 
identically to
 with the macros
 <a href="images.html#label">LABEL</a>
 and
-<a href="images.html#caption">CAPTION</a>.
+<a href="images.html#caption">CAPTION</a>
+(see
+<a href="images.html#float-label-caption">Labelling and captioning floats</a>).
 </p>
 
 <!-- -QUOTE- -->
@@ -2251,7 +2252,8 @@ below quotes, invoke
 with no argument.  If you wish to restore mom&#8217;s
 default behaviour regarding the spacing of quotes (see
 <a href="#quote-spacing">Quote spacing</a>),
-invoke the macro with any argument (<kbd>OFF, QUIT, END, X</kbd>...)
+invoke the macro with any argument (<kbd>OFF</kbd>, <kbd>QUIT</kbd>,
+<kbd>END</kbd>, <kbd>X</kbd>...)
 </p>
 
 <div class="box-tip">
@@ -2268,10 +2270,10 @@ This macro also sets mom&#8217;s spacing policy for
 By default in
 <a href="docprocessing.html#printstyle">PRINTSTYLE TYPEWRITE</a>,
 mom underlines quotes.  If you&#8217;d rather she didn&#8217;t,
-invoke <kbd>.UNDERLINE_QUOTES</kbd> with any argument (<b>OFF,
-QUIT, END, X</b>...) to disable the feature.  Invoke it without
-an argument to restore mom&#8217;s default underlining of
-quotes.
+invoke <kbd>.UNDERLINE_QUOTES</kbd> with any argument
+(<kbd>OFF</kbd>, <kbd>QUIT</kbd>, <kbd>END</kbd>, <kbd>X</kbd>...)
+to disable the feature.  Invoke it without an argument to restore
+mom&#8217;s default underlining of quotes.
 </p>
 
 <p>
@@ -2280,7 +2282,7 @@ she set them in italic, you must follow each instance of 
QUOTE with
 the typesetting macro
 <a href="typesetting.html#font">FT I</a>.
 Furthermore, since mom underlines all instances of italics by
-default in <b>PRINTSTYLE TYPEWRITE</b>, you must also make sure that
+default in PRINTSTYLE&nbsp;TYPEWRITE, you must also make sure that
 ITALIC_MEANS_ITALIC is enabled (see
 <a href="docprocessing.html#typewrite-control">PRINTSTYLE TYPEWRITE control 
macros</a>).
 </p>
@@ -2397,7 +2399,7 @@ space allotted for it, you&#8217;d do
 <span class="note">Note:</span>
 The aliases CITE and CITATION may be used in place of the BLOCKQUOTE
 tag, as well as in any of the control macros that begin or end with
-<kbd>BLOCKQUOTE_</kbd>.
+BLOCKQUOTE_.
 </p>
 </div>
 
@@ -2438,7 +2440,7 @@ using BLOCKQUOTE_STYLE.
 <kbd>BLOCKQUOTE_INDENT</kbd> takes one of two kinds of argument: an
 integer representing the amount by which to multiply the argument
 passed to
-<a href="#para-indent"><kbd>.PARA_INDENT</kbd></a>
+<a href="#para-indent">PARA_INDENT</a>
 (by default, 2
 <a href="definitions.html#em">ems</a>
 for TYPESET, 3
@@ -2460,7 +2462,7 @@ and 1 (for
 <p class="tip">
 <span class="note">Note:</span>
 If your PARA_INDENT is 0 (i.e. no indenting of the first line of
-paragraphs), you <i>must</i> set a BLOCKQUOTE_INDENT yourself, with
+paragraphs), you must set a BLOCKQUOTE_INDENT yourself, with
 a unit of measure appended to the argument.  Mom has no default for
 BLOCKQUOTE_INDENT if paragraph first lines are not being indented.
 </p>
@@ -2480,8 +2482,8 @@ below blockquotes, invoke
 with no argument.  If you wish to restore mom&#8217;s default
 behaviour regarding the spacing of blockquotes (see
 <a href="#quote-spacing">Quote spacing</a>),
-invoke the macro with any argument (<b>OFF, QUIT, END,
-X</b>...).
+invoke the macro with any argument (<kbd>OFF</kbd>, <kbd>QUIT</kbd>,
+<kbd>END</kbd>, <kbd>X</kbd>...).
 </p>
 
 <div class="box-tip">
@@ -2523,8 +2525,9 @@ Inline escape: <b><kbd>\*[CODE]</kbd></b>
 </p>
 
 <p>
-When you invoke the macro <kbd>.CODE</kbd> or insert <kbd>\*[CODE]</kbd> into
-running text, mom switches to a
+When you invoke the macro CODE or insert
+<kbd><nobr>\*[CODE]</nobr></kbd> into running text, mom switches to
+a
 <a href="definitions.html#fixedwidthfont">fixed-width font</a>
 (Courier, by default) and turns
 <a href="goodies.html#smartquotes">SMARTQUOTES</a>
@@ -2613,32 +2616,32 @@ introducing unwanted vertical whitespace.
 
 <p>
 Passing any argument other than <kbd>BR</kbd>, <kbd>BREAK</kbd> or
-<kbd>SPREAD</kbd> to CODE (e.g. <kbd>OFF, QUIT, END, X,</kbd> etc.)
-turns CODE off and returns the family, font, and smartquotes back to
-their former state.
+<kbd>SPREAD</kbd> to CODE (e.g. <kbd>OFF</kbd>, <kbd>QUIT</kbd>,
+<kbd>END</kbd>, <kbd>X</kbd>, etc) turns CODE off and returns the
+family, font, and smartquotes back to their former state.
 </p>
 
 <h4 class="docs" style="font-size: 102%">Using <kbd>\*[CODE]</kbd> inline</h4>
 
 <p>
-<kbd>\*[CODE]</kbd> invokes <kbd>.CODE</kbd>, allowing you to
+<kbd><nobr>\*[CODE]</nobr></kbd> invokes <kbd>.CODE</kbd>, allowing you to
 bracket code snippets inline.  It does not accept the <kbd>BR</kbd>,
 <kbd>BREAK</kbd>, or <kbd>SPREAD</kbd> arguments.  It is most useful
 for short snippets, as in the following example.
 <br/>
 <span class="pre-in-pp">
-  \*[CODE]apropos\*[CODE OFF] and \*[CODE]man&nbsp;-k\*[CODE] are identical.
+  \*[CODE]apropos\*[CODE X] and \*[CODE]man&nbsp;-k\*[CODE X] are identical.
 </span>
 </p>
 
 <p>
-<kbd>\*[CODE]</kbd> does not permit changing the escape character,
-so <kbd>\e</kbd> or a doubled backslash must be used.  Furthermore,
-if your code starts with a period, you must enter it as
+<kbd><nobr>\*[CODE]</nobr></kbd> does not permit changing the escape
+character, so <kbd>\e</kbd> or a doubled backslash must be used.
+Furthermore, if your code starts with a period, you must enter it as
 &#8220;<kbd>\&.</kbd>&#8221;.
 <br/>
 <span class="pre-in-pp">
-  Registers are created with the \*[CODE]\&.nr\*[CODE OFF] request.
+  Registers are created with the \*[CODE]\&.nr\*[CODE X] request.
 </span>
 </p>
 
@@ -2662,10 +2665,10 @@ it with
   .CODE OFF
   \&.  As this demonstrates...
 </span>
-Use of <kbd>\*[CODE]</kbd> inline does not require the
-<kbd>\c</kbd>, however periods and apostrophes after
-<kbd>\*[CODE&nbsp;OFF]</kbd> still need to be introduced with
-<kbd>\&</kbd>, as in this example:
+Use of <kbd><nobr>\*[CODE]</nobr></kbd> inline does not require
+the <kbd>\c</kbd>, however periods and apostrophes after
+<kbd><nobr>\*[CODE&nbsp;X]</nobr></kbd> still need to be introduced
+with <kbd>\&</kbd>, as in this example:
 <br/>
 <span class="pre-in-pp">
   ...append the unit of measure \*[CODE]p\*[CODE&nbsp;OFF]\&. New sentence...
@@ -2711,7 +2714,7 @@ CODE_SIZE works a little differently from the other _SIZE 
macros
 macros</a>).  The argument you pass it is a percentage of the
 prevailing document point size.  It does not require a pre-pended
 plus (<kbd>+</kbd>) or minus (<kbd>-</kbd>) sign, nor an appended
-percent sign (<kbd>%</kbd>).  Thus, is you want the point size of your CODE 
font to be
+percent sign (<kbd>%</kbd>).  Thus, if you want the point size of your CODE 
font to be
 90% of the prevailing document point size, you enter:
 <br/>
 <span class="pre-in-pp">
@@ -2725,9 +2728,9 @@ technically the same point size.  CODE_SIZE lets you 
choose a
 percentage of the prevailing point size for your fixed-width
 CODE font so it doesn&#8217;t look gangly or minuscule in relation
 to the type around it.  All invocations of <kbd>.CODE</kbd> or
-<kbd>\*[CODE]</kbd> will use this size, so that if you decide to
-change the prevailing point size of your document, the CODE font
-will be scaled proportionally.
+<kbd><nobr>\*[CODE]</nobr></kbd> will use this size, so that if you
+decide to change the prevailing point size of your document, the
+CODE font will be scaled proportionally.
 </p>
 
 <div class="rule-short"><hr/></div>
@@ -2757,7 +2760,8 @@ Setting lists with mom is easy.  First, you initialize a 
list with
 the LIST macro.  Then, for every item in the list, you invoke
 the macro <kbd>.ITEM</kbd> followed by the text of the item.
 When a list is finished, you exit the list with
-<kbd>.LIST&nbsp;OFF</kbd> (or <kbd>QUIT, END, BACK,</kbd> etc.)
+<kbd>.LIST&nbsp;OFF</kbd> (or <kbd>QUIT</kbd>, <kbd>END</kbd>,
+<kbd>BACK</kbd>, etc.)
 </p>
 
 <p>
@@ -2765,7 +2769,7 @@ By default mom starts each list with the enumerator flush 
with the
 left margin of running text that comes before it, like this:
 <br/>
 <span class="pre-in-pp">
-  My daily schedule needs organizing.  I can&#8217;t
+  My daily schedule needs organising.  I can&#8217;t
   seem to get everything done I want.
   o an hour&#8217;s worth of exercise
   o time to prepare at least one healthy
@@ -2873,7 +2877,7 @@ The optional arguments <kbd>BULLET</kbd>, <kbd>DASH</kbd>,
 uppercase letters), <kbd>alpha</kbd> (for lowercase letters),
 <kbd>ROMAN&lt;n&gt;</kbd> (for uppercase roman numerals),
 <kbd>roman&lt;n&gt;</kbd> (for lowercase roman numerals) tell
-<kbd>mom</kbd> what kind of enumerator to use for a given list.
+mom what kind of enumerator to use for a given list.
 </p>
 
 <p>
@@ -2967,7 +2971,7 @@ The size and vertical positioning of special characters 
may be
 adjusted with
 <a href="definitions.html#inlines">inline escapes</a>
 in the argument passed to USER.  For example, to raise the position
-of <kbd>\[sq]</kbd> slightly, you might do
+of <kbd><nobr>\[sq]</nobr></kbd> slightly, you might do
 <span class="pre-in-pp">
   .LIST USER "\*[UP .25p]\[sq]\*[DOWN .25p]"
     or
@@ -3072,7 +3076,7 @@ which would produce
 </p>
 </div>
 
-<h3 class="docs">Exiting lists &ndash; LIST OFF/BACK or QUIT_LISTS</h3>
+<h3 class="docs">Exiting lists &ndash; LIST OFF / BACK or QUIT_LISTS</h3>
 
 <p>
 Any single argument to <kbd>LIST</kbd> other than
@@ -3259,12 +3263,12 @@ produces (approximately)
 <span class="pre-in-pp">
   Lorem ipsum dolor sit amet, consetetur sadipscing elitr,
   sed diam nonumy eirmod tempor invidunt ut labore.
-      o List 1 item
-      o List 1 item
+      &bull; List 1 item
+      &bull; List 1 item
           - List 2 item
           - List 2 item
-      o List 1 item
-      o List 1 item
+      &bull; List 1 item
+      &bull; List 1 item
   Lorem ipsum dolor sit amet, consetetur sadipscing elitr,
   sed diam nonumy eirmod tempor invidunt ut labore.
 </span>
@@ -3273,7 +3277,7 @@ produces (approximately)
 <h4 id="reset-list" class="docs" style="margin-top: -.25em;">2. Resetting an 
initialized list&#8217;s enumerator &ndash; RESET_LIST</h4>
 
 <p>
-In nested lists, if your choice of list enumerator for a given level
+In nested lists, if your choice of enumerator for a given level
 of list is <kbd>DIGIT</kbd>, <kbd>ALPHA</kbd>, <kbd>alpha</kbd>,
 <kbd>ROMAN</kbd> or <kbd>roman</kbd>, you may sometimes want to
 reset the list&#8217;s enumerator when you return to that list.
@@ -3281,37 +3285,34 @@ Consider the following:
 <br/>
 <span class="pre-in-pp">
   Things to do religiously each and every day:
-  1. Take care of the dog
-     a) walk every day
-     b) brush once a week
-        - trim around the eyes every fourth brushing
-        - don&#8217;t forget to check nails
-  2. Feed the cat
-     a) soft food on Mon., Wed. and Fri.
-     b) dry food on Tues., Thurs. and Sat.
-     c) canned tuna on Sunday
+  &bull; take care of the dog
+    a) walk every day
+    b) brush once a week
+       - trim around the eyes every fourth brushing
+       - don&#8217;t forget to check nails
+  &bull; feed the cat
+    d) soft food on Mon., Wed. and Fri.
+    e) dry food on Tues., Thurs. and Sat.
+    f) canned tuna on Sunday
 </span>
 </p>
 
 <p>
-Normally, within a nested list, when you return to an
-incrementally-enumerated list, the enumerator continues incrementing
-from where it left off.  That means, in the example above, the
-normal state of affairs for the alpha&#8217;ed list under
-<br/>
-<span class="pre-in-pp">
-  2.  Feed the cat
-</span>
-would be d), e) and f).  The solution, in such a case, is simply
-to reset the enumerator&mdash;before <kbd>.ITEM</kbd>&mdash;with
-the macro <kbd>.RESET_LIST</kbd>.  By default, with no argument,
-<kbd>.RESET_LIST</kbd> resets the enumerator to 1, A, a, I or i
-depending on the style of enumerator.  You may, if you wish, pass
-<kbd>.RESET_LIST</kbd> a
-<a href="definitions.html#numericargument">numeric argument</a>
-representing the starting enumerator for the reset (if different
-from "1"), although I can&#8217;t at present think of a use for this
-feature.
+The alpha-enumerated items under &#8220;Feed the cat&#8221;
+would be normally a), b), c), but we want d), e), f).  The
+solution is to reset the second <kbd>.LIST alpha</kbd>&#8217;s
+enumerator&mdash;before the first <kbd>.ITEM</kbd>&mdash;with
+the macro RESET_LIST.
+</p>
+
+<p>
+With no argument, <kbd>.RESET_LIST</kbd> resets an incrementing
+enumerator to 1, A, a, I or i depending on the style of enumerator.
+If you pass <kbd>.RESET_LIST</kbd> a
+<a href="definitions.html#numericargument">numeric argument</a>,
+it represents the starting postion for an incrementing enumerator.  In
+the example above, <kbd>.RESET_LIST 4</kbd>&nbsp;starts the second
+alpha-ed list at d).
 </p>
 
 <h4 id="pad-list-digits" class="docs" style="margin-top: -.25em;">3. Padding 
digit enumerators &ndash; PAD_LIST_DIGITS</h4>
@@ -3456,7 +3457,7 @@ for instructions on line-numbered endnotes.)
 <div class="box-tip">
 <p class="tip">
 <span class="note">Note:</span>
-Do not use <kbd>NUMBER_LINES</kbd> inside 
+Do not use NUMBER_LINES inside 
 <a href="#quote">QUOTE</a>
 or
 <a href="#blockquote">BLOCKQUOTE</a>.
@@ -3476,8 +3477,8 @@ The first time you invoke
 you must, at a minimum, tell it what line number you want the
 <i>next</i>
 <a href="definitions.html#outputline">output line</a>
-to have.  The optional arguments <kbd>which lines to number</kbd>
-and <kbd>gutter</kbd> allow you to state which lines should
+to have.  The optional arguments <kbd>&lt;which lines to number&gt;</kbd>
+and <kbd>&lt;gutter&gt;</kbd> allow you to state which lines should
 be numbered (e.g. every five or every ten lines), and the gutter to
 place between line numbers and
 <a href="definitions.html#running">running text</a>.
@@ -3494,7 +3495,7 @@ subsequent output lines sequentially.
 
 <p>
 If you want only every five lines numbered, pass mom the optional
-<kbd>which lines to number</kbd> argument, like this:
+<kbd>&lt;which lines to number&gt;</kbd> argument, like this:
 <span class="pre-in-pp">
   .NUMBER_LINES 1 5
 </span>
@@ -3511,15 +3512,16 @@ Hence, in the above example, line number <kbd>1</kbd> 
will
 </p>
 
 <p>
-If you want line number <kbd>1</kbd> to be numbered, you have to
-invoke <kbd>.NUMBER_LINES 1 1</kbd> before the first output line
-you want numbered, then study your <i>output</i> copy and determine
-where best to insert the following in your <i>input</i> input text:
+If you want line number <kbd>1</kbd> to be numbered, you have
+to invoke <kbd><nobr>.NUMBER_LINES 1 1</nobr></kbd> before the
+first output line you want numbered, then study your <i>output</i>
+copy and determine where best to insert the following in your
+<i>input</i> text:
 <br/>
 <span class="pre-in-pp">
   .NUMBER_LINES \n[ln] 5
 </span>
-(The escape, <kbd>\n[ln]</kbd>, ensures that NUMBER_LINES
+(The escape <kbd>\n[ln]</kbd> ensures that NUMBER_LINES
 automatically supplies the correct value for the first argument,
 <kbd>&lt;start number&gt;</kbd>.)
 </p>
@@ -3571,7 +3573,7 @@ option to resume, using
 <span class="pre-in-pp">
   .NUMBER_LINES&nbsp;OFF
 </span>
-(or <kbd>END, QUIT, X,</kbd> etc).
+(or <kbd>END</kbd>, <kbd>QUIT</kbd>, <kbd>X</kbd>, etc).
 </p>
 
 <p>To resume line numbering:
@@ -3600,7 +3602,7 @@ desired result.
       you should re-invoke, at a minimum,
       <kbd>.NUMBER_LINES&nbsp;1</kbd> for each collated
       document, in order to ensure that each begins with the
-      number, <kbd>1</kbd>, prepended to the first line.
+      number <kbd>1</kbd> prepended to the first line.
   </li>
   <li style="margin-top: .25em;">Occasionally, you may want to
       change the current gutter between line numbers and running
@@ -3704,27 +3706,25 @@ or
 <span class="pre-in-pp">
   .NUMBER_BLOCKQUOTE_LINES
 </span>
-either before or after <kbd>NUMBER_LINES</kbd>.  Both behave
-identically with respect to the affected macro (i.e. <kbd>QUOTE</kbd>
-or <kbd>BLOCKQUOTE</kbd>).
+either before or after NUMBER_LINES. Both behave identically with
+respect to the affected macro (i.e. QUOTE or BLOCKQUOTE).
 </p>
 
 <h5 id="number-quote-lines-selective" class="docs" style="font-size: 
87%">&bull;&nbsp;Selectively enabling line numbering for QUOTEs and 
BLOCKQUOTEs</h5>
 
 <p>
-If you&#8217;d like to enable line numbering
-selectively for quotes and blockquotes <i>only</i>, enable
-<kbd>NUMBER_QUOTE_LINES</kbd> or <kbd>NUMBER_BLOCKQUOTE_LINES</kbd>
-first, followed by <kbd>NUMBER_LINES&nbsp;&lt;n&gt;</kbd>, where
-<kbd>&lt;n&gt;</kbd> is the first line number of the quote
-or blockquote.  Afterwards, enter your <kbd>QUOTE</kbd> or
-<kbd>BLOCKQUOTE</kbd>.  When the quote or blockquote is finished (i.e.
-after <kbd>QUOTE&nbsp;OFF</kbd> or <kbd>BLOCKQUOTE&nbsp;OFF</kbd>),
-turn line numbering off.  Each subsequent quote or blockquote you
-want line numbered requires only <kbd>NUMBER_LINES &lt;n&gt;</kbd>
-(with a corresponding <kbd>NUMBER_LINES OFF</kbd>) until you turn
-<kbd>NUMBER_QUOTE_LINES</kbd> or <kbd>NUMBER_BLOCKQUOTE_LINES</kbd>
-off.
+If you&#8217;d like to enable line numbering selectively for quotes
+and blockquotes <i>only</i>, invoke <kbd>.NUMBER_QUOTE_LINES</kbd>
+or <kbd>.NUMBER_BLOCKQUOTE_LINES</kbd> first, followed by
+<kbd>.NUMBER_LINES&nbsp;&lt;n&gt;</kbd>, where <kbd>&lt;n&gt;</kbd>
+is the first line number of the quote or blockquote.  Afterwards,
+enter your QUOTE or BLOCKQUOTE.  When the quote or blockquote
+is finished (i.e. after <kbd>.QUOTE&nbsp;OFF</kbd> or
+<kbd>.BLOCKQUOTE&nbsp;OFF</kbd>), turn line numbering off.  Each
+subsequent quote or blockquote you want line numbered requires
+only <kbd>.NUMBER_LINES &lt;n&gt;</kbd> (with a corresponding
+<kbd>.NUMBER_LINES OFF</kbd>) until you turn NUMBER_QUOTE_LINES or
+NUMBER_BLOCKQUOTE_LINES off.
 </p>
 
 <p>
@@ -3759,13 +3759,13 @@ or blockquotes to hang outside a document&#8217;s 
overall left
 margin and be reliably flush with the line numbers of paragraph
 text.  Consequently, line numbers in quotes or blockquotes hang
 to the left of the quote, separated by the currently active
-gutter for <kbd>NUMBER_LINES</kbd>.
+gutter for NUMBER_LINES.
 </p>
 
 <p>
-If you&#8217;d like to change the line number gutter for
-quotes or blockquotes, invoke <kbd>NUMBER_QUOTE_LINES</kbd> or
-<kbd>NUMBER_BLOCKQUOTE_LINES</kbd> with a digit representing the
+If you&#8217;d like to change the line number gutter for quotes
+or blockquotes, invoke <kbd>.NUMBER_QUOTE_LINES</kbd> or
+<kbd>.NUMBER_BLOCKQUOTE_LINES</kbd> with a digit representing the
 number of
 <a href="definitions.html#figurespace">figure spaces</a>
 you&#8217;d like between the line numbers and the quoted text, like this:
@@ -3798,8 +3798,8 @@ appear in the output copy.
 </p>
 
 <p>
-Once having turned <kbd>NUMBER_QUOTE_LINES</kbd> or
-<kbd>NUMBER_BLOCKQUOTE_LINES</kbd> on, you may disable them with
+Once having turned NUMBER_QUOTE_LINES or NUMBER_BLOCKQUOTE_LINES on,
+you may disable them with
 <span class="pre-in-pp">
   .NUMBER_QUOTE_LINES OFF
 </span>
@@ -3952,7 +3952,8 @@ the page the deferred ones were moved to, add the space 
manually by
 putting a
 <a href="typesetting.html#space"><kbd>.SPACE</kbd></a>
 command at the end of the footnote text, before
-<kbd>.FOOTNOTE&nbsp;OFF</kbd> (or <kbd>X, QUIT, EXIT</kbd>, etc).
+<kbd>.FOOTNOTE&nbsp;OFF</kbd> (or <kbd>OFF</kbd>, <kbd>QUIT</kbd>,
+<kbd>END</kbd>, <kbd>X</kbd>, etc).
 </p>
 
 <p>
@@ -4084,8 +4085,9 @@ for fill modes.
 In the second instance, you must explicitly tell mom that
 you want input text after <kbd>.FOOTNOTE&nbsp;OFF</kbd> to
 begin on a new output line.  This is accomplished by passing
-<kbd>.FOOTNOTE&nbsp;OFF</kbd> (or <kbd>QUIT, END, X,</kbd> etc) an
-additional argument: <kbd>BREAK</kbd> or <kbd>BR</kbd>.
+<kbd>.FOOTNOTE&nbsp;OFF</kbd> (or <kbd>OFF</kbd>, <kbd>QUIT</kbd>,
+<kbd>END</kbd>, <kbd>X</kbd>, etc) an additional argument:
+<kbd>BREAK</kbd> or <kbd>BR</kbd>.
 </p>
 
 <p>
@@ -4165,7 +4167,7 @@ you insert footnotes into quotes.
 </div>
 
 <div class="box-macro-args">
-Tag: FOOTNOTE <kbd class="macro-args">&lt;toggle&gt; [ BREAK | BR ] | INDENT 
LEFT | RIGHT | BOTH &lt;indent value&gt;</kbd>
+Tag: FOOTNOTE <kbd class="macro-args">&lt;toggle&gt; [ BREAK | BR ] [ INDENT 
LEFT | RIGHT | BOTH &lt;indent value&gt; ]</kbd>
 </div>
 
 <p class="requires">
@@ -4177,8 +4179,9 @@ See <span style="font-style: normal"><a 
href="#footnote-note">HYPER-IMPORTANT NO
 <p>
 FOOTNOTE is a toggle macro, therefore invoking it on a line by
 itself allows you to enter a footnote in the body of a document.
-Invoking it with any argument other than INDENT (i.e. <kbd>OFF,
-QUIT, END, X...</kbd>) tells mom you&#8217;re finished.
+Invoking it with any argument other than <kbd>INDENT</kbd> (i.e.
+<kbd>OFF</kbd>, <kbd>QUIT</kbd>, <kbd>END</kbd>, <kbd>X</kbd>...)
+tells mom you&#8217;re finished.
 </p>
 
 <p>
@@ -4238,9 +4241,10 @@ explanation and examples
 In
 <a href="definitions.html#filled">no-fill</a>
 modes, the optional argument <kbd>BREAK</kbd> or <kbd>BR</kbd> may
-be used after the <kbd>OFF</kbd> (or <kbd>QUIT, END, X,</kbd> etc.)
-argument to instruct mom not to join the next input line to the
-previous output.  See
+be used after the <kbd>OFF</kbd> (or <kbd>OFF</kbd>,
+<kbd>QUIT</kbd>, <kbd>END</kbd>, <kbd>X</kbd>, etc) argument to
+instruct mom not to join the next input line to the previous output.
+See
 <a href="#fn-and-punct-nofill">here</a>
 for a more complete explanation, with examples.
 </p>
@@ -4304,13 +4308,13 @@ using FOOTNOTE_STYLE.
 <h4 id="footnote-markers" class="docs" style="margin-top: -1.25em;">2. 
Footnote markers &ndash; FOOTNOTE_MARKERS</h4>
 
 <p>
-If you don&#8217;t want footnote markers, in either the body of
+If you don&#8217;t want footnote markers in either the body of
 the document or beside footnote entries themselves, toggle them
-off with <kbd>.FOOTNOTE_MARKERS&nbsp;OFF</kbd> (or <kbd>END, QUIT,
-X</kbd>...).  This means, of course, that you&#8217;ll
-have to roll your own.  If you want them back on, invoke
-<kbd>.FOOTNOTE_MARKERS</kbd> with no argument.  Footnote markers are
-on by default.
+off with <kbd>.FOOTNOTE_MARKERS&nbsp;OFF</kbd> (or <kbd>OFF</kbd>,
+<kbd>QUIT</kbd>, <kbd>END</kbd>, <kbd>X</kbd>...).  This means,
+of course, that you&#8217;ll have to roll your own.  If you want
+them back on, invoke <kbd>.FOOTNOTE_MARKERS</kbd> with no argument.
+Footnote markers are on by default.
 </p>
 
 <p>
@@ -4422,22 +4426,27 @@ footnotes either by single line numbers, or line 
ranges.  If
 what you want is a single line number, you need only invoke
 <kbd>.FOOTNOTE</kbd>, <i>without the terminating</i> <kbd>\c</kbd>,
 at the appropriate place in running text.  Input lines after the
-footnote has been terminated (e.g. with <kbd>.FOOTNOTE OFF</kbd>)
-must begin at the left margin.
+footnote has been terminated (e.g. with
+<kbd>.FOOTNOTE&nbsp;OFF</kbd>) are entered normally.
 </p>
 
 <p>
 If you want a range of line numbers (e.g.&nbsp;[5-11]&nbsp;),
-insert, directly into the first line of the range you want,
-the <a href="definitions.html#inlines">inline escape</a>,
-<kbd>\*[FN_MARK]</kbd>.  For the terminating line number of the
-range, you need only invoke <kbd>.FOOTNOTE</kbd> (again, without the
-terminating <kbd>\c</kbd>); mom is smart enough to figure out that
-where <kbd>.FOOTNOTE</kbd> was invoked represents the terminating
-line number.  Range-numbered footnotes are always output on the
-page where <kbd>.FOOTNOTE</kbd> was invoked, not the page where
-<kbd>\*[FN_MARK]</kbd> appears (subject, of course, to the rules for
-footnotes that fall too close to the bottom of a page, as outlined
+insert, directly into the first line of the range you want, the
+<a href="definitions.html#inlines">inline escape</a>,
+<kbd><nobr>\*[FN_MARK]</nobr></kbd>.  For the terminating line
+number of the range, you need only invoke <kbd>.FOOTNOTE</kbd>
+(again, without the terminating <kbd>\c</kbd>); mom is smart enough
+to figure out that where <kbd>.FOOTNOTE</kbd> was invoked represents
+the terminating line number.
+</p>
+
+<p>
+Range-numbered footnotes are always output on the page
+where <kbd>.FOOTNOTE</kbd> was invoked, not the page where
+<kbd><nobr>\*[FN_MARK]</nobr></kbd> appears (subject, of course, to
+the rules for footnotes that fall too close to the bottom of a page,
+as outlined
 <a href="#footnote-rules">here</a>).
 </p>
 
@@ -4585,10 +4594,11 @@ you can accomplish with 
<kbd>.FOOTNOTE_SPACING&nbsp;1v</kbd>.
 <h4 id="footnote-rule" class="docs" style="margin-top: -.25em;">7. Footnote 
rule &ndash; FOOTNOTE_RULE</h4>
 
 <p>
-If you don&#8217;t want a footnote separator rule, toggle it off with
-<kbd>.FOOTNOTE_RULE&nbsp;OFF</kbd> (or <kbd>END, QUIT, X</kbd>...).
-Toggle it back on by invoking <kbd>.FOOTNOTE_RULE</kbd> with no
-argument.  The default is to print the rule.
+If you don&#8217;t want a footnote separator rule, toggle it
+off with <kbd>.FOOTNOTE_RULE&nbsp;OFF</kbd> (or <kbd>END</kbd>,
+<kbd>QUIT</kbd>, <kbd>X</kbd>...).  Toggle it back on by invoking
+<kbd>.FOOTNOTE_RULE</kbd> with no argument.  The default is to print
+the rule.
 </p>
 
 <h4 id="footnote-rule-length" class="docs" style="margin-top: -.25em;">8. 
Footnote rule length &ndash; FOOTNOTE_RULE_LENGTH</h4>
@@ -4850,8 +4860,9 @@ See <span style="font-style: normal"><a 
href="#endnote-note">HYPER-IMPORTANT NOT
 <p>
 ENDNOTE is a toggle macro, therefore invoking it on a line by itself
 allows you to enter an endnote in the body of a document.  Invoking
-it with any other argument (i.e. <kbd>OFF, QUIT, END, X...</kbd>)
-tells mom that you&#8217;ve finished the endnote.
+it with any other argument (i.e. <kbd>OFF</kbd>, <kbd>QUIT</kbd>,
+<kbd>END</kbd>, <kbd>X</kbd>...) tells mom that you&#8217;ve
+finished the endnote.
 </p>
 
 <div class="box-tip">
@@ -4901,9 +4912,10 @@ endnotes,
 In
 <a href="definitions.html#filled">no-fill</a>
 modes, the optional argument <kbd>BREAK</kbd> or <kbd>BR</kbd> may
-be used after the <kbd>OFF</kbd> (or <kbd>QUIT, END, X,</kbd> etc.)
-argument to instruct mom not to join the next input line to the
-previous output.  See
+be used after the <kbd>OFF</kbd> (or <kbd>OFF</kbd>,
+<kbd>QUIT</kbd>, <kbd>END</kbd>, <kbd>X</kbd>, etc) argument to
+instruct mom not to join the next input line to the previous output.
+See
 <a href="#fn-and-punct-nofill">here</a>
 for a more complete explanation.  The examples are for
 <kbd>.FOOTNOTE</kbd>, but apply equally to <kbd>.ENDNOTE</kbd>.
@@ -5217,7 +5229,7 @@ with no argument.  And if, god help you, you want to 
change endnote
 single-spacing back to double-spacing for different spacing of
 endnotes output at the ends of separate documents in a collated
 document, invoke <kbd>.SINGLESPACE_ENDNOTES</kbd> with any argument
-(<kbd>OFF, QUIT, Q, X</kbd>...).
+(<kbd>OFF</kbd>, <kbd>QUIT</kbd>, <kbd>END</kbd>, <kbd>X</kbd>...).
 </p>
 
 <!-- -ENDNOTE_PARA_INDENT- -->
@@ -5466,8 +5478,8 @@ default is not to print the centre string.
 <p>
 If, for some reason, having enabled the header/footer centre string
 on endnotes pages, you wish to disable it, invoke the same macro
-with any argument (<kbd>OFF, QUIT, Q, X</kbd>...).
-</p>
+with any argument (<kbd>OFF</kbd>, <kbd>QUIT</kbd>, <kbd>END</kbd>,
+<kbd>X</kbd>...). </p>
 
 <h5 id="endnotes-allows-headers" class="docs" style="margin-top: -.5em; 
margin-bottom: .5em; margin-left: .5em;">&bull;&nbsp;Allow headers on endnotes 
pages</h5>
 
@@ -5695,7 +5707,7 @@ title.
 If you&#8217;re generating a table of contents, you may want the
 endnotes pages title to be in caps, but the toc entry in caps/lower
 case.  If the argument to
-<kbd><a href="#endnotes-header-string">ENDNOTES_HEADER_STRING</a></kbd>
+<a href="#endnotes-header-string">ENDNOTES_HEADER_STRING</a>
 is in caps/lower case and ENDNOTES_HEADER_CAPS is on, this is exactly
 what will happen.
 </p>
@@ -5805,11 +5817,11 @@ nothing to prevent you from doing so.)
 If you want a range of line numbers (e.g.&nbsp;[5-11]&nbsp;),
 insert, directly into the first line of the range you want, the
 <a href="definitions.html#inlines">inline escape</a>,
-<kbd>\*[EN-MARK]</kbd>.  For the terminating line number of the
-range, you need only invoke <kbd>.ENDNOTE</kbd> (again, without the
-terminating <kbd>\c</kbd>).  Mom is smart enough to figure out that
-where <kbd>.ENDNOTE</kbd> is invoked represents the terminating line
-number.
+<kbd><nobr>\*[EN-MARK]</nobr></kbd>.  For the terminating line
+number of the range, you need only invoke <kbd>.ENDNOTE</kbd>
+(again, without the terminating <kbd>\c</kbd>).  Mom is smart enough
+to figure out that where <kbd>.ENDNOTE</kbd> is invoked represents
+the terminating line number.
 </p>
 
 <div id="endnote-linenumbers-note" class="box-tip">
@@ -6420,8 +6432,9 @@ argument of <kbd>RIGHT</kbd> will set a right margin note.
 </p>
 
 <p>
-Any argument, such as <kbd>OFF</kbd> (or <kbd>QUIT, END, X</kbd>,
-etc) exits the current margin note.
+Any argument, such as <kbd>OFF</kbd> (or <kbd>OFF</kbd>,
+<kbd>QUIT</kbd>, <kbd>END</kbd>, <kbd>X</kbd>, etc) exits the
+current margin note.
 </p>
 
 <div class="rule-short"><hr/></div>
@@ -6582,7 +6595,7 @@ pre-defined (or &#8220;initialized&#8221;) colour changes 
the colour
 of both the FINIS string and the em-dashes that surround it.  If you
 use the
 <a href="definitions.html#inline">inline escape</a>,
-<a href="color.html#color-inline"><kbd>\*[&lt;colourname&gt;]</kbd></a>,
+<a 
href="color.html#color-inline"><kbd><nobr>\*[&lt;colourname&gt;]</nobr></kbd></a>,
 in the argument passed to FINIS, only the text will be in the
 new colour; the em-dashes will be in the default document colour
 (usually black).
diff --git a/contrib/mom/momdoc/docprocessing.html 
b/contrib/mom/momdoc/docprocessing.html
index d3442a2..3d10a43 100644
--- a/contrib/mom/momdoc/docprocessing.html
+++ b/contrib/mom/momdoc/docprocessing.html
@@ -196,7 +196,7 @@ the pertinent tag.
 </p>
 
 <p>
-I fear the following may not be adequately covered in the
+I fear the following may not be adequately covered elsewhere in the
 documentation, so just in case:
 </p>
 <ul style="margin-top: -.5em; margin-bottom: .5em;">
@@ -337,8 +337,8 @@ This is because paragraphs are not flex-spaced.  
Typographically,
 the ideal for spaced paragraphs is that the space between them
 remain constant.  Paradoxically, the only way to achieve flush
 bottom margins, or to correct excessive flex-spacing before a
-heading, is by adding flex-space between paragraphs.  This requires
-human judgment, and mom does not presume to decide for you.
+heading, is by adding flex-space between the paragraphs.  This
+requires human judgment, and mom does not presume to decide for you.
 </p>
 
 <p>
@@ -414,9 +414,9 @@ suppresses the SHIM macro, and enables flex-spacing.
 </p>
 
 <p>
-NO_SHIM with any argument (e.g. <b>OFF, QUIT, END, X</b>, etc)
-re-enables shimming if it has been disabled and disables
-flex-spacing.
+NO_SHIM with any argument (e.g. <kbd>OFF</kbd>, <kbd>QUIT</kbd>,
+<kbd>END</kbd>, <kbd>X</kbd>, etc) re-enables shimming if it has
+been disabled and disables flex-spacing.
 </p>
 
 <!-- -FLEX- -->
@@ -459,10 +459,10 @@ insert <kbd>.FLEX</kbd> immediately beforehand.
 
 <p>
 There are some instances where mom inhibits flex-spacing, notably
-after outputting deferred floats and pre-processor material.
-Introducing FLEX by itself in these instances&mdash;say, before a head
-or paragraph&mdash;will not have any effect; you must pass FLEX the
-<kbd>FORCE</kbd> argument.
+after outputting floated material deferred from one page to the
+next.  Introducing FLEX by itself in these instances&mdash;say,
+before a head or paragraph&mdash;will not have any effect; you must
+pass FLEX the <kbd>FORCE</kbd> argument.
 </p>
 
 <div class="box-tip">
@@ -559,8 +559,9 @@ shimmed.
 </p>
 
 <p>
-NO_FLEX with any argument (e.g. <b>OFF, QUIT, END, X</b>, etc)
-re-enables flex-spacing if it has been disabled.
+NO_FLEX with any argument (e.g. <kbd>OFF</kbd>, <kbd>QUIT</kbd>,
+<kbd>END</kbd>, <kbd>X</kbd>, etc) re-enables flex-spacing if it has
+been disabled.
 </p>
 
 <div class="rule-short"><hr/></div>
@@ -679,7 +680,7 @@ macros&#8221;, and they&#8217;re essentially templates.
 <ul style="margin-top: -.5em; margin-bottom: -.5em;">
   <li>PRINTSTYLE&mdash;typeset or typewritten</li>
   <li>DOCTYPE&mdash;the type of document (default, chapter, user-defined, 
letter, slide)</li>
-  <li>COPYSTYLE &mdash;draft or final copy</li>
+  <li>COPYSTYLE&mdash;draft or final copy</li>
 </ul>
 
 <p>
@@ -1056,16 +1057,6 @@ and/or
 <a href="cover.html#doc-cover">Doc covers</a>.
 </p>
 
-<div class="box-tip">
-<p class="tip">
-<span class="note">Note:</span>
-If your
-<a href="#doctype">DOCTYPE</a>
-is CHAPTER, you don&#8217;t need DOCTITLE.  TITLE takes care of
-everything.
-</p>
-</div>
-
 <!-- -SUBTITLE- -->
 
 <div class="macro-id-overline">
@@ -1253,9 +1244,9 @@ what it is with the CHAPTER_STRING macro, like this:
 </p>
 
 <p>
-If you would like a blank chapter string, ie you&#8217;d like
-the chapter number to appear without &#8220;Chapter&#8221;
-beforehand, enter <kbd>.CHAPTER_STRING "\&"</kbd>.
+If you would like a blank chapter string, i.e., you&#8217;d like the
+chapter number to appear without &#8220;Chapter&#8221; beforehand,
+enter <kbd>.CHAPTER_STRING "\&"</kbd>.
 </p>
 
 <!-- -CHAPTER_TITLE- -->
@@ -1925,18 +1916,19 @@ for how mom outputs each part of the page header.)
 </p>
 
 <div class="box-tip">
-<p id="copystyle-note" class="tip">
+<p id="doctype-note" class="tip">
 <span class="note">Note: version 2.1 change</span>
 <br/>
-<kbd>DOCTYPE NAMED "string"</kbd> no longer accepts a colour argument
-after <kbd>"string"</kbd>.  Setting the colour of the string is now
-done with <kbd>DOCTYPE_COLOR &lt;colour&gt;</kbd>.  Default
-underscoring of <kbd>"string"</kbd> in the docheader and on covers
-has been removed.  Use <kbd>DOCTYPE_UNDERLINE</kbd>,
-<kbd>DOC_COVER_DOCTYPE_UNDERLINE</kbd> and/or
-<kbd>COVER_DOCTYPE_UNDERLINE</kbd> to re-enable it.  All three
-take the same arguments listed in the
-<a href="docelement.html#underline">Underline style, rule weight</a>
+<kbd>DOCTYPE NAMED "string"</kbd> no longer accepts a colour
+argument after <kbd>"string"</kbd>.  Setting the colour
+of the string is now done with <kbd><nobr>DOCTYPE_COLOR
+&lt;color&gt;</nobr></kbd>.  Default underscoring of
+<kbd>"string"</kbd> in the docheader and on covers
+has been removed.  Use <kbd>DOCTYPE_UNDERSCORE</kbd>,
+<kbd>DOC_COVER_DOCTYPE_UNDERSCORE</kbd> and/or
+<kbd>COVER_DOCTYPE_UNDERSCORE</kbd> to re-enable it.  All three take
+the same arguments listed in the
+<a href="docelement.html#underscore">Underscore style, rule weight</a>
 section of
 <a href="docelement.html#control-macro-args">Arguments to the control 
macros</a>.
 </p>
@@ -2029,7 +2021,7 @@ numbered, the slide number must be given to one of the 
header/footer
 parts with the
 <a href="definitions.html#inlines">inline escape</a>
 <br/>
-<kbd>\*[SLIDE#]</kbd>.  For example:
+<kbd><nobr>\*[SLIDE#]</nobr></kbd>.  For example:
 <span class="pre-in-pp">
   HEADER "" "My slide presentation" "" \
   FOOTER "" "" "\*[SLIDE#]"
@@ -2071,10 +2063,11 @@ black and two points larger, this is how you&#8217;d do 
it:
 <p class="tip">
 <span class="note">Note:</span>
 Do not use mom&#8217;s
-<a href="inlines.html#inline-size-mom"><kbd>\*[SIZE &plusmn;n]</kbd></a>
-inline escape to change point size in the strings passed to HEADER
-or FOOTER.  Prefer either mom&#8217;s <kbd>\*S[&plusmn;n]</kbd> or
-groff&#8217;s <kbd>\s[&plusmn;n]</kbd>.
+<a 
href="inlines.html#inline-size-mom"><kbd><nobr>\*[SIZE&nbsp;&plusmn;n]</nobr></kbd></a>
+inline escape to change point size in the strings
+passed to HEADER or FOOTER.  Prefer either mom&#8217;s
+<kbd><nobr>\*S[&plusmn;n]</nobr></kbd> or groff&#8217;s
+<kbd><nobr>\s[&plusmn;n]</nobr></kbd>.
 </span>
 </p>
 </div>
@@ -2088,7 +2081,7 @@ each with a choice of configurable parameters.  Modes 
include Box,
 Blinds, Wipe, Fade, and several others.  Parameters include things
 like duration, dimension, and direction.  There are a total of
 twelve modes; for each one there are from one to six configurable
-parameters.  Consult <kbd>man gropdf(1)</kbd> for a complete listing
+parameters.  Consult <kbd>man&nbsp;gropdf(1)</kbd> for a complete listing
 of modes and parameters.
 </p>
 
@@ -2244,13 +2237,12 @@ page with a nasty message.
 
 <p class="tip-bottom">
 <span class="important">Just as important:</span>
-PRINTSTYLE <b>must precede any and all page and style
+<b>PRINTSTYLE must precede any and all page and style
 parameters associated with a document</b> with the exception of
-<kbd>PAPER</kbd>, <kbd>PAGEWIDTH</kbd>, and/or
-<kbd>PAGELENGTH</kbd>, which should be placed at the top of your
-file.  PRINTSTYLE sets up complete templates that include default
-margins, family, fonts, point sizes, and so on.  Therefore, changes
-to any aspect of document style must come afterwards.  For example,
+<kbd>PAPER</kbd>, which should be placed at the top of your file.
+PRINTSTYLE sets up complete templates that include default margins,
+family, fonts, point sizes, and so on.  Therefore, changes to any
+aspect of document style must come afterwards.  For example,
 <br/>
 <span class="pre-in-pp">
   .PAPER A4
@@ -2299,7 +2291,7 @@ are (mostly) ignored.  An important exception is
 point size of headers/footers should they become too crowded.  Most
 of mom&#8217;s inlines affecting the appearance of type are also
 ignored
-(<kbd><a href="inlines.html#inline-size-mom">\*S[&lt;size&gt;]</a></kbd>
+(<a 
href="inlines.html#inline-size-mom"><kbd><nobr>\*S[&lt;size&gt;]</nobr></kbd></a>
 is an exception; there may be a few others).
 </p>
 
@@ -2402,7 +2394,7 @@ for double-spaced, and 12-point for single-spaced.
 <p>
 In PRINTSTYLE <kbd>TYPEWRITE</kbd>, mom, by default, underlines
 anything that looks like italics.  This includes the
-<a href="typesetting.html#slant-inline"><kbd>\*[SLANT]</kbd></a>
+<a href="typesetting.html#slant-inline"><kbd><nobr>\*[SLANT]</nobr></kbd></a>
 <a href="definitions.html#inlines">inline escape</a>
 for pseudo-italics.  (See
 <a href="goodies.html#underline">UNDERLINE</a>
@@ -2453,7 +2445,7 @@ an argument.
 <p>
 While most of the
 <a href="docelement.html#docelement-control">control macros</a>
-have no effect on <b>PRINTSTYLE TYPEWRITE</b>, there
+have no effect on PRINTSTYLE <kbd>TYPEWRITE</kbd>, there
 is an important exception:
 <a href="headfootpage.html#hdrftr-global-size">HEADER_SIZE</a>
 (and by extension, FOOTER_SIZE).  This is
@@ -2466,7 +2458,7 @@ is <kbd>DRAFT</kbd).
 
 <p class="tip-bottom">
 Finally, note that colour is disabled for <kbd>TYPEWRITE</kbd>.  If
-you would like it enabled, for example so PDF links are colourized,
+you would like it enabled, for example so PDF links are colourised,
 invoke the groff
 <a href="definitions.html#primitives">primitive</a>
 '<kbd>.color</kbd>' after PRINTSTYLE.
@@ -2748,9 +2740,13 @@ below have the following meanings:
 
 <p style="margin-top: -.75em;">
 Other macros that deal with type style, or refinements thereof
-(<b>KERN, LIGATURES, HY, WS, SS,</b> etc.), behave normally.
-It is not recommended that you set up tabs or indents prior to
-START.
+(<a href="typesetting.html#kern">KERN</a>,
+<a href="typesetting.html#ligatures">LIGATURES</a>,
+<a href="typesetting.html#hy">HY</a>,
+<a href="typesetting.html#ws">WS</a>,
+<a href="typesetting.html#ss">SS</a>,
+etc.), behave normally.  It is not recommended that you set up tabs
+or indents prior to START.
 </p>
 
 <p>
@@ -2769,8 +2765,12 @@ when invoked prior to START.
 </p>
 
 <p>
-All mom&#8217;s document element tags (PP, HEAD, BLOCKQUOTE,
-FOOTNOTE, etc.) except
+All mom&#8217;s document element tags
+(<a href="docelement.html#pp">PP</a>,
+<a href="docelement.html#heading">HEADING</a>,
+<a href="docelement.html#blockquote">BLOCKQUOTE</a>,
+<a href="docelement.html#footnote">FOOTNOTE</a>,
+etc.) except
 <a href="docelement.html#quote">QUOTE</a>
 set a
 <a href="definitions.html#filled">fill mode</a>
@@ -2793,8 +2793,8 @@ If you routinely make the same changes to mom&#8217;s 
defaults in
 order to create similar documents in a similar style&mdash;in other
 words, you need a template&mdash; you can create style-sheet files
 and include, or &#8220;source&#8221;, them into your mom documents
-with the macro INCLUDE.  The right place for such style sheets is
-after
+with the macro <kbd>.INCLUDE</kbd>.  The right place for such style
+sheets is after
 <a href="#printstyle">PRINTSTYLE</a>
 and before
 <a href="#start">START</a>.
@@ -2802,10 +2802,10 @@ and before
 
 <p>
 Say, for example, in a particular kind of document, you always
-want main heads set in Helvetica Bold Italic, flush left,
-with no underscore.  You&#8217;d create a file, let&#8217;s call it
-<kbd>head-template</kbd>, in which you&#8217;d place the pertinent HEAD
-control macros.
+want main heads set in Helvetica Bold Italic, flush left, with
+no underscore.  You&#8217;d create a file, let&#8217;s call it
+<kbd>head-template</kbd>, in which you&#8217;d place the pertinent
+HEADIING control macros.
 <br/>
 <span class="pre-in-pp">
   .HEADING_STYLE 1 \
@@ -2889,9 +2889,9 @@ The macro
 <a href="color.html#color">COLOR</a>
 and the
 <a href="definitions.html#inlines">inline escape</a>,
-<a href="color.html#color-inline"><kbd>\*[&lt;colorname&gt;]</kbd></a>
+<a 
href="color.html#color-inline"><kbd><nobr>\*[&lt;colorname&gt;]</nobr></kbd></a>
 can be used at any time during document processing for occasional
-colour effects.  However, consistent and reliable colourizing of
+colour effects.  However, consistent and reliable colourising of
 various document elements (the docheader, heads, linebreaks,
 footnotes, pagenumbers, and so on) must be managed through the use
 of the
@@ -2902,7 +2902,7 @@ of the
 Please note that colour is disabled if your
 <a href="#printstyle">PRINTSTYLE</a>
 is <kbd>TYPEWRITE</kbd>.  If you would like it enabled, for example
-so PDF links are colourized, invoke the groff
+so PDF links are colourised, invoke the groff
 <a href="definitions.html#primitives">primitive</a>
 '<kbd>.color</kbd>' after PRINTSTYLE.
 </p>
@@ -2914,7 +2914,7 @@ If you plan to have mom generate a
 <a href="docelement.html#toc">table of contents</a>,
 do not embed colour
 <a href="definitions.html#inlines">inline escapes</a>
-(<a href="color.html#color-inline"><kbd>\*[&lt;colourname&gt;]</kbd></a>)
+(<a 
href="color.html#color-inline"><kbd><nobr>\*[&lt;colourname&gt;]</nobr></kbd></a>)
 in the
 <a href="definitions.html#stringargument">string arguments</a>
 given to any of the
@@ -2983,7 +2983,7 @@ If you set the document leading prior to START with
 <a href="typesetting.html#leading">LS</a>
 or
 <a href="typesetting.html#autolead">AUTOLEAD</a>,
-DOC_LEAD_ADJUST&nbsp;<kbd>OFF</kbd> must come afterwards, like
+<kbd>.DOC_LEAD_ADJUST&nbsp;OFF</kbd> must come afterwards, like
 this:
 <br/>
 <span class="pre-in-pp">
@@ -3069,10 +3069,10 @@ argument.
 <span class="pre-in-pp">
   .DOCHEADER OFF 1.5i
 </span>
-This starts the document 1.5 inches from the top of the page PLUS
+This starts the document 1.5 inches from the top of the page plus
 whatever spacing adjustment mom has to make in order to ensure that
 the first baseline of running text falls on a &#8220;valid&#8221;
-baseline (i.e. one that ensures that the bottom margin of the first
+baseline (i.e., one that ensures that the bottom margin of the first
 page falls where it should).  The distance is measured from the top
 edge of the paper to the
 <a href="definitions.html#baseline">baseline</a>
@@ -3080,14 +3080,14 @@ of the first line of type.
 </p>
 
 <p>
-With <kbd>DOCHEADER OFF</kbd>, it is possible to create your own
+With <kbd>.DOCHEADER OFF</kbd>, it is possible to create your own
 custom docheaders (after
 <a href="#start">START</a>)
 using mom&#8217;s typesetting macros.  It is recommended that if you
 do create a custom docheader, you make
 <a href="docprocessing.html#shim"><kbd>.SHIM</kbd></a>
 the last macro before the first item of your document (for
-example, <kbd>PP</kbd> or <kbd>HEADING&nbsp;1</kbd>.
+example, <kbd>.PP</kbd> or <kbd>.HEADING&nbsp;1</kbd>.
 </p>
 
 <div class="box-tip">
@@ -3152,7 +3152,7 @@ Chapter Title  bold italic, 4 points larger than running 
text
 The
 <a href="definitions.html#family">family</a>
 is the prevailing family of the whole document.  Title, subtitle,
-author and document type are what you supply with the
+author, and document type are what you supply with the
 <a href="#reference-macros">reference macros</a>.
 Any you leave out will not appear; mom will compensate:
 </p>
@@ -3176,10 +3176,10 @@ the space with
 
 <p style="margin-top: -1.5em; margin-left: .5em; margin-right: .5em">
 With the docheader control macros, you can change the family,
-colour, leading and quad direction of the entire docheader.  You can
+colour, leading, and quad direction of the entire docheader.  You can
 also set the style parameters for each part individually.  Style
 parameters include family, font, size, colour, lead, space before,
-caps, smallcaps and underscoring.
+caps, smallcaps, and underscoring.
 </p>
 
 <ul class="macro-list" style="margin-top: -.5em">
@@ -3314,7 +3314,7 @@ you wish to change using an underscore, then supply any 
necessary
 arguments.  The subtitle double-underlined?  No problem.
 <br/>
 <span class="pre-in-pp">
-  .SUBTITLE_UNDERLINE DOUBLE
+  .SUBTITLE_UNDERSCORE DOUBLE
 </span>
 Author in red?
 <br/>
@@ -3495,7 +3495,7 @@ appears.
 </p>
 
 <p>
-If the optional argument, <kbd>COVER</kbd> or <kbd>DOC_COVER</kbd>,
+If the optional argument <kbd>COVER</kbd> or <kbd>DOC_COVER</kbd>
 is given to ATTRIBUTE_STRING, the string argument represents the
 attribution string that will appear on cover or document cover pages
 (see the
@@ -3818,7 +3818,8 @@ in document processing.  Additionally, see
 if you encounter the problem of trying to get mom to put space at
 the tops of pages after the first.)
 </p>
-<div id="behaviour-specific" class="box-code" style="margin-left: 24px;">
+
+<div id="behaviour-specific" class="box-code" style="margin-left: 3.5%">
 <span class="pre" style="color: #302419;">
   MACRO       EFFECT DURING DOCUMENT PROCESSING
   -----       ---------------------------------
@@ -4389,7 +4390,7 @@ text, not any macros following.
 <div class="box-tip">
 <p class="tip">
 <span class="note">Note:</span>
-<a href="inlines.html#b"><kbd>\*[B]</kbd></a>
+<a href="inlines.html#b"><kbd><nobr>\*[B]</nobr></kbd></a>
 cannot be used as a replacement for <kbd>.EL</kbd> when terminating
 a document.
 </p>
diff --git a/contrib/mom/momdoc/goodies.html b/contrib/mom/momdoc/goodies.html
index ce0c6c5..5200873 100644
--- a/contrib/mom/momdoc/goodies.html
+++ b/contrib/mom/momdoc/goodies.html
@@ -159,12 +159,6 @@ The second is the &#8220;official&#8221; name by which the 
macro is
 normally invoked.  After ALIAS, either can be used.
 </p>
 
-<p>
-Note that in ALIAS, you do NOT include the period (dot) that
-precedes the macro when it&#8217;s a
-<a href="definitions.html#controllines">control line</a>.
-</p>
-
 <div class="box-tip">
 <p class="tip">
 <span class="tip">Tip:</span>
@@ -275,7 +269,7 @@ when you&#8217;re in one of the
 <a href="definitions.html#filled">fill modes</a>
 (<a href="typesetting.html#justify">JUSTIFY</a>
 or
-<a href="typesetting.html#quad">QUAD L | R | C | J</a>).
+<a 
href="typesetting.html#quad">QUAD&nbsp;L&nbsp;|&nbsp;R&nbsp;|&nbsp;C&nbsp;|&nbsp;J</a>).
 The same applies to tabs
 (<a href="typesetting.html#tab-set">typesetting</a>
 or
@@ -345,7 +339,7 @@ quoting styles.)
 
 <p>
 Typographically, there is a difference between the inch-mark and
-quotation marks&mdash;a BIG difference.  Sadly, typewriters and computer
+quotation marks&mdash;a big difference.  Sadly, typewriters and computer
 keyboards supply only one: the inch-mark.  While using inches for
 doublequotes is, and always has been, acceptable in typewriter-style
 copy, it has never been, and, God willing, never will be acceptable in
@@ -414,16 +408,16 @@ output the correct quotes.
 
 <p>
 Turn SMARTQUOTES off by passing it any argument not in the argument
-list (e.g. OFF, QUIT, X, etc.)
+list (e.g. <kbd>OFF</kbd>, <kbd>QUIT</kbd>, <kbd>X</kbd>, etc)
 </p>
 
 <p>
 If you&#8217;re using the
 <a href="docprocessing.html#docprocessing">document processing macros</a>
 with
-<a href="docprocessing.html#printstyle">PRINTSTYLE TYPESET</a>,
-SMARTQUOTES is on by default (in the Anglo-American style); with
-<a href="docprocessing.html#printstyle">PRINTSTYLE TYPEWRITE</a>,
+<a href="docprocessing.html#printstyle">PRINTSTYLE&nbsp;TYPESET</a>,
+smartquotes are on by default (in the Anglo-American style); with
+<a href="docprocessing.html#printstyle">PRINTSTYLE&nbsp;TYPEWRITE</a>,
 it&#8217;s off by default (and should probably stay that way).
 </p>
 
@@ -432,7 +426,7 @@ Finally, if you&#8217;re fussy about the kerning of quote 
marks in
 relation to the text they surround, or have special quoting needs,
 you have to enter quote marks by hand using groff&#8217;s native
 <a href="definitions.html#inlines">inline escapes</a>
-for special characters (see <kbd>man groff-char</kbd>
+for special characters (see <kbd>man&nbsp;groff-char</kbd>
 for a complete list of special characters).  Entering quote marks
 this way allows you to use mom&#8217;s
 <a href="inlines.html#inline-kerning-mom">inline kerning escapes</a>
@@ -461,8 +455,8 @@ single quotes:
 Whether or not you have SMARTQUOTES turned on, get into the habit of
 entering the foot-and inch-marks, when you need them, with the
 <a href="definitions.html#inlines">inline escapes</a>
-<kbd>\*[FOOT]</kbd> and
-<kbd>\*[INCH]</kbd>, instead of
+<kbd><nobr>\*[FOOT]</nobr></kbd> and
+<kbd><nobr>\*[INCH]</nobr></kbd>, instead of
 <kbd>'</kbd> and <kbd>"</kbd>.
 </p>
 </div>
@@ -482,8 +476,8 @@ CAPS converts all lower case letters to upper case.
 Primarily, it&#8217;s a support macro used by the
 <a href="docprocessing.html#docprocessing">document processing macros</a>,
 but you may find it helpful on occasion. CAPS is a toggle, therefore
-no argument turns it on, any argument (OFF, QUIT, X, etc.) turns
-it off.
+no argument turns it on, any argument (<kbd>OFF</kbd>,
+<kbd>QUIT</kbd>, <kbd>X</kbd>, etc) turns it off.
 <br/>
 <span class="pre-in-pp">
   .CAPS
@@ -498,7 +492,7 @@ produces, on output
 </span>
 If you wish to capitalise a section of type inline, use the
 <a href="definitions.html#inlines">inline escapes</a>,
-<a href="inlines.html#uc-lc"><kbd>\*[UC]...\*[LC]</kbd></a>
+<a href="inlines.html#uc-lc"><kbd><nobr>\*[UC]...\*[LC]</nobr></kbd></a>
 like this:
 <br/>
 <span class="pre-in-pp">
@@ -570,7 +564,7 @@ this:
 </span>
 Once a string is defined, you can call it any time with the
 <a href="definitions.html#inlines">inline escape</a>
-<kbd>\*[&lt;stringname&gt;]</kbd>.  Using the example
+<kbd><nobr>\*[&lt;name&gt;]</nobr></kbd>.  Using the example
 string above
 <br/>
 <span class="pre-in-pp">
@@ -673,8 +667,10 @@ or
 depth of type at the current point size, invoke <kbd
 class="bold">.SIZESPECS</kbd>, which takes no argument.
 The dimensions are stored in the string registers
-<b>\*[$CAP_HEIGHT]</b>, <b>\*[$X_HEIGHT]</b> and
-<b>\*[$DESCENDER]</b>, respectively, in
+<b><nobr>\*[$CAP_HEIGHT]</nobr></b>,
+<b><nobr>\*[$X_HEIGHT]</nobr></b>,
+and
+<b><nobr>\*[$DESCENDER]</nobr></b>, respectively, in
 <a href="definitions.html#units">machine units</a>
 to which the
 <a href="definitions.html#unitofmeasure">unit of measure</a>,
@@ -794,9 +790,9 @@ UNDERSCORE_WEIGHT also sets the weight of
 If you want underscored text to be in a different colour from the
 text around it, use the
 <a href="color.html#color">COLOR</a>
-macro, rather than the
-<a href="color.html#color-inline">inline escape for changing color</a>.
-In other words, assuming your prevailing text color is black and
+macro rather than the
+<a href="color.html#color-inline">inline escape for changing colour</a>.
+In other words, assuming your prevailing text colour is black and
 you want underscored text in red
 <br/>
 <span class="pre-in-pp">
@@ -809,7 +805,7 @@ rather than
 <span class="pre-in-pp">
   .UNDERSCORE "\*[red]text to underscore\*[black]"
 </span>
-The latter will render the text in red, and the underscore in black.
+The latter will render the text in red but the underscore in black.
 You can use this to create truly rainbow effects if you want, e.g.
 text in red, underscore in blue, and prevailing type in black:
 <br/>
@@ -907,9 +903,9 @@ Macro: <b>UNDERLINE</b> <kbd class="macro-args">toggle</kbd>
 The distinction between underscoring and underlining is that
 underscoring is suitable for occasional effects (a word here,
 a phrase there), whereas underlining underlines whole passages
-of type.  Furthermore, you cannot colourise underlining, and
-there&#8217;s a special macro
-<a href="#underline-specs">UNDERLINE_SPECS</a>
+of type.  Furthermore, you cannot colourise underlining.
+There&#8217;s a special macro,
+<a href="#underline-specs">UNDERLINE_SPECS</a>,
 to control the weight and distance from the baseline of the
 underline.
 
@@ -934,7 +930,8 @@ above.
 <p>
 UNDERLINE is a toggle macro, therefore you invoke it by itself (i.e.
 with no argument) to initiate underlining, and with any argument
-(<kbd>OFF, QUIT, X,</kbd> etc) to turn it off.
+(<kbd>OFF</kbd>, <kbd>QUIT</kbd>, <kbd>END</kbd>, <kbd>X</kbd>, etc)
+to turn it off.
 </p>
 
 <div class="box-tip">
@@ -943,13 +940,13 @@ with no argument) to initiate underlining, and with any 
argument
 Underlining may also be turned on and off
 <a href="definitions.html#inlines">inline</a>
 with the escapes
-<kbd><a href="#ul">\*[UL]...\*[ULX]</a></kbd>.
+<a href="#ul"><kbd><nobr>\*[UL]...\*[ULX]</nobr></kbd></a>.
 </p>
 
 <p class="tip-bottom">
 <span class="additional-note">Additional note:</span>
 In document processing, neither <kbd>.UNDERLINE</kbd> nor
-<kbd>\*[UL]</kbd> persist past the current document element tag.
+<kbd><nobr>\*[UL]</nobr></kbd> persist past the current document element tag.
 For example, if you turn underlining on in a paragraph
 (<kbd><a href="docelement.html#pp">.PP</a></kbd>),
 your next paragraph will not be underlined.
@@ -980,8 +977,8 @@ mom&#8217;s default is 1-1/4 points (1.25p).
 The macro pair,
 <kbd><a href="#underline">.UNDERLINE</a></kbd> /
 <kbd>.UNDERLINE&nbsp;OFF</kbd>, and the inline escapes,
-<kbd>\*[UL]</kbd> / <kbd>\*[ULX]</kbd>, are functionally identical,
-hence, in
+<nobr><kbd>\*[UL]</kbd> / <kbd>\*[ULX]</kbd></nobr>, are
+functionally identical, hence, in
 <a href="definitions.html#filled">fill</a>
 modes
 <br/>
@@ -1079,7 +1076,7 @@ The following uses the Date/Signature example, above, but 
adds
 rules into the whitespace through the use of string tabs and
 mom&#8217;s
 <a href="definitions.html#inlines">inline escape</a>
-<kbd><a href="inlines.html#inline-rule-mom">\*[RULE]</a></kbd>.
+<a href="inlines.html#inline-rule-mom"><kbd><nobr>\*[RULE]</nobr></kbd></a>.
 <br/>
 <span class="pre-in-pp">
   .LL 30P
@@ -1196,7 +1193,7 @@ Whenever you want to fill a line or tab with
 <a href="definitions.html#leader">leaders</a>,
 use the
 <a href="definitions.html#inlines">inline escape</a>
-<kbd>\*[LEADER]</kbd>.  The remainder of the line or
+<kbd><nobr>\*[LEADER]</nobr></kbd>.  The remainder of the line or
 tab will be filled with the leader character. Mom&#8217;s default
 leader character is a period (dot), but you can change it to any
 character you like with
@@ -1256,7 +1253,7 @@ LEADER_CHARACTER takes one argument: a single character 
you would
 like to be used for
 <a href="definitions.html#leader">leaders</a>.
 (See
-<kbd><a href="#leader">\*[LEADER]</a></kbd>
+<a href="#leader"><kbd><nobr>\*[LEADER]</nobr></kbd></a>
 for an explanation of how to fill lines with leaders.)
 </p>
 
@@ -1351,7 +1348,7 @@ When using the
 <a href="docelement.html#pp">PP</a>,
 DROPCAP only works
 </p>
-<ul style="margin-top: -1em; margin-bottom: 0;">
+<ul style="margin-top: -1em; margin-bottom: -.5em;">
   <li>with initial paragraphs (i.e. at the start of the document,
       or after
       <a href="docelement.html#head">HEAD</a>),</li>
@@ -1486,9 +1483,10 @@ Inlines: <kbd>\*[SUP]...\*[SUPX]</kbd>
 <p>
 Superscripts are accomplished
 <a href="definitions.html#inlines">inline</a>.
-Whenever you need one, typically for numerals, all you need to do is
-surround the superscript with the inlines above. <kbd>\*[SUP]</kbd>
-begins superscripting; <kbd>\*[SUPX]</kbd> turns it off.
+Whenever you need one, typically for numerals, all you need
+to do is surround the superscript with the inlines above.
+<kbd><nobr>\*[SUP]</nobr></kbd> begins superscripting;
+<kbd><nobr>\*[SUPX]</nobr></kbd> turns it off.
 </p>
 
 <p id="cond-or-ext-sup">
@@ -1499,8 +1497,8 @@ or
 and you want your superscripts to be equivalently pseudo-condensed
 or -extended, use
 <br/>
-<kbd>\*[CONDSUP]...\*[CONDSUPX]</kbd> or
-<kbd>\*[EXTSUP]...\*[EXTSUPX]</kbd>.
+<kbd><nobr>\*[CONDSUP]...\*[CONDSUPX]</nobr></kbd> or
+<kbd><nobr>\*[EXTSUP]...\*[EXTSUPX]</nobr></kbd>.
 </p>
 
 <p>
@@ -1563,8 +1561,9 @@ left-quadded
 </p>
 
 <p>
-Whenever you want to centre a block of type on the page, surround it with
-<kbd>.CENTER_BLOCK/.CENTER_BLOCK OFF</kbd> (or QUIT, X, etc.).
+Whenever you want to centre a block of type on the page, surround it
+with <kbd>.CENTER_BLOCK/.CENTER_BLOCK OFF</kbd> (or <kbd>QUIT</kbd>,
+<kbd>X</kbd>, etc).
 </p>
 
 <div class="macro-id-overline">
@@ -1614,9 +1613,9 @@ justified copy, like this:
   This line will have its closing period hung outside
   the right margin\*[HANG .]
 </span>
-For the exceptionally fussy, <kbd>\*[HANG]</kbd> may also be used
-with centred text to centre the text visually without taking the
-hung punctuation into account.
+For the exceptionally fussy, <kbd><nobr>\*[HANG]</nobr></kbd> may
+also be used with centred text to centre the text visually without
+taking the hung punctuation into account.
 </p>
 
 <p>
@@ -1627,8 +1626,8 @@ characters of the form <kbd>\[xx]</kbd>.
 </p>
 
 <p>
-If the hung character is a hyphen, <kbd>\*[HANG&nbsp;-]</kbd> must
-come at the end of an
+If the hung character is a hyphen,
+<kbd><nobr>\*[HANG&nbsp;-]</nobr></kbd> must come at the end of an
 <a href="definitions.html#inputline">input line</a>.
 All other characters may be used mid-line if groff breaks the line
 naturally at the point the hung character is introduced.
diff --git a/contrib/mom/momdoc/graphical.html 
b/contrib/mom/momdoc/graphical.html
index 6216f12..08458f8 100644
--- a/contrib/mom/momdoc/graphical.html
+++ b/contrib/mom/momdoc/graphical.html
@@ -61,10 +61,10 @@ for drawing rules, polygons, ellipses and splines.  All 
begin with
 in the groff info manual:
 <br/>
 <span class="pre-in-pp">
-  info groff => Escape index => \D
+  info groff \D
 </span>
 The escapes allow you to draw just about any simple graphical object
-you can think of, but owing to their syntax, they&#8217;re not always easy
+you can think of, but owing to their syntax they&#8217;re not always easy
 to read, which can make tweaking them difficult.  Additionally,
 while they perform in a <i>consistent</i> manner, they don&#8217;t
 always perform in an <i>expected</i> manner.
@@ -215,7 +215,7 @@ Macro: <b>DRH</b> <kbd class="macro-args">&lt;none&gt; | 
&lt;weight&gt;  &lt;ind
 &bull;&nbsp;
 the argument to <kbd class="normal">&lt;weight&gt;</kbd> is in
 <a href="definitions.html#picaspoints" class="normal">points</a>,
-but do <span class="normal">NOT</span> append the
+but do <span class="normal">not</span> append the
 <a href="definitions.html#unitsofmeasure">unit of measure</a>,
 <kbd class="normal">p</kbd>
 <br/>
@@ -248,8 +248,8 @@ the rule is determined by the argument you last gave the
 macro
 <a href="inlines.html#rule-weight">RULE_WEIGHT</a>.
 DRH, used this way, is exactly equivalent to entering the
-<a href="definitions.html#inlines">inline escape</a>, <a
-href="inlines.html#inline-rule-mom"><kbd>\*[RULE]</kbd></a>.
+<a href="definitions.html#inlines">inline escape</a>
+<a href="inlines.html#inline-rule-mom"><kbd><nobr>\*[RULE]</nobr></kbd></a>.
 </p>
 </div>
 
@@ -282,7 +282,7 @@ inches.  To do so, you&#8217;d invoke <kbd>.DRH</kbd> like 
this:
           indent
 </span>
 (Note that the rule weight argument, which is expressed in points,
-must NOT have the unit of measure <kbd>p</kbd> appended to it.)
+must not have the unit of measure <kbd>p</kbd> appended to it.)
 </p>
 
 <p>
@@ -323,7 +323,7 @@ Macro: <b>DRV</b> <kbd class="macro-args">&lt;weight&gt;  
&lt;indent&gt; &lt;dep
 &bull;&nbsp;
 the argument to <kbd class="normal">&lt;weight&gt;</kbd> is in
 <a href="definitions.html#picaspoints" class="normal">points</a>,
-but do <span class="normal">NOT</span> append the
+but do <span class="normal">not</span> append the
 <a href="definitions.html#unitsofmeasure">unit of measure</a>,
 <kbd class="normal">p</kbd>
 <br/>
@@ -371,7 +371,7 @@ this:
            indent
 </span>
 (Note that the rule weight argument, which is expressed in points,
-must NOT have the unit of measure <kbd>p</kbd> appended to it.)
+must not have the unit of measure <kbd>p</kbd> appended to it.)
 </p>
 
 <p>
@@ -412,7 +412,7 @@ Macro: <b>DBX</b> <kbd 
class="macro-args">&lt;weight&gt;|SOLID &lt;indent&gt; &l
 &bull;&nbsp;
 the argument to <kbd class="normal">&lt;weight&gt;</kbd> is in
 <a href="definitions.html#picaspoints" class="normal">points</a>,
-but do <span class="normal">NOT</span> append the
+but do <span class="normal">not</span> append the
 <a href="definitions.html#unitsofmeasure">unit of measure</a>
 <kbd class="normal">p</kbd>
 <br/>
@@ -439,7 +439,7 @@ To draw boxes you must, at a minimum, supply DBX with the 
arguments
 
 <p>
 <kbd>weight</kbd> is the rule weight of outlined boxes, given in
-points but without the unit of measure
+points but without the
 <a href="definitions.html#unitsofmeasure">unit of measure</a>
 <kbd>p</kbd> appended.
 </p>
@@ -495,7 +495,7 @@ like this:
      weight   width
 </span>
 (Note that the box weight argument, which is expressed in points,
-must NOT have the unit of measure <kbd>p</kbd> appended to it.)
+must not have the unit of measure <kbd>p</kbd> appended to it.)
 </p>
 
 <p>
@@ -547,7 +547,7 @@ Macro: <b>DCL</b> <kbd 
class="macro-args">&lt;weight&gt;|SOLID &lt;indent&gt; &l
 &bull;&nbsp;
 the argument to <kbd class="normal">&lt;weight&gt;</kbd> is in
 <a href="definitions.html#picaspoints" class="normal">points</a>,
-but do <span class="normal">NOT</span> append the
+but do <span class="normal">not</span> append the
 <a href="definitions.html#unitsofmeasure">unit of measure</a>
 <kbd class="normal">p</kbd>
 <br/>
@@ -630,7 +630,7 @@ like this:
      weight   width
 </span>
 (Note that the circle weight argument, which is expressed in points,
-must NOT have the unit of measure <kbd>p</kbd> appended to it.)
+must not have the unit of measure <kbd>p</kbd> appended to it.)
 </p>
 
 <p>
diff --git a/contrib/mom/momdoc/headfootpage.html 
b/contrib/mom/momdoc/headfootpage.html
index 6e2d014..7d46472 100644
--- a/contrib/mom/momdoc/headfootpage.html
+++ b/contrib/mom/momdoc/headfootpage.html
@@ -312,12 +312,12 @@ the bottom margin.)
 
 <p>
 Confused?  Mom apologizes.  It&#8217;s really quite simple.  By
-default, mom sets headers 4-1/2
+default, mom sets headers <nobr>4-1/2</nobr>
 <a href="definitions.html#picaspoints">picas</a>
 down from the top of the page and begins the running text 3 picas
 (the HEADER_GAP) beneath that, which means the effective top margin
-of the running text is 7-1/2 picas (visually approx. 1 inch).
-However, if you give mom a literal top margin (with
+of the running text is <nobr>7-1/2</nobr> picas (visually approx. 1
+inch).  However, if you give mom a literal top margin (with
 <a href="typesetting.html#t-margin">T_MARGIN</a>),
 she ignores the HEADER_GAP and starts the running text at whatever
 top margin you give.
@@ -427,8 +427,8 @@ Macro: <b>HEADERS</b> <kbd class="macro-args">toggle</kbd>
 <p>
 <a href="definitions.html#header">Page headers</a>
 are on by default.  If you don&#8217;t want them, turn them off by
-invoking <kbd>.HEADERS</kbd> with any argument (<b>OFF, QUIT,
-END, X...</b>), e.g.
+invoking <kbd>.HEADERS</kbd> with any argument (<kbd>OFF</kbd>,
+<kbd>QUIT</kbd>, <kbd>END</kbd>, <kbd>X</kbd>...), e.g.
 <br/>
 <span class="pre-in-pp">
     .HEADERS OFF
@@ -751,8 +751,8 @@ Then, you&#8217;d prepare mom for the next document:
   .TITLE "New Doc Title"
   .AUTHOR "Josephine Blough"
 </span>
-Then, you&#8217;d redefine the header-centre string using the reserved
-string <kbd>\*[$TITLE]</kbd>, like this:
+Then, you&#8217;d redefine the header-centre string using the
+reserved string <kbd><nobr>\*[$TITLE]</nobr></kbd>, like this:
 <br/>
 <span class="pre-in-pp">
   .HEADER_CENTER "\E*[$TITLE]"
@@ -817,7 +817,7 @@ string you pass to HEADER_LEFT, _CENTER, or _RIGHT, (as
 opposed to replacing the string with the page number), use the
 special
 <a href="definitions.html#inlines">inline escape</a>
-<kbd>\*[PAGE#]</kbd> in the string argument.
+<kbd><nobr>\*[PAGE#]</nobr></kbd> in the string argument.
 </p>
 
 <p>
@@ -1049,7 +1049,8 @@ or as defined by you with the
 simply invoke this macro (using the appropriate position) with no
 argument.  If you wish to turn capitalization off (say, for the
 header-right string that mom capitalizes by default), invoke the
-macro with any argument (e.g. <kbd>OFF, QUIT, END, X</kbd>...).
+macro with any argument (e.g. <kbd>OFF</kbd>, <kbd>QUIT</kbd>,
+<kbd>END</kbd>, <kbd>X</kbd>...).
 </p>
 
 <p>
@@ -1067,7 +1068,8 @@ HEADER_&lt;POSITION&gt;_SMALLCAPS is a
 If you want any part of headers to be set in smallcaps, simply
 invoke this macro (using the appropriate position) with no argument.
 If you wish to turn the smallcaps off, invoke the macro with any
-argument (e.g. <kbd>OFF, QUIT, END, X</kbd>...).
+argument (e.g. <kbd>OFF</kbd>, <kbd>QUIT</kbd>, <kbd>END</kbd>,
+<kbd>X</kbd>...).
 </p>
 
 <p>
@@ -1112,7 +1114,7 @@ or
 and you want various elements within the header to be colourized,
 embed the colours in the string passed to HEADER_RECTO or
 HEADER_VERSO with the
-<a href="color.html#color-inline"><kbd>\*[&lt;colorname&gt;]</kbd></a>
+<a 
href="color.html#color-inline"><kbd><nobr>\*[&lt;colorname&gt;]</nobr></kbd></a>
 <a href="definitions.html#inlines">inline escape</a>.
 </p>
 
@@ -1420,8 +1422,8 @@ Macro: <b>HEADER_RULE</b> <kbd 
class="macro-args">toggle</kbd>
 <p>
 By default, mom prints a header separator rule underneath headers
 (or above footers). If you don&#8217;t want the rule, turn it off by
-invoking <kbd>.HEADER_RULE</kbd> with any argument (<kbd>OFF, QUIT,
-END, X...</kbd>), e.g.
+invoking <kbd>.HEADER_RULE</kbd> with any argument (<kbd>OFF</kbd>,
+<kbd>QUIT</kbd>, <kbd>END</kbd>, <kbd>X</kbd>...), e.g.
 <br/>
 <span class="pre-in-pp">
   .HEADER_RULE OFF
@@ -1633,9 +1635,9 @@ or flush right, and both take a single
 <a href="definitions.html#stringargument">string argument</a>
 with which, by combining text and
 <a href="definitions.html#inlines">inline escapes</a>,
-you can make the headers come out just about any way you want.
-Use of the <kbd>\*[PAGE#]</kbd> escape is permitted in the string
-argument (see
+you can make the headers come out just about any way you want.  Use
+of the <kbd><nobr>\*[PAGE#]</nobr></kbd> escape is permitted in the
+string argument (see
 <a href="#page-number-incl">Including the page number in header-left, -centre 
or -right</a>),
 and, as an added bonus, mom provides a special mechanism whereby
 it&#8217;s possible to
@@ -1692,15 +1694,15 @@ to set up recto/verso footers.
 The first argument to HEADER_RECTO is the direction in which you
 want the header
 <a href="definitions.html#quad">quadded</a>.
-<kbd>L, C</kbd> and <kbd>R</kbd> may be used in place of <kbd>LEFT,
-CENTER</kbd> and <kbd>RIGHT</kbd>.
+<kbd>L</kbd>, <kbd>C</kbd>, and <kbd>R</kbd> may be used in place of
+<kbd>LEFT</kbd>, <kbd>CENTER</kbd>, and <kbd>RIGHT</kbd>.
 </p>
 
 <p>
 The second argument (optional) tells mom to capitalize the text of
-the header. <b>Please note:</b> Do not use <kbd><a
-href="inlines.html#uc-lc">\*[UC]...\*[LC]</a></kbd> inside the
-string passed to HEADER_RECTO.
+the header. <b>Please note:</b> Do not use
+<a href="inlines.html#uc-lc"><kbd><nobr>\*[UC]...\*[LC]</nobr></kbd></a>
+inside the string passed to HEADER_RECTO.
 </p>
 
 <p>
@@ -1710,7 +1712,7 @@ mom&#8217;s normal 3-part headers, therefore anything you 
want in
 the headers must be entered by hand in the string, including colours
 (via the
 <a href="definitions.html#inlines">inline escape</a>
-<a href="color.html#color-inline"><kbd>\*[&lt;colorname&gt;]</kbd></a>).
+<a 
href="color.html#color-inline"><kbd><nobr>\*[&lt;colorname&gt;]</nobr></kbd></a>).
 </p>
 
 <p>
@@ -1722,8 +1724,11 @@ and
 may be used to change the default family and size.  Changes to the
 font(s) within the string must be accomplished with the
 <a href="definitions.html#inlines">inline escapes</a>
-<kbd>\*[ROM], \*[IT], \*[BD], \*[BDI]</kbd> and
-<kbd>\*[PREV]</kbd> (see
+<kbd><nobr>\*[ROM]</nobr></kbd>,
+<kbd><nobr>\*[IT]</nobr></kbd>,
+<kbd><nobr>\*[BD]</nobr></kbd>,
+<kbd><nobr>\*[BDI]</nobr></kbd>,
+and <kbd><nobr>\*[PREV]</nobr></kbd> (see
 <a href="inlines.html#inline-fonts-mom">Changing fonts</a>).
 Additional refinements to the style of the header-recto string,
 including horizontal spacing and/or positioning, can also be made
@@ -1732,7 +1737,7 @@ with inline escapes.
 
 <p>
 To include the current page number in the string, use the
-<kbd>\*[PAGE#]</kbd>
+<kbd><nobr>\*[PAGE#]</nobr></kbd>
 <a href="definitions.html#inlines">inline escape</a>.
 </p>
 
@@ -1784,8 +1789,8 @@ Notice that the quad argument, <kbd>LEFT</kbd>, is used 
in both
 cases.  When padding a header, it doesn&#8217;t matter which
 quad argument you use, although you must be sure to supply
 one.  Also note that mom does not interpret the <kbd>#</kbd> in
-<kbd>\*[PAGE#]</kbd> as a padding marker (i.e. as a place to insert
-whitespace).
+<kbd><nobr>\*[PAGE#]</nobr></kbd> as a padding marker (i.e. as a
+place to insert whitespace).
 </p>
 
 <div class="box-important">
@@ -1864,7 +1869,7 @@ The manner of entering what you want is identical to the 
way you
 input
 <a href="#userdef-hdrftr-rv">single string headers and footers</a>.
 I suggest reading up on them, as well as looking at the entries,
-<kbd><a href="#hdrftr-rectoverso">HEADER_RECTO</a></kbd>
+<a href="#hdrftr-rectoverso">HEADER_RECTO</a>
 and
 <a href="#reserved-strings">Using mom&#8217;s reserved strings in 
header/footer definitions</a>.
 </p>
@@ -1904,11 +1909,11 @@ to the style shown above to keep things manageable.
 <p>
 If you want to disable having both headers and footers on the same
 page, invoke <kbd>.HEADERS_AND_FOOTERS</kbd> with any argument
-you want (e.g. <kbd>OFF, QUIT, END, X...</kbd>). Mom will restore
-her default behaviour of setting automatically generated page
-headers, with the page number, centered, at the bottom of the
-page.  If you would prefer footers instead of headers after turning
-HEADERS_AND_FOOTERS off, invoke
+you want (e.g. <kbd>OFF</kbd>, <kbd>QUIT</kbd>, <kbd>END</kbd>,
+<kbd>X</kbd>...).  Mom will restore her default behaviour of setting
+automatically generated page headers, with the page number,
+centered, at the bottom of the page.  If you would prefer footers
+instead of headers after turning HEADERS_AND_FOOTERS off, invoke
 <a href="#footers"><kbd>.FOOTERS</kbd></a>
 afterwards.
 </p>
@@ -1937,14 +1942,15 @@ L "^\E*[$AUTHOR]#\*[PAGE#]^"    |                       
|
 </span>
 
 <p>
-<kbd>\E*[$TITLE]</kbd> and <kbd>\E*[$AUTHOR]</kbd> will print the
-strings you pass to
+<kbd><nobr>\E*[$TITLE]</nobr></kbd> and
+<kbd><nobr>\E*[$AUTHOR]</nobr></kbd> will print the strings you pass
+to
 <a href="docprocessing.html#title">TITLE</a>
 and
 <a href="docprocessing.html#author">AUTHOR</a>;
-<kbd>\*[PAGE#]</kbd> is how you include the page number in a header
-or footer string.  (For a list of special strings you can use in
-headers and footers, see
+<kbd><nobr>\*[PAGE#]</nobr></kbd> is how you include the page number
+in a header or footer string.  (For a list of special strings you
+can use in headers and footers, see
 <a href="#reserved-strings">here</a>.)
 </p>
 
@@ -2023,9 +2029,10 @@ Macro: <b>PAGINATE</b> <kbd 
class="macro-args">toggle</kbd>
 
 <p>
 By default, mom paginates documents (in the bottom margin).  If
-you&#8217;d prefer she not paginate, turn pagination off by invoking
-<kbd>.PAGINATE</kbd> with any argument (<kbd>OFF, NO, QUIT, END,
-X...</kbd>), e.g.
+you&#8217;d prefer she not paginate, turn pagination off by
+invoking <kbd>.PAGINATE</kbd> with any argument (<kbd>OFF</kbd>,
+<kbd>NO</kbd>, <kbd>QUIT</kbd>, <kbd>END</kbd>, <kbd>X</kbd>...),
+e.g.
 <br/>
 <span class="pre-in-pp">
   .PAGINATE NO 
@@ -2093,7 +2100,8 @@ when footers are on, invoke
   .PAGENUM_ON_FIRST_PAGE
 </span>
 with no argument.  Any other argument turns the feature off
-(<kbd>OFF, QUIT, END, X</kbd>, etc).
+(<kbd>OFF</kbd>, <kbd>QUIT</kbd>, <kbd>END</kbd>, <kbd>X</kbd>,
+etc).
 </p>
 
 <p>
@@ -2167,7 +2175,7 @@ you&#8217;d enter
 </span>
 Notice that the page number is entered symbolically with the
 <a href="definitions.html#inlines">inline escape</a>
-<span style="white-space:nowrap"><kbd>\*[PAGE#]</kbd>,</span>
+<span style="white-space:nowrap"><kbd><nobr>\*[PAGE#]</nobr></kbd>,</span>
 while the total number of pages must be entered explicitly after the
 document is complete and the total number of pages known.
 </p>
@@ -2251,7 +2259,8 @@ Macro: <b>PAGENUM_HYPHENS</b> <kbd 
class="macro-args">toggle</kbd>
 <p>
 By default, mom encloses page numbers between hyphens.  If you
 don&#8217;t want this behaviour, invoke the macro PAGENUM_HYPHENS
-with any argument (<kbd>OFF, QUIT, END, X</kbd>, etc), like this:
+with any argument (<kbd>OFF</kbd>, <kbd>QUIT</kbd>, <kbd>END</kbd>,
+<kbd>X</kbd>, etc), like this:
 <br/>
 <span class="pre-in-pp">
   .PAGENUM_HYPHENS OFF
diff --git a/contrib/mom/momdoc/images.html b/contrib/mom/momdoc/images.html
index fe33eb4..ac9e7ac 100644
--- a/contrib/mom/momdoc/images.html
+++ b/contrib/mom/momdoc/images.html
@@ -307,7 +307,8 @@ sign or unit of measure should be appended.
 <h5 class="docs" style="margin-top: 1em; text-transform: none">ADJUST</h5>
 
 <p>
-<kbd>ADJUST</kbd> lets you raise (<kbd>+</kbd>) or lower (<kbd>-</kbd>) the 
image
+<kbd>ADJUST</kbd> lets you raise (<kbd>-</kbd>) or lower
+(<kbd>+</kbd>) the image
 <span style="font-style: italic">within the space allotted for it</span>
 by the amount you specify.  This is useful for achieving good
 optical centering between surrounding blocks of type.  A unit of
@@ -421,9 +422,9 @@ is enabled and the document is processed with
 <a href="using.html#pdfmom" style="font-weight: bold">pdfmom</a>,
 the target name can be used to generate the target&#8217;s label
 number in running text if it is entered as a groff string, i.e. of the
-form <kbd>\*[name]</kbd>.  For example, if you create a target named
-&#8220;foo&#8221; for a pdf image whose autolabel number would be 3,
-entering
+form <kbd><nobr>\*[name]</nobr></kbd>.  For example, if you create
+a target named &#8220;foo&#8221; for a pdf image whose autolabel
+number would be 3, entering
 <br/>
 <span class="pre-in-pp">
   See
@@ -763,7 +764,8 @@ additional material is included in what is floated.
 <p style="margin-top: -.5em">
 To begin a float, simply invoke <kbd>.FLOAT</kbd> and follow it with
 whatever you want the float to contain.  When you&#8217;re done,
-invoke <kbd>.FLOAT&nbsp;OFF</kbd> (or <kbd>QUIT, END, X</kbd>, etc).
+invoke <kbd>.FLOAT&nbsp;OFF</kbd> (or <kbd>OFF</kbd>,
+<kbd>QUIT</kbd>, <kbd>END</kbd>, <kbd>X</kbd>, etc).
 </p>
 
 <h5 class="docs" style="margin-top: 1em; text-transform: none">ADJUST</h5>
@@ -1052,12 +1054,14 @@ before ending the float:
 <h3  id="reserved-label-strings" class="docs" style="text-transform: 
none">Reserved variables for labels</h3>
 
 <p>
-Mom reserves strings you may use when entering label text after
-the <kbd>LABEL</kbd> argument. <kbd>\*[chapter]</kbd> holds the
-current chapter or major section number. <kbd>\*[fig-label]</kbd>,
-<kbd>\*[tbl-label]</kbd>, and <kbd>\*[eqn-label]</kbd>
-increment the label number of the appropriate label type by one,
-and are initially set to zero after each invocation of
+Mom reserves strings you may use when entering
+label text after the <kbd>LABEL</kbd> argument.
+<kbd><nobr>\*[chapter]</nobr></kbd> holds the current chapter
+or major section number. <kbd><nobr>\*[fig-label]</nobr></kbd>,
+<kbd><nobr>\*[tbl-label]</nobr></kbd>, and
+<kbd><nobr>\*[eqn-label]</nobr></kbd> increment the label number of
+the appropriate label type by one, and are initially set to zero
+after each invocation of
 <a href="docprocessing.html#start">START</a>
 when the
 <a href="docprocessing.html#doctype">DOCTYPE</a>
@@ -1073,7 +1077,8 @@ produce <kbd>Fig. 2.3.</kbd>
 
 <p>
 If your <b>DOCTYPE</b> is <kbd>DEFAULT</kbd> or <kbd>NAMED</kbd>,
-you must reset <kbd>\*[&lt;type&gt;-label]</kbd> after each
+you must reset <kbd><nobr>\*[&lt;type&gt;-label]</nobr></kbd> after
+each
 <a href="docprocessing.html#collate">COLLATE</a>
 by entering
 <br/>
@@ -1281,7 +1286,7 @@ documents created with versions prior to 2.0-c as 
necessary.
 
 <p>
 Mom documents can include tables generated with the groff
-preprocessor, <b>tbl</b>.  If you are unfamiliar with <b>tbl</b>, I
+preprocessor <b>tbl</b>.  If you are unfamiliar with <b>tbl</b>, I
 recommend downloading a copy of
 <a href="http://plan9.bell-labs.com/10thEdMan/tbl.pdf";>Tbl - A Program to 
Format Tables</a>,
 which, in addition to providing a thorough introduction, contains
@@ -1341,7 +1346,7 @@ span as many pages as necessary to complete output.  A 
table header
 will be printed at the top of each page&#8217;s table output.  In the
 event that there is not enough room to print the table header and
 at least one row of table data near the bottom of a page, mom will
-break to a new page before beginning table output, leaving a blank
+break to a new page before beginning table output, leaving a gap
 in
 <a href="definitions.html#running">running text</a>.
 </p>
@@ -1594,11 +1599,12 @@ number of rows.
 <h5 class="docs" style="margin-top: 1em; text-transform: none">ADJUST</h5>
 
 <p>
-<kbd>ADJUST</kbd> lets you raise (<kbd>+</kbd>) or lower
-(<kbd>-</kbd>) the table <span style="font-style: italic">within
-the space allotted for it</span> by the amount you specify.  This
-is useful for achieving good optical centering between surrounding
-blocks of type.  A unit of measure is required.
+<kbd>ADJUST</kbd> lets you raise (<kbd>-</kbd>) or lower
+(<kbd>+</kbd>) the table
+<span style="font-style: italic">within the space allotted for it</span>
+by the amount you specify.  This is useful for achieving good
+optical centering between surrounding blocks of type.  A unit of
+measure is required.
 </p>
 
 <h5 class="docs" style="margin-top: 1em; text-transform: none">NO_SHIM</h5>
@@ -1691,9 +1697,9 @@ is enabled and the document is processed with
 <a href="using.html#pdfmom" style="font-weight: bold">pdfmom</a>,
 the target name can be used to generate the target&#8217;s label
 number in running text if it is entered as a groff string, i.e. of
-the form <kbd>\*[name]</kbd>.  For example, if you create a target
-called &#8220;foo&#8221; for a table whose autolabel number would be
-3, entering
+the form <kbd><nobr>\*[name]</nobr></kbd>.  For example, if you
+create a target called &#8220;foo&#8221; for a table whose autolabel
+number would be 3, entering
 <br/>
 <span class="pre-in-pp">
   See
@@ -1756,7 +1762,7 @@ double-quotes.  The SOURCE argument may only be used if
 
 <p>
 Mom documents can include diagrams generated with the groff
-preprocessor, <b>pic</b>.  If you are unfamiliar with <b>pic</b>, I
+preprocessor <b>pic</b>.  If you are unfamiliar with <b>pic</b>, I
 recommend downloading a copy of
 <a href="http://www.kohala.com/start/troff/gpic.raymond.ps";>Making Pictures 
with GNU PIC</a>
 which provides a thorough introduction and contains many examples.
@@ -1885,8 +1891,8 @@ argument.
 <h5 class="docs" style="margin-top: 1em; text-transform: none">ADJUST</h5>
 
 <p>
-<kbd>ADJUST</kbd> lets you raise (<kbd>+</kbd>) or lower
-(<kbd>-</kbd>) a diagram
+<kbd>ADJUST</kbd> lets you raise (<kbd>-</kbd>) or lower
+(<kbd>+</kbd>) a diagram
 <span style="font-style: italic">within the space allotted for it</span>
 by the amount you specify.  This is useful for achieving good
 optical centering between surrounding blocks of type.  A unit of
@@ -1976,9 +1982,9 @@ is enabled and the document is processed with
 <a href="using.html#pdfmom" style="font-weight: bold">pdfmom</a>,
 the target name can be used to generate the target&#8217;s label
 number in running text if it is entered as a groff string, i.e. of
-the form <kbd>\*[name]</kbd>.  For example, if you create a target
-called &#8220;foo&#8221; for a diagram whose autolabel number would
-be 3, entering
+the form <kbd><nobr>\*[name]</nobr></kbd>.  For example, if you
+create a target called &#8220;foo&#8221; for a diagram whose
+autolabel number would be 3, entering
 <br/>
 <span class="pre-in-pp">
   See
@@ -2171,8 +2177,8 @@ if <kbd>-L</kbd> or <kbd>-I</kbd> are passed as arguments 
to
 <h5 class="docs" style="margin-top: 1em; text-transform: none">ADJUST</h5>
 
 <p>
-<kbd>ADJUST</kbd> lets you raise (<kbd>+</kbd>) or lower
-(<kbd>-</kbd>) an equation
+<kbd>ADJUST</kbd> lets you raise (<kbd>-</kbd>) or lower
+(<kbd>+</kbd>) an equation
 <span style="font-style: italic">within the space allotted for it</span>
 by the amount you specify.  This is useful for achieving good
 optical centering between surrounding blocks of type.  A unit of
@@ -2271,9 +2277,9 @@ is enabled and the document is processed with
 <a href="using.html#pdfmom" style="font-weight: bold">pdfmom</a>,
 the target name can be used to generate the target&#8217;s label
 number in running text if it is entered as a groff string, i.e. of
-the form <kbd>\*[name]</kbd>.  For example, if you create a target
-called &#8220;foo&#8221; for an equation whose autolabel number
-would be 3, entering
+the form <kbd><nobr>\*[name]</nobr></kbd>.  For example, if you
+create a target called &#8220;foo&#8221; for an equation whose
+autolabel number would be 3, entering
 <br/>
 <span class="pre-in-pp">
   See
@@ -2297,10 +2303,10 @@ A block of <b>eqn</b> code is terminated with 
<kbd>.EN</kbd>.
 <p>
 If an equation needs to span multiple lines, possibly aligned
 with <b>eqn</b>&#8217;s <kbd>'mark'</kbd> and <kbd>'lineup'</kbd>
-directives, separate invocations of <kbd>.EQ/.EN</kbd> are required
-for each line, and the optional argument, <kbd>CONTINUED</kbd> (or
-<kbd>CONT</kbd>, or <kbd>...</kbd> [three dots, an ellipsis]), must
-be passed to <kbd>.EN</kbd>.
+directives, separate invocations of <kbd><nobr>.EQ/.EN</nobr></kbd>
+are required for each line, and the optional argument,
+<kbd>CONTINUED</kbd> (or <kbd>CONT</kbd>, or <kbd>...</kbd> [three
+dots, an ellipsis]), must be passed to <kbd>.EN</kbd>.
 </p>
 
 <p>
@@ -2420,9 +2426,9 @@ would disable autolabelling of images.
 <p>
 By default, when <b>AUTOLABEL</b> is enabled, the label numbers are
 prefixed, and, in the case of equations, suffixed, with strings such
-that they appear for tables as &#8220;Table &lt;n&gt;&#8221;, for
-<b>pic</b> diagrams and pdf images as &#8220;Fig. &lt;n&gt;&#8221;,
-and for equations as &#8220;(&lt;n&gt;)&#8221;.
+that they appear for tables as &#8220;Table&nbsp;&lt;n&gt;&#8221;, for
+<b>pic</b> diagrams and pdf images as &#8220;Fig.&nbsp;&lt;n&gt;&#8221;,
+and for equations as &#8220;Eq.&nbsp;(&lt;n&gt;)&#8221;.
 </p>
 
 <p>
@@ -2484,8 +2490,8 @@ as if it were <b>DOCTYPE&nbsp;CHAPTER</b>, hence, with
 <kbd>PREFIX_CHAPTER</kbd>, each collated <b>DEFAULT</b>
 doctype&#8217;s prefixed &#8220;chapter&#8221; number is
 incremented and the label number itself reset to &#8220;1&#8221;.
-If you do not give <kbd>PREFIX_CHAPTER</kbd>, the label number
-is <i>not</i> reset automatically.  To reset it, invoke
+If you do not supply the <kbd>PREFIX_CHAPTER</kbd> argument, the
+label number is <i>not</i> reset automatically.  To reset it, invoke
 <kbd>.AUTOLABEL_&lt;type&gt;</kbd> after each
 <a href="docprocessing.html#collate">COLLATE</a>.
 </div>
@@ -2701,8 +2707,8 @@ set quad right, and their captions centered.
 Regardless of the quad direction, captions, labels and sources
 are set on the width of the figure, table, or pdf image
 unless you pass the optional <kbd>ON_LL</kbd> argument to
-<kbd>QUAD&nbsp;&lt;direction&gt;</kbd>, in which case the prevailing
-document line length is used instead.
+<kbd><nobr>QUAD&nbsp;&lt;direction&gt;</nobr></kbd>, in which case
+the prevailing document line length is used instead.
 </p>
 
 <h5 class="docs" style="text-transform: none">&bull;&nbsp;eqn</h5>
@@ -2713,9 +2719,10 @@ set flush right with the page&#8217;s right margin 
regardless of
 equation positioning, which is, again by default, centered.  If the
 equation is positioned left, the label will appear at the right
 margin regardless of the direction you give to <kbd>QUAD</kbd>.  If
-the equation is indented with the <kbd>-I&nbsp;&lt;indent&gt;</kbd>
-option, a quad direction of <kbd>LEFT</kbd> is observed, but may
-overprint the last line of the equation.
+the equation is indented with the
+<kbd><nobr>-I&nbsp;&lt;indent&gt;</nobr></kbd> option, a quad
+direction of <kbd>LEFT</kbd> is observed, but may overprint the last
+line of the equation.
 </p>
 
 <p>
@@ -3193,8 +3200,8 @@ Non-toggle macros like
 or
 <a href="docelement.html#pp">PP</a>
 require that the box be started beforehand.  Boxed pre-processor
-material must be fully enclosed by BOX/BOX&nbsp;OFF, as in this
-recipe for a one-off boxed pic diagram:
+material must be fully enclosed by BOX&nbsp;/&nbsp;BOX&nbsp;OFF, as
+in this recipe for a one-off boxed pic diagram:
 <span class="pre-in-pp">
 .BOX
 .PS
@@ -3457,8 +3464,8 @@ including <kbd>PAGE_COLOR OFF</kbd>, only the last 
applies.
 Unlike other
 <a href="definitions.html#toggle">toggle macros</a>,
 PAGE_COLOR requires the use of <kbd>OFF</kbd> or <kbd>off</kbd>
-to terminate it rather than an arbitrary string (<kbd>QUIT, X,
-END</kbd>, etc.)
+to terminate it rather than an arbitrary string (<kbd>OFF</kbd>,
+<kbd>QUIT</kbd>, <kbd>END</kbd>, <kbd>X</kbd>, etc).
 </p>
 </div>
 
diff --git a/contrib/mom/momdoc/inlines.html b/contrib/mom/momdoc/inlines.html
index ad77e63..df082a5 100644
--- a/contrib/mom/momdoc/inlines.html
+++ b/contrib/mom/momdoc/inlines.html
@@ -73,7 +73,7 @@ Groff interprets everything following the backslash as 
instructions,
 not literal text, until the escape sequence is complete.  Should
 you need the actual backslash character as part of a line of text,
 simply enter it twice (<kbd>\\</kbd>).  Groff understands that this
-means "please print a backslash character."
+means &#8220;please print a backslash character.&#8221;
 </p>
 
 <p>
@@ -96,8 +96,9 @@ brackets.
 <p>
 Mom recognizes that certain escapes get used more often than others.
 For these, she has a consistent input style that takes the form
-<kbd>\*[...]</kbd>, which makes them stand out well from the text of
-your documents.  These escapes are the ones listed under
+<kbd><nobr></nobr>\*[...]</nobr></kbd>, which makes them stand out well
+from the text of your documents.  These escapes are the ones listed
+under
 <a href="#inlines-mom">Mom&#8217;s personal inline escapes</a>.
 </p>
 
@@ -174,11 +175,12 @@ Mom provides five escapes for changing fonts inline:
 
 <div class="box-tip">
 <p class="tip">
-<span class="note">Note:</span>
-<kbd>\*[PREV]</kbd> does not operate "stack style".  It returns
-to the previous font once only, and afterwards has no effect.  In
-other words, in the case of <kbd>\*[PREV]\*[PREV]</kbd>, only the
-first <kbd>\*[PREV]</kbd> is respected; the second one is silently
+<span class="note">*Note:</span>
+<kbd><nobr>\*[PREV]</nobr></kbd> does not operate "stack
+style".  It returns to the previous font once only, and
+afterwards has no effect.  In other words, in the case of
+<kbd><nobr>\*[PREV]\*[PREV]</nobr></kbd>, only the first
+<kbd><nobr>\*[PREV]</nobr></kbd> is respected; the second one is silently
 ignored.
 </p>
 </div>
@@ -211,7 +213,10 @@ and/or
 HEADERS or FOOTERS, or in the strings passed to
 <a href="headfootpage.html#headers-and-footers">HEADERS_AND_FOOTERS</a>,
 you must enter the inlines beginning with <kbd>\E*</kbd>
-rather than just <kbd>\*</kbd>, e.g. <kbd>\E*[BD]</kbd>.
+rather than just <kbd><nobr>\*</nobr></kbd>, e.g.
+<kbd><nobr>\E*[BD]</nobr></kbd>.  You may, in such cases, prefer to
+use the simpler groff inline escape
+<a href="#inline-fonts-groff"><kbd>\f</kbd></a>.
 </p>
 </div>
 
@@ -241,8 +246,9 @@ or
 <span class="pre-in-pp">
   \*S[12]
 </span>
-Entering either <kbd>\*[SIZE]</kbd> or <kbd>\*S[]</kbd> with no
-argument reverts to the former point size.
+Entering either <kbd><nobr>\*[SIZE]</nobr></kbd> or
+<kbd><nobr>\*S[]</nobr></kbd> with no argument reverts to the former
+point size.
 </p>
 
 <p>
@@ -261,11 +267,11 @@ allowed.
 </p>
 
 <p>
-The size given to <kbd>\*[SIZE&nbsp;&lt;size&gt;]</kbd> or
-<kbd>\*S[&lt;size&gt;]</kbd> may be expressed in plus or minus
-terms, which can be very useful.  In the following examples, the
-word &#8220;mom&#8221; will be output 2 points larger than the point
-size of the rest of the line.
+The size given to <kbd><nobr>\*[SIZE&nbsp;&lt;size&gt;]</nobr></kbd>
+or <kbd><nobr>\*S[&lt;size&gt;]</nobr></kbd> may be expressed in
+plus or minus terms, which can be very useful.  In the following
+examples, the word &#8220;mom&#8221; will be output 2 points larger
+than the point size of the rest of the line.
 <br/>
 <span class="pre-in-pp">
   While she isn't perfect, \*S[+2]mom\*S[-2] isn't half bad.
@@ -290,9 +296,9 @@ and/or
 <a href="headfootpage.html#hdrftr-rectoverso">verso</a>
 HEADERS or FOOTERS, or in the strings passed to
 <a href="headfootpage.html#headers-and-footers">HEADERS_AND_FOOTERS</a>,
-you <i>must</i> use the form <kbd>\*S[&lt;n&gt;]</kbd>
+you <i>must</i> use the form <kbd><nobr>\*S[&lt;n&gt;]</nobr></kbd>
 and enter the inline beginning with <kbd>\E*</kbd>, like this:
-<kbd>\E*S[&lt;+|-&gt;&lt;n&gt;]</kbd>.
+<kbd><nobr>\E*S[&lt;+|-&gt;&lt;n&gt;]</nobr></kbd>.
 </p>
 
 <p class="tip-bottom">
@@ -308,9 +314,10 @@ doesn&#8217;t care.
 
 <h3 id="uc-lc" class="docs">Capitalise a section of type</h3>
 <p>
-If you need to capitalise a region of type inline, bracket the
-region of type with the inline escapes, <kbd>\*[UC]</kbd> (Upper Case)
-and <kbd>\*[LC]</kbd> (Lower Case), like this:
+If you need to capitalise a region of type inline,
+bracket the region of type with the inline escapes,
+<kbd><nobr>\*[UC]</nobr></kbd> (Upper Case) and
+<kbd><nobr>\*[LC]</nobr></kbd> (Lower Case), like this:
 <br/>
 <span class="pre-in-pp">
   All work \*[UC]and\*[LC] no play makes Jack a dull boy.
@@ -415,10 +422,12 @@ and/or
 <a href="headfootpage.html#hdrftr-rectoverso">verso</a>
 HEADERS or FOOTERS, or in the strings passed to
 <a href="headfootpage.html#headers-and-footers">HEADERS_AND_FOOTERS</a>,
-you <i>must</i> use the forms <kbd>\E*[BU&lt;n&gt;]</kbd>
-and <kbd>\E*[FU&lt;n&gt;]</kbd> (i.e. with no space), and enter the
-inline beginning with <kbd>\E*</kbd> rather than just <kbd>\*</kbd>,
-e.g. <kbd>\E*[BU4]</kbd>.
+you <i>must</i> use the forms
+<kbd><nobr>\E*[BU&lt;n&gt;]</nobr></kbd> and
+<kbd><nobr>\E*[FU&lt;n&gt;]</nobr></kbd> (i.e. with no space),
+and enter the inline beginning with <kbd><nobr>\E*</nobr></kbd>
+rather than just <kbd><nobr>\*</kbd></nobr>, e.g.
+<kbd><nobr>\E*[BU4]</nobr></kbd>.
 </p>
  
 <p class="tip-bottom">
@@ -426,8 +435,8 @@ e.g. <kbd>\E*[BU4]</kbd>.
 Using the <kbd>BU</kbd> or <kbd>FU</kbd> escapes between characters
 pairs that are already automatically kerned (see
 <a href="typesetting.html#kern">KERN</a>)
-disables the automatic
-kerning and uses the value you give to BU or FU instead.
+disables the automatic kerning and uses the value you give to
+<kbd>BU</kbd> or <kbd>FU</kbd> instead.
 </p>
 </div>
 
@@ -478,9 +487,9 @@ For backward compatibility, the forms
 </span>
 also exist (i.e. with no space before the digit and points being
 the unit of measure, hence no unit of measure required).  Both
-accept quarter points, so it&#8217;s possible to do, for example,
-<kbd>\*[FP.5]</kbd> or <kbd>\*[BP1.25]</kbd> up to a limit
-of 12.75 points.
+accept quarter points, so it&#8217;s possible to do,
+for example, <kbd><nobr>\*[FP.5]</nobr></kbd> or
+<kbd><nobr>\*[BP1.25]</nobr></kbd> up to a limit of 12.75 points.
 </p>
 </div>
 
@@ -498,10 +507,14 @@ and/or
 <a href="headfootpage.html#hdrftr-rectoverso">verso</a>
 HEADERS or FOOTERS, or in the strings passed to
 <a href="headfootpage.html#headers-and-footers">HEADERS_AND_FOOTERS</a>,
-you <i>must</i> use the forms <kbd>\E*[BP&lt;n&gt;]</kbd>
-and <kbd>\E*[FP&lt;n&gt;]</kbd> (i.e. with no space), and enter the
-inline beginning with <kbd>\E*</kbd> rather than just <kbd>\*</kbd>,
-e.g. <kbd>\E*[BP.75]</kbd>.
+you <i>must</i> use the forms
+<kbd><nobr>\E*[BP&lt;n&gt;]</nobr></kbd> and
+<kbd><nobr>\E*[FP&lt;n&gt;]</nobr></kbd> (i.e. with no space),
+and enter the inline beginning with <kbd><nobr>\E*</nobr></kbd>
+rather than just <kbd><nobr>\*</nobr></kbd>, e.g.
+<kbd><nobr>\E*[BP.75]</nobr></kbd>.  You may, in such cases, prefer
+to use the native groff inline escape
+<a href="#inline-horizontal-groff"><kbd>\h</kbd></a>.
 </p>
 </div>
 
@@ -531,9 +544,9 @@ moves back down by the same amount.
 <div class="box-tip">
 <p class="tip">
 <span class="note">Note:</span>
-<kbd>\*[UP]</kbd> and <kbd>\*[DOWN]</kbd> do not work in conjunction
-with the inline escape,
-<kbd><a href="#inline-rule-mom">\*[RULE]</a></kbd>.
+<kbd><nobr>\*[UP]</nobr></kbd> and <kbd><nobr>\*[DOWN]</nobr></kbd>
+do not work in conjunction with the inline escape,
+<a href="#inline-rule-mom"><kbd><nobr>\*[RULE]</nobr></kbd></a>.
 </p>
 
 <p>
@@ -547,8 +560,9 @@ For backward compatibility, the following are also 
available:
 </p>
 
 <p class="tip-bottom">
-Both <kbd>\*[ALD]</kbd> and <kbd>\*[RLD]</kbd> work in points, hence
-you mustn&#8217;t use a unit of measure.
+Both <kbd><nobr>\*[ALD]</nobr></kbd> and
+<kbd><nobr>\*[RLD]</nobr></kbd> work in points, hence you
+mustn&#8217;t use a unit of measure.
 </p>
 </div>
 
@@ -566,10 +580,15 @@ and/or
 <a href="headfootpage.html#hdrftr-rectoverso">verso</a>
 HEADERS or FOOTERS, or in the strings passed to
 <a href="headfootpage.html#headers-and-footers">HEADERS_AND_FOOTERS</a>,
-you <i>must</i> use the forms <kbd>\E*[ALD&lt;n&gt;]</kbd>
-and <kbd>\E*[RLD&lt;n&gt;]</kbd> (i.e. with no space), and enter the
-inline beginning with <kbd>\E*</kbd> rather than just <kbd>\*</kbd>,
-e.g. <kbd>\E*[ALD.5]</kbd>.
+you <i>must</i> use the forms
+<kbd><nobr>\E*[ALD&lt;n&gt;]</nobr></kbd> and
+<kbd>\E*[RLD&lt;n&gt;]</kbd> (i.e. with no space), and enter the
+inline beginning with <kbd><nobr>\E*</nobr></kbd> rather than just
+<kbd><nobr>\*</nobr></kbd>, e.g. <kbd><nobr>\E*[ALD.5]</nobr></kbd>.
+You may, in such cases, prefer to use the native groff inline
+escape
+<a href="#inline-vertical-groff"><kbd>\v</kbd></a>.
+
 </p>
 </div>
 
@@ -580,9 +599,10 @@ e.g. <kbd>\E*[ALD.5]</kbd>.
 Sometimes, you want mom to break a line but not advance on the page.
 This can be accomplished with the macro
 <a href="typesetting.html#el">EL</a>
-or with the escape <kbd>\*[B]</kbd>.  Simply attach <kbd>\*[B]</kbd>
-to the end of any input line.  Using the example given in the
-document entry for EL, you&#8217;d use <kbd>\*[B]</kbd> like this:
+or with the escape <kbd><nobr>\*[B]</nobr></kbd>.  Simply attach
+<kbd><nobr>\*[B]</nobr></kbd> to the end of any input line.  Using
+the example given in the document entry for EL, you&#8217;d use
+<kbd><nobr>\*[B]</nobr></kbd> like this:
 <br/>
 <span class="pre-in-pp">
   .LEFT
@@ -604,9 +624,9 @@ Sometimes, you want mom to move to the next tab in sequence 
(e.g.
 from TAB 1 to TAB 2, or TAB 8 to TAB 9) without mom advancing on the
 page.  (See the NOTE
 <a href="typesetting.html#note-tn">here</a>
-if you&#8217;re not clear how mom manages tabs and linebreaks.)
-To do so, simply attach the escape <kbd>\*[TB+]</kbd> to the end of
-the input line in previous tab, like this:
+if you&#8217;re not clear how mom manages tabs and linebreaks.)  To
+do so, simply attach the escape <kbd><nobr>\*[TB+]</nobr></kbd> to
+the end of the input line in previous tab, like this:
 <br/>
 <span class="pre-in-pp">
   .TAB 1
@@ -614,7 +634,8 @@ the input line in previous tab, like this:
   Some more text    \" In tab 2, same baseline.
 </span>
 
-<kbd>\*[TB+]</kbd> works reliably regardless of the current
+<kbd><nobr>\*[TB+]</nobr></kbd> works reliably regardless of the
+current
 <a href="definitions.html#filled">fill mode</a>.
 </p>
 
@@ -622,13 +643,14 @@ the input line in previous tab, like this:
 
 <h3 id="inline-rule-mom" class="docs">Full measure rules</h3>
 <p>
-I find I often need rules drawn to the full measure of the current line
-or tab length.  The official way to do this is <kbd>\l'\n[.l]u'</kbd>,
-which is annoying to type, and doesn&#8217;t mean a whole heck of a lot if
-you&#8217;re new to groff.  The inline, <kbd>\*[RULE]</kbd>, is a simple
-replacement for <kbd>\l'\n[.l]u'</kbd>.  Use it whenever you need
-a rule drawn to the full measure of the current line or tab length, for
-example:
+I find I often need rules drawn to the full measure of the
+current line or tab length.  The official way to do this is
+<kbd><nobr>\l'\n[.l]u'</nobr></kbd>, which is annoying to type,
+and doesn&#8217;t mean a whole heck of a lot if you&#8217;re new
+to groff.  The inline, <kbd><nobr>\*[RULE]</nobr></kbd>, is a
+simple replacement for <kbd><nobr>\l'\n[.l]u'</nobr></kbd>.  Use it
+whenever you need a rule drawn to the full measure of the current
+line or tab length, for example:
 <br/>
 <span class="pre-in-pp">
   .LL 6P
@@ -649,8 +671,8 @@ immediately after a macro.
 </p>
 
 <p>
-The weight of the rule drawn with <kbd>\*[RULE]</kbd> is controlled
-with the macro
+The weight of the rule drawn with <kbd><nobr>\*[RULE]</nobr></kbd>
+is controlled with the macro
 <a href="#rule-weight">RULE_WEIGHT</a>.
 Mom&#8217;s default is 1/2 point.
 </p>
@@ -658,9 +680,9 @@ Mom&#8217;s default is 1/2 point.
 <div class="box-tip">
 <p class="tip">
 <span class="note">Note:</span>
-<kbd>\*[RULE]</kbd> draws the rule to the full measure, hence it
-cannot be used to fill the remainder of a partial line with a rule
-in this way:
+<kbd><nobr>\*[RULE]</nobr></kbd> draws the rule to the full measure,
+hence it cannot be used to fill the remainder of a partial line with
+a rule in this way:
 <br/>
 <span class="pre-in-pp">
   Signature__________________________________________
@@ -678,13 +700,14 @@ provided with PAD.)
 
 <p>
 Please also note that the inline escapes
-<a href="#up"><kbd>\*[UP]</kbd></a>
+<a href="#up"><kbd><nobr>\*[UP]</nobr></kbd></a>
 and
 <a href="#down"><kbd>\*[DOWN]</kbd></a>
-cannot be used in conjunction with <kbd>\*[RULE]</kbd>.
+cannot be used in conjunction with <kbd><nobr>\*[RULE]</nobr></kbd>.
 </p>
 
-<p>This <i>doesn&#8217;t</i> work:
+<p>
+This <i>doesn&#8217;t</i> work:
 <br/>
 <span class="pre-in-pp">
   \*[DOWN 2p]\*[RULE]\*[UP 2p]
@@ -724,13 +747,14 @@ fractions are allowed.
 RULE_WEIGHT allows you to tell mom how heavy (in other words, how
 &#8220;thick&#8221;) you want the rules drawn with the inline
 escape,
-<a href="#inline-rule-mom"><kbd>\*[RULE]</kbd></a>.
+<a href="#inline-rule-mom"><kbd><nobr>\*[RULE]</nobr></kbd></a>.
 It takes a single argument: the weight of the rule in
 <a href="definitions.html#picaspoints">points</a>
 <i>but without the</i>
 <a href="definitions.html#unitofmeasure">unit of measure</a>
 <kbd>p</kbd> <i>attached</i>.  Thus, to set the weight of rules
-drawn with <kbd>\*[RULE]</kbd> to 1-1/4 points, you&#8217;d do
+drawn with <kbd><nobr>\*[RULE]</nobr></kbd> to 1-1/4 points,
+you&#8217;d do
 <br/>
 <span class="pre-in-pp">
   .RULE_WEIGHT 1.25
@@ -774,7 +798,7 @@ for a list of pre-registered font styles provided by mom).
 </p>
 
 <p>
-<kbd>\f[&lt;font&gt;]</kbd> can also take a complete valid
+<kbd>\f[&lt;family&gt;&lt;font&gt;]</kbd> can also take a complete valid
 family+font name combo.  This is especially useful should you
 need to change both family and font inline.  For example, if your
 prevailing family and font are Times Roman and you want a few words
@@ -815,8 +839,8 @@ position on the current
 <div class="box-tip">
 <p class="tip">
 <span class="note">Note:</span>
-<kbd>\h'&lt;distance&gt;'</kbd> is exactly equivalent to
-<a href="#fwd"><kbd>\*[FWD n&lt;unit&gt;]</kbd></a>.
+<kbd>\h'&lt;distance&gt;'</kbd> is exactly equivalent to a
+<href="#fwd"><kbd><nobr>\*[FWD&nbsp;n&lt;unit&gt;]</nobr></kbd></a>.
 </p>
 </div>
 
@@ -832,7 +856,7 @@ To move backwards by the same amount, do
 <p class="tip" style="margin-top: -1em;">
 <span class="note">Note:</span>
 <kbd>\h'-&lt;distance&gt;'</kbd> is exactly equivalent to
-<a href="#bck"><kbd>\*[BCK n&lt;unit&gt;]</kbd></a>.
+<a href="#bck"><kbd><nobr>\*[BCK&nbsp;n&lt;unit&gt;]</nobr></kbd></a>.
 </p>
 </div>
 
@@ -864,7 +888,7 @@ downward on the current
 <p class="tip">
 <span class="note">Note:</span>
 <kbd>\v'&lt;distance&gt;'</kbd> is exactly equivalent to
-<a href="#down"><kbd>\*[DOWN n&lt;unit&gt;]</kbd></a>.
+<a href="#down"><kbd><nobr>\*[DOWN&nbsp;n&lt;unit&gt;]</nobr></kbd></a>.
 </p>
 </div>
 
@@ -880,14 +904,14 @@ To move upward an equivalent amount, do
 <p class="tip">
 <span class="note">Note:</span>
 <kbd>\v'&lt;-distance&gt;'</kbd> is exactly equivalent to
-<a href="#up"><kbd>\*[UP n&lt;unit&gt;]</kbd></a>.
+<a href="#up"><kbd><nobr>\*[UP&nbsp;n&lt;unit&gt;]</nobr></kbd></a>.
 </p>
 </div>
 
 <div class="box-important">
 <p class="tip">
 <span class="important">Important:</span>
-The vertical motion of <kbd>\v</kbd> affects ONLY type on the
+The vertical motion of <kbd>\v</kbd> only affects type on the
 current
 <a href="definitions.html#outputline">output line</a>.
 When groff breaks the output line, the effect of
@@ -935,9 +959,11 @@ to a macro that normally requires a
 </p>
 
 <p class="tip-bottom">
-Furthermore, if the string is composed of several words separated
-by spaces, you MUST surround the whole escape with double quotes,
-as in the example above.
+Furthermore, if the <kbd>\w</kbd> is used in place of a
+<a href="definitions.html#numericargument">numeric argument</a>
+to a macro and <kbd>string</kbd> is composed of several words
+separated by spaces, you must surround the whole escape with double
+quotes, as in the example above.
 </p>
 </div>
 
@@ -980,7 +1006,7 @@ sophisticated &#8220;drawing&#8221; escapes.  It is well 
beyond
 the scope of this documentation to demonstrate their usage; see
 <br/>
 <span class="pre-in-pp">
-  info groff =&gt; Escape index =&gt; \D
+  info groff \\D
 </span>
 for directions concerning their use.  The drawing escapes can be a
 bit unwieldy, so mom provides &#8220;user-friendly&#8221; macros for
@@ -1034,7 +1060,7 @@ ligatures and letters unique to various European 
languages), consult
   CHARACTER                   ESCAPE SEQUENCE
   ---------                   ---------------
   Comment line                \# or .\"
-  Fixed-width space           \&lt;space&gt; (i.e. backslash followed by a 
space)
+  Fixed-width space           \&lt;space&gt;
   Unbreakable space           \~
   Digit-width (figure) space  \0
   Zero-width character        \&amp;
diff --git a/contrib/mom/momdoc/intro.html b/contrib/mom/momdoc/intro.html
index f7e6bc7..5c9aa8c 100644
--- a/contrib/mom/momdoc/intro.html
+++ b/contrib/mom/momdoc/intro.html
@@ -381,9 +381,9 @@ has ever read a manpage.  Briefly:
 Some macros don&#8217;t require an argument.  They simply start
 something.  When you need to turn them off, the same macro with
 any argument will do the trick.  That&#8217;s right: <em>any</em>
-argument (in caps, lowercase or a mixture thereof).  This permits
-choosing whatever works for you: <kbd>OFF, end, Quit, Q, X</kbd>,
-and so on.
+argument (in caps, lowercase, or a mixture thereof).  This permits
+choosing whatever works for you: <kbd>OFF</kbd>, <kbd>end</kbd>,
+<kbd>Quit</kbd>, <kbd>Q</kbd>, <kbd>X</kbd>, and so on.
 </p>
 
 <p>
diff --git a/contrib/mom/momdoc/rectoverso.html 
b/contrib/mom/momdoc/rectoverso.html
index 38e1f3e..92cf80f 100644
--- a/contrib/mom/momdoc/rectoverso.html
+++ b/contrib/mom/momdoc/rectoverso.html
@@ -214,27 +214,21 @@ get printed correctly, and a host of other details.
 <p>
 The COLLATE macro, which can be used with any
 <a href="docprocessing.html#doctype">DOCTYPE</a>
-except <kbd>LETTER</kbd>, lets you glue mom-formatted text files
+except <kbd>LETTER</kbd>, lets you glue mom-formatted input files
 together.  You need only concatenate chapters into a single file
-(most likely with the <kbd>cat</kbd> command), put <kbd>.COLLATE</kbd> at the 
end of each
-concatenated chapter, follow it with the
+(most likely with <kbd>cat(1)</kbd>), and put
+<kbd>.COLLATE</kbd> at the end of each concatenated chapter.
+Assuming all the files begin with the required
 <a href="docprocessing.html#reference-macros">reference macros</a>
-(metadata) needed for the new chapter, e.g.
-<a href="docprocessing.html#chapter">CHAPTER</a>
-or
-<a href="docprocessing.html#chapter-string">CHAPTER_STRING</a>,
-make any pertinent style changes to the upcoming chapter (unlikely,
-but possible), and re-invoke the
-<a href="docprocessing.html#start">START</a>
-macro.  (Most likely, the metadata and <kbd>.START</kbd> are
-already there.)  Each chapter will begin on a fresh page and behave
-as expected.
+(metadata), style parameters, and
+<a href="docprocessing.html#start">START</a>,
+each chapter will begin on a fresh page and behave as expected.
 </p>
 
 <p>
-Even if you always work with monolithic, multi-chapter files, every
+Even if you work with monolithic, multi-chapter files, every
 chapter and its associated metadata plus <kbd>.START</kbd>
-still needs to be preceded by a <kbd>.COLLATE</kbd> command.
+still needs to be preceded by <kbd>.COLLATE</kbd>.
 </p>
 
 <div class="box-tip">
@@ -306,7 +300,7 @@ by a macro likely to cause a linebreak (e.g. <kbd>.LIST 
OFF</kbd> or
 the start of the following document.
 </p>
 
-<p class="tip-bottom">
+<p class="tip-bottom" style="margin-top: -1em">
 In order to avoid this, insert
 <a href="docprocessing.html#EL"><kbd>.EL</kbd></a>
 after the last line of text, before <kbd>.COLLATE</kbd> and/or any
diff --git a/contrib/mom/momdoc/refer.html b/contrib/mom/momdoc/refer.html
index 5fbf910..963f036 100644
--- a/contrib/mom/momdoc/refer.html
+++ b/contrib/mom/momdoc/refer.html
@@ -531,13 +531,11 @@ the document?
 </p>
 
 <p>
-It&#8217;s simple.  Instead of invoking groff with just the
-<kbd>-mom</kbd> option, as explained
-<a href="using.html#using-saving">here</a>,
-invoke groff with the <kbd>-R</kbd> option as well, like this:
+It&#8217;s simple.  Pass the <kbd>-R</kbd> flag to pdfmom or groff,
+like this:
 <br/>
 <span class="pre-in-pp">
-  groff -R -mom &lt;filename&gt; ...
+  pdfmom -R &lt;filename&gt; ...
 </span>
 </p>
 </div>
@@ -746,8 +744,9 @@ are very few rules, and those there are make sense.  In a 
nutshell:
       <kbd>\[oq]</kbd> and <kbd>\[cq]</kbd> (openquote, closequote) rather 
than the
       single-quote (or apostrophe) character on your keyboard</li>
   <li>if part of a field needs to be forced into italics, use the
-      escapes <kbd>\*[IT]</kbd> and <kbd>\*[PREV]</kbd>; if the italicized
-      portion concludes the field, omit <kbd>\*[PREV]</kbd></li>
+      escapes <kbd><nobr>\*[IT]</nobr></kbd> and
+      <kbd><nobr>\*[PREV]</nobr></kbd>; if the italicized portion
+      concludes the field, omit <kbd><nobr>\*[PREV]</nobr></kbd></li>
   <li>if you require characters with accents, ligatures or special
       symbols, use groff&#8217;s &#8220;named&#8221; glyphs (e.g.
       <kbd>\['e]</kbd> for <kbd>é</kbd>); a full list can be found in
@@ -894,8 +893,8 @@ information minus <kbd>idem</kbd>, like this:
 <h4 id="p" class="docs fields">%p &ndash; post-author information</h4>
 
 <p>
-When citing from a preface, foreword, introduction, afterword or
-appendix, MLA requires that the information come between the
+When citing from a preface, foreword, introduction, afterword,
+or appendix, MLA requires that the information come between the
 author&#8217;s name and the work&#8217;s title, like this:
 <br/>
 <span class="pre-in-pp">
@@ -1144,7 +1143,7 @@ reference in a footnote by doing
 </span>
 However, if you have a lot of references going into footnotes (or
 endnotes), it&#8217;s much shorter to type <kbd>.REF/.REF</kbd>
-than <kbd>.FOOTNOTE/.FOOTNOTE OFF</kbd>.  It also helps you
+than <kbd>.FOOTNOTE/.FOOTNOTE&nbsp;OFF</kbd>.  It also helps you
 distinguish&mdash;visually, in your input file&mdash;between
 footnotes (or endnotes) which are references, and footnotes (or
 endnotes) which are explanatory, or expand on the text.
@@ -1210,7 +1209,7 @@ By default, FOOTNOTE_REFS sets the
 <a href="docelement.html#footnote-marker-style">FOOTNOTE_MARKER_STYLE</a>
 to <kbd>NUMBER</kbd> (i.e. superscript numbers).  You may change
 change that if you wish by invoking FOOTNOTE_MARKER_STYLE, with the
-argument you want after FOOTNOTE_REFS.
+argument you want, after FOOTNOTE_REFS.
 </p>
 
 <p>
@@ -1241,7 +1240,7 @@ macro to endnotes.&#8221; You invoke it by itself, with 
no argument.
 <p>
 When ENDNOTE_REFS is in effect, mom continues to format regular
 endnotes, (i.e. those introduced with <kbd>.ENDNOTE</kbd> and
-terminated with <kbd>.ENDNOTE OFF</kbd>) in the normal way.
+terminated with <kbd>.ENDNOTE&nbsp;OFF</kbd>) in the normal way.
 </p>
 
 <p>
@@ -1361,8 +1360,9 @@ hyphenation for references.
 <p>
 HYPHENATE_REFS is a toggle macro; invoking it by itself will turn
 automatic hyphenation of REF-bracketed references on (the default).
-Invoking it with any other argument (<kbd>OFF, NO, X</kbd>, etc.)
-will disable automatic hyphenation for references bracketed by REF.
+Invoking it with any other argument (<kbd>OFF</kbd>, <kbd>NO</kbd>,
+<kbd>X</kbd>, etc.) will disable automatic hyphenation for
+references bracketed by REF.
 </p>
 
 <p>
@@ -1461,7 +1461,7 @@ equivalent arguments to
 
 <p>
 You may enter the BIBLIOGRAPHY_TYPE either before or after
-<kbd>.BIBLIOGRAPHY</kbd>.  It must, however, always come before the
+<kbd>.BIBLIOGRAPHY</kbd>.  It must, however, always come before
 any <kbd>refer</kbd> commands.  See
 <a href="#bibliography-from-embedded">Generating a bibliography from 
parenthetical insertions</a>
 and
@@ -1895,7 +1895,8 @@ centre string.
 <p>
 If, for some reason, having enabled the header/footer centre string
 on bibliography pages, you wish to disable it, invoke the same macro
-with any argument (<kbd>OFF, QUIT, Q, X</kbd>...).
+with any argument (<kbd>OFF</kbd>, <kbd>QUIT</kbd>, <kbd>Q</kbd>,
+<kbd>X</kbd>...).
 </p>
 
 <h5 id="biblio-allows-headers" class="docs" style="margin-top: -.5em; 
margin-bottom: .5em; margin-left: .5em;">&bull;&nbsp;Allow headers on 
bibliography pages</h5>
@@ -1924,7 +1925,7 @@ If you want headers on every page including the first, do
 <span class="note">Note:</span>
 If FOOTERS are on, mom prints footers on every bibliography page.
 This is a style convention.  In mom, there is no such beast as
-BIBLIOGRAPHY_ALLOWS_FOOTERS OFF.
+BIBLIOGRAPHY_ALLOWS_FOOTERS&nbsp;OFF.
 </p>
 </div>
 
@@ -2035,8 +2036,8 @@ Invoked without an argument,
 underneath the bibliography&#8217;s first-page title.  Invoked with the
 argument, <kbd>DOUBLE</kbd>, BIBLIOGRAPHY_STRING_UNDERSCORE will
 double-underscore the title.  Invoked with any other non-numeric
-argument, (e.g. <kbd>OFF, NO, X</kbd>, etc.) the macro disables
-underlining of the title.
+argument, (e.g. <kbd>OFF</kbd>, <kbd>NO</kbd>, <kbd>X</kbd>, etc.)
+the macro disables underlining of the title.
 </p>
 
 <p>
diff --git a/contrib/mom/momdoc/stylesheet.css 
b/contrib/mom/momdoc/stylesheet.css
index 46dc214..5e2c40b 100644
--- a/contrib/mom/momdoc/stylesheet.css
+++ b/contrib/mom/momdoc/stylesheet.css
@@ -27,7 +27,7 @@ a:link.quick { text-decoration: underline; }
 
 .page /* Page setup: page color, size and border */
 {
-  width: 760px ;
+  width: 57% ;
   position: relative ;
   top: 12px ;
   bottom: 12px ;
@@ -220,8 +220,7 @@ div.rule-long /* precedes nav bar at bottom of page */
 .box-code
 {
   display: block ;
-  width: 679px ;
-  max-width: 679px ;
+  width: 100% ;
   border: solid 1px #302419 ;
   padding-top: 5px ;
   padding-bottom: 18px ;
diff --git a/contrib/mom/momdoc/tables-of-contents.html 
b/contrib/mom/momdoc/tables-of-contents.html
index f3013d1..52e6786 100644
--- a/contrib/mom/momdoc/tables-of-contents.html
+++ b/contrib/mom/momdoc/tables-of-contents.html
@@ -91,7 +91,7 @@ contents&#8217; typographic appearance, you can.
 <p>
 When you output a table of contents (with
 <kbd><a href="#toc">.TOC</a></kbd>),
-mom finishes processing the last page of your document, then breaks
+mom finishes processing the last page of your document then breaks
 to a new page for printing the table of contents.
 </p>
 
@@ -189,7 +189,7 @@ is used to process files with a table of contents, the macro
 of contents to the top of the output document, with the presence
 of a cover and/or title page sensibly taken into account.  Full
 AUTO_RELOCATE_TOC usage is described in the manual,
-<a href="http://www.schaffter.ca/mom/pdf/mom-pdf.pdf";><span 
class="book-title">Producing PDFs with groff and mom</span></a>.
+<a href="https://www.schaffter.ca/mom/pdf/mom-pdf.pdf";><span 
class="book-title">Producing PDFs with groff and mom</span></a>.
 </p>
 
 <p>
@@ -314,7 +314,7 @@ by a macro likely to cause a linebreak (e.g. <kbd>.LIST 
OFF</kbd> or
 Table of Contents.
 </p>
 
-<p class="tip-bottom">
+<p class="tip-bottom" style="margin-top: -1em">
 In order to avoid this, insert
 <a href="typesetting.html#el"><kbd>.EL</kbd></a>
 after the last line of text, before <kbd>.TOC</kbd> and/or any
@@ -561,8 +561,8 @@ immediately prior to <kbd>.TOC</kbd>.
 </p>
 
 <p>
-A special macro
-<kbd><a href="#toc-pagenum-style">TOC_PAGENUM_STYLE</a></kbd>
+A special macro,
+<a href="#toc-pagenum-style">TOC_PAGENUM_STYLE</a>,
 controls the style of table of contents pagination (i.e. the actual
 table of contents pages&#8217; numbers, not the page number
 references of entries).
@@ -875,16 +875,17 @@ Macro: <b>TOC_PREFIX_CHAPTER_NUMBER</b> <kbd 
class="macro-args">&lt;none&gt; &lt
 <p>
 By default, mom does not prefix a chapter number to chapters or
 section titles in the table of contents.  If you would like her to
-do so, invoke <kbd>TOC_PREFIX_CHAPTER_NUMBER</kbd> without an
+do so, invoke <kbd>.TOC_PREFIX_CHAPTER_NUMBER</kbd> without an
 argument before
 <a href="docprocessing.html#start">START</a>.
 </p>
 
 <p>
-You may subsequently disable the prefixing of chapter numbers by
-supplying the macro with any argument (<b>OFF, QUIT, Q, X</b>...)
-prior to the <kbd>START</kbd> that comes after
-<a href="rectoverso.html#collate">COLLATE</a>.
+You may subsequently disable the prefixing of chapter numbers
+by supplying the macro with any argument (<kbd>OFF</kbd>,
+<kbd>QUIT</kbd>, <kbd>Q</kbd>, <kbd>X</kbd>...) prior to the
+<kbd>.START</kbd> that comes after
+<a href="rectoverso.html#collate"><kbd>.COLLATE</kbd></a>.
 </p>
 
 <p>
@@ -995,7 +996,7 @@ when
 <a href="docelement.html#prefix-chapter-number">PREFIX_CHAPTER_NUMBER</a>
 is enabled.  To enable the numbering of chapter or section titles
 in this circumstance, use
-<a href="#toc-prefix-ch-number"><kbd>TOC_PREFIX_CHAPTER_NUMBER</kbd></a>.
+<a href="#toc-prefix-ch-number">TOC_PREFIX_CHAPTER_NUMBER</a>.
 </p>
 </div>
 
@@ -1167,8 +1168,8 @@ TOC_PAGE_SETTINGS allows you to enter extra formatting 
changes for
 the Table of Contents as if it were simply another collated section
 or chapter of a document.  Because it&#8217;s a toggle macro,
 invoking it by itself begins collecting your formatting directives,
-and invoking it with any argument (<b>OFF, QUIT, END</b>...) stops
-the collection.
+and invoking it with any argument (<kbd>OFF</kbd>, <kbd>QUIT</kbd>,
+<kbd>END</kbd>...) stops the collection.
 </p>
 
 <p>
diff --git a/contrib/mom/momdoc/typesetting.html 
b/contrib/mom/momdoc/typesetting.html
index b137a5e..78a7cc5 100644
--- a/contrib/mom/momdoc/typesetting.html
+++ b/contrib/mom/momdoc/typesetting.html
@@ -162,19 +162,7 @@ control.
 
 <p>
 The page setup macros establish the physical dimensions of your page
-and the margins you want it to have. Groff has defaults for these,
-but I recommend setting them at the top of your files anyway.
-</p>
-
-<p>
-If you&#8217;re using mom&#8217;s
-<a href="docprocessing.html#docprocessing">document processing macros</a>,
-these macros must come after
-<a href="docprocessing.html#printstyle">PRINTSTYLE</a>.
-</p>
-
-<p>
-The
+and the margins you want it to have.  The
 <a href="#paper">PAPER</a>
 macro provides a shortcut for setting the page to the correct
 dimensions for a number of common paper sizes.  The
@@ -295,15 +283,36 @@ allowed.  Hence, to tell mom that the width of your 
printer sheet is
 </span>
 Please read the
 <a href="#page-setup-note">Important note on page dimensions and papersize</a>
-for information on ensuring groff respects your
-PAGEWIDTH.
+for information on ensuring groff respects your PAGEWIDTH.
 </p>
 
-<div class="box-important">
+<div id="important" class="box-important">
 <p class="tip">
-<span class="important">Important:</span> <kbd>PAGEWIDTH</kbd>,
-when you need it, should be placed at the top of your files.
+<span class="important">Important:</span> PAGEWIDTH and the
+corresponding
+<a href="#pagelength">PAGELENGTH</a>
+are not intended for use with the document processing macros but
+rather for creating unique media sizes for non-structured output.
+When you need them, they should be placed at the very top of the
+file.
 </p>
+
+<p class="tip-bottom" style="margin-top: -1em">
+If you do need PAGEWIDTH/PAGELENGTH for a structured document, they
+should come after
+<a href="docprocessing.html#printstyle">PRINTSTYLE</a>,
+not at the top of your file.  Furthermore, you must set the left and
+right margins yourself with
+<a href="#l-margin">L_MARGIN</a>
+and
+<a href="#r-margin">R_MARGIN</a>.
+A better
+choice in such scenarios is
+<a href="#page">PAGE</a>,
+which allows you to set the page dimensions and all the margins with
+a single macro.
+</p>
+
 </div>
 
 <!-- -PAGELENGTH- -->
@@ -334,8 +343,12 @@ for information on ensuring groff respects your PAGELENGTH.
 
 <div class="box-important">
 <p class="tip">
-<span class="important">Important:</span> <kbd>PAGELENGTH</kbd>,
-when you need it, should be placed at the top of your files.
+<span class="important">Important:</span> PAGELENGTH and the
+corresponding
+<a href="#pagewidth">PAGEWIDTH</a>
+are not intended for use with the document processing macros.  See
+<a href="#important">here</a>
+for more information.
 </p>
 </div>
 
@@ -385,8 +398,8 @@ for information on ensuring groff respects your PAPER size.
 
 <div class="box-important">
 <p class="tip">
-<span class="important">Important:</span> <kbd>PAPER</kbd> when you
-need it, should be placed at the top of your files.
+<span class="important">Important:</span> If you need PAPER,
+it should always be placed at the very top of your file.
 </p>
 </div>
 
@@ -405,19 +418,23 @@ Macro: <b>L_MARGIN</b> <kbd class="macro-args">&lt;left 
margin&gt;</kbd>
 
 <p>
 L_MARGIN establishes the distance from the left edge of the printer
-sheet at which you want your type to start.  It may be used any
-time, and remains in effect until you enter a new value.
-</p>
-
-<p>
+sheet at which you want your type to start.
 <a href="#il">Left indents</a>
 and
 <a href="#tabs">tabs</a>
-are calculated from the value you pass to L_MARGIN, hence it&#8217;s
-always a good idea to invoke it before starting any serious
-typesetting.  A unit of measure is required.  Decimal fractions are
-allowed.  Therefore, to set the left margin at 3 picas (1/2 inch),
-you&#8217;d enter either
+are calculated from the value you pass to L_MARGIN.
+If you use the macros
+<a href="#pagewidth">PAGEWIDTH</a>
+or
+<a href="#paper">PAPER</a>
+without setting L_MARGIN, mom automatically sets the left margin to
+1 inch.
+</p>
+
+<p>
+A unit of measure is required and decimal fractions are allowed.
+Therefore, to set the left margin at 3 picas (1/2 inch), you&#8217;d
+enter either
 <br/>
 <span class="pre-in-pp">
   .L_MARGIN 3P
@@ -426,13 +443,6 @@ or
 <span class="pre-in-pp">
   .L_MARGIN .5i
 </span>
-If you use the macros
-<a href="#page">PAGE</a>,
-<a href="#pagewidth">PAGEWIDTH</a>
-or
-<a href="#paper">PAPER</a>
-without invoking L_MARGIN (either before or afterwards), mom
-automatically sets L_MARGIN to 1 inch.
 </p>
 
 <div class="box-tip">
@@ -470,8 +480,8 @@ and/or
 <a href="#page">PAGE</a>
 (if a right margin isn&#8217;t given to PAGE).  The reason is that
 R_MARGIN calculates line length from the overall page dimensions and
-the left margin.  Obviously, it can&#8217;t make the calculation if
-it doesn&#8217;t know the page width and the left margin.
+the left margin.  Mom can&#8217;t make the calculation if
+she doesn&#8217;t know the page width and the left margin.
 </p>
 </div>
 
@@ -674,7 +684,7 @@ different than when you&#8217;re using just the typesetting 
macros
 PAGE lets you establish paper dimensions and page margins with a
 single macro.  The only required argument is page width.  The rest
 are optional, but they must appear in order and you can&#8217;t
-skip over any. <kbd>&lt;lm&gt;, &lt;rm&gt;, &lt;tm&gt;</kbd> and
+skip over any. <kbd>&lt;lm&gt;, &lt;rm&gt;, &lt;tm&gt;</kbd>, and
 <kbd>&lt;bm&gt;</kbd> refer to the left, right, top and bottom
 margins respectively.
 </p>
@@ -717,17 +727,17 @@ This sets up an 8-1/2 by 11 inch page with margins of 45 
points
 </p>
 
 <p>
-Additionally, if you invoke <kbd>.PAGE</kbd> with a top margin
-argument, any macros you invoke after <kbd>.PAGE</kbd> will almost
-certainly move the
+Additionally, if you are not using the
+<a href="docprecessing.html">document processing macros</a>
+and invoke PAGE with a top margin argument, any macro you invoke
+after PAGE will likely move the
 <a href="definitions.html#baseline">baseline</a>
 of the first line of text down by one linespace.  To compensate, do
 <br/>
 <span class="pre-in-pp">
   .RLD 1v
 </span>
-immediately before entering any text, or, if it&#8217;s feasible,
-make PAGE the last macro you invoke prior to entering text.
+immediately before entering any text.
 </p>
 
 <p>
@@ -762,8 +772,8 @@ you to the top of a new one (subject to the top margin set 
with
 
 <p>
 The basic typesetting parameter macros deal with fundamental
-requirements for setting type: family, font, point size, leading and
-line length.
+requirements for setting type: family, font, point size, leading,
+and line length.
 </p>
 
 <p>
@@ -880,7 +890,7 @@ However, if the font style does not exist in the new 
family, mom
 will set all subsequent type in the
 <a href="#fallback-font">fallback font</a>
 (by default, Courier Medium Roman) until she encounters a
-<a href="#font">.FT</a>
+<a href="#font">FT</a>
 request that&#8217;s valid for the family.  For example, assuming
 you don&#8217;t have the font &#8220;Medium Condensed Roman&#8221;
 (mom extension &#8220;CD&#8221;) in the Helvetica family:
@@ -974,7 +984,7 @@ though, that you must have the fonts, correctly installed 
and named,
 in order to use the arguments.  (See
 <a href="appendices.html#fonts">Adding fonts to groff</a>
 for instructions and information.)  Please also read the
-<a href="#fam-add-note">ADDITIONAL NOTE</a>
+<a href="#fam-add-note">Additional note</a>
 found in the description of the FAMILY macro.
 </p>
 
@@ -1170,7 +1180,7 @@ would allow you to set point sizes with <kbd>.PS</kbd>.
 <!-- -LS- -->
 
 <div class="macro-id-overline">
-<h3 id="leading" class="macro-id">Line spacing/leading</h3>
+<h3 id="leading" class="macro-id">Line spacing / leading</h3>
 </div>
 
 <div class="box-macro-args">
@@ -1557,7 +1567,7 @@ for a definition of the difference between 
&#8220;fill&#8221; and
 </p>
 
 <p>
-LEFT, RIGHT and CENTER let you enter text on a line for line basis
+LEFT, RIGHT, and CENTER let you enter text on a line for line basis
 without having to use the
 <a href="#br">BR</a>
 macro after each line.  Consider the following:
@@ -1573,7 +1583,7 @@ macro after each line.  Consider the following:
   And with no language but a cry.
   .BR
 </span>
-Because text after <kbd>.QUAD LEFT</kbd> is
+Because text after <kbd>.QUAD&nbsp;LEFT</kbd> is
 <a href="definitions.html#filled">filled</a>,
 you have to use the
 <a href="#br">BR</a>
@@ -1593,7 +1603,7 @@ better to do
 <div class="box-important" style="margin-top: -.5em;">
 <p class="tip">
 <span class="important">IMPORTANT:</span> Because LEFT,
-RIGHT and CENTER are nofill modes, groff does not always respect the
+RIGHT, and CENTER are nofill modes, groff does not always respect the
 current line length.
 <a href="definitions.html#inputline">Input lines</a>
 that run long may exceed it, or get broken in undesirable ways.
@@ -1684,7 +1694,7 @@ with the
 <i>bothersome, you may prefer to use the</i>
 <a href="definitions.html#inlines">inline escape</a>
 <i>alternative to</i> EL,
-<a href="inlines.html#b"><kbd>\*[B]</kbd></a>,
+<a href="inlines.html#b"><kbd><nobr>\*[B]</nobr></kbd></a>,
 <i>which works consistently regardless of the fill mode.
 </i>EL <i>does not work after the</i>
 <a href="goodies.html#pad">PAD</a>
@@ -1694,7 +1704,7 @@ with the
 </p>
 
 <p id="el-example">
-EL ("<span style="text-decoration: underline;">E</span>nd <span 
style="text-decoration: underline;">L</span>ine")
+EL (&#8220;<span style="text-decoration: underline;">E</span>nd <span 
style="text-decoration: underline;">L</span>ine&#8221;)
 is conceptually equivalent to the notion of a carriage return with
 no linefeed.  Its function is simple: it breaks a line without
 advancing on the page.  As an example of where you might use it,
@@ -1773,7 +1783,7 @@ breaks the line and adds two extra linespaces.
 If you supply a unit of measure, SPACE breaks the line then advances
 one linespace (at the current
 <a href="definitions.html#leading">leading</a>)
-PLUS the specified amount of extra space given to SPACE, as in
+<i>plus</i> the specified amount of extra space given to SPACE, as in
 <br/>
 <span class="pre-in-pp">
   .SPACE 6p
@@ -1969,8 +1979,8 @@ to stretch the word spacing.
 <p>
 Word space is relative to point size.  Generally, in/decreasing the
 word space by a value of 1 or 2 produces a difference that in many
-cases is scarcely visible; in/decreasing by a value between 3 and 5
-produces a subtle but noticeable difference; and in/decreasing by a
+cases is scarcely visible.  In/decreasing by a value between 3 and 5
+produces a subtle but noticeable difference.  In/decreasing by a
 value greater than 6 is almost always apparent.  You should preview
 your work to assess the effect of WS.
 </p>
@@ -2038,17 +2048,17 @@ normal word space PLUS the +2 value passed to SS.
 Like
 <a href="#ws">WS</a>,
 increasing the sentence space by a value of 1 or 2 produces a
-difference that in many cases is scarcely visible; increasing by a
+difference that in many cases is scarcely visible.  Increasing by a
 value of 5 or so produces a subtle but noticeable difference (i.e.,
-the space between double-spaced input sentences will be slightly but
-visibly greater than the space between words); and increasing by a
+the space between double-spaced input sentences will be slightly
+but visibly greater than the space between words).  Increasing by a
 value greater than 10 is always apparent.  You should preview your
 work to assess the effect of SS.
 </p>
 
 <p>
 There&#8217;s an additional argument you can pass SS: the number
-zero (without the + sign).  It&#8217;s the argument you&#8217;ll
+zero (without the plus sign).  It&#8217;s the argument you&#8217;ll
 use most often.  Typeset copy should never have two spaces between
 sentences, and the "zero" argument tells groff to give the extra
 spaces no space at all (effectively removing them).  Therefore, if
@@ -2123,7 +2133,7 @@ to HY, I&#8217;ve broken them down into separate sections.
 
 <p>
 HY by itself (i.e. with no argument) simply turns automatic
-hyphenation on.  Any argument other than LINES, MARGIN, SPACE or
+hyphenation on.  Any argument other than LINES, MARGIN, SPACE, or
 DEFAULT, turns automatic hyphenation off.  For example, as explained
 in
 <a href="intro.html#macro-args">How to read macro arguments</a>,
@@ -2211,9 +2221,9 @@ MARGIN requires a
 <h3 class="docs numbered">4.&nbsp;&nbsp;HY SPACE</h3>
 
 <p>
-HY SPACE sets an amount of extra interword space that groff will try
-to put between words on a line in order to PREVENT hyphenation.  HY
-SPACE applies only to
+HY SPACE sets an amount of extra interword space that groff will
+try to put between words on a line in order to <i>prevent</i>
+hyphenation.  HY SPACE applies only to
 <a href="definitions.html#just">justified lines</a>.
 Generally speaking, you&#8217;ll want this value to be quite small,
 since too big a value will result in lines with gaping holes between
@@ -2284,10 +2294,10 @@ Macro: <b>HY_SET</b> <kbd 
class="macro-args">&lt;lines&gt; [ &lt;margin&gt; [ &l
 <p>
 HY_SET lets you set the parameters for hyphenation
 with a single macro. <kbd>&lt;lines&gt;,</kbd>
-<kbd>&lt;margin&gt;</kbd> and
+<kbd>&lt;margin&gt;</kbd>, and
 <kbd>&lt;space&gt;</kbd> correspond to the numeric
 values required by <kbd>LINES</kbd>,
-<kbd>MARGIN</kbd> and <kbd>SPACE</kbd> as described
+<kbd>MARGIN</kbd>, and <kbd>SPACE</kbd> as described
 <a href="#hy">above</a>.
 </p>
 
@@ -2368,7 +2378,7 @@ when it&#8217;s invoked if you&#8217;re in one of the
 <a href="definitions.html#fill">fill</a>
 modes (i.e.
 <a href="#quad">QUAD</a>
-L, R, C, J or
+L, R, C, J, or
 <a href="#justify">JUSTIFY</a>).
 If you want
 RW to break at the ends of the previous
@@ -2382,7 +2392,7 @@ that&#8217;s what you want by invoking
 <div class="box-important">
 <p class="tip">
 <span class="important">IMPORTANT:</span>
-RW (and its complement, EW; see below) only affects the current
+RW (and its complement, EW, see below) only affects the current
 font, and remains in effect for that font every time it&#8217;s
 called, hence it must be reset to zero to cancel its effect
 (<kbd>.RW&nbsp;0</kbd>).
@@ -2431,7 +2441,7 @@ when it&#8217;s invoked if you&#8217;re in one of the
 <a href="definitions.html#fill">fill</a>
 modes (i.e.
 <a href="#quad">QUAD</a>
-L, R, C, J or
+L, R, C, J, or
 <a href="#justify">JUSTIFY</a>).
 If you want
 EW to break at the ends of the previous
@@ -2446,7 +2456,7 @@ toggle macro.
 <div class="box-important">
 <p class="tip">
 <span class="important">IMPORTANT:</span>
-EW (and its complement, RW; see above) only affects the current
+EW (and its complement, RW, see above) only affects the current
 font, and remains in effect for that font every time it&#8217;s
 called, hence it must be reset to zero to cancel its effect
 (<kbd>.RW&nbsp;0</kbd>).
@@ -2468,7 +2478,7 @@ By default, in
 <a href="definitions.html#filled">fill</a>
 modes (i.e.
 <a href="#quad">QUAD</a>
-L, R, C, J or
+L, R, C, J, or
 <a href="#justify">JUSTIFY</a>)
 mom does not break
 <a href="definitions.html#inputline">input lines</a>
@@ -2479,7 +2489,8 @@ or
 If you&#8217;d like her to break input lines prior to RW or EW,
 invoke <kbd>.BR_AT_INPUT_LINE</kbd> without any argument.  To
 disable the breaks, invoke <kbd>.BR_AT_INPUT_LINE</kbd> with any
-argument (OFF, QUIT, Q, X...), like this
+argument (<kbd>OFF</kbd>, <kbd>QUIT</kbd>, <kbd>END</kbd>,
+<kbd>X</kbd>...), like this
 <br/>
 <span class="pre-in-pp">
   .BR_AT_LINE_KERN OFF
@@ -2488,7 +2499,7 @@ or
 <span class="pre-in-pp">
   .BR_AT_LINE_KERN X
 </span>
-With QUAD L, R or C, mom simply breaks the line.  With QUAD J (or
+With QUAD L, R, or C, mom simply breaks the line.  With QUAD J (or
 just JUSTIFY, which is the same thing), she breaks and
 <a href="definitions.html#force">force justifies</a>
 the line prior to <kbd>.EW</kbd> or <kbd>.RW</kbd>.
@@ -2507,15 +2518,16 @@ Macro: <b>KERN</b> <kbd class="macro-args">toggle</kbd>
 <p>
 By itself (i.e. with no argument), KERN turns automatic pairwise
 <a href="definitions.html#kern">kerning</a>
-on.  With any argument (e.g. OFF, Q, X), pairwise kerning is turned
-off.
+on.  With any argument (e.g. <kbd>OFF</kbd>, <kbd>Q</kbd>,
+<kbd>X</kbd>), pairwise kerning is turned off.
 </p>
 
 <p>
-Kerning of individual character pairs can be controlled with the
+Kerning of individual character pairs can be controlled with the two
 <a href="definitions.html#inlines">inline escapes</a>
-<kbd>\*[BU &lt;n&gt;]</kbd> and
-<kbd>\*[FU &lt;n&gt;]</kbd>.  See
+<br/>
+<kbd>\*[BU&nbsp;&lt;n&gt;]</kbd> and
+<kbd>\*[FU&nbsp;&lt;n&gt;]</kbd>.  See
 <a href="inlines.html#inline-kerning-mom">Inline Escapes, kerning</a>.
 </p>
 
@@ -2657,9 +2669,10 @@ Inline: <kbd class="macro-args">\*[SLANTX</kbd>]
 </div>
 
 <p>
-<kbd class="macro-args">\*[SLANT]</kbd> begins pseudo-italicizing type.
-<kbd class="macro-args">\*[SLANTX]</kbd> turns the feature off.  Both are
-<a href="definitions.html#inlines">inline escapes</a>,
+<kbd class="macro-args">\*[SLANT]</kbd> begins pseudo-italicizing
+<type. kbd class="macro-args"><nobr>\*[SLANTX]</nobr></kbd> turns
+<the feature off.  Both are a href="definitions.html#inlines">inline
+<escapes</a>,
 therefore they should not appear as separate lines, but rather be
 embedded in text lines, like this:
 <br/>
@@ -2672,8 +2685,8 @@ you&#8217;d do
 <span class="pre-in-pp">
   \*[SLANT]Not everything is as it seems.\*[SLANTX]
 </span>
-Once <kbd>\*[SLANT]</kbd> is invoked, it remains in effect until
-turned off.
+Once <kbd><nobr>\*[SLANT]</nobr></kbd> is invoked, it remains in
+effect until turned off.
 </p>
 
 <div class="box-tip" style="margin-top: .5em;">
@@ -2725,7 +2738,7 @@ to the mom default, do
 emboldening type; it merely tells mom what you want the emboldening
 offset to be.  To start emboldening, use the
 <a href="definitions.html#inlines">inline escape</a>
-<kbd>\*[BOLDER]</kbd>.
+<kbd><nobr>\*[BOLDER]</nobr></kbd>.
 </p>
 </div>
 
@@ -2743,7 +2756,8 @@ Inline: <kbd class="macro-args">\*[BOLDERX]</kbd>
 
 <p>
 <kbd class="macro-args">\*[BOLDER]</kbd> begins emboldening type.
-<kbd class="macro-args">\*[BOLDERX]</kbd> turns the feature off.  Both are
+<kbd class="macro-args"><nobr>\*[BOLDERX]</nobr></kbd> turns the
+<kbd class="macro-args">feature off.  Both are
 <a href="definitions.html#inlines">inline escapes</a>,
 therefore they should not appear as separate lines, but rather be
 embedded in text lines, like this:
@@ -2757,8 +2771,8 @@ you&#8217;d do
 <span class="pre-in-pp">
   \*[BOLDER]Not everything is as it seems.\*[BOLDERX]
 </span>
-Once <kbd>\*[BOLDER]</kbd> is invoked, it remains in effect
-until turned off.
+Once <kbd><nobr>\*[BOLDER]</nobr></kbd> is invoked, it remains in
+effect until turned off.
 </p>
 
 <div class="box-tip">
@@ -2793,7 +2807,7 @@ want the characters to be condensed.
 Mom has no default value for CONDENSE, therefore you must set it
 before using the
 <a href="definitions.html#inlines">inline escape</a>
-<kbd><a href="#cond-inline">\*[COND]</a></kbd>.
+<kbd><a href="#cond-inline"><nobr>\*[COND]</nobr></a></kbd>.
 80 percent of the normal character width is a good value, and
 you&#8217;d set it like this:
 <br/>
@@ -2809,13 +2823,13 @@ pseudo-condensing type; it merely tells mom what 
percentage of the
 normal character width you want characters to be condensed.  To
 start pseudo-condensing, use the
 <a href="definitions.html#inlines">inline escape</a>
-<kbd>\*[COND]</kbd>.
+<kbd><nobr>\*[COND]</nobr></kbd>.
 </p>
 
 <p class="tip-bottom">
 <span class="additional-note">Additional note:</span> Make sure that
 pseudo-condensing is off (with
-<kbd><a href="#cond-inline">\*[CONDX]</a></kbd>)
+<kbd><a href="#cond-inline"><nobr>\*[CONDX]</nobr></a></kbd>)
 before making any changes to the pseudo-condense percentage
 with CONDENSE.
 </p>
@@ -2835,7 +2849,7 @@ Inline: <kbd class="macro-args">\*[CONDX]</kbd>
 
 <p>
 <kbd>\*[COND]</kbd> begins pseudo-condensing type.
-<kbd>\*[CONDX]</kbd> turns the feature off.  Both are
+<kbd><nobr>\*[CONDX]</nobr></kbd> turns the feature off.  Both are
 <a href="definitions.html#inlines">inline escapes</a>,
 therefore they should not appear as separate lines, but rather be
 embedded in text lines, like this:
@@ -2843,21 +2857,21 @@ embedded in text lines, like this:
 <span class="pre-in-pp">
   \*[COND]Not everything is as it seems.\*[CONDX]
 </span>
-<kbd>\*[COND]</kbd> remains in effect until you turn it
-off with <kbd>\*[CONDX]</kbd>.
+<kbd><nobr>\*[COND]</nobr></kbd> remains in effect until you turn it
+off with <kbd><nobr>\*[CONDX]</nobr></kbd>.
 </p>
 
 <div class="box-important">
 <p class="tip">
 <span class="important">IMPORTANT:</span> You must turn
-<kbd>\*[COND]</kbd>
-off before making any changes to the point size of your type, either
-via the
+<kbd><nobr>\*[COND]</nobr></kbd> off before making any changes to
+the point size of your type, either via the
 <a href="#ps">PT_SIZE</a>
 macro or with the <kbd>\s</kbd> inline escape.  If you wish
 the new point size to be pseudo-condensed, simply re-invoke
-<kbd>\*[COND]</kbd> afterwards.  Equally, <kbd>\*[COND]</kbd> must
-be turned off before changing the condense percentage with
+<kbd><nobr>\*[COND]</nobr></kbd> afterwards.  Equally,
+<kbd><nobr>\*[COND]</nobr></kbd> must be turned off before changing
+the condense percentage with
 <kbd><a href="#condense">.CONDENSE</a></kbd>.
 </p>
 </div>
@@ -2894,9 +2908,9 @@ characters to be extended.
 Mom has no default value for EXTEND, therefore you must set it
 before using the
 <a href="definitions.html#inlines">inline escape</a>
-<kbd><a href="#ext-inline">\*[EXT]</a></kbd>.
-120% of the normal character width is a good value, and you&#8217;d
-set it like this:
+<kbd><a href="#ext-inline"><nobr>\*[EXT]</nobr></a></kbd>.  120% of
+the normal character width is a good value, and you&#8217;d set it
+like this:
 <br/>
 <span class="pre-in-pp">
   .EXTEND 120
@@ -2910,7 +2924,7 @@ pseudo-extending type; it merely tells mom what 
percentage of the
 normal character width you want characters to be extended.  To start
 pseudo-extending, use the
 <a href="definitions.html#inlines">inline escape</a>
-<kbd>\*[EXT]</kbd>.
+<kbd><nobr>\*[EXT]</nobr></kbd>.
 </p>
 
 <p class="tip-bottom">
@@ -2936,7 +2950,7 @@ Inline: <kbd class="macro-args">\*[EXTX]</kbd>
 
 <p>
 <kbd>\*[EXT]</kbd> begins pseudo-extending type.
-<kbd>\*[EXTX]</kbd> turns the feature off.  Both are
+<kbd><nobr>\*[EXTX]</nobr></kbd> turns the feature off.  Both are
 <a href="definitions.html#inlines">inline escapes</a>,
 therefore they should not appear as separate lines, but rather be
 embedded in text lines, like this:
@@ -2945,16 +2959,17 @@ embedded in text lines, like this:
   \*[EXT]Not everything is as it seems.\*[EXTX]
 </span>
 <kbd>\*[EXT]</kbd> remains in effect until you turn it off with
-<kbd>\*[EXTX]</kbd>.
+<kbd><nobr>\*[EXTX]</nobr></kbd>.
 </p> <div class="box-important"> <p class="tip">
 <span class="important">IMPORTANT:</span> You must turn
-<kbd>\*[EXT]</kbd> off before making any changes to the point size
-of your type, either via the
+<kbd><nobr>\*[EXT]</nobr></kbd> off before making any changes to the
+point size of your type, either via the
 <a href="#ps">PT_SIZE</a>
-macro or with the <kbd>\s</kbd> inline escape.  If you wish the new
-point size to be pseudo-extended, simply re-invoke <kbd>\*[EXT]</kbd>
-afterwards.  Equally, <kbd>\*[EXT]</kbd> must be turned off before
-changing the extend percentage with
+macro or with the <kbd>\s</kbd> inline escape.  If you wish
+the new point size to be pseudo-extended, simply re-invoke
+<kbd><nobr>\*[EXT]</nobr></kbd> afterwards.  Equally,
+<kbd><nobr>\*[EXT]</nobr></kbd> must be turned off before changing
+the extend percentage with
 <a href="#extend">EXTEND</a>.
 </p>
 </div>
@@ -2964,7 +2979,7 @@ changing the extend percentage with
 <a href="docprocessing.html#docprocessing">document processing macros</a>
 with
 <a href="docprocessing.html#printstyle">PRINTSTYLE TYPEWRITE</a>,
-mom ignores <kbd>\*[EXT]</kbd> requests.
+mom ignores <kbd><nobr>\*[EXT]</nobr></kbd> requests.
 </p>
 </div>
 
@@ -2984,7 +2999,11 @@ To begin setting type in pseudo-smallcaps, simply invoke
 <kbd>SMALLCAPS&nbsp;OFF</kbd> (or <kbd>END</kbd>, <kbd>STOP</kbd>,
 <kbd>DONE</kbd>, etc).  If you are currently in a
 <a href="definitions.html#filled">no-fill mode</a>,
-(i.e. <kbd>.LEFT</kbd>, <kbd>.CENTER</kbd>, or <kbd>.RIGHT</kbd>)
+(i.e.
+<a href="#lrc">LEFT</a>,
+<a href="#lrc">CENTER</a>,
+or
+<a href="#lrc">RIGHT</a>)
 and you want the smallcaps to continue on the same line,
 append a <kbd>\c</kbd> to the line, like this
 <br/>
@@ -2994,7 +3013,7 @@ append a <kbd>\c</kbd> to the line, like this
   with a few words in smallcaps.
   .SMALLCAPS OFF
 </span>
-The line preceding <kbd>.SMALLCAPS OFF</kbd> should also have a
+The line preceding <kbd>.SMALLCAPS&nbsp;OFF</kbd> should also have a
 <kbd>\c</kbd> appended to it if you wish it to continue unbroken.
 </p>
 
@@ -3002,7 +3021,9 @@ The line preceding <kbd>.SMALLCAPS OFF</kbd> should also 
have a
 <p class="tip-top">
 <span class="note">Note:</span>
 SMALLCAPS does not have an inline equivalent to
-<a href="inlines.html#uc-lc"><kbd>\*[UC]</kbd> / <kbd>\*[LC]</kbd></a>.
+<a href="inlines.html#uc-lc">
+<kbd><nobr>\*[UC]</kbd>&nbsp;/&nbsp;<kbd><nobr>\*[LC]</nobr></kbd>
+</a>.
 Furthermore, if you&#8217;re using the
 <a href="docprocessing.html#docprocessing">document processing macros</a>
 with
@@ -3270,7 +3291,7 @@ Team spirit     Needs work     Persistently gives higher 
priority
 You want the first tab, CRITERION,
 </p>
 <ul style="margin-top: -.5em; margin-bottom: -.5em;">
-<li>to begin at the left margin of the page &ndash; ie no indent</li>
+<li>to begin at the left margin of the page &ndash; i.e. no indent</li>
 <li>to have a line length of 5 picas</li>
 <li>to be set flush left</li>
 </ul>
@@ -3448,7 +3469,7 @@ In combination with the
 macro and the groff inline escape
 <kbd><a href="inlines.html#inline-horizontal-groff">\h</a></kbd>
 (move horizontally across the page) or mom&#8217;s
-<kbd><a href="inlines.html#inline-horizontal-mom">\*[FWD 
&lt;distance&gt;]</a></kbd>
+<kbd><a 
href="inlines.html#inline-horizontal-mom">\*[FWD&nbsp;&lt;distance&gt;]</a></kbd>
 (move forward) inline, string tabs provide tremendous flexibility in
 setting up complex tab structures.
 </p>
@@ -3480,9 +3501,9 @@ The first thing you need for string tabs is an
 <a href="definitions.html#inputline">input line</a>
 with tab positions marked on it.  Tabs are marked with the
 <a href="definitions.html#inlines">inline escapes</a>
-<kbd><a href="#inline-st">\*[ST&lt;n&gt;]</a></kbd>
+<a href="#inline-st"><kbd><nobr>\*[ST&lt;n&gt;]</nobr></kbd></a>
 and
-<kbd><a href="#inline-st">\*[ST&lt;n&gt;X]</a></kbd>,
+<a href="#inline-st"><kbd><nobr>\*[ST&lt;n&gt;X]</nobr></kbd></a>,
 where <kbd>&lt;n&gt;</kbd>
 is the number you want the tab to have.  (In this example, we
 enclose the input line with the
@@ -3521,7 +3542,7 @@ into its component parts:
 </span>
 </li>
 <li>We want a 1 pica (12 points) gutter between tab 1 and 2,
-    so we insert 12 points of space with \*[FWD 12p]:
+    so we insert 12 points of space with <nobr>\*[FWD&nbsp;12p]:</nobr>
 <br/>
 <span class="pre-in-pp" style="margin-bottom: -.25em;">
   \*[FWD 12p]
@@ -3573,7 +3594,7 @@ From here on in, you call the tabs with
 <kbd><a href="#tab">.TAB</a></kbd>,
 <kbd><a href="#tn">.TN</a></kbd>,
 or
-<kbd><a href="#tn">\*[TB+]</a></kbd>
+<a href="#tn"><kbd><nobr>\*[TB+]</nobr></kbd></a>
 just like typesetting tabs (see
 <a href="#typesetting-tabs-tut">typesetting tabs tutorial</a>).
 </p>
@@ -3644,9 +3665,11 @@ of the tabs have altered because of the new point size.
 
 <p>
 Now try increasing the gutters to 2 picas
-(<kbd>\*[FWD&nbsp;24p]</kbd> or <kbd>\*[FWD&nbsp;2P]</kbd> instead
-of <kbd>\*[FWD&nbsp;12p]</kbd>).  Preview the file again, and notice
-how the tab structure remains the same, but the gutters are wider.
+(<kbd><nobr>\*[FWD&nbsp;24p]</nobr></kbd> or
+<kbd><nobr>\*[FWD&nbsp;2P]</nobr></kbd> instead of
+<kbd><nobr>\*[FWD&nbsp;12p]</nobr></kbd>).  Preview the file again,
+and notice how the tab structure remains the same, but the gutters
+are wider.
 </p>
 </div>
 
@@ -3727,7 +3750,7 @@ this:
   .TAB 1 9p 6P J
 </span>
 Once tabs are set, they can be called at any time with the
-<a href="#tab">TAB &lt;n&gt;</a>
+<a href="#tab">TAB&nbsp;&lt;n&gt;</a>
 macro, where &lt;n&gt; is the number of the desired tab.
 </p>
 
@@ -3735,10 +3758,11 @@ macro, where &lt;n&gt; is the number of the desired tab.
 You can set up any number of typesetting tabs.  However, be aware
 that
 <a href="#string-tabs">string tabs</a>
-are also called with TAB &lt;n&gt;, so be careful that you
+are also called with TAB&nbsp;&lt;n&gt;, so be careful that you
 don&#8217;t set up a typesetting tab numbered, say, 4, when you
 already have a string tab numbered 4.  Every tab, typesetting or
-string, must have a unique numeric identifier. </p>
+string, must have a unique numeric identifier.
+</p>
 
 <div class="box-tip">
 <p class="tip">
@@ -3857,7 +3881,7 @@ justified and broken with
 In other words, in order to use string tabs,
 <a href="#lrc">LEFT</a>
 must be active, or, if
-<a href="#quad">QUAD LEFT</a>
+<a href="#quad">QUAD&nbsp;LEFT</a>
 or
 <a href="#justify">JUSTIFY</a>
 are active, the line on which the string tabs are marked must be
@@ -3915,15 +3939,15 @@ Macro: <b>ST</b> <kbd class="macro-args">&lt;tab 
number&gt;  L | R | C | J [ QUA
 
 <p>
 After string tabs have been marked off on an input line (see
-<a href="#inline-st"><kbd>\*[ST]...\*[STX]</kbd></a>),
+<a href="#inline-st"><kbd><nobr>\*[ST]...\*[STX]</nobr></kbd></a>),
 you need to &#8220;set&#8221; them by giving them a direction and,
 optionally, the <kbd>QUAD</kbd> argument.  In this respect, ST is
 like
 <a href="#tab-set">TAB_SET</a>
 except that you don&#8217;t have to give ST an indent or a
 line length (that&#8217;s already taken care of, inline, by
-<kbd>\*[ST]...\*[STX]</kbd>).  If you want string tab 1 to be left,
-enter
+<kbd><nobr>\*[ST]...\*[STX]</nobr></kbd>).  If you want string tab 1
+to be left, enter
 <br/>
 <span class="pre-in-pp">
   .ST 1 L
@@ -3992,7 +4016,7 @@ If you want the tabs to line up, use
 <a href="#tn">TN</a>
 (Tab Next)
 or, more conveniently, the inline escape
-<a href="#tn">\*[TB+]</a>:
+<a href="#tn"><nobr>\*[TB+]</nobr></a>:
 <br/>
 <span class="pre-in-pp">
   .TAB 1
@@ -4040,7 +4064,7 @@ in the description of the TAB macro for an example of how 
TN works.
 <p>
 In tabs that aren&#8217;t given the <kbd class="normal">QUAD</kbd>
 argument when they&#8217;re set up with
-<a href="#tab-set" class="normal">TAB_SET</a>
+<a href="#tab-set" class="normal">TAB&nbsp;SET</a>
 or
 <a href="#st" class="normal">ST</a>,
 you must terminate the line preceding <kbd class="normal">.TN</kbd>
@@ -4055,7 +4079,7 @@ If you find remembering whether to put in the
 <a href="definitions.html#inlines" class="normal">inline escape</a>
 alternative to
 <kbd class="normal">.TN</kbd>,
-<kbd class="normal"><a href="inlines.html#tb-plus-mom">\*[TB+]</a></kbd>,
+<a href="inlines.html#tb-plus-mom"><kbd 
class="normal"><nobr>\*[TB+]</nobr></kbd></a>,
 which works consistently regardless of the fill mode.
 </p>
 
@@ -4199,13 +4223,13 @@ macro in the
 <p class="tip">
 <span class="note">Additional Note:</span>
 Do not use multi-columns with
-<a href="docprocessing.html#slide">DOCTYPE SLIDES</a>
+<a href="docprocessing.html#slide">DOCTYPE&nbsp;SLIDES</a>
 because MCX uses the lowest line on the page to determine column
 depth.  Owing to the fact that both headers and footers are printed
 prior to slides receiving text, MCX will always go to the
 footer position.  If you need functionality similar to MCO/MCX, use
 the groff requests <kbd>.mk</kbd> and <kbd>.rt</kbd>.  See
-<kbd>info groff --index-search=mk</kbd>.
+<kbd>info groff mk</kbd>.
 </p>
 </div>
 
@@ -4368,7 +4392,7 @@ indents:
 </ul>
 
 <p>
-This section deals exclusively with IL, IR and IB.  For an
+This section deals exclusively with IL, IR, and IB.  For an
 explanation of hanging and temporary indents&mdash;how they work and
 how to use them&mdash;see
 <a href="#hi">Hanging indents</a>
@@ -4406,7 +4430,7 @@ As you can see, once you&#8217;ve supplied a measure to 
an indent
 macro, mom stores the value, obviating the need to repeat it on
 subsequent invocations.  And mom doesn&#8217;t just store the
 measure&mdash;she hangs on to it tenaciously.  Arguments passed to
-IL, IR and IB are additive.  Consider the following:
+IL, IR, and IB are additive.  Consider the following:
 <br/>
 <span class="pre-in-pp">
   .LL 20P
@@ -4428,7 +4452,7 @@ length is shortened by 2 picas to 18 picas).  The second 
block of
 text, after IQ, is, as you&#8217;d expect, set to the full measure.
 The third block of text&mdash;the one to pay attention to&mdash;is
 not right indented by 2 picas, but rather by 4 picas.  Mom adds
-the value of arguments to IL, IR and IB to whatever value is already
+the value of arguments to IL, IR, and IB to whatever value is already
 in effect.
 </p>
 
@@ -4564,7 +4588,7 @@ for more details.
 <div class="box-tip">
 <p class="tip-top">
 <span class="note">Note:</span> Calling a tab (with
-<kbd><a href="#tab">.TAB &lt;n&gt;</a></kbd>)
+<kbd><a href="#tab">.TAB&nbsp;&lt;n&gt;</a></kbd>)
 automatically cancels any active indents.
 </p>
 
@@ -4616,7 +4640,7 @@ for more details.
 <div class="box-tip">
 <p class="tip-top">
 <span class="note">Note:</span> Calling a tab (with
-<kbd><a href="#tab">.TAB &lt;n&gt;</a></kbd>)
+<kbd><a href="#tab">.TAB&nbsp;&lt;n&gt;</a></kbd>)
 automatically cancels any active indents.
 </p>
 
@@ -4686,7 +4710,7 @@ for more details.
 <div class="box-tip">
 <p class="tip-top">
 <span class="note">Note:</span> Calling a tab (with
-<kbd><a href="#tab">.TAB &lt;n&gt;</a></kbd>)
+<a href="#tab"><kbd>.TAB&nbsp;&lt;n&gt;</kbd></a>)
 automatically cancels any active indents.
 </p>
 
@@ -4738,9 +4762,9 @@ turn them off.
 
 <div class="box-important">
 <p class="tip">
-<span class="important">IMPORTANT:</span> Unlike IL, IR and IB,
-measures given to TI are NOT additive.  In the following example,
-the second <kbd>.TI&nbsp;2P</kbd> is exactly 2 picas.
+<span class="important">IMPORTANT:</span> Unlike IL, IR, and IB,
+measures given to TI are <i>not</i> additive.  In the following
+example, the second <kbd>.TI&nbsp;2P</kbd> is exactly 2 picas.
 <br/>
 <span class="pre-in-pp" style="margin-bottom: -18px;">
   .TI 1P
@@ -4811,7 +4835,7 @@ need to turn them off.
 
 <div class="box-important">
 <p class="tip">
-<span class="important">IMPORTANT:</span> Unlike IL, IR and IB,
+<span class="important">IMPORTANT:</span> Unlike IL, IR, and IB,
 measures given to HI are NOT additive.  Each time you pass a measure
 to HI, the measure is treated literally.
 </p>
diff --git a/contrib/mom/momdoc/version-2.html 
b/contrib/mom/momdoc/version-2.html
index 0569ac0..219b499 100644
--- a/contrib/mom/momdoc/version-2.html
+++ b/contrib/mom/momdoc/version-2.html
@@ -185,15 +185,15 @@ and provides an excellent demonstration of mom usage.
 
 <p>
 A new macro for embedding PDF images has been added,
-<a href="images.html#pdf-image"><kbd>PDF_IMAGE</kbd></a>.
+<a href="images.html#pdf-image">PDF_IMAGE</a>.
 </p>
 
 <p>
-<kbd>PDF_IMAGE</kbd> functions similarly to <kbd>PSPIC</kbd> and
-accepts the same arguments.  Differences in implementation are that
-PDF_IMAGE requires the image dimensions (the bounding box) to be
-supplied.  Instructions for getting the bounding box are included in
-the documentation entry for PDF_IMAGE.  Two additional options,
+PDF_IMAGE functions similarly to PSPIC and accepts the same
+arguments.  Differences in implementation are that PDF_IMAGE
+requires the image dimensions (the bounding box) to be supplied.
+Instructions for getting the bounding box are included in the
+documentation entry for PDF_IMAGE.  Two additional options,
 <kbd>SCALE</kbd> and <kbd>ADJUST</kbd>, allow scaling of the image
 and optical centering.
 </p>
@@ -202,68 +202,53 @@ and optical centering.
 
 <p>
 Arguments to
-<a href="cover.html#cover"><kbd>COVER</kbd></a>
+<a href="cover.html#cover">COVER</a>
 and
-<a href="cover.html#doc-cover"><kbd>DOC_COVER</kbd></a>
+<a href="cover.html#doc-cover">DOC_COVER</a>
 may now be given in any order.
 </p>
 
 <h3 id="headings" class="docs">2.3. Headings</h3>
 
 <p>
-The 1.x macros
-<br/>
-<span class="pre-in-pp">
-  HEAD SUBHEAD SUBSUBHEAD
-</span>
-are now deprecated and have been replaced by a single macro
-<br/>
-<span class="pre-in-pp">
-  <a href="docelement.html#heading"><kbd>HEADING &lt;n&gt;</kbd></a>
-</span>
+The 1.x macros HEAD, SUBHEAD, SUBSUBHEAD, are now deprecated and
+have been replaced by the single macro
+<a href="docelement.html#heading">HEADING <kbd>&lt;n&gt;<kbd></a>,
 where <kbd>&lt;n&gt;</kbd> is the heading level.  The deprecated
 macros may still be used, and conform in style to their original
-defaults; they are, however, wrappers around
-<kbd>HEADING</kbd> levels 1 - 3.
-Both the wrappers and <kbd>HEADING</kbd> itself can take a
-<kbd>NAMED &lt;id&gt;</kbd> argument, specifying a PDF link
+defaults; they are, however, wrappers around HEADING levels 1
+&#8211; 3.  Both the wrappers and HEADING itself can take a
+<kbd>NAMED&nbsp;&lt;id&gt;</kbd> argument, specifying a PDF link
 destination.
 </p>
 
 <p>
-Styling of headings is managed by a single macro
-<br/>
-<span class="pre-in-pp">
-  <a href="docelement.html#heading"><kbd>HEADING_STYLE &lt;n&gt;</kbd></a>
-</span>
-where <kbd>&lt;n&gt;</kbd> conforms to a <kbd>HEADING</kbd> level.
-The control macros for HEAD, SUBHEAD and SUBSUBHEAD have been
-removed.  Users wishing to style the wrappers must use
-<kbd>HEADING_STYLE</kbd>.
+Styling of headings is managed by the single macro <a
+href="docelement.html#heading">HEADING_STYLE &lt;n&gt;</a> where
+<kbd>&lt;n&gt;</kbd> conforms to a heading level.  The control
+macros for HEAD, SUBHEAD and SUBSUBHEAD have been removed.  Users
+wishing to style the wrappers must use HEADING_STYLE.
 </p>
 
 <p>
-<kbd>PARAHEAD</kbd> is no longer valid.  Paragraph heads in
-2.0 are created by passing the <kbd>PARAHEAD</kbd> argument to
-<kbd>.HEADING</kbd>.  Mom will abort with an informational message
-whenever she encounters <kbd>.PARAHEAD</kbd>.
+PARAHEAD is no longer valid.  Paragraph heads in 2.0 are created
+by passing the <kbd>PARAHEAD</kbd> argument to HEADING.  Mom
+will abort with an informational message whenever she encounters
+<kbd>.PARAHEAD</kbd>.
 </p>
 
 <h3 id="margin-notes" class="docs">2.4. Margin notes</h3>
 
 <p>
 The macro for setting margin note parameters,
-<a href="docelement.html#mn-init"><kbd>MN_INIT</kbd></a>,
+<a href="docelement.html#mn-init">MN_INIT</a>,
 has been re-written such that each parameter now has the form
-<br/>
-<span class="pre-in-pp">
-  &lt;PARAMETER&gt; &lt;value&gt;
-</span>
-This differs from 1.x where parameters were entered without a
-preceding <kbd>&lt;PARAMETER&gt;</kbd> flag.  Parameters may be
-entered in any order.  Any that are skipped are set to default
-values.  Documents created with 1.x will have to have their
-<kbd>MN_INIT</kbd> updated accordingly.
+<kbd>&lt;PARAMETER&gt &lt;value&gt;</kbd>.  This differs
+from 1.x where parameters were entered without a preceding
+<kbd>&lt;PARAMETER&gt;</kbd> flag.  Parameters may be entered in any
+order.  Any that are skipped are set to default values.  Documents
+created with 1.x will have to have their <kbd>MN_INIT</kbd> updated
+accordingly.
 </p>
 
 <h3 id="floats" class="docs">2.5. Floats</h3>
@@ -272,8 +257,8 @@ values.  Documents created with 1.x will have to have their
 A
 <a href="images.html#floats-intro">FLOAT</a>
 macro has been added, which functions similarly to the <kbd>ms</kbd>
-macros&#8217; <kbd>.KF/.KE</kbd>, ie the contents of the float are
-output immediately if there&#8217;s room on the page; otherwise,
+macros&#8217; <kbd>.KF/.KE</kbd>, i.e., the contents of the float are
+output immediately if there&#8217;s room on the page, otherwise
 normal text processing continues and the contents are output at the
 top of the next page.  An <kbd>ADJUST</kbd> argument to FLOAT allows
 for optical centering.
@@ -284,44 +269,30 @@ for optical centering.
 <p>
 The default look of the Table of Contents has been overhauled to
 produce a more typographically pleasing result.  All control macros
-for TOC title and entry styles have been removed, replaced by the
-macros
-<br/>
-<span class="pre-in-pp">
-  <a href="tables-of-contents.html#toc-title-style">TOC_TITLE_STYLE</a>
-</span>
+for TOC title and entry styles have been removed, replaced by
+<a href="tables-of-contents.html#toc-title-style">TOC_TITLE_STYLE</a>
 and
-<br/>
-<span class="pre-in-pp">
-  <a href="tables-of-contents.html#toc-title-style">TOC_ENTRY_STYLE 
&lt;n&gt;</a>
-</span>
-where <kbd>&lt;n&gt;</kbd> corresponds to a <kbd>HEADING</kbd>
-level.  Both macros permit setting any or all of the style
-parameters for TOC titles (i.e. chapters or major sections/divisions
-of a collated document) and TOC entries (nested heading levels) at
-once.  Documents created with 1.x that contain TOCs will need to
-have their TOC style updated if the new defaults are unsatisfactory.
+<a href="tables-of-contents.html#toc-title-style">TOC_ENTRY_STYLE 
<kbd>&lt;n&gt;</kbd></a>
+where <kbd>&lt;n&gt;</kbd> corresponds to a heading level.  Both
+macros permit setting any or all of the style parameters for TOC
+titles (i.e. chapters or major sections/divisions of a collated
+document) and TOC entries (nested heading levels) at once.
+Documents created with 1.x that contain TOCs will need to have their
+TOC style updated if the new defaults are unsatisfactory.
 </p>
 
 <p>
 Two new TOC control macros have been added,
-<br/>
-<span class="pre-in-pp">
-  <a href="tables-of-contents.html#space-toc-items">SPACE_TOC_ITEMS</a>
-</span>
+<a href="tables-of-contents.html#space-toc-items">SPACE_TOC_ITEMS</a>
 and
-<br/>
-<span class="pre-in-pp">
-  <a
-  href="tables-of-contents.html#auto-relocate-toc">AUTO_RELOCATE_TOC</a>
-</span>
-<kbd>SPACE_TOC_ITEMS</kbd> groups TOC entry levels and separates
-them with a discrete amount of whitespace.  This leads to improved
-legibility, and is highly recommended even though it is not
-mom&#8217;s default. <kbd>AUTO_RELOCATE_TOC</kbd> intelligently
-repositions the Table of Contents to the top of a document when
-the mom source file is processed with
-<a href="pdfmom"><strong>pdfmom</strong></a>.
+<a href="tables-of-contents.html#auto-relocate-toc">AUTO_RELOCATE_TOC</a>.
+SPACE_TOC_ITEMS groups TOC entry levels and separates them with a
+discrete amount of whitespace.  This leads to improved legibility,
+and is highly recommended even though it is not mom&#8217;s
+default.  AUTO_RELOCATE_TOC intelligently repositions the Table
+of Contents to the top of a document when the mom source file is
+processed with
+<a href="pdfmom">pdfmom</a>.
 </p>
 
 <h2 id="v2.1-changes" class="docs">3. Version 2.1 changes</h2>
@@ -349,20 +320,21 @@ The following changes have been made:
 
 <ul style="margin-top: -.5em; width: 90%">
   <li>MISC_AUTOLEAD (including COVER_MISC_AUTOLEAD and
-  DOC_COVER_MISC_AUTOLEAD) has been replaced in favour of MISC_LEAD,
-  which takes an absolute leading value, rather than one derived
-  from the point size</li>
+      DOC_COVER_MISC_AUTOLEAD) has been replaced in favour of MISC_LEAD,
+      which takes an absolute leading value rather than one derived
+      from the point size.</li>
   <li>COVER_UNDERLINE and DOC_COVER_UNDERLINE have been
-  removed in favour of COVER_DOCTYPE_UNDERLINE and
-  DOC_COVER_DOCTYPE_UNDERLINE</li>
-  <li>DOCTYPE NAMED &lt;string&gt; no longer accepts a color
-  argument; setting the color for &lt;string&gt; is accomplished with
-  DOCTYPE_COLOR &lt;color&gt;; in addition, the string now has a
-  complete set of control macros</li>
-  <li>default underscoring of the DOCTYPE NAMED string has been
-  removed, both in the docheader and on cover/title pages</li>
-  <li>no cover/title page data persists, however formatting for the
-  elements on them does</li>
+      removed in favour of COVER_DOCTYPE_UNDERLINE and
+      DOC_COVER_DOCTYPE_UNDERLINE.</li>
+  <li>DOCTYPE NAMED <kbd>&lt;string&gt;</kbd> no longer accepts a
+      <kbd>color</kbd> argument; setting the colour for
+      <kbd>&lt;string&gt;</kbd> is accomplished with DOCTYPE_COLOR
+      <kbd>&lt;color&gt;</kbd>.  In addition, the string now has a
+      complete set of control macros.</li>
+  <li>Default underscoring of the DOCTYPE NAMED string has been
+      removed, both in the docheader and on cover/title pages.</li>
+  <li>No cover/title page data persists, however formatting for the
+      elements on them does.</li>
 </ul>
 
 <h2 id="v2.2-changes" class="docs">4. Version 2.2 changes</h2>
@@ -376,7 +348,7 @@ Version 2.2 adds these features:
   distributing any excess equally at sensible points so that running
   text always fills the page to the bottom margin (see
   <a href="docprocessing.html#vertical-whitespace-management">
-    vertical whitespace management</a>
+    vertical whitespace management</a>)
   </li>
   <li>improvements to auto-labelling, such that it is now possible
   to link symbolically to auto-labelled preprocessor material and
@@ -400,15 +372,18 @@ Deri James has provided <strong>pdfmom</strong>, a 
wrapper around
 groff that processes mom source files with all the PDF bells and
 whistles.  Its use is highly recommended.  Usage is explained in the
 manual,
-<a href="http://www.schaffter.ca/mom/pdf/mom-pdf.pdf";><span 
class="book-title">Producing PDFs with groff and mom</span></a>.
-A significant convenience of <strong>pdfmom</strong> is that it can,
-with the <kbd>-Tps</kbd> flag, be used to pass processing over to Keith
+<a href="http://www.schaffter.ca/mom/pdf/mom-pdf.pdf";>
+  <span class="book-title">Producing PDFs with groff and mom</span>
+</a>.
+A significant convenience of pdfmom is that it can, with the
+<kbd>-Tps</kbd> flag, be used to pass processing over to Keith
 Marshall&#8217;s <strong>pdfroff</strong>.  This is useful when
 processing files that contain PostScript images embedded with
-<kbd>PSPIC</kbd>. <strong>pdfmom</strong>, without the flag, uses
-groff&#8217;s PDF device (<strong>gropdf</strong>), which only
-recognizes PDF images that have been embedded with
-<a href="images.html#pdf-image"><kbd>PDF_IMAGE</kbd></a>.
+<a href="images.html#pspic">PSPIC</a>.
+pdfmom, without the flag, uses groff&#8217;s PDF device
+(<strong>gropdf</strong>), which only recognizes PDF images that
+have been embedded with
+<a href="images.html#pdf-image">PDF_IMAGE</a>.
 </p>
 
 <h2 id="install-font" class="docs">7. install-font.sh</h2>
@@ -422,13 +397,12 @@ an official part of groff.
 
 <p>
 Installing groff fonts is a multi-step procedure, which, while not
-difficult, can be a nuisance.  <strong>install-font.sh</strong> takes
+difficult, can be a nuisance.  install-font.sh takes
 care of all the details, including converting fonts to formats
 acceptable to <strong>grops</strong> and <strong>gropdf</strong>,
 creating and installing the groff fonts in the appropriate
-directories, updating the <strong>download</strong> files, and
-installing the original fonts in a system-wide directory, if
-desired.
+directories, updating the download files, and installing the
+original fonts in a system-wide directory, if desired.
 </p>
 
 <div class="rule-long"><hr/></div>



reply via email to

[Prev in Thread] Current Thread [Next in Thread]