[groff] 01/01: Updated copyright info for 2016. Fixed issue with kern units.

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit 1f9cb0b1f0717ce1b6f5af713baa34e6ffe46ddc
Author: Peter Schaffter <address@hidden>
Date:   Thu Mar 17 15:01:10 2016 -0400

    Updated copyright info for 2016.  Fixed issue with kern units.
---
 contrib/mom/BUGS                           |    2 +-
 contrib/mom/NEWS                           |    6 +++++-
 contrib/mom/TODO                           |    2 +-
 contrib/mom/copyright                      |    2 +-
 contrib/mom/examples/README-fr.txt         |    2 +-
 contrib/mom/examples/README.txt            |    2 +-
 contrib/mom/examples/elvis_syntax          |    2 +-
 contrib/mom/examples/elvis_syntax.new      |    2 +-
 contrib/mom/examples/letter.mom            |    2 +-
 contrib/mom/examples/mom-pdf.mom           |    2 +-
 contrib/mom/examples/mom.vim               |    2 +-
 contrib/mom/examples/mon_premier_doc.mom   |    2 +-
 contrib/mom/examples/sample_docs.mom       |    2 +-
 contrib/mom/examples/typesetting.mom       |    3 +--
 contrib/mom/groff_mom.7.man                |    2 +-
 contrib/mom/momdoc/appendices.html         |    2 +-
 contrib/mom/momdoc/color.html              |    2 +-
 contrib/mom/momdoc/cover.html              |    2 +-
 contrib/mom/momdoc/definitions.html        |    2 +-
 contrib/mom/momdoc/docelement.html         |    2 +-
 contrib/mom/momdoc/docprocessing.html      |    2 +-
 contrib/mom/momdoc/goodies.html            |    2 +-
 contrib/mom/momdoc/graphical.html          |    2 +-
 contrib/mom/momdoc/headfootpage.html       |    4 ++--
 contrib/mom/momdoc/images.html             |    2 +-
 contrib/mom/momdoc/inlines.html            |    2 +-
 contrib/mom/momdoc/intro.html              |    2 +-
 contrib/mom/momdoc/letters.html            |    2 +-
 contrib/mom/momdoc/macrolist.html          |    2 +-
 contrib/mom/momdoc/rectoverso.html         |    2 +-
 contrib/mom/momdoc/refer.html              |    2 +-
 contrib/mom/momdoc/reserved.html           |    2 +-
 contrib/mom/momdoc/stylesheet.css          |    2 +-
 contrib/mom/momdoc/tables-of-contents.html |    2 +-
 contrib/mom/momdoc/toc.html                |    6 +++---
 contrib/mom/momdoc/typesetting.html        |    2 +-
 contrib/mom/momdoc/using.html              |    2 +-
 contrib/mom/momdoc/version-2.html          |    2 +-
 contrib/mom/om.tmac-u                      |   18 +++++++++---------
 39 files changed, 54 insertions(+), 51 deletions(-)

diff --git a/contrib/mom/BUGS b/contrib/mom/BUGS
index 7bb753a..0e273d2 100644
--- a/contrib/mom/BUGS
+++ b/contrib/mom/BUGS
@@ -1,5 +1,5 @@
     -*- text -*-
-    Copyright 2004-2015  Free Software Foundation, Inc.
+    Copyright 2004-2016  Free Software Foundation, Inc.
 
     Copying and distribution of this file, with or without modification,
     are permitted in any medium without royalty provided the copyright
diff --git a/contrib/mom/NEWS b/contrib/mom/NEWS
index 55fc984..5640cf9 100644
--- a/contrib/mom/NEWS
+++ b/contrib/mom/NEWS
@@ -1,10 +1,14 @@
     -*- text -*-
-    Copyright (C) 2004-2015  Free Software Foundation, Inc.
+    Copyright (C) 2004-2016  Free Software Foundation, Inc.
 
     Copying and distribution of this file, with or without modification,
     are permitted in any medium without royalty provided the copyright
     notice and this notice are preserved.
 
+Release 2.1-b
+-------------
+Fix to handling of kern units.  Updated copyright info.
+
 Release 2.1-a
 -------------
 Expanded labelling facilities to include floats and
diff --git a/contrib/mom/TODO b/contrib/mom/TODO
index 45b62d1..dce632b 100644
--- a/contrib/mom/TODO
+++ b/contrib/mom/TODO
@@ -1,5 +1,5 @@
     -*- txt -*-
-    Copyright 2004-2015  Free Software Foundation, Inc.
+    Copyright 2004-2016  Free Software Foundation, Inc.
 
     Copying and distribution of this file, with or without modification,
     are permitted in any medium without royalty provided the copyright
diff --git a/contrib/mom/copyright b/contrib/mom/copyright
index c0c955a..2583724 100644
--- a/contrib/mom/copyright
+++ b/contrib/mom/copyright
@@ -9,7 +9,7 @@ K1L 6X6
 ========================================================================
 
 The groff macro file om.tmac and the html documentation pertaining to
-it are Copyright (C) 2004-2015 Peter Schaffter.
+it are Copyright (C) 2004-2016 Peter Schaffter.
 
 om.tmac is issued under the GNU General Public License, a full copy of
 which can be had at
diff --git a/contrib/mom/examples/README-fr.txt 
b/contrib/mom/examples/README-fr.txt
index c5573f9..893c9fa 100644
--- a/contrib/mom/examples/README-fr.txt
+++ b/contrib/mom/examples/README-fr.txt
@@ -1,5 +1,5 @@
      -*- mode: text; coding: utf-8; -*-
-    Copyright (C) 2014-2015  Free Software Foundation, Inc.
+    Copyright (C) 2014-2016  Free Software Foundation, Inc.
 
     Copying and distribution of this file, with or without modification,
     are permitted in any medium without royalty provided the copyright
diff --git a/contrib/mom/examples/README.txt b/contrib/mom/examples/README.txt
index e4fefb1..0e41e0c 100644
--- a/contrib/mom/examples/README.txt
+++ b/contrib/mom/examples/README.txt
@@ -1,5 +1,5 @@
      -*- text -*-
-    Copyright (C) 2004-2015  Free Software Foundation, Inc.
+    Copyright (C) 2004-2016  Free Software Foundation, Inc.
 
     Copying and distribution of this file, with or without modification,
     are permitted in any medium without royalty provided the copyright
diff --git a/contrib/mom/examples/elvis_syntax 
b/contrib/mom/examples/elvis_syntax
index 7b29a04..e8d033e 100644
--- a/contrib/mom/examples/elvis_syntax
+++ b/contrib/mom/examples/elvis_syntax
@@ -1,4 +1,4 @@
-" Copyright (C) 2004-2014 Free Software Foundation, Inc.
+" Copyright (C) 2004-2016 Free Software Foundation, Inc.
 "
 " Copying and distribution of this file, with or without modification,
 " are permitted in any medium without royalty provided the copyright
diff --git a/contrib/mom/examples/elvis_syntax.new 
b/contrib/mom/examples/elvis_syntax.new
index eb1aae7..3410b0b 100644
--- a/contrib/mom/examples/elvis_syntax.new
+++ b/contrib/mom/examples/elvis_syntax.new
@@ -1,4 +1,4 @@
-" Copyright (C) 2004-2014  Free Software Foundation, Inc.
+" Copyright (C) 2004-2016  Free Software Foundation, Inc.
 "
 " Copying and distribution of this file, with or without modification,
 " are permitted in any medium without royalty provided the copyright
diff --git a/contrib/mom/examples/letter.mom b/contrib/mom/examples/letter.mom
index 5be8674..83dfe51 100644
--- a/contrib/mom/examples/letter.mom
+++ b/contrib/mom/examples/letter.mom
@@ -1,6 +1,6 @@
 .\" -*- mode: troff; coding: utf-8; -*-
 .
-\# Copyright (C) 2004-2015  Free Software Foundation, Inc.
+\# Copyright (C) 2004-2016  Free Software Foundation, Inc.
 \#
 \# Copying and distribution of this file, with or without modification,
 \# are permitted in any medium without royalty provided the copyright
diff --git a/contrib/mom/examples/mom-pdf.mom b/contrib/mom/examples/mom-pdf.mom
index 0749f41..a9467d3 100644
--- a/contrib/mom/examples/mom-pdf.mom
+++ b/contrib/mom/examples/mom-pdf.mom
@@ -1,5 +1,5 @@
 .\" -*- nroff -*-
-.\" Copyright (C) 2012-2015  Free Software Foundation, Inc.
+.\" Copyright (C) 2012-2016  Free Software Foundation, Inc.
 .\"
 .\" This file is part of mom, which is part of groff, a free software
 .\" project.
diff --git a/contrib/mom/examples/mom.vim b/contrib/mom/examples/mom.vim
index 79ec75c..e36039a 100644
--- a/contrib/mom/examples/mom.vim
+++ b/contrib/mom/examples/mom.vim
@@ -1,4 +1,4 @@
-" Copyright (C) 2012-2014  Free Software Foundation, Inc.
+" Copyright (C) 2012-2016  Free Software Foundation, Inc.
 "
 " Copying and distribution of this file, with or without modification,
 " are permitted in any medium without royalty provided the copyright
diff --git a/contrib/mom/examples/mon_premier_doc.mom 
b/contrib/mom/examples/mon_premier_doc.mom
index 698d6d9..4fad7c0 100644
--- a/contrib/mom/examples/mon_premier_doc.mom
+++ b/contrib/mom/examples/mon_premier_doc.mom
@@ -1,5 +1,5 @@
 .\" -*- mode: troff; coding: utf-8; -*-
-\# Copyright (C) 2015  Free Software Foundation, Inc.
+\# Copyright (C) 2015-2016  Free Software Foundation, Inc.
 \#
 \# Copying and distribution of this file, with or without modification,
 \# are permitted in any medium without royalty provided the copyright
diff --git a/contrib/mom/examples/sample_docs.mom 
b/contrib/mom/examples/sample_docs.mom
index c2cb79a..073b534 100644
--- a/contrib/mom/examples/sample_docs.mom
+++ b/contrib/mom/examples/sample_docs.mom
@@ -1,4 +1,4 @@
-\# Copyright (C) 2004-2015  Free Software Foundation, Inc.
+\# Copyright (C) 2004-2016  Free Software Foundation, Inc.
 \#
 \# Copying and distribution of this file, with or without modification,
 \# are permitted in any medium without royalty provided the copyright
diff --git a/contrib/mom/examples/typesetting.mom 
b/contrib/mom/examples/typesetting.mom
index 0ed2d46..fbac609 100644
--- a/contrib/mom/examples/typesetting.mom
+++ b/contrib/mom/examples/typesetting.mom
@@ -1,5 +1,4 @@
-\# Copyright 2004, 2005, 2006, 2009, 2010, 2011, 2012
-\# Free Software Foundation, Inc.
+\# Copyright 2004-2016  Free Software Foundation, Inc.
 \#
 \# Copying and distribution of this file, with or without modification,
 \# are permitted in any medium without royalty provided the copyright
diff --git a/contrib/mom/groff_mom.7.man b/contrib/mom/groff_mom.7.man
index 324552c..9280f4d 100644
--- a/contrib/mom/groff_mom.7.man
+++ b/contrib/mom/groff_mom.7.man
@@ -14,7 +14,7 @@ groff_mom \- groff `mom' macros, `mom' is a `roff' language, 
part of `groff'
 .\" --------------------------------------------------------------------
 .
 .de co
-Copyright \[co] 2002-2014 Free Software Foundation, Inc.
+Copyright \[co] 2002-2016 Free Software Foundation, Inc.
 
 This file is part of groff, a free software project.
 
diff --git a/contrib/mom/momdoc/appendices.html 
b/contrib/mom/momdoc/appendices.html
index d8b5b9c..d3cc529 100644
--- a/contrib/mom/momdoc/appendices.html
+++ b/contrib/mom/momdoc/appendices.html
@@ -2,7 +2,7 @@
 <!--
 This file is part of groff, the GNU roff type-setting system.
 
-Copyright (C) 2004-2015  Free Software Foundation, Inc.
+Copyright (C) 2004-2016  Free Software Foundation, Inc.
 Written by Peter Schaffter (address@hidden).
 
 Permission is granted to copy, distribute and/or modify this document
diff --git a/contrib/mom/momdoc/color.html b/contrib/mom/momdoc/color.html
index 8bd8eb4..d268118 100644
--- a/contrib/mom/momdoc/color.html
+++ b/contrib/mom/momdoc/color.html
@@ -2,7 +2,7 @@
 <!--
 This file is part of groff, the GNU roff type-setting system.
 
-Copyright (C) 2004-2015  Free Software Foundation, Inc.
+Copyright (C) 2004-2016  Free Software Foundation, Inc.
 Written by Peter Schaffter (address@hidden).
 
 Permission is granted to copy, distribute and/or modify this document
diff --git a/contrib/mom/momdoc/cover.html b/contrib/mom/momdoc/cover.html
index ec62913..d2700f4 100644
--- a/contrib/mom/momdoc/cover.html
+++ b/contrib/mom/momdoc/cover.html
@@ -2,7 +2,7 @@
 <!--
 This file is part of groff, the GNU roff type-setting system.
 
-Copyright (C) 2004-2015  Free Software Foundation, Inc.
+Copyright (C) 2004-2016  Free Software Foundation, Inc.
 Written by Peter Schaffter (address@hidden).
 
 Permission is granted to copy, distribute and/or modify this document
diff --git a/contrib/mom/momdoc/definitions.html 
b/contrib/mom/momdoc/definitions.html
index 091ac7a..6811a85 100644
--- a/contrib/mom/momdoc/definitions.html
+++ b/contrib/mom/momdoc/definitions.html
@@ -2,7 +2,7 @@
 <!--
 This file is part of groff, the GNU roff type-setting system.
 
-Copyright (C) 2004-2015  Free Software Foundation, Inc.
+Copyright (C) 2004-2016  Free Software Foundation, Inc.
 Written by Peter Schaffter (address@hidden).
 
 Permission is granted to copy, distribute and/or modify this document
diff --git a/contrib/mom/momdoc/docelement.html 
b/contrib/mom/momdoc/docelement.html
index 524581d..a33a4dd 100644
--- a/contrib/mom/momdoc/docelement.html
+++ b/contrib/mom/momdoc/docelement.html
@@ -2,7 +2,7 @@
 <!--
 This file is part of groff, the GNU roff type-setting system.
 
-Copyright (C) 2004-2015 Free Software Foundation, Inc.
+Copyright (C) 2004-2016 Free Software Foundation, Inc.
 Written by Peter Schaffter (address@hidden).
 
 Permission is granted to copy, distribute and/or modify this document
diff --git a/contrib/mom/momdoc/docprocessing.html 
b/contrib/mom/momdoc/docprocessing.html
index e091f4c..89b21b4 100644
--- a/contrib/mom/momdoc/docprocessing.html
+++ b/contrib/mom/momdoc/docprocessing.html
@@ -2,7 +2,7 @@
 <!--
 This file is part of groff, the GNU roff type-setting system.
 
-Copyright (C) 2004-2015 Free Software Foundation, Inc.
+Copyright (C) 2004-2016 Free Software Foundation, Inc.
 Written by Peter Schaffter (address@hidden).
 
 Permission is granted to copy, distribute and/or modify this document
diff --git a/contrib/mom/momdoc/goodies.html b/contrib/mom/momdoc/goodies.html
index 13c9c77..055a58f 100644
--- a/contrib/mom/momdoc/goodies.html
+++ b/contrib/mom/momdoc/goodies.html
@@ -2,7 +2,7 @@
 <!--
 This file is part of groff, the GNU roff type-setting system.
 
-Copyright (C) 2004-2015 Free Software Foundation, Inc.
+Copyright (C) 2004-2016 Free Software Foundation, Inc.
 Written by Peter Schaffter (address@hidden).
 
 Permission is granted to copy, distribute and/or modify this document
diff --git a/contrib/mom/momdoc/graphical.html 
b/contrib/mom/momdoc/graphical.html
index 6d7bdb1..494f3d4 100644
--- a/contrib/mom/momdoc/graphical.html
+++ b/contrib/mom/momdoc/graphical.html
@@ -2,7 +2,7 @@
 <!--
 This file is part of groff, the GNU roff type-setting system.
 
-Copyright (C) 2004-2015 Free Software Foundation, Inc.
+Copyright (C) 2004-2016 Free Software Foundation, Inc.
 Written by Peter Schaffter (address@hidden).
 
 Permission is granted to copy, distribute and/or modify this document
diff --git a/contrib/mom/momdoc/headfootpage.html 
b/contrib/mom/momdoc/headfootpage.html
index 2f8d07f..76c9258 100644
--- a/contrib/mom/momdoc/headfootpage.html
+++ b/contrib/mom/momdoc/headfootpage.html
@@ -2,7 +2,7 @@
 <!--
 This file is part of groff, the GNU roff type-setting system.
 
-Copyright (C) 2004-2015 Free Software Foundation, Inc.
+Copyright (C) 2004-2016 Free Software Foundation, Inc.
 Written by Peter Schaffter (address@hidden).
 
 Permission is granted to copy, distribute and/or modify this document
@@ -1800,7 +1800,7 @@ Invocation:
   &lt;L | C | R&gt; "&lt;header-recto string&gt;" \
   &lt;L | C | R&gt; "&lt;footer-recto string&gt;" \
   &lt;L | C | R&gt; "&lt;header-verso string&gt;" \
-  &lt;L | C | R&gt; "&lt;header-verso string&gt;"
+  &lt;L | C | R&gt; "&lt;footer-verso string&gt;"
 </span>
 or
 <span class="pre-in-pp" style="margin-top: -.5em;">
diff --git a/contrib/mom/momdoc/images.html b/contrib/mom/momdoc/images.html
index 976e939..8beeb68 100644
--- a/contrib/mom/momdoc/images.html
+++ b/contrib/mom/momdoc/images.html
@@ -2,7 +2,7 @@
 <!--
 This file is part of groff, the GNU roff type-setting system.
 
-Copyright (C) 2004-2015 Free Software Foundation, Inc.
+Copyright (C) 2004-2016 Free Software Foundation, Inc.
 Written by Peter Schaffter (address@hidden).
 
 Permission is granted to copy, distribute and/or modify this document
diff --git a/contrib/mom/momdoc/inlines.html b/contrib/mom/momdoc/inlines.html
index ea7ed49..0bc5723 100644
--- a/contrib/mom/momdoc/inlines.html
+++ b/contrib/mom/momdoc/inlines.html
@@ -2,7 +2,7 @@
 <!--
 This file is part of groff, the GNU roff type-setting system.
 
-Copyright (C) 2004-2015 Free Software Foundation, Inc.
+Copyright (C) 2004-2016 Free Software Foundation, Inc.
 Written by Peter Schaffter (address@hidden).
 
 Permission is granted to copy, distribute and/or modify this document
diff --git a/contrib/mom/momdoc/intro.html b/contrib/mom/momdoc/intro.html
index ee17d88..1632fef 100644
--- a/contrib/mom/momdoc/intro.html
+++ b/contrib/mom/momdoc/intro.html
@@ -2,7 +2,7 @@
 <!--
 This file is part of groff, the GNU roff type-setting system.
 
-Copyright (C) 2004-2015 Free Software Foundation, Inc.
+Copyright (C) 2004-2016 Free Software Foundation, Inc.
 Written by Peter Schaffter (address@hidden).
 
 Permission is granted to copy, distribute and/or modify this document
diff --git a/contrib/mom/momdoc/letters.html b/contrib/mom/momdoc/letters.html
index 885c74d..572ac46 100644
--- a/contrib/mom/momdoc/letters.html
+++ b/contrib/mom/momdoc/letters.html
@@ -2,7 +2,7 @@
 <!--
 This file is part of groff, the GNU roff type-setting system.
 
-Copyright (C) 2004-2015 Free Software Foundation, Inc.
+Copyright (C) 2004-2016 Free Software Foundation, Inc.
 Written by Peter Schaffter (address@hidden).
 
 Permission is granted to copy, distribute and/or modify this document
diff --git a/contrib/mom/momdoc/macrolist.html 
b/contrib/mom/momdoc/macrolist.html
index 7e7e6ee..f48cf11 100644
--- a/contrib/mom/momdoc/macrolist.html
+++ b/contrib/mom/momdoc/macrolist.html
@@ -2,7 +2,7 @@
 <!--
 This file is part of groff, the GNU roff type-setting system.
 
-Copyright (C) 2004-2015 Free Software Foundation, Inc.
+Copyright (C) 2004-2016 Free Software Foundation, Inc.
 Written by Peter Schaffter (address@hidden).
 
 Permission is granted to copy, distribute and/or modify this document
diff --git a/contrib/mom/momdoc/rectoverso.html 
b/contrib/mom/momdoc/rectoverso.html
index e786986..025684b 100644
--- a/contrib/mom/momdoc/rectoverso.html
+++ b/contrib/mom/momdoc/rectoverso.html
@@ -2,7 +2,7 @@
 <!--
 This file is part of groff, the GNU roff type-setting system.
 
-Copyright (C) 2004-2015 Free Software Foundation, Inc.
+Copyright (C) 2004-2016 Free Software Foundation, Inc.
 Written by Peter Schaffter (address@hidden).
 
 Permission is granted to copy, distribute and/or modify this document
diff --git a/contrib/mom/momdoc/refer.html b/contrib/mom/momdoc/refer.html
index 9af763e..486c82b 100644
--- a/contrib/mom/momdoc/refer.html
+++ b/contrib/mom/momdoc/refer.html
@@ -2,7 +2,7 @@
 <!--
 This file is part of groff, the GNU roff type-setting system.
 
-Copyright (C) 2004-2015 Free Software Foundation, Inc.
+Copyright (C) 2004-2016 Free Software Foundation, Inc.
 Written by Peter Schaffter (address@hidden).
 
 Permission is granted to copy, distribute and/or modify this document
diff --git a/contrib/mom/momdoc/reserved.html b/contrib/mom/momdoc/reserved.html
index 1260ce4..096d960 100644
--- a/contrib/mom/momdoc/reserved.html
+++ b/contrib/mom/momdoc/reserved.html
@@ -2,7 +2,7 @@
 <!--
 This file is part of groff, the GNU roff type-setting system.
 
-Copyright (C) 2004-2015 Free Software Foundation, Inc.
+Copyright (C) 2004-2016 Free Software Foundation, Inc.
 Written by Peter Schaffter (address@hidden).
 
 Permission is granted to copy, distribute and/or modify this document
diff --git a/contrib/mom/momdoc/stylesheet.css 
b/contrib/mom/momdoc/stylesheet.css
index d3df7b6..6a2a71f 100644
--- a/contrib/mom/momdoc/stylesheet.css
+++ b/contrib/mom/momdoc/stylesheet.css
@@ -1,4 +1,4 @@
-/* Copyright (C) 2004-2015  Free Software Foundation, Inc. */
+/* Copyright (C) 2004-2016  Free Software Foundation, Inc. */
 /* This file is part of mom, which is part of groff, a free software */
 /* project. */
 
diff --git a/contrib/mom/momdoc/tables-of-contents.html 
b/contrib/mom/momdoc/tables-of-contents.html
index feb05b7..a40510a 100644
--- a/contrib/mom/momdoc/tables-of-contents.html
+++ b/contrib/mom/momdoc/tables-of-contents.html
@@ -2,7 +2,7 @@
 <!--
 This file is part of groff, the GNU roff type-setting system.
 
-Copyright (C) 2004-2015 Free Software Foundation, Inc.
+Copyright (C) 2004-2016 Free Software Foundation, Inc.
 Written by Peter Schaffter (address@hidden).
 
 Permission is granted to copy, distribute and/or modify this document
diff --git a/contrib/mom/momdoc/toc.html b/contrib/mom/momdoc/toc.html
index 0381caf..c7cc754 100644
--- a/contrib/mom/momdoc/toc.html
+++ b/contrib/mom/momdoc/toc.html
@@ -2,7 +2,7 @@
 <!--
 This file is part of groff, the GNU roff type-setting system.
 
-Copyright (C) 2004-2015 Free Software Foundation, Inc.
+Copyright (C) 2004-2016 Free Software Foundation, Inc.
 Written by Peter Schaffter (address@hidden).
 
 Permission is granted to copy, distribute and/or modify this document
@@ -20,7 +20,7 @@ FDL in the main directory of the groff source package.
 
 <head>
   <meta http-equiv="content-type" content="text/html;charset=utf-8"/>
-  <title>Mom, version 2.1-a -- Table of Contents</title>
+  <title>Mom, version 2.1-b -- Table of Contents</title>
   <link rel="stylesheet" type="text/css" href="stylesheet.css" />
 </head>
 
@@ -31,7 +31,7 @@ FDL in the main directory of the groff source package.
 <div class="page">
 
   <div class="version">
-    mom, version 2.1-a
+    mom, version 2.1-b
   </div>
 
 <h1 class="toc" style="margin-top: 9px;">Table of Contents</h1>
diff --git a/contrib/mom/momdoc/typesetting.html 
b/contrib/mom/momdoc/typesetting.html
index e34e615..7fdb1be 100644
--- a/contrib/mom/momdoc/typesetting.html
+++ b/contrib/mom/momdoc/typesetting.html
@@ -2,7 +2,7 @@
 <!--
 This file is part of groff, the GNU roff type-setting system.
 
-Copyright (C) 2004-2015 Free Software Foundation, Inc.
+Copyright (C) 2004-2016 Free Software Foundation, Inc.
 Written by Peter Schaffter (address@hidden).
 
 Permission is granted to copy, distribute and/or modify this document
diff --git a/contrib/mom/momdoc/using.html b/contrib/mom/momdoc/using.html
index 167410a..2973e06 100644
--- a/contrib/mom/momdoc/using.html
+++ b/contrib/mom/momdoc/using.html
@@ -2,7 +2,7 @@
 <!--
 This file is part of groff, the GNU roff type-setting system.
 
-Copyright (C) 2004-2015 Free Software Foundation, Inc.
+Copyright (C) 2004-2016 Free Software Foundation, Inc.
 Written by Peter Schaffter (address@hidden).
 
 Permission is granted to copy, distribute and/or modify this document
diff --git a/contrib/mom/momdoc/version-2.html 
b/contrib/mom/momdoc/version-2.html
index e1f52c7..e371f26 100644
--- a/contrib/mom/momdoc/version-2.html
+++ b/contrib/mom/momdoc/version-2.html
@@ -2,7 +2,7 @@
 <!--
 This file is part of groff, the GNU roff type-setting system.
 
-Copyright (C) 2004-2015 Free Software Foundation, Inc.
+Copyright (C) 2004-2016 Free Software Foundation, Inc.
 Written by Peter Schaffter (address@hidden).
 
 Permission is granted to copy, distribute and/or modify this document
diff --git a/contrib/mom/om.tmac-u b/contrib/mom/om.tmac-u
index 6314b83..540dd54 100644
--- a/contrib/mom/om.tmac-u
+++ b/contrib/mom/om.tmac-u
@@ -2,7 +2,7 @@
 .ig
 Mom -- a typesetting/document-processing macro set for groff.
 
-Copyright (C) 2002-2015  Free Software Foundation, Inc.
+Copyright (C) 2002-2016  Free Software Foundation, Inc.
  Written by Peter Schaffter <address@hidden>
  PDF integration contributed by Deri James <address@hidden>
 
@@ -21,7 +21,7 @@ for more details.
 You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-Version 2.1-a
+Version 2.1-b
 -------------
 Antoine de St-Exup�ry asserted that elegance in engineering is
 achieved not when there is nothing left to add, but when there is
@@ -741,20 +741,20 @@ end
 \# KERN_UNIT macro.
 \#
 .MAC KERN_UNIT END
-.    ie '\\$1'DEFAULT' .nr #KERN_UNIT 36
-.    el .nr #KERN_UNIT \\$1
+.    ie '\\$1'DEFAULT' .ds $KERN_UNIT 36
+.    el .ds $KERN_UNIT \\$1
 .END
 \#
-.nr #KERN_UNIT 36
-.ds BU   \h'-(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*\\$1u)'
-.ds FU   \h'(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*\\$1u)'
+.ds $KERN_UNIT 36
+.ds BU   \h'-(\En[.ps]u/\E*[$KERN_UNIT]u*\\$1u)'
+.ds FU   \h'(\En[.ps]u/\E*[$KERN_UNIT]u*\\$1u)'
 \#
 \# Initialize strings for pre-1.1.3c-style BU and FU
 \#
 .nr #LOOP 0 1
 .while \n+[#LOOP]<37 \{\
-.   ds BU\n[#LOOP] \h'-(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*\n[#LOOP]u)'
-.   ds FU\n[#LOOP] \h'(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*\n[#LOOP]u)'
+.   ds BU\n[#LOOP] \h'-(\En[.ps]u/\E*[$KERN_UNIT]u*\n[#LOOP]u)'
+.   ds FU\n[#LOOP] \h'(\En[.ps]u/\E*[$KERN_UNIT]u*\n[#LOOP]u)'
 .\}
 \#
 \# Horizontal movements