From MAILER-DAEMON Thu Aug 06 08:05:17 2015
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1ZNJvB-0000Y9-Nh
	for mharc-groff-commit@gnu.org; Thu, 06 Aug 2015 08:05:17 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:37378)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <bernd.warken@web.de>) id 1ZNJut-0000MU-LW
	for groff-commit@gnu.org; Thu, 06 Aug 2015 08:05:10 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <bernd.warken@web.de>) id 1ZNJul-0007qn-MA
	for groff-commit@gnu.org; Thu, 06 Aug 2015 08:04:59 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:44572)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <bernd.warken@web.de>) id 1ZNJul-0007qe-FL
	for groff-commit@gnu.org; Thu, 06 Aug 2015 08:04:51 -0400
Received: from bwarken by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <bernd.warken@web.de>) id 1ZNJuk-000879-N6
	for groff-commit@gnu.org; Thu, 06 Aug 2015 12:04:50 +0000
Date: Thu, 06 Aug 2015 12:04:50 +0000
Message-Id: <E1ZNJuk-000879-N6@vcs.savannah.gnu.org>
To: groff-commit@gnu.org
Subject: [groff] 01/01: all *.am: add latest update, setup Emacs mode
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
In-Reply-To: groff@gnu.org
References: <20150806120450.31159.68797@vcs.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: 2390f0262b7af36040b0a9edb9943df25d58c8d4
Auto-Submitted: auto-generated
From: Bernd Warken <bernd.warken@web.de>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 140.186.70.72
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: groff@gnu.org
List-Id: <groff-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/groff-commit>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 06 Aug 2015 12:05:10 -0000

bwarken pushed a commit to branch master
in repository groff.

commit 2390f0262b7af36040b0a9edb9943df25d58c8d4
Author: Bernd Warken <groff-bernd.warken-72@web.de>
Date:   Thu Aug 6 14:03:58 2015 +0200

    all *.am: add latest update, setup Emacs mode
---
 ChangeLog                                  |   33 ++++++++++++++++++++++++++++
 Makefile.am                                |   16 ++++++++++---
 arch/mingw/mingw.am                        |   11 ++++++++-
 arch/misc/misc.am                          |   18 +++++++++++----
 contrib/chem/ChangeLog                     |    4 +++
 contrib/chem/chem.am                       |   17 +++++++++++---
 contrib/eqn2graph/eqn2graph.am             |    9 +++++++
 contrib/gdiffmk/ChangeLog                  |    5 ++++
 contrib/gdiffmk/gdiffmk.am                 |   12 +++++++++-
 contrib/glilypond/ChangeLog                |    6 ++++-
 contrib/glilypond/glilypond.am             |   11 ++++++++-
 contrib/gperl/ChangeLog                    |    4 +++
 contrib/gperl/gperl.am                     |   10 +++++++-
 contrib/gpinyin/ChangeLog                  |    4 +++
 contrib/gpinyin/gpinyin.am                 |   11 ++++++++-
 contrib/grap2graph/grap2graph.am           |   11 ++++++++-
 contrib/groff_filenames/ChangeLog          |    5 ++++
 contrib/groff_filenames/groff_filenames.am |   13 +++++++++-
 contrib/groffer/ChangeLog                  |    6 ++++-
 contrib/groffer/groffer.am                 |   11 ++++++++-
 contrib/hdtbl/ChangeLog                    |    9 ++++++-
 contrib/hdtbl/hdtbl.am                     |   11 ++++++++-
 contrib/mm/ChangeLog                       |   10 ++++++-
 contrib/mm/Makefile.sim                    |    4 ++-
 contrib/mm/mm.am                           |   11 ++++++++-
 contrib/mom/ChangeLog                      |    6 ++++-
 contrib/mom/mom.am                         |   11 ++++++++-
 contrib/pdfmark/ChangeLog                  |    5 ++++
 contrib/pdfmark/pdfmark.am                 |   11 ++++++++-
 contrib/pic2graph/pic2graph.am             |   11 ++++++++-
 doc/doc.am                                 |   11 ++++++++-
 font/devX100-12/devX100-12.am              |   11 ++++++++-
 font/devX100/devX100.am                    |   11 ++++++++-
 font/devX75-12/devX75-12.am                |   11 ++++++++-
 font/devX75/devX75.am                      |   11 ++++++++-
 font/devascii/devascii.am                  |   11 ++++++++-
 font/devcp1047/devcp1047.am                |   11 ++++++++-
 font/devdvi/devdvi.am                      |   11 ++++++++-
 font/devhtml/devhtml.am                    |   11 ++++++++-
 font/devlatin1/devlatin1.am                |   11 ++++++++-
 font/devlbp/devlbp.am                      |   11 ++++++++-
 font/devlj4/devlj4.am                      |   11 ++++++++-
 font/devpdf/devpdf.am                      |   11 ++++++++-
 font/devps/devps.am                        |   11 ++++++++-
 font/devutf8/devutf8.am                    |   11 ++++++++-
 font/scripts/scripts.am                    |   26 ++++++++++++++++++++++
 man/man.am                                 |   11 ++++++++-
 src/devices/grodvi/grodvi.am               |   11 +++++++-
 src/devices/grohtml/grohtml.am             |   13 +++++++++-
 src/devices/grolbp/grolbp.am               |   13 +++++++++-
 src/devices/grolj4/grolj4.am               |   11 +++++++-
 src/devices/gropdf/gropdf.am               |   13 +++++++++-
 src/devices/grops/grops.am                 |   13 +++++++++-
 src/devices/grotty/grotty.am               |   13 +++++++++-
 src/devices/xditview/ChangeLog             |    9 ++++++-
 src/devices/xditview/xditview.am           |   13 +++++++++-
 src/include/include.am                     |   11 ++++++++-
 src/libs/libbib/libbib.am                  |   11 ++++++++-
 src/libs/libdriver/libdriver.am            |   11 ++++++++-
 src/libs/libgroff/libgroff.am              |   13 +++++++++-
 src/libs/libxutil/libxutil.am              |   11 ++++++++-
 src/preproc/eqn/eqn.am                     |   13 +++++++++-
 src/preproc/grn/grn.am                     |   13 +++++++++-
 src/preproc/html/html.am                   |   13 +++++++++-
 src/preproc/pic/pic.am                     |   12 ++++++++-
 src/preproc/preconv/preconv.am             |   13 +++++++++-
 src/preproc/refer/refer.am                 |   12 ++++++++-
 src/preproc/soelim/soelim.am               |   13 +++++++++-
 src/preproc/tbl/tbl.am                     |   13 +++++++++-
 src/roff/groff/groff.am                    |   11 ++++++++-
 src/roff/grog/grog.am                      |   11 ++++++++-
 src/roff/nroff/nroff.am                    |   13 +++++++++-
 src/roff/troff/troff.am                    |   13 +++++++++-
 src/utils/addftinfo/addftinfo.am           |   11 ++++++++-
 src/utils/afmtodit/afmtodit.am             |   11 ++++++++-
 src/utils/hpftodit/hpftodit.am             |   11 ++++++++-
 src/utils/indxbib/indxbib.am               |   13 +++++++++-
 src/utils/lkbib/lkbib.am                   |   13 +++++++++-
 src/utils/lookbib/lookbib.am               |   13 +++++++++-
 src/utils/pfbtops/pfbtops.am               |   13 +++++++++-
 src/utils/tfmtodit/tfmtodit.am             |   13 +++++++++-
 src/utils/xtotroff/xtotroff.am             |   13 +++++++++-
 tmac/tmac.am                               |   11 ++++++++-
 83 files changed, 835 insertions(+), 111 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 810106f..2a51ffd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,36 @@
+2015-08-05  Bernd Warken  <groff-bernd.warken-72@web.de>
+
+	* Makefile.am, arch/mingw/mingw.am, arch/misc/misc.am,
+	* contrib/eqn2graph/eqn2graph.am, contrib/grap2graph/grap2graph,
+	* contrib/pic2graph/pic2graph.am, doc/doc.am,
+	* font/devX100/devX100.am, font/devX100-12/devX100-12.am,
+	* font/devX75/devX75.am, font/devX75-12/devX75-12.am,
+	* font/devascii/devascii.am, font/devcp1047/devcp1047.am,
+	* font/devdvi/devdvi.am, font/devhtml/devhtml.am,
+	* font/devlatin1/devlatin1.am, font/devlbp/devlbp.am,
+	* font/devlj4/devlj4.am, font/devpdf/devpdf.am,
+	* font/devps/devps.am, font/devutf8/devutf8.am,
+	* font/scripts/scripts.am, man/man.am,
+	* src/devices/grodvi/grodvi.am, src/devices/grohtml/grohtml.am,
+	* src/devices/grolbp/grolbp.am, src/devices/grolj4/grolj4.am,
+	* src/devices/gropdf/gropdf.am, src/devices/grops/grops.am,
+	* src/devices/grotty/grotty.am,
+	* src/include/include.am, src/libs/libbib/libbib.am,
+	* src/libs/libdriver/libdriver.am, src/libs/libgroff/libgroff.am,
+	* src/libs/libxutil/libxutil.am, src/preproc/grn/grn.am,
+	* src/preproc/html/html.am, src/preproc/pic/pic.am,
+	* src/preproc/preconv/preconv.am, src/preproc/tbl/tbl.am
+	* src/preproc/refer/refer.am, src/preproc/soelim/soelim.am,
+	* src/roff/groff/groff.am, src/roff/grog/grog.am,
+	* src/roff/nroff/nroff.am, src/roff/troff/troff.am,
+	* src/utils/addftinfo/addftinfo.am,
+	* src/utils/afmtodit/afmtodit.am, src/utils/hpftodit/hpftodit.am,
+	* src/utils/indxbib/indxbib.am, src/utils/lkbib/lkbib.am,
+	* src/utils/lookbib/lookbib.am, src/utils/pfbtops/pfbtops.am,
+	* src/utils/tfmtodit/tfmtodit.am, src/utils/xtotroff/xtotroff.am,
+	* tmac/tmac.am:
+	Add `Last update'.  Setup Emacs mode.
+
 2015-07-29  Bernd Warken  <groff-bernd.warken-72@web.de>
 
 	* src/roff/grog/subs.pl: Add -T for all `grog' output, also using
diff --git a/Makefile.am b/Makefile.am
index d3b9de7..17e10ad 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,8 @@
-# # Copyright (C) 1989-2014 Free Software Foundation, Inc.
-#   Free Software Foundation, Inc.
-#      Original Makefile.in written by James Clark (jjc@jclark.com)
-#      Migrated to Automake by Bertrand Garrigues
+# Copyright (C) 1989-2015 Free Software Foundation, Inc.
+# Original Makefile.in written by James Clark (jjc@jclark.com)
+# Migrated to Automake by Bertrand Garrigues
+#
+# Last update: 5 Aug 2015
 #
 # This file is part of groff.
 #
@@ -892,3 +893,10 @@ MOSTLYCLEANFILES += $(prefixexecbin_SCRIPTS) $(bin_SCRIPTS) \
 	     -e "s|[@]TMAC_S_PREFIX[@]|$(tmac_s_prefix)|g" \
 	     -e "s|[@]VERSION[@]|$(VERSION)|g" \
 	 $< >$@
+
+
+########################################################################
+### Emacs settings
+# Local Variables:
+# mode: makefile-automake
+# End.
diff --git a/arch/mingw/mingw.am b/arch/mingw/mingw.am
index 49b259e..c3c6f0b 100644
--- a/arch/mingw/mingw.am
+++ b/arch/mingw/mingw.am
@@ -1,6 +1,8 @@
-# Copyright (C) 2014
+# Copyright (C) 2014-15
 #   Free Software Foundation, Inc.
 #
+# Last update: 5 Aug 2015
+#
 # This file is part of groff.
 #
 # groff is free software; you can redistribute it and/or modify it under
@@ -42,3 +44,10 @@ bin_SCRIPTS += $(WINSCRIPTS)
 else
 EXTRA_DIST += $(WINSCRIPTS)
 endif
+
+
+########################################################################
+### Emacs settings
+# Local Variables:
+# mode: makefile-automake
+# End.
diff --git a/arch/misc/misc.am b/arch/misc/misc.am
index 3b4c004..e80d8bc 100644
--- a/arch/misc/misc.am
+++ b/arch/misc/misc.am
@@ -1,8 +1,9 @@
-# Copyright (C) 2004-2014 Free Software Foundation, Inc.
-#      Original Makefile.sub written by Keith Marshall
-#      (keith.d.marshall@ntlworld.com).
-#      Adapted to Automake by Bertrand Garrigues
-#      (bertrand.garrigues@laposte.net).
+# Copyright (C) 2004-2015 Free Software Foundation, Inc.
+# Original Makefile.sub written by Keith Marshall
+#   (keith.d.marshall@ntlworld.com).
+# Adapted to Automake by Bertrand Garrigues (bertrand.garrigues@laposte.net).
+#
+# Last update: 6 Aug 2015
 #
 # This file is part of groff.
 #
@@ -23,3 +24,10 @@ MOSTLYCLEANFILES += shdeps.sed
 
 shdeps.sed: $(top_srcdir)/arch/misc/shdeps.sh
 	$(SHELL) $(top_srcdir)/arch/misc/shdeps.sh "$(RT_SEP)" "$(SH_SEP)" "$(bindir)" > $@
+
+
+########################################################################
+### Emacs settings
+# Local Variables:
+# mode: makefile-automake
+# End.
diff --git a/contrib/chem/ChangeLog b/contrib/chem/ChangeLog
index 64e4c82..9dff2d6 100644
--- a/contrib/chem/ChangeLog
+++ b/contrib/chem/ChangeLog
@@ -1,3 +1,7 @@
+2015-08-05  Bernd Warken  <bernd.warken@web.de>
+
+	* chen.am: Add `Last update'.  Setup Emacs makefile-automake-mode.
+
 2015-04-03  Werner LEMBERG  <wl@gnu.org>
 
 	* chem.man: Make it work in compatibility mode.
diff --git a/contrib/chem/chem.am b/contrib/chem/chem.am
index be6b7b1..a8ca170 100644
--- a/contrib/chem/chem.am
+++ b/contrib/chem/chem.am
@@ -6,18 +6,20 @@
 #   Free Software Foundation, Inc.
 # Written by Bernd Warken <groff-bernd.warken-72@web.de>.
 # Moved to automake by Bertrand Garrigues
-
+#
+# Last update: 6 Aug 2015
+#
 # This file is part of `chem' which is part of `groff'.
-
+#
 # `groff' is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License (GPL) version 2 as
 # published by the Free Software Foundation.
-
+#
 # `groff' is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 # General Public License for more details.
-
+#
 # The GPL2 license text is available in the internet at
 # <http://www.gnu.org/licenses/gpl-2.0.html>.
 
@@ -119,3 +121,10 @@ dist_chem:
 	for i in $(chem_srcdir)/examples/122/*.chem; do \
 	  cp -f $$i $(distdir)/contrib/chem/examples/122; \
 	done
+
+
+########################################################################
+### Emacs settings
+# Local Variables:
+# mode: makefile-automake
+# End.
diff --git a/contrib/eqn2graph/eqn2graph.am b/contrib/eqn2graph/eqn2graph.am
index 4e66cce..6ffa0ec 100644
--- a/contrib/eqn2graph/eqn2graph.am
+++ b/contrib/eqn2graph/eqn2graph.am
@@ -1,6 +1,8 @@
 # Copyright (C) 2002-2014
 #   Free Software Foundation, Inc.
 #
+# Last update: 5 Aug 2015
+#
 # This file is part of groff.
 #
 # groff is free software; you can redistribute it and/or modify it under
@@ -31,3 +33,10 @@ eqn2graph: $(top_srcdir)/contrib/eqn2graph/eqn2graph.sh
 	    -e "s|[@]VERSION[@]|$(VERSION)|" \
 	    -e $(SH_SCRIPT_SED_CMD) $(eqn2graph_srcdir)/eqn2graph.sh >$@
 	chmod +x $@
+
+
+########################################################################
+### Emacs settings
+# Local Variables:
+# mode: makefile-automake
+# End.
diff --git a/contrib/gdiffmk/ChangeLog b/contrib/gdiffmk/ChangeLog
index 769b88f..d51c07a 100644
--- a/contrib/gdiffmk/ChangeLog
+++ b/contrib/gdiffmk/ChangeLog
@@ -1,3 +1,7 @@
+2015-08-05  Bernd Warken  <groff-bernd.warken-72@web.de>
+
+	* gdiffmk.am: Add `Last update'.  Setup Emacs mode.
+
 2015-04-13  Mike Bianchi <MBianchi@Foveal.com>
 	More fixes to Savannah bug #44768.
 
@@ -154,5 +158,6 @@ notice and this notice are preserved.
 
 Local Variables:
 version-control: never
+mode: change-log
 coding: latin-1
 End:
diff --git a/contrib/gdiffmk/gdiffmk.am b/contrib/gdiffmk/gdiffmk.am
index 0308bd1..6dbcf02 100644
--- a/contrib/gdiffmk/gdiffmk.am
+++ b/contrib/gdiffmk/gdiffmk.am
@@ -2,10 +2,13 @@
 #
 # File position: <groff-source>/contrib/gdiffmk/gdiffmk.am
 #
-# Copyright (C) 2004, 2006, 2009, 2014 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2006, 2009, 2014-15
+#    Free Software Foundation, Inc.
 # Written by Mike Bianchi <MBianchi@Foveal.com <mailto:MBianchi@Foveal.com>>
 # Automake migration by Bertrand Garrigues
 #
+# Last update: 5 Aug 2015
+#
 # This file is part of the gdiffmk utility, which is part of groff.
 #
 # groff is free software; you can redistribute it and/or modify it
@@ -59,3 +62,10 @@ clean_gdiffmk_check:
 	  cd $(top_builddir)/contrib/gdiffmk/tests && \
 	  $(abs_top_srcdir)/contrib/gdiffmk/tests/runtests.sh clean; \
 	fi
+
+
+########################################################################
+### Emacs settings
+# Local Variables:
+# mode: makefile-automake
+# End.
diff --git a/contrib/glilypond/ChangeLog b/contrib/glilypond/ChangeLog
index 00d65b0..1c0acfd 100644
--- a/contrib/glilypond/ChangeLog
+++ b/contrib/glilypond/ChangeLog
@@ -1,3 +1,7 @@
+2015-08-05  Bernd Warken  <groff-bernd.warken-72@web.de>
+
+	* glilypond.am: Add `Last update'.  Setup Emacs mode.
+
 2015-04-03  Werner LEMBERG  <wl@gnu.org>
 
 	* glilypond.man: Make it work in compatibility mode.
@@ -198,5 +202,5 @@ notice and this notice are preserved.
 
 Local Variables:
 version-control: never
-coding: utf-8
+mode: change-log
 End:
diff --git a/contrib/glilypond/glilypond.am b/contrib/glilypond/glilypond.am
index 0f173c6..56018c1 100644
--- a/contrib/glilypond/glilypond.am
+++ b/contrib/glilypond/glilypond.am
@@ -2,12 +2,14 @@
 
 # File position: <groff-source>/contrib/lilypond/glilypond.am
 
-# Copyright (C) 2013-2014
+# Copyright (C) 2013-2015
 #   Free Software Foundation, Inc.
 # Written by Werner Lemberg <wl@gnu.org> and
 # Bernd Warken <groff-bernd.warken-72@web.de>.
 # Automake migration by Bertrand Garrigues
 
+# Last update: 5 Aug 2015
+
 # This file is part of `glilypond' which is part of `groff'.
 
 # `groff' is free software; you can redistribute it and/or modify it
@@ -61,3 +63,10 @@ uninstall-glilypond-hook:
 	if test -d $(DESTDIR)$(glilyponddir); then \
 	  rmdir $(DESTDIR)$(glilyponddir); \
 	fi
+
+
+########################################################################
+### Emacs settings
+# Local Variables:
+# mode: makefile-automake
+# End.
diff --git a/contrib/gperl/ChangeLog b/contrib/gperl/ChangeLog
index dd0d50d..0d8b7c0 100644
--- a/contrib/gperl/ChangeLog
+++ b/contrib/gperl/ChangeLog
@@ -1,3 +1,7 @@
+2015-08-05  Bernd Warken  <groff-bernd.warken-72@web.de>
+
+	* gperl.am: Add `Last update'.  Setup Emacs mode.
+
 2015-04-03  Werner LEMBERG  <wl@gnu.org>
 
 	* gperl.man: Make it work in compatibility mode.
diff --git a/contrib/gperl/gperl.am b/contrib/gperl/gperl.am
index 1ace5cf..79d0e92 100644
--- a/contrib/gperl/gperl.am
+++ b/contrib/gperl/gperl.am
@@ -2,10 +2,12 @@
 
 # File position: <groff-source>/contrib/gperl/gperl.am
 
-# Copyright (C) 2014  Free Software Foundation, Inc.
+# Copyright (C) 2014-15  Free Software Foundation, Inc.
 # Written by Bernd Warken <groff-bernd.warken-72@web.de>.
 # Automake migration by Bertrand Garrigues
 
+# Last update: 5 Aug 2015
+
 # This file is part of `gperl' which is part of `groff'.
 
 # `groff' is free software; you can redistribute it and/or modify it
@@ -40,3 +42,9 @@ gperl: $(top_srcdir)/contrib/gperl/gperl.pl shdeps.sed
 	     $(top_srcdir)/contrib/gperl/gperl.pl >$@; \
 	chmod +x $@
 
+
+########################################################################
+### Emacs settings
+# Local Variables:
+# mode: makefile-automake
+# End.
diff --git a/contrib/gpinyin/ChangeLog b/contrib/gpinyin/ChangeLog
index 77eb3a4..a3b2630 100644
--- a/contrib/gpinyin/ChangeLog
+++ b/contrib/gpinyin/ChangeLog
@@ -1,3 +1,7 @@
+2015-08-05  Bernd Warken  <groff-bernd.warken-72@web.de>
+
+	* gpinyin.am: Add `Last update'.  Setup Emacs mode.
+
 2015-04-03  Werner LEMBERG  <wl@gnu.org>
 
 	* gpinyin.man: Make it work in compatibility mode.
diff --git a/contrib/gpinyin/gpinyin.am b/contrib/gpinyin/gpinyin.am
index 20fd14b..09dcb59 100644
--- a/contrib/gpinyin/gpinyin.am
+++ b/contrib/gpinyin/gpinyin.am
@@ -2,11 +2,13 @@
 
 # File position: <groff-source>/contrib/gpinyin/gpinyin.am
 
-# Copyright (C) 2014
+# Copyright (C) 2014-15
 #   Free Software Foundation, Inc.
 # Written by Bernd Warken <groff-bernd.warken-72@web.de>.
 # Moved to automake by Bertrand Garrigues
 
+# Last update: 5 Aug 2015
+
 # This file is part of `gpinyin' which is part of `groff'.
 
 # `groff' is free software; you can redistribute it and/or modify it
@@ -50,3 +52,10 @@ uninstall-gpinyin-hook:
 	if test -d $(DESTDIR)$(gpinyindir); then \
 	  rmdir $(DESTDIR)$(gpinyindir); \
 	fi
+
+
+########################################################################
+### Emacs settings
+# Local Variables:
+# mode: makefile-automake
+# End.
diff --git a/contrib/grap2graph/grap2graph.am b/contrib/grap2graph/grap2graph.am
index 3d47da1..6c0b51b 100644
--- a/contrib/grap2graph/grap2graph.am
+++ b/contrib/grap2graph/grap2graph.am
@@ -1,4 +1,6 @@
-# Copyright (C) 2003-2014  Free Software Foundation, Inc.
+# Copyright (C) 2003-2015  Free Software Foundation, Inc.
+#
+# Last update: 5 Aug 2015
 #
 # This file is part of groff.
 #
@@ -29,3 +31,10 @@ grap2graph: $(grap2graph_srcdir)/grap2graph.sh
 	    -e "s|[@]VERSION[@]|$(VERSION)|" \
 	    -e $(SH_SCRIPT_SED_CMD) $(grap2graph_srcdir)/grap2graph.sh >$@
 	chmod +x $@
+
+
+########################################################################
+### Emacs settings
+# Local Variables:
+# mode: makefile-automake
+# End.
diff --git a/contrib/groff_filenames/ChangeLog b/contrib/groff_filenames/ChangeLog
index e954fb3..4ae6605 100644
--- a/contrib/groff_filenames/ChangeLog
+++ b/contrib/groff_filenames/ChangeLog
@@ -1,3 +1,7 @@
+2015-08-05  Bernd Warken  <groff-bernd.warken-72@web.de>
+
+	* groff_filenames.am: Add `Last update'.  Setup Emacs mode.
+
 2015-04-03  Werner LEMBERG  <wl@gnu.org>
 
 	* groff_filenames.man: Make it work in compatibility mode.
@@ -84,5 +88,6 @@ notice and this notice are preserved.
 
 Local Variables:
 version-control: never
+mode: change-log
 coding: utf-8
 End:
diff --git a/contrib/groff_filenames/groff_filenames.am b/contrib/groff_filenames/groff_filenames.am
index 076238c..4c76eaf 100644
--- a/contrib/groff_filenames/groff_filenames.am
+++ b/contrib/groff_filenames/groff_filenames.am
@@ -2,8 +2,10 @@
 
 # File position: <groff-source>/contrib/groff_filenames/groff_filenames.am
 
-# Copyright (C) 2013-2014  Free Software Foundation, Inc.
-#
+# Copyright (C) 2013-2015  Free Software Foundation, Inc.
+
+# Last update: 5 Aug 2015
+
 # Written by Bernd Warken <groff-bernd.warken-72@web.de>.
 # Automake migration by Bertrand Garrigues
 
@@ -28,3 +30,10 @@ man7_MANS += contrib/groff_filenames/groff_filenames.n
 EXTRA_DIST += \
   contrib/groff_filenames/ChangeLog \
   contrib/groff_filenames/groff_filenames.man
+
+
+########################################################################
+### Emacs settings
+# Local Variables:
+# mode: makefile-automake
+# End.
diff --git a/contrib/groffer/ChangeLog b/contrib/groffer/ChangeLog
index 83a1640..d9948a4 100644
--- a/contrib/groffer/ChangeLog
+++ b/contrib/groffer/ChangeLog
@@ -1,3 +1,7 @@
+2015-08-05  Bernd Warken  <groff-bernd.warken-72@web.de>
+
+	* groffer.am: Add `Last update'.  Setup Emacs mode.
+
 2015-04-04  Werner LEMBERG  <wl@gnu.org>
 
 	* roff2.man (EL): Fix typo.
@@ -509,7 +513,7 @@
 ________________________________________________________________
 License
 
-Copyright (C) 2006-2009, 2011-2014
+Copyright (C) 2006-2009, 2011-2015
 	Free Software Foundation, Inc.
 Written by Bernd Warken <groff-bernd.warken-72@web.de>.
 
diff --git a/contrib/groffer/groffer.am b/contrib/groffer/groffer.am
index 4f7771f..fa3f45b 100644
--- a/contrib/groffer/groffer.am
+++ b/contrib/groffer/groffer.am
@@ -2,12 +2,14 @@
 
 # File position: <groff-source>/contrib/groffer/groffer.am
 
-# Copyright (C) 2001-2014
+# Copyright (C) 2001-2015
 #   Free Software Foundation, Inc.
 # Written by Werner Lemberg <wl@gnu.org> and
 # Bernd Warken <groff-bernd.warken-72@web.de>.
 # Automake migration by Bertrand Garrigues
 
+# Last update: 5 Aug 2015
+
 # This file is part of `groffer' which is part of `groff'.
 
 # `groff' is free software; you can redistribute it and/or modify it
@@ -104,3 +106,10 @@ uninstall-groffer-hook:
 	if test -d $(DESTDIR)$(grofferdir); then \
 	  rmdir $(DESTDIR)$(grofferdir); \
 	fi
+
+
+########################################################################
+### Emacs settings
+# Local Variables:
+# mode: makefile-automake
+# End.
diff --git a/contrib/hdtbl/ChangeLog b/contrib/hdtbl/ChangeLog
index c759ff7..77e10ac 100644
--- a/contrib/hdtbl/ChangeLog
+++ b/contrib/hdtbl/ChangeLog
@@ -1,3 +1,7 @@
+2015-08-05  Bernd Warken  <groff-bernd.warken-72@web.de>
+
+	* hdtbl.am: Add `Last update'.  Setup Emacs mode.
+
 2015-04-03  Werner LEMBERG  <wl@gnu.org>
 
 	Fix Savannah bug #44798.
@@ -322,7 +326,9 @@
 	* Import of hdtbl 0.91 (with some further modifications).  Still
 	many rough edges.
 
-Copyright 2006, 2008-2014
+________________________________________________________________________
+
+Copyright 2006, 2008-2015
   Free Software Foundation, Inc.
 
 Copying and distribution of this file, with or without modification,
@@ -331,5 +337,6 @@ notice and this notice are preserved.
 
 Local Variables:
 version-control: never
+mode: change-log
 coding: latin-1
 End:
diff --git a/contrib/hdtbl/hdtbl.am b/contrib/hdtbl/hdtbl.am
index ef2e1f1..6a7ec92 100644
--- a/contrib/hdtbl/hdtbl.am
+++ b/contrib/hdtbl/hdtbl.am
@@ -1,7 +1,9 @@
-# Copyright (C) 2006-2014 Free Software Foundation, Inc.
+# Copyright (C) 2006-2015 Free Software Foundation, Inc.
 #      Written by Werner Lemberg (wl@gnu.org)
 #      Automake migration by Bertrand Garrigues
 #
+# Last update: 5 Aug 2015
+#
 # This file is part of groff.
 #
 # groff is free software; you can redistribute it and/or modify it under
@@ -124,3 +126,10 @@ uninstall-hdtbl-hook:
 	if test -d $(DESTDIR)$(hdtblexampledir); then \
 	  rmdir $(DESTDIR)$(hdtblexampledir); \
 	fi
+
+
+########################################################################
+### Emacs settings
+# Local Variables:
+# mode: makefile-automake
+# End.
diff --git a/contrib/mm/ChangeLog b/contrib/mm/ChangeLog
index 83deaf9..6223f33 100644
--- a/contrib/mm/ChangeLog
+++ b/contrib/mm/ChangeLog
@@ -1,3 +1,7 @@
+2015-08-05  Bernd Warken  <groff-bernd.warken-72@web.de>
+
+	* mm.am, Makefile.sim: Add `Last update'.  Setup Emacs mode.
+
 Thu Jul 16 11:52:03 2015  Carsten Kunze  <carsten.kunze@arcor.de>
 
 	Fix line length of `.DS' with indentation (#45452).
@@ -966,7 +970,9 @@ Sun Jan 1 00:00:00 1991 Joergen Haegg (jh at efd.lth.se)
 	* TP&PX	supported
 	* warnings for unimplemented macros
 
-Copyright 1991-2007, 2009-2014
+________________________________________________________________________
+
+Copyright 1991-2007, 2009-2015
   Free Software Foundation, Inc.
 
 Copying and distribution of this file, with or without modification,
@@ -975,5 +981,5 @@ notice and this notice are preserved.
 
 Local Variables:
 version-control: never
-coding: latin-1
+mode: change-log
 End:
diff --git a/contrib/mm/Makefile.sim b/contrib/mm/Makefile.sim
index 5f4048a..dc167e7 100644
--- a/contrib/mm/Makefile.sim
+++ b/contrib/mm/Makefile.sim
@@ -1,4 +1,6 @@
-# Copyright 1991-2014  Free S0ftware Foundation, Inc.
+# Copyright 1991-2015  Free Software Foundation, Inc.
+#
+# Last update: 5 Aug 2015
 #
 # This file is part of groff.
 #
diff --git a/contrib/mm/mm.am b/contrib/mm/mm.am
index 6a72493..318c0c5 100644
--- a/contrib/mm/mm.am
+++ b/contrib/mm/mm.am
@@ -1,6 +1,8 @@
-# Copyright 1991-2014
+# Copyright 1991-2015
 #   Free Software Foundation, Inc.
 #
+# Last update: 5 Aug 2015
+#
 # This file is part of groff.
 #
 # groff is free software; you can redistribute it and/or modify it under
@@ -104,3 +106,10 @@ dist_mm:
 	for i in $(mm_srcdir)/*.tmac; do \
 	  cp -f $$i $(distdir)/contrib/mm/; \
 	done
+
+
+########################################################################
+### Emacs settings
+# Local Variables:
+# mode: makefile-automake
+# End.
diff --git a/contrib/mom/ChangeLog b/contrib/mom/ChangeLog
index 8b87800..10defb2 100644
--- a/contrib/mom/ChangeLog
+++ b/contrib/mom/ChangeLog
@@ -1,3 +1,7 @@
+2015-08-05  Bernd Warken  <groff-bernd.warken-72@web.de>
+
+	* mom.am: Add `Last update'.  Setup Emacs mode.
+
 * Sun Jul 26 2015
 
 	o Fix to header part-by-part changes.
@@ -1594,7 +1598,7 @@ ________________________________________________________________________
 
 ##### License
 
-Copyright 2004-2014  Free Software Foundation, Inc.
+Copyright 2004-2015  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/mom.am b/contrib/mom/mom.am
index 8ba503a..db94742 100644
--- a/contrib/mom/mom.am
+++ b/contrib/mom/mom.am
@@ -1,8 +1,10 @@
-# Copyright (C) 2002-2014
+# Copyright (C) 2002-2015
 #   Free Software Foundation, Inc.
 #      Written by Werner Lemberg (wl@gnu.org)
 #      Automake migration by Bertrand Garrigues
 #
+# Last update: 5 Aug 2015
+#
 # This file is part of groff.
 #
 # groff is free software; you can redistribute it and/or modify it under
@@ -166,3 +168,10 @@ uninstall_mom:
 	if test -d $(DESTDIR)$(htmldocdir)/mom; then \
 	  rmdir $(DESTDIR)$(htmldocdir)/mom; \
 	fi
+
+
+########################################################################
+### Emacs settings
+# Local Variables:
+# mode: makefile-automake
+# End.
diff --git a/contrib/pdfmark/ChangeLog b/contrib/pdfmark/ChangeLog
index f591aa6..6a7c894 100644
--- a/contrib/pdfmark/ChangeLog
+++ b/contrib/pdfmark/ChangeLog
@@ -1,3 +1,7 @@
+2015-08-05  Bernd Warken  <groff-bernd.warken-72@web.de>
+
+	* pdfmark.am: Add `Last update'.  Setup Emacs mode.
+
 2015-04-03  Werner LEMBERG  <wl@gnu.org>
 
 	* pdfroff.man: Make it work in compatibility mode.
@@ -426,4 +430,5 @@ notice and this notice are preserved.
 Local Variables:
 version-control: never
 coding: latin-1
+mode: change-log
 End:
diff --git a/contrib/pdfmark/pdfmark.am b/contrib/pdfmark/pdfmark.am
index 64a1197..6ebc6d9 100644
--- a/contrib/pdfmark/pdfmark.am
+++ b/contrib/pdfmark/pdfmark.am
@@ -1,8 +1,10 @@
-# Copyright (C) 2005-2014
+# Copyright (C) 2005-2015
 # Free Software Foundation, Inc.
 #      Written by Keith Marshall (keith.d.marshall@ntlworld.com)
 #      Automake migration by Bertrand Garrigues
 #
+# Last update: 5 Aug 2015
+#
 # This file is part of groff.
 #
 # groff is free software; you can redistribute it and/or modify it under
@@ -91,3 +93,10 @@ if BUILD_PDFDOC
 	  rmdir $(DESTDIR)$(pdfmarkpdfdocdir); \
 	fi
 endif
+
+
+########################################################################
+### Emacs settings
+# Local Variables:
+# mode: makefile-automake
+# End.
diff --git a/contrib/pic2graph/pic2graph.am b/contrib/pic2graph/pic2graph.am
index 313fd67..78b6635 100644
--- a/contrib/pic2graph/pic2graph.am
+++ b/contrib/pic2graph/pic2graph.am
@@ -1,4 +1,6 @@
-# Copyright (C) 2001-2014  Free Software Foundation, Inc.
+# Copyright (C) 2001-2015  Free Software Foundation, Inc.
+#
+# Last update: 5 Aug 2015
 #
 # This file is part of groff.
 #
@@ -29,3 +31,10 @@ pic2graph: $(pic2graph_srcdir)/pic2graph.sh
 	    -e "s|[@]VERSION[@]|$(VERSION)|" \
 	    -e $(SH_SCRIPT_SED_CMD) $(pic2graph_srcdir)/pic2graph.sh >$@
 	chmod +x $@
+
+
+########################################################################
+### Emacs settings
+# Local Variables:
+# mode: makefile-automake
+# End.
diff --git a/doc/doc.am b/doc/doc.am
index abc5534..1db4e14 100644
--- a/doc/doc.am
+++ b/doc/doc.am
@@ -1,8 +1,10 @@
-# Copyright (C) 2002-2014  Free Software Foundation, Inc.
+# Copyright (C) 2002-2015  Free Software Foundation, Inc.
 #      Original Makefile.sub written by Werner Lemberg <wl@gnu.org>
 #      Automake migration by 
 #      Bertrand Garrigues <bertrand.garrigues@laposte.net>
 #
+# LAst update: 5 Aug 2015
+#
 # This file is part of groff.
 #
 # groff is free software; you can redistribute it and/or modify it under
@@ -438,3 +440,10 @@ dist-hook: dist-gnueps
 dist-gnueps:
 	chmod u+w $(distdir)/doc
 	cp -f gnu.eps $(distdir)/doc
+
+
+########################################################################
+### Emacs settings
+# Local Variables:
+# mode: makefile-automake
+# End.
diff --git a/font/devX100-12/devX100-12.am b/font/devX100-12/devX100-12.am
index 8ab8625..ef73b62 100644
--- a/font/devX100-12/devX100-12.am
+++ b/font/devX100-12/devX100-12.am
@@ -1,6 +1,8 @@
-# Copyright (C) 2014
+# Copyright (C) 2014-15
 #   Free Software Foundation, Inc.
 #
+# Last update: 5 Aug 2015
+#
 # This file is part of `groff'.
 #
 # `groff' is free software; you can redistribute it and/or modify it
@@ -42,3 +44,10 @@ devX10012font_DATA = $(DEVX10012FONTS)
 endif
 
 EXTRA_DIST += $(DEVX10012FONTS)
+
+
+########################################################################
+### Emacs settings
+# Local Variables:
+# mode: makefile-automake
+# End.
diff --git a/font/devX100/devX100.am b/font/devX100/devX100.am
index bd41926..b5f9ad3 100644
--- a/font/devX100/devX100.am
+++ b/font/devX100/devX100.am
@@ -1,6 +1,8 @@
-# Copyright (C) 2014
+# Copyright (C) 2014-15
 #   Free Software Foundation, Inc.
 #
+# Last update: 5 Aug 2015
+#
 # This file is part of `groff'.
 #
 # `groff' is free software; you can redistribute it and/or modify it
@@ -42,3 +44,10 @@ devX100font_DATA = $(DEVX100FONTS)
 endif
 
 EXTRA_DIST += $(DEVX100FONTS)
+
+
+########################################################################
+### Emacs settings
+# Local Variables:
+# mode: makefile-automake
+# End.
diff --git a/font/devX75-12/devX75-12.am b/font/devX75-12/devX75-12.am
index d959e79..4cd60f4 100644
--- a/font/devX75-12/devX75-12.am
+++ b/font/devX75-12/devX75-12.am
@@ -1,6 +1,8 @@
-# Copyright (C) 2014
+# Copyright (C) 2014-15
 #   Free Software Foundation, Inc.
 #
+# Last update: 5 Aug 2015
+#
 # This file is part of `groff'
 #
 # `groff' is free software; you can redistribute it and/or modify it
@@ -40,3 +42,10 @@ devX7512fontdir = $(fontdir)/devX75-12
 devX7512font_DATA = $(DEVX7512FONTS)
 endif
 EXTRA_DIST += $(DEVX7512FONTS)
+
+
+########################################################################
+### Emacs settings
+# Local Variables:
+# mode: makefile-automake
+# End.
diff --git a/font/devX75/devX75.am b/font/devX75/devX75.am
index e265ce2..4eb683c 100644
--- a/font/devX75/devX75.am
+++ b/font/devX75/devX75.am
@@ -1,6 +1,8 @@
-# Copyright (C) 2014
+# Copyright (C) 2014-15
 #   Free Software Foundation, Inc.
 #
+# Last update: 5 Aug 2015
+#
 # This file is part of `groff'
 #
 # `groff' is free software; you can redistribute it and/or modify it
@@ -42,3 +44,10 @@ devX75font_DATA = $(DEVX75FONTS)
 endif
 
 EXTRA_DIST += $(DEVX75FONTS)
+
+
+########################################################################
+### Emacs settings
+# Local Variables:
+# mode: makefile-automake
+# End.
diff --git a/font/devascii/devascii.am b/font/devascii/devascii.am
index 5e2c08d..8b30675 100644
--- a/font/devascii/devascii.am
+++ b/font/devascii/devascii.am
@@ -1,6 +1,8 @@
-# Copyright (C) 2014
+# Copyright (C) 2014-15
 #   Free Software Foundation, Inc.
 #
+# Last update: 5 Aug 2015
+#
 # This file is part of `groff'
 #
 # `groff' is free software; you can redistribute it and/or modify it
@@ -44,3 +46,10 @@ font/devascii/DESC: $(devascii_srcdir)/DESC.proto
 	$(MKDIR_P) `dirname $@`
 	$(SHELL) $(GENDESCSH) $(devascii_srcdir)/DESC.proto \
 	  $(DEVASCIIRES) $(DEVASCIICPI) $(DEVASCIILPI) $(DEVASCIIFONTS) > $@
+
+
+########################################################################
+### Emacs settings
+# Local Variables:
+# mode: makefile-automake
+# End.
diff --git a/font/devcp1047/devcp1047.am b/font/devcp1047/devcp1047.am
index 1a49f5d..d7f4a14 100644
--- a/font/devcp1047/devcp1047.am
+++ b/font/devcp1047/devcp1047.am
@@ -1,6 +1,8 @@
-# Copyright (C) 2014
+# Copyright (C) 2014-15
 #   Free Software Foundation, Inc.
 #
+# Last update: 5 Aug 2015
+#
 # This file is part of `groff'
 #
 # `groff' is free software; you can redistribute it and/or modify it
@@ -42,3 +44,10 @@ font/devcp1047/DESC: $(devcp1047_srcdir)/DESC.proto
 	@$(MKDIR_P) `dirname $@`
 	@$(SHELL) $(GENDESCSH) $(devcp1047_srcdir)/DESC.proto \
 	 $(DEVCP1047RES) $(DEVCP1047CPI) $(DEVCP1047LPI) $(DEVCP1047FONTS) > $@
+
+
+########################################################################
+### Emacs settings
+# Local Variables:
+# mode: makefile-automake
+# End.
diff --git a/font/devdvi/devdvi.am b/font/devdvi/devdvi.am
index d19bff1..1cb16b8 100644
--- a/font/devdvi/devdvi.am
+++ b/font/devdvi/devdvi.am
@@ -1,6 +1,8 @@
-# Copyright (C) 2014
+# Copyright (C) 2014-15
 #   Free Software Foundation, Inc.
 #
+# Last update: 5 Aug 2015
+#
 # This file is part of `groff'
 #
 # `groff' is free software; you can redistribute it and/or modify it
@@ -88,3 +90,10 @@ font/devdvi/DESC: $(devdvi_srcdir)/DESC.in
 	  echo "papersize letter" >>$@; \
 	fi
 	@test -z '$(DVIPRINT)' || echo print '$(DVIPRINT)' >>$@
+
+
+########################################################################
+### Emacs settings
+# Local Variables:
+# mode: makefile-automake
+# End.
diff --git a/font/devhtml/devhtml.am b/font/devhtml/devhtml.am
index 00f982a..9f0f254 100644
--- a/font/devhtml/devhtml.am
+++ b/font/devhtml/devhtml.am
@@ -1,6 +1,8 @@
-# Copyright (C) 2014
+# Copyright (C) 2014-15
 #   Free Software Foundation, Inc.
 #
+# Last update: 5 Aug 2015
+#
 # This file is part of `groff'
 #
 # `groff' is free software; you can redistribute it and/or modify it
@@ -54,3 +56,10 @@ font/devhtml/DESC: $(devhtml_srcdir)/DESC.proto
 	@$(SHELL) $(GENDESCSH) $(devhtml_srcdir)/DESC.proto \
 	 $(DEVHTMLRES) $(DEVHTMLCPI) $(DEVHTMLLPI) $(DEVHTMLFONTS) > $@
 	@echo "image_generator $(GHOSTSCRIPT)" >> $@
+
+
+########################################################################
+### Emacs settings
+# Local Variables:
+# mode: makefile-automake
+# End.
diff --git a/font/devlatin1/devlatin1.am b/font/devlatin1/devlatin1.am
index 5508682..f2ba32c 100644
--- a/font/devlatin1/devlatin1.am
+++ b/font/devlatin1/devlatin1.am
@@ -1,6 +1,8 @@
-# Copyright (C) 2014
+# Copyright (C) 2014-15
 #   Free Software Foundation, Inc.
 #
+# Last update: 5 Aug 2015
+#
 # This file is part of `groff'
 #
 # `groff' is free software; you can redistribute it and/or modify it
@@ -42,3 +44,10 @@ font/devlatin1/DESC: $(devlatin1_srcdir)/DESC.proto
 	@$(MKDIR_P) `dirname $@`
 	@$(SHELL) $(GENDESCSH) $(devlatin1_srcdir)/DESC.proto \
 	 $(DEVLATIN1RES) $(DEVLATIN1CPI) $(DEVLATIN1LPI) $(DEVLATIN1FONTS) > $@
+
+
+########################################################################
+### Emacs settings
+# Local Variables:
+# mode: makefile-automake
+# End.
diff --git a/font/devlbp/devlbp.am b/font/devlbp/devlbp.am
index 7c8effe..2b350df 100644
--- a/font/devlbp/devlbp.am
+++ b/font/devlbp/devlbp.am
@@ -1,6 +1,8 @@
-# Copyright (C) 2014
+# Copyright (C) 2014-15
 #   Free Software Foundation, Inc.
 #
+# Last update: 5 Aug 2015
+#
 # This file is part of `groff'
 #
 # `groff' is free software; you can redistribute it and/or modify it
@@ -52,3 +54,10 @@ font/devlbp/DESC: $(devlbp_srcdir)/DESC.in
 	  echo "papersize letter" >>$@; \
 	fi
 	@test -z '$(LBPPRINT)' || echo print '$(LBPPRINT)' >>$@
+
+
+########################################################################
+### Emacs settings
+# Local Variables:
+# mode: makefile-automake
+# End.
diff --git a/font/devlj4/devlj4.am b/font/devlj4/devlj4.am
index de6e5f7..2687f5e 100644
--- a/font/devlj4/devlj4.am
+++ b/font/devlj4/devlj4.am
@@ -1,6 +1,8 @@
-# Copyright (C) 2014
+# Copyright (C) 2014-15
 #   Free Software Foundation, Inc.
 #
+# Last update: 5 Aug 2015
+#
 # This file is part of `groff'
 #
 # `groff' is free software; you can redistribute it and/or modify it
@@ -102,3 +104,10 @@ fonts: devlj4_fonts
 devlj4_fonts: hpftodit font/devlj4/DESC
 	$(MAKE) -f $(devlj4_srcdir)/generate/Makefile \
 	  srcdir=$(devlj4_srcdir)/generate HPFTODIT=$(top_builddir)/hpftodit
+
+
+########################################################################
+### Emacs settings
+# Local Variables:
+# mode: makefile-automake
+# End.
diff --git a/font/devpdf/devpdf.am b/font/devpdf/devpdf.am
index ac37064..893000a 100644
--- a/font/devpdf/devpdf.am
+++ b/font/devpdf/devpdf.am
@@ -1,9 +1,11 @@
-# Copyright (C) 2011-2014 Free Software Foundation, Inc.
+# Copyright (C) 2011-2015 Free Software Foundation, Inc.
 #      Free Software Foundation, Inc.
 #      Original Makefile.sub Written 
 #      by Deri James <deri@chuzzlewit.demon.co.uk>
 #      Automake migration by Bertrand Garrigues
 #
+# Last update: 2015
+#
 # This file is part of groff.
 #
 # groff is free software; you can redistribute it and/or modify it under
@@ -165,3 +167,10 @@ uninstall_devpdf:
 	  rm -f $(DESTDIR)$(devpdffontdir)/download; \
 	  rmdir $(DESTDIR)$(devpdffontdir); \
 	fi
+
+
+########################################################################
+### Emacs settings
+# Local Variables:
+# mode: makefile-automake
+# End.
diff --git a/font/devps/devps.am b/font/devps/devps.am
index 42ea38a..9ea9d01 100644
--- a/font/devps/devps.am
+++ b/font/devps/devps.am
@@ -1,6 +1,8 @@
-# Copyright (C) 2014
+# Copyright (C) 2014-15
 #   Free Software Foundation, Inc.
 #
+# Last update: 5 Aug 2015
+#
 # This file is part of `groff'
 #
 # `groff' is free software; you can redistribute it and/or modify it
@@ -168,3 +170,10 @@ font/devps/symbolsl.pfa: $(devps_srcdir)/symbolsl.ps
 	@$(MKDIR_P) font/devps
 	$(RM) $@
 	sed -f $(devps_srcdir)/psstrip.sed $? >$@
+
+
+########################################################################
+### Emacs settings
+# Local Variables:
+# mode: makefile-automake
+# End.
diff --git a/font/devutf8/devutf8.am b/font/devutf8/devutf8.am
index d101e32..636ad02 100644
--- a/font/devutf8/devutf8.am
+++ b/font/devutf8/devutf8.am
@@ -1,6 +1,8 @@
-# Copyright (C) 2014
+# Copyright (C) 2014-15
 #   Free Software Foundation, Inc.
 #
+# Last update: 5 Aug 2015
+#
 # This file is part of `groff'
 #
 # `groff' is free software; you can redistribute it and/or modify it
@@ -46,3 +48,10 @@ font/devutf8/DESC: $(devutf8_srcdir)/DESC.proto
 	@$(MKDIR_P) `dirname $@`
 	@$(SHELL) $(GENDESCSH) $(devutf8_srcdir)/DESC.proto \
 	 $(DEVUTF8RES) $(DEVUTF8CPI) $(DEVUTF8LPI) $(DEVUTF8FONTS) > $@
+
+
+########################################################################
+### Emacs settings
+# Local Variables:
+# mode: makefile-automake
+# End.
diff --git a/font/scripts/scripts.am b/font/scripts/scripts.am
index f384e67..9a6dfbc 100644
--- a/font/scripts/scripts.am
+++ b/font/scripts/scripts.am
@@ -1,4 +1,30 @@
+# Copyright (C) 2015
+#   Free Software Foundation, Inc.
+#
+# Last update: 5 Aug 2015
+#
+# This file is part of groff.
+#
+# groff is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free
+# Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# groff is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# 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/>.
+
 # Scripts for font files generation
 GENFONTSSH=$(top_srcdir)/font/scripts/genfonts.sh
 GENDESCSH = $(top_srcdir)/font/scripts/gendesc.sh
 EXTRA_DIST += $(GENFONTSSH) $(GENDESCSH)
+
+########################################################################
+### Emacs settings
+# Local Variables:
+# mode: makefile-automake
+# End.
diff --git a/man/man.am b/man/man.am
index 9658ad3..9d6ff2d 100644
--- a/man/man.am
+++ b/man/man.am
@@ -1,6 +1,8 @@
-# Copyright (C) 2014
+# Copyright (C) 2014-15
 #   Free Software Foundation, Inc.
 #
+# Last update: 5 Aug 2015
+#
 # This file is part of `groff'
 #
 # `groff' is free software; you can redistribute it and/or modify it
@@ -40,3 +42,10 @@ EXTRA_DIST += \
 BUILT_SOURCES += man
 man:
 	$(MKDIR_P) $(top_builddir)/man
+
+
+########################################################################
+### Emacs settings
+# Local Variables:
+# mode: makefile-automake
+# End.
diff --git a/src/devices/grodvi/grodvi.am b/src/devices/grodvi/grodvi.am
index ba0e0ed..53af681 100644
--- a/src/devices/grodvi/grodvi.am
+++ b/src/devices/grodvi/grodvi.am
@@ -1,6 +1,8 @@
-# Copyright (C) 2014
+# Copyright (C) 2014-15
 #      Free Software Foundation, Inc.
-# 
+#
+# Last update: 5 Aug 2015
+#
 # This file is part of groff.
 #
 # groff is free software; you can redistribute it and/or modify it under
@@ -26,3 +28,8 @@ man1_MANS += src/devices/grodvi/grodvi.n
 EXTRA_DIST += src/devices/grodvi/grodvi.man
 
 
+########################################################################
+### Emacs settings
+# Local Variables:
+# mode: makefile-automake
+# End.
diff --git a/src/devices/grohtml/grohtml.am b/src/devices/grohtml/grohtml.am
index 68c59f1..8d33f8f 100644
--- a/src/devices/grohtml/grohtml.am
+++ b/src/devices/grohtml/grohtml.am
@@ -1,6 +1,8 @@
-# Copyright (C) 2014
+# Copyright (C) 2014-15
 #      Free Software Foundation, Inc.
-# 
+#
+# Last update: 5 Aug 2015
+#
 # This file is part of groff.
 #
 # groff is free software; you can redistribute it and/or modify it under
@@ -32,3 +34,10 @@ post_grohtml_LDADD = $(LIBM) \
   lib/libgnu.a 
 man1_MANS += src/devices/grohtml/grohtml.n
 EXTRA_DIST += src/devices/grohtml/grohtml.man
+
+
+########################################################################
+### Emacs settings
+# Local Variables:
+# mode: makefile-automake
+# End.
diff --git a/src/devices/grolbp/grolbp.am b/src/devices/grolbp/grolbp.am
index 987bbeb..a7f1ffe 100644
--- a/src/devices/grolbp/grolbp.am
+++ b/src/devices/grolbp/grolbp.am
@@ -1,6 +1,8 @@
-# Copyright (C) 2014
+# Copyright (C) 2014-15
 #      Free Software Foundation, Inc.
-# 
+#
+# Last update: 5 Aug 2015
+#
 # This file is part of groff.
 #
 # groff is free software; you can redistribute it and/or modify it under
@@ -28,3 +30,10 @@ grolbp_LDADD = $(LIBM) \
   lib/libgnu.a
 man1_MANS += src/devices/grolbp/grolbp.n
 EXTRA_DIST += src/devices/grolbp/grolbp.man
+
+
+########################################################################
+### Emacs settings
+# Local Variables:
+# mode: makefile-automake
+# End.
diff --git a/src/devices/grolj4/grolj4.am b/src/devices/grolj4/grolj4.am
index 6f81545..7d4b5bf 100644
--- a/src/devices/grolj4/grolj4.am
+++ b/src/devices/grolj4/grolj4.am
@@ -1,6 +1,8 @@
-# Copyright (C) 2014
+# Copyright (C) 2014-15
 #      Free Software Foundation, Inc.
-# 
+#
+# Last update: 5 Aug 2015
+#
 # This file is part of groff.
 #
 # groff is free software; you can redistribute it and/or modify it under
@@ -28,3 +30,8 @@ EXTRA_DIST += \
   src/devices/grolj4/grolj4.man \
   src/devices/grolj4/lj4_font.man
 
+########################################################################
+### Emacs settings
+# Local Variables:
+# mode: makefile-automake
+# End.
diff --git a/src/devices/gropdf/gropdf.am b/src/devices/gropdf/gropdf.am
index 4388aee..4d41d96 100644
--- a/src/devices/gropdf/gropdf.am
+++ b/src/devices/gropdf/gropdf.am
@@ -1,8 +1,10 @@
-# Copyright (C) 2011-2014
+# Copyright (C) 2011-2015
 #      Free Software Foundation, Inc.
 #  Original Makefile.sub written by Deri James <deri@chuzzlewit.demon.co.uk>.
 #  Automake migration by Bertrand Garrigues
-# 
+#
+# Last update: 5 Aug 2015
+#
 # This file is part of groff.
 #
 # groff is free software; you can redistribute it and/or modify it under
@@ -48,3 +50,10 @@ pdfmom: $(gropdf_dir)/pdfmom.pl $(SH_DEPS_SED_SCRIPT)
 	    -e "s|[@]RT_SEP[@]|$(RT_SEP)|" \
 	    -e "s|[@]PERL[@]|$(PERL)|" $(gropdf_dir)/pdfmom.pl >$@
 	chmod +x $@
+
+
+########################################################################
+### Emacs settings
+# Local Variables:
+# mode: makefile-automake
+# End.
diff --git a/src/devices/grops/grops.am b/src/devices/grops/grops.am
index 6a62cf7..5edecf1 100644
--- a/src/devices/grops/grops.am
+++ b/src/devices/grops/grops.am
@@ -1,6 +1,8 @@
-# Copyright (C) 2014
+# Copyright (C) 2014-15
 #      Free Software Foundation, Inc.
-# 
+#
+# Last update: 5 Aug 2015
+#
 # This file is part of groff.
 #
 # groff is free software; you can redistribute it and/or modify it under
@@ -30,3 +32,10 @@ EXTRA_DIST += \
   src/devices/grops/grops.man \
   src/devices/grops/psfig.diff \
   src/devices/grops/TODO
+
+
+########################################################################
+### Emacs settings
+# Local Variables:
+# mode: makefile-automake
+# End.
diff --git a/src/devices/grotty/grotty.am b/src/devices/grotty/grotty.am
index d3e36b8..d200e5d 100644
--- a/src/devices/grotty/grotty.am
+++ b/src/devices/grotty/grotty.am
@@ -1,6 +1,8 @@
-# Copyright (C) 2014
+# Copyright (C) 2014-15
 #      Free Software Foundation, Inc.
-# 
+#
+# Last update: 5 Aug 2015
+#
 # This file is part of groff.
 #
 # groff is free software; you can redistribute it and/or modify it under
@@ -26,3 +28,10 @@ man1_MANS += src/devices/grotty/grotty.n
 EXTRA_DIST += \
   src/devices/grotty/grotty.man \
   src/devices/grotty/TODO
+
+
+########################################################################
+### Emacs settings
+# Local Variables:
+# mode: makefile-automake
+# End.
diff --git a/src/devices/xditview/ChangeLog b/src/devices/xditview/ChangeLog
index 024e59f..c24b01d 100644
--- a/src/devices/xditview/ChangeLog
+++ b/src/devices/xditview/ChangeLog
@@ -1,3 +1,7 @@
+2015-08-05  Bernd Warken  <groff-bernd.warken-72@web.de>
+
+	* xditview.am: Add `Last update'.  Setup Emacs mode.
+
 2004-05-29  Werner LEMBERG  <wl@gnu.org>
 
 	gxditview and xtotroff have been integrated into the normal groff
@@ -541,7 +545,9 @@ Sun May 26 14:14:01 1991  James Clark  (jjc at jclark)
 
 	* Started separate ChangeLog.
 
-Copyright 1991-1995, 1999, 200, 2001, 2002, 2003, 2004
+________________________________________________________________________
+
+Copyright 1991-1995, 1999-2004
   Free Software Foundation, Inc.
 
 Copying and distribution of this file, with or without modification,
@@ -550,5 +556,6 @@ notice and this notice are preserved.
 
 Local Variables:
 version-control: never
+mode: change-log
 coding: latin-1
 End:
diff --git a/src/devices/xditview/xditview.am b/src/devices/xditview/xditview.am
index 93f291c..d4c65a0 100644
--- a/src/devices/xditview/xditview.am
+++ b/src/devices/xditview/xditview.am
@@ -1,6 +1,8 @@
-# Copyright (C) 2014
+# Copyright (C) 2014-15
 #      Free Software Foundation, Inc.
-# 
+#
+# Last update: 5 Aug 2015
+#
 # This file is part of groff.
 #
 # groff is free software; you can redistribute it and/or modify it under
@@ -106,3 +108,10 @@ uninstall_xditview:
 	rm -f $(DESTDIR)$(appresdir)/GXditview-color
 
 endif
+
+
+########################################################################
+### Emacs settings
+# Local Variables:
+# mode: makefile-automake
+# End.
diff --git a/src/include/include.am b/src/include/include.am
index 8518791..3b877f9 100644
--- a/src/include/include.am
+++ b/src/include/include.am
@@ -2,7 +2,9 @@
 #
 # File position: <groff-source>/src/include/include.am
 #
-# Copyright (C) 2014  Free Software Foundation, Inc.
+# Copyright (C) 2014-15  Free Software Foundation, Inc.
+#
+# Latest update: 5 Aug 2015
 #
 # `groff' is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -40,3 +42,10 @@ dist-hook: dist_include
 dist_include:
 	chmod u+w $(distdir)/src/include
 	cp -f $(top_srcdir)/src/include/*.h $(distdir)/src/include
+
+
+########################################################################
+### Emacs settings
+# Local Variables:
+# mode: makefile-automake
+# End.
diff --git a/src/libs/libbib/libbib.am b/src/libs/libbib/libbib.am
index ca44191..e889aed 100644
--- a/src/libs/libbib/libbib.am
+++ b/src/libs/libbib/libbib.am
@@ -2,7 +2,9 @@
 #
 # File position: <groff-source>/src/libs/libbib/libbib.am
 #
-# Copyright (C) 2014  Free Software Foundation, Inc.
+# Copyright (C) 2014-15  Free Software Foundation, Inc.
+#
+# Latest update: 5 Aug 2015
 #
 # `groff' is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -28,3 +30,10 @@ libbib_a_SOURCES = \
   src/libs/libbib/search.cpp \
   src/libs/libbib/map.c
 src/libs/libbib/index.$(OBJEXT): defs.h
+
+
+########################################################################
+### Emacs settings
+# Local Variables:
+# mode: makefile-automake
+# End.
diff --git a/src/libs/libdriver/libdriver.am b/src/libs/libdriver/libdriver.am
index 6c504d2..eec328a 100644
--- a/src/libs/libdriver/libdriver.am
+++ b/src/libs/libdriver/libdriver.am
@@ -2,7 +2,9 @@
 #
 # File position: <groff-source>/src/libs/libdriver/libdriver.am
 #
-# Copyright (C) 2014  Free Software Foundation, Inc.
+# Copyright (C) 2014-15  Free Software Foundation, Inc.
+#
+# Latest update: 5 Aug 2015
 #
 # `groff' is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -24,3 +26,10 @@ noinst_LIBRARIES += libdriver.a
 libdriver_a_SOURCES = \
   src/libs/libdriver/input.cpp \
   src/libs/libdriver/printer.cpp
+
+
+########################################################################
+### Emacs settings
+# Local Variables:
+# mode: makefile-automake
+# End.
diff --git a/src/libs/libgroff/libgroff.am b/src/libs/libgroff/libgroff.am
index 76cb609..6eb6959 100644
--- a/src/libs/libgroff/libgroff.am
+++ b/src/libs/libgroff/libgroff.am
@@ -1,6 +1,8 @@
-# Copyright (C) 2014
+# Copyright (C) 2014-15
 #      Free Software Foundation, Inc.
-# 
+#
+# Latest update: 5 Aug 2015
+#
 # This file is part of groff.
 #
 # groff is free software; you can redistribute it and/or modify it under
@@ -170,3 +172,10 @@ uninstall_charset_data:
 	  fi; \
 	  rm -f $(DESTDIR)$(libdir)/t-charset.alias; \
 	fi
+
+
+########################################################################
+### Emacs settings
+# Local Variables:
+# mode: makefile-automake
+# End.
diff --git a/src/libs/libxutil/libxutil.am b/src/libs/libxutil/libxutil.am
index a20b708..83b964f 100644
--- a/src/libs/libxutil/libxutil.am
+++ b/src/libs/libxutil/libxutil.am
@@ -2,7 +2,9 @@
 #
 # File position: <groff-source>/src/libs/libxutil/libxutil.am
 #
-# Copyright (C) 2014 Free Software Foundation, Inc.
+# Copyright (C) 2014-15 Free Software Foundation, Inc.
+#
+# Latest update: 5 Aug 2015
 #
 # `groff' is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -28,3 +30,10 @@ libxutil_a_SOURCES = \
   src/libs/libxutil/XFontName.c \
   src/libs/libxutil/xmalloc.c
 endif
+
+
+########################################################################
+### Emacs settings
+# Local Variables:
+# mode: makefile-automake
+# End.
diff --git a/src/preproc/eqn/eqn.am b/src/preproc/eqn/eqn.am
index 4c98a11..9184e33 100644
--- a/src/preproc/eqn/eqn.am
+++ b/src/preproc/eqn/eqn.am
@@ -1,6 +1,8 @@
-# Copyright (C) 2014
+# Copyright (C) 2014-15
 #      Free Software Foundation, Inc.
-# 
+#
+# Latest update: 5 Aug 2015
+#
 # This file is part of groff.
 #
 # groff is free software; you can redistribute it and/or modify it under
@@ -62,3 +64,10 @@ neqn: $(top_srcdir)/src/preproc/eqn/neqn.sh $(SH_DEPS_SED_SCRIPT)
 	    -f $(SH_DEPS_SED_SCRIPT) \
 	    -e $(SH_SCRIPT_SED_CMD) $(top_srcdir)/src/preproc/eqn/neqn.sh >$@
 	chmod +x $@
+
+
+########################################################################
+### Emacs settings
+# Local Variables:
+# mode: makefile-automake
+# End.
diff --git a/src/preproc/grn/grn.am b/src/preproc/grn/grn.am
index 021bfe5..9691bff 100644
--- a/src/preproc/grn/grn.am
+++ b/src/preproc/grn/grn.am
@@ -1,6 +1,8 @@
-# Copyright (C) 2014
+# Copyright (C) 2014-15
 #      Free Software Foundation, Inc.
-# 
+#
+# Latest update: 5 Aug 2015
+#
 # This file is part of groff.
 #
 # groff is free software; you can redistribute it and/or modify it under
@@ -27,3 +29,10 @@ src/preproc/grn/main.$(OBJEXT): defs.h
 grn_LDADD = libgroff.a lib/libgnu.a $(LIBM)
 PREFIXMAN1 += src/preproc/grn/grn.n
 EXTRA_DIST += src/preproc/grn/README src/preproc/grn/grn.man
+
+
+########################################################################
+### Emacs settings
+# Local Variables:
+# mode: makefile-automake
+# End.
diff --git a/src/preproc/html/html.am b/src/preproc/html/html.am
index f378a39..c9a449f 100644
--- a/src/preproc/html/html.am
+++ b/src/preproc/html/html.am
@@ -1,6 +1,8 @@
-# Copyright (C) 2014
+# Copyright (C) 2014-15
 #      Free Software Foundation, Inc.
-# 
+#
+# Latest update: 5 Aug 2015
+#
 # This file is part of groff.
 #
 # groff is free software; you can redistribute it and/or modify it under
@@ -24,3 +26,10 @@ pre_grohtml_SOURCES = \
   src/preproc/html/pre-html.h \
   src/preproc/html/pushback.h
 src/preproc/html/pre-html.$(OBJEXT): defs.h
+
+
+########################################################################
+### Emacs settings
+# Local Variables:
+# mode: makefile-automake
+# End.
diff --git a/src/preproc/pic/pic.am b/src/preproc/pic/pic.am
index e0896db..18ee0e5 100644
--- a/src/preproc/pic/pic.am
+++ b/src/preproc/pic/pic.am
@@ -1,6 +1,8 @@
-# Copyright (C) 2014
+# Copyright (C) 2014-15
 #      Free Software Foundation, Inc.
-# 
+#
+# Latest update: 5 Aug 2015
+#
 # This file is part of groff.
 #
 # groff is free software; you can redistribute it and/or modify it under
@@ -47,3 +49,9 @@ CLEANFILES += \
   src/preproc/pic/pic.hpp \
   src/preproc/pic/pic.output
 
+
+########################################################################
+### Emacs settings
+# Local Variables:
+# mode: makefile-automake
+# End.
diff --git a/src/preproc/preconv/preconv.am b/src/preproc/preconv/preconv.am
index a5777b0..e4130e1 100644
--- a/src/preproc/preconv/preconv.am
+++ b/src/preproc/preconv/preconv.am
@@ -1,6 +1,8 @@
-# Copyright (C) 2014
+# Copyright (C) 2014-15
 #      Free Software Foundation, Inc.
-# 
+#
+# Latest update: 5 Aug 2015
+#
 # This file is part of groff.
 #
 # groff is free software; you can redistribute it and/or modify it under
@@ -21,3 +23,10 @@ preconv_LDADD = libgroff.a $(LIBM) $(LIBICONV)
 preconv_SOURCES = src/preproc/preconv/preconv.cpp
 man1_MANS += src/preproc/preconv/preconv.n
 EXTRA_DIST += src/preproc/preconv/preconv.man
+
+
+########################################################################
+### Emacs settings
+# Local Variables:
+# mode: makefile-automake
+# End.
diff --git a/src/preproc/refer/refer.am b/src/preproc/refer/refer.am
index 8cd9886..33b4ca9 100644
--- a/src/preproc/refer/refer.am
+++ b/src/preproc/refer/refer.am
@@ -1,6 +1,8 @@
-# Copyright (C) 2014
+# Copyright (C) 2014-15
 #      Free Software Foundation, Inc.
-# 
+#
+# Latest update: 5 Aug 2015
+#
 # This file is part of groff.
 #
 # groff is free software; you can redistribute it and/or modify it under
@@ -42,3 +44,9 @@ src/preproc/refer/refer-refer.$(OBJEXT): defs.h
 src/preproc/refer/refer-token.$(OBJEXT): defs.h
 src/preproc/refer/refer-label.$(OBJEXT): defs.h
 
+
+########################################################################
+### Emacs settings
+# Local Variables:
+# mode: makefile-automake
+# End.
diff --git a/src/preproc/soelim/soelim.am b/src/preproc/soelim/soelim.am
index 5c41692..debc1ae 100644
--- a/src/preproc/soelim/soelim.am
+++ b/src/preproc/soelim/soelim.am
@@ -1,6 +1,8 @@
-# Copyright (C) 2014
+# Copyright (C) 2014-15
 #      Free Software Foundation, Inc.
-# 
+#
+# Latest update: 5 Aug 2015
+#
 # This file is part of groff.
 #
 # groff is free software; you can redistribute it and/or modify it under
@@ -23,3 +25,10 @@ PREFIXMAN1 += src/preproc/soelim/soelim.n
 EXTRA_DIST += \
   src/preproc/soelim/TODO \
   src/preproc/soelim/soelim.man
+
+
+########################################################################
+### Emacs settings
+# Local Variables:
+# mode: makefile-automake
+# End.
diff --git a/src/preproc/tbl/tbl.am b/src/preproc/tbl/tbl.am
index 5342205..5b41f3c 100644
--- a/src/preproc/tbl/tbl.am
+++ b/src/preproc/tbl/tbl.am
@@ -1,6 +1,8 @@
-# Copyright (C) 2014
+# Copyright (C) 2014-15
 #      Free Software Foundation, Inc.
-# 
+#
+# Latest update: 5 Aug 2015
+#
 # This file is part of groff.
 #
 # groff is free software; you can redistribute it and/or modify it under
@@ -24,3 +26,10 @@ tbl_SOURCES = \
   src/preproc/tbl/table.h
 PREFIXMAN1 += src/preproc/tbl/tbl.n
 EXTRA_DIST += src/preproc/tbl/tbl.man
+
+
+########################################################################
+### Emacs settings
+# Local Variables:
+# mode: makefile-automake
+# End.
diff --git a/src/roff/groff/groff.am b/src/roff/groff/groff.am
index 9a08e46..169c9d7 100644
--- a/src/roff/groff/groff.am
+++ b/src/roff/groff/groff.am
@@ -1,4 +1,4 @@
-# Copyright (C) 1993-2014
+# Copyright (C) 1993-2015
 #   Free Software Foundation, Inc.
 #
 #   Original Makefile.sub rewritten by 
@@ -8,6 +8,8 @@
 #   Automake migration by 
 #   Bertrand Garrigues <bertrand.garrigues@laposte.net>
 #
+# Latest update: 5 Aug 2015
+#
 # `groff' is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -58,3 +60,10 @@ groff_opts_with_arg.txt: groff_opts_no_arg.txt
 	@sed "s/[`cat $?`:]//g" groff_opts.tmp > $@
 	@echo -n 'with arg: '
 	@cat $@
+
+
+########################################################################
+### Emacs settings
+# Local Variables:
+# mode: makefile-automake
+# End.
diff --git a/src/roff/grog/grog.am b/src/roff/grog/grog.am
index 90bfce0..b1dcb35 100644
--- a/src/roff/grog/grog.am
+++ b/src/roff/grog/grog.am
@@ -2,9 +2,11 @@
 #
 # File position: <groff-source>/src/roff/grog/grog.am
 #
-# Copyright (C) 1993-2014
+# Copyright (C) 1993-2015
 #   Free Software Foundation, Inc.
 #
+# Latest update: 5 Aug 2015
+#
 # This file is part of `grog' which is part of `groff'.
 #
 # `groff' is free software; you can redistribute it and/or modify it
@@ -47,3 +49,10 @@ grog: $(grog_srcdir)/grog.pl $(GROG) $(SH_DEPS_SED_SCRIPT)
 	    -e "$(SH_SCRIPT_SED_CMD)" \
 	    $(grog_srcdir)/grog.pl >$@
 	chmod +x $@
+
+
+########################################################################
+### Emacs settings
+# Local Variables:
+# mode: makefile-automake
+# End.
diff --git a/src/roff/nroff/nroff.am b/src/roff/nroff/nroff.am
index 5b9cf55..f0ad935 100644
--- a/src/roff/nroff/nroff.am
+++ b/src/roff/nroff/nroff.am
@@ -1,6 +1,8 @@
-# Copyright (C) 2014
+# Copyright (C) 2014-15
 #      Free Software Foundation, Inc.
-# 
+#
+# Latest update: 5 Aug 2015
+#
 # This file is part of groff.
 #
 # groff is free software; you can redistribute it and/or modify it under
@@ -29,3 +31,10 @@ nroff: $(nroff_srcdir)/nroff.sh $(SH_DEPS_SED_SCRIPT)
 	    -e $(SH_SCRIPT_SED_CMD) \
 	    -e "s|[@]VERSION[@]|$(VERSION)|" $(nroff_srcdir)/nroff.sh >$@
 	chmod +x $@
+
+
+########################################################################
+### Emacs settings
+# Local Variables:
+# mode: makefile-automake
+# End.
diff --git a/src/roff/troff/troff.am b/src/roff/troff/troff.am
index 5dc9d6a..50091a2 100644
--- a/src/roff/troff/troff.am
+++ b/src/roff/troff/troff.am
@@ -1,6 +1,8 @@
-# Copyright (C) 2014
+# Copyright (C) 2014-15
 #      Free Software Foundation, Inc.
-# 
+#
+# Latest update: 5 Aug 2015
+#
 # This file is part of groff.
 #
 # groff is free software; you can redistribute it and/or modify it under
@@ -59,3 +61,10 @@ src/roff/troff/majorminor.cpp: $(top_srcdir)/VERSION $(top_srcdir)/REVISION
 	   \"`sed -e 's/^[^.]*\.\([0-9]*\).*$$/\1/' $(top_srcdir)/VERSION`\"\; \
 	   >>$@
 	@echo const char \*revision = \"`cat $(top_srcdir)/REVISION`\"\; >>$@
+
+
+########################################################################
+### Emacs settings
+# Local Variables:
+# mode: makefile-automake
+# End.
diff --git a/src/utils/addftinfo/addftinfo.am b/src/utils/addftinfo/addftinfo.am
index 164f42d..b029685 100644
--- a/src/utils/addftinfo/addftinfo.am
+++ b/src/utils/addftinfo/addftinfo.am
@@ -2,7 +2,9 @@
 #
 # File position: <groff-source>/src/utils/addftinfo/addftinfo.am
 #
-# Copyright (C) 2014  Free Software Foundation, Inc.
+# Copyright (C) 2014-15  Free Software Foundation, Inc.
+#
+# Latest update: 5 Aug 2015
 #
 # `groff' is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -28,3 +30,10 @@ addftinfo_SOURCES = \
   src/utils/addftinfo/addftinfo.cpp \
   src/utils/addftinfo/guess.cpp \
   src/utils/addftinfo/guess.h
+
+
+########################################################################
+### Emacs settings
+# Local Variables:
+# mode: makefile-automake
+# End.
diff --git a/src/utils/afmtodit/afmtodit.am b/src/utils/afmtodit/afmtodit.am
index 30d46c9..707880f 100644
--- a/src/utils/afmtodit/afmtodit.am
+++ b/src/utils/afmtodit/afmtodit.am
@@ -2,7 +2,9 @@
 #
 # File position: <groff-source>/src/utils/afmtodit/afmtdodit.am
 #
-# Copyright (C) 2013-2014  Free Software Foundation, Inc.
+# Copyright (C) 2013-2015  Free Software Foundation, Inc.
+#
+# Latest update: 5 Aug 2015
 #
 # This file is part of groff.
 #
@@ -47,3 +49,10 @@ afmtodit: $(afmtodit_srcdir)/afmtodit.pl $(afmtodit_srcdir)/afmtodit.tables
 	      $(afmtodit_srcdir)/afmtodit.pl >afmtodit; \
 	fi
 	chmod +x afmtodit
+
+
+########################################################################
+### Emacs settings
+# Local Variables:
+# mode: makefile-automake
+# End.
diff --git a/src/utils/hpftodit/hpftodit.am b/src/utils/hpftodit/hpftodit.am
index 3519d1a..cb9d27b 100644
--- a/src/utils/hpftodit/hpftodit.am
+++ b/src/utils/hpftodit/hpftodit.am
@@ -2,7 +2,9 @@
 #
 # File position: <groff-source>/src/utils/hpftodit/hpftodit.am
 #
-# Copyright (C) 2014  Free Software Foundation, Inc.
+# Copyright (C) 2014-2015  Free Software Foundation, Inc.
+#
+# Latest update: 5 Aug 2015
 #
 # `groff' is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -27,3 +29,10 @@ hpftodit_LDADD = libgroff.a $(LIBM)
 hpftodit_SOURCES = \
   src/utils/hpftodit/hpftodit.cpp \
   src/utils/hpftodit/hpuni.cpp
+
+
+########################################################################
+### Emacs settings
+# Local Variables:
+# mode: makefile-automake
+# End.
diff --git a/src/utils/indxbib/indxbib.am b/src/utils/indxbib/indxbib.am
index 044b389..c2651f4 100644
--- a/src/utils/indxbib/indxbib.am
+++ b/src/utils/indxbib/indxbib.am
@@ -1,6 +1,8 @@
-# Copyright (C) 2014
+# Copyright (C) 2014-2015
 #      Free Software Foundation, Inc.
-# 
+#
+# Latest update: 5 Aug 2015
+#
 # This file is part of groff.
 #
 # groff is free software; you can redistribute it and/or modify it under
@@ -49,3 +51,10 @@ install_indxbib: $(indxbib_srcdir)/eign
 uninstall-local: uninstall_indxbib
 uninstall_indxbib:
 	rm -f $(DESTDIR)$(common_words_file)
+
+
+########################################################################
+### Emacs settings
+# Local Variables:
+# mode: makefile-automake
+# End.
diff --git a/src/utils/lkbib/lkbib.am b/src/utils/lkbib/lkbib.am
index 9001893..3b15076 100644
--- a/src/utils/lkbib/lkbib.am
+++ b/src/utils/lkbib/lkbib.am
@@ -1,6 +1,8 @@
-# Copyright (C) 2014
+# Copyright (C) 2014-2015
 #      Free Software Foundation, Inc.
-# 
+#
+# Latest update: 5 Aug 2015
+#
 # This file is part of groff.
 #
 # groff is free software; you can redistribute it and/or modify it under
@@ -22,3 +24,10 @@ EXTRA_DIST += src/utils/lkbib/lkbib.man
 lkbib_LDADD = libbib.a libgroff.a $(LIBM)
 lkbib_SOURCES = src/utils/lkbib/lkbib.cpp
 src/utils/lkbib/lkbib.$(OBJEXT): defs.h
+
+
+########################################################################
+### Emacs settings
+# Local Variables:
+# mode: makefile-automake
+# End.
diff --git a/src/utils/lookbib/lookbib.am b/src/utils/lookbib/lookbib.am
index 57d1e40..7fda71a 100644
--- a/src/utils/lookbib/lookbib.am
+++ b/src/utils/lookbib/lookbib.am
@@ -1,6 +1,8 @@
-# Copyright (C) 2014
+# Copyright (C) 2014-2015
 #      Free Software Foundation, Inc.
-# 
+#
+# Latest update: 5 Aug 2015
+#
 # This file is part of groff.
 #
 # groff is free software; you can redistribute it and/or modify it under
@@ -21,3 +23,10 @@ PREFIXMAN1 += src/utils/lookbib/lookbib.n
 EXTRA_DIST += src/utils/lookbib/lookbib.man
 lookbib_LDADD = libbib.a libgroff.a $(LIBM)
 lookbib_SOURCES = src/utils/lookbib/lookbib.cpp
+
+
+########################################################################
+### Emacs settings
+# Local Variables:
+# mode: makefile-automake
+# End.
diff --git a/src/utils/pfbtops/pfbtops.am b/src/utils/pfbtops/pfbtops.am
index 59efd88..bc99cfd 100644
--- a/src/utils/pfbtops/pfbtops.am
+++ b/src/utils/pfbtops/pfbtops.am
@@ -1,6 +1,8 @@
-# Copyright (C) 2014
+# Copyright (C) 2014-2015
 #      Free Software Foundation, Inc.
-# 
+#
+# Latest update: 5 Aug 2015
+#
 # This file is part of groff.
 #
 # groff is free software; you can redistribute it and/or modify it under
@@ -24,3 +26,10 @@ pfbtops_LDADD = libgroff.a $(LIBM)
 # We use the following trick to force the use of C++ compiler
 # See the Automake manual, "Libtool Convenience Libraries"
 nodist_EXTRA_pfbtops_SOURCES = src/utils/pfbtops/dummy.cpp
+
+
+########################################################################
+### Emacs settings
+# Local Variables:
+# mode: makefile-automake
+# End.
diff --git a/src/utils/tfmtodit/tfmtodit.am b/src/utils/tfmtodit/tfmtodit.am
index ad6ce65..00ee06f 100644
--- a/src/utils/tfmtodit/tfmtodit.am
+++ b/src/utils/tfmtodit/tfmtodit.am
@@ -1,6 +1,8 @@
-# Copyright (C) 2014
+# Copyright (C) 2014-2015
 #      Free Software Foundation, Inc.
-# 
+#
+# Latest update: 5 Aug 2015
+#
 # This file is part of groff.
 #
 # groff is free software; you can redistribute it and/or modify it under
@@ -21,3 +23,10 @@ man1_MANS += src/utils/tfmtodit/tfmtodit.n
 EXTRA_DIST += src/utils/tfmtodit/tfmtodit.man
 tfmtodit_SOURCES = src/utils/tfmtodit/tfmtodit.cpp
 tfmtodit_LDADD = libgroff.a $(LIBM)
+
+
+########################################################################
+### Emacs settings
+# Local Variables:
+# mode: makefile-automake
+# End.
diff --git a/src/utils/xtotroff/xtotroff.am b/src/utils/xtotroff/xtotroff.am
index 07a5e9c..fc43ba0 100644
--- a/src/utils/xtotroff/xtotroff.am
+++ b/src/utils/xtotroff/xtotroff.am
@@ -1,6 +1,8 @@
-# Copyright (C) 2014
+# Copyright (C) 2014-2015
 #      Free Software Foundation, Inc.
-# 
+#
+# Latest update: 5 Aug 2015
+#
 # This file is part of groff.
 #
 # groff is free software; you can redistribute it and/or modify it under
@@ -26,3 +28,10 @@ xtotroff_LDADD = libxutil.a libgroff.a $(X_LIBS) $(X_PRE_LIBS) \
 xtotroff_CPPFLAGS = $(AM_CPPFLAGS) $(X_CFLAGS)
 endif
 EXTRA_DIST += src/utils/xtotroff/xtotroff.man
+
+
+########################################################################
+### Emacs settings
+# Local Variables:
+# mode: makefile-automake
+# End.
diff --git a/tmac/tmac.am b/tmac/tmac.am
index e75a558..c387892 100644
--- a/tmac/tmac.am
+++ b/tmac/tmac.am
@@ -1,8 +1,10 @@
-# Copyright (C) 1989-2007, 2009-2012, 2014
+# Copyright (C) 1989-2007, 2009-2012, 2014-2015
 #   Free Software Foundation, Inc.
 #      Written by James Clark (jjc@jclark.com)
 #      Automake migration by Bertrand Garrigues
 #
+# Latest update: 5 Aug 2015
+#
 # This file is part of groff.
 #
 # groff is free software; you can redistribute it and/or modify it under
@@ -248,3 +250,10 @@ uninstall_tmac_hook:
 	if test -d $(DESTDIR)$(localtmacdir); then \
 	  rmdir $(DESTDIR)$(localtmacdir); \
 	fi
+
+
+########################################################################
+### Emacs settings
+# Local Variables:
+# mode: makefile-automake
+# End.


From MAILER-DAEMON Sat Aug 08 08:28:58 2015
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1ZO3FB-00073x-Vp
	for mharc-groff-commit@gnu.org; Sat, 08 Aug 2015 08:28:57 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:60246)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <bernd.warken@web.de>) id 1ZO3F3-00073B-M6
	for groff-commit@gnu.org; Sat, 08 Aug 2015 08:28:56 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <bernd.warken@web.de>) id 1ZO3Ew-0007NK-Jf
	for groff-commit@gnu.org; Sat, 08 Aug 2015 08:28:49 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:44154)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <bernd.warken@web.de>) id 1ZO3Ew-0007NE-EY
	for groff-commit@gnu.org; Sat, 08 Aug 2015 08:28:42 -0400
Received: from bwarken by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <bernd.warken@web.de>) id 1ZO3Ev-00015a-FU
	for groff-commit@gnu.org; Sat, 08 Aug 2015 12:28:41 +0000
Date: Sat, 08 Aug 2015 12:28:41 +0000
Message-Id: <E1ZO3Ev-00015a-FU@vcs.savannah.gnu.org>
To: groff-commit@gnu.org
Subject: [groff] 01/01: Add section name into all man-page names.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
In-Reply-To: groff@gnu.org
References: <20150808122841.4155.62336@vcs.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: a0c631ffb06e83c288ae96a9833dab70d5993b61
Auto-Submitted: auto-generated
From: Bernd Warken <bernd.warken@web.de>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 140.186.70.72
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: groff@gnu.org
List-Id: <groff-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/groff-commit>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 08 Aug 2015 12:28:56 -0000

bwarken pushed a commit to branch master
in repository groff.

commit a0c631ffb06e83c288ae96a9833dab70d5993b61
Author: Bernd Warken <groff-bernd.warken-72@web.de>
Date:   Sat Aug 8 14:19:59 2015 +0200

    Add section name into all man-page names.
---
 ChangeLog                                          |   12 ++++++
 Makefile.am                                        |   18 +++++-----
 contrib/chem/{chem.man => chem.1.man}              |    0
 contrib/chem/chem.am                               |    6 ++--
 .../eqn2graph/{eqn2graph.man => eqn2graph.1.man}   |    0
 contrib/eqn2graph/eqn2graph.am                     |    6 ++--
 contrib/gdiffmk/ChangeLog                          |    4 ++
 contrib/gdiffmk/{gdiffmk.man => gdiffmk.1.man}     |    0
 contrib/gdiffmk/gdiffmk.am                         |    4 +-
 contrib/glilypond/ChangeLog                        |    4 ++
 .../glilypond/{glilypond.man => glilypond.1.man}   |    0
 contrib/glilypond/glilypond.am                     |    6 ++--
 contrib/gperl/ChangeLog                            |    4 ++
 contrib/gperl/{gperl.man => gperl.1.man}           |    0
 contrib/gperl/gperl.am                             |    6 ++--
 contrib/gpinyin/ChangeLog                          |    4 ++
 contrib/gpinyin/{gpinyin.man => gpinyin.1.man}     |    0
 contrib/gpinyin/gpinyin.am                         |    6 ++--
 .../{grap2graph.man => grap2graph.1.man}           |    0
 contrib/grap2graph/grap2graph.am                   |    6 ++--
 .../{groff_filenames.man => groff_filenames.7.man} |    0
 contrib/groff_filenames/groff_filenames.am         |    6 ++--
 contrib/groffer/ChangeLog                          |    4 ++
 contrib/groffer/{groffer.man => groffer.1.man}     |    0
 contrib/groffer/groffer.am                         |   38 ++++++++++----------
 contrib/groffer/{roff2.man => roff2.1.man}         |    0
 contrib/hdtbl/ChangeLog                            |    4 ++
 .../hdtbl/{groff_hdtbl.man => groff_hdtbl.7.man}   |    0
 contrib/hdtbl/hdtbl.am                             |    8 ++--
 contrib/mm/ChangeLog                               |    4 ++
 contrib/mm/Makefile.sim                            |    8 ++--
 contrib/mm/{groff_mm.man => groff_mm.7.man}        |    0
 contrib/mm/{groff_mmse.man => groff_mmse.7.man}    |    0
 contrib/mm/mm.am                                   |   14 ++++----
 contrib/mm/{mmroff.man => mmroff.1.man}            |    0
 contrib/mom/ChangeLog                              |    4 ++
 contrib/mom/{groff_mom.man => groff_mom.7.man}     |    0
 contrib/mom/mom.am                                 |    6 ++--
 contrib/pdfmark/ChangeLog                          |    4 ++
 contrib/pdfmark/pdfmark.am                         |    6 ++--
 contrib/pdfmark/{pdfroff.man => pdfroff.1.man}     |    0
 .../pic2graph/{pic2graph.man => pic2graph.1.man}   |    0
 contrib/pic2graph/pic2graph.am                     |    6 ++--
 man/{ditroff.man => ditroff.7.man}                 |    0
 man/{groff.man => groff.7.man}                     |    0
 man/{groff_char.man => groff_char.7.man}           |    0
 man/{groff_diff.man => groff_diff.7.man}           |    0
 man/{groff_font.man => groff_font.5.man}           |    0
 man/{groff_out.man => groff_out.5.man}             |    0
 man/{groff_tmac.man => groff_tmac.5.man}           |    0
 man/man.am                                         |   34 +++++++++---------
 man/{roff.man => roff.7.man}                       |    0
 src/devices/grodvi/{grodvi.man => grodvi.1.man}    |    0
 src/devices/grodvi/grodvi.am                       |    6 ++--
 src/devices/grohtml/{grohtml.man => grohtml.1.man} |    0
 src/devices/grohtml/grohtml.am                     |    6 ++--
 src/devices/grolbp/{grolbp.man => grolbp.1.man}    |    0
 src/devices/grolbp/grolbp.am                       |    6 ++--
 src/devices/grolj4/{grolj4.man => grolj4.1.man}    |    0
 src/devices/grolj4/grolj4.am                       |    8 ++--
 .../grolj4/{lj4_font.man => lj4_font.5.man}        |    0
 src/devices/gropdf/{gropdf.man => gropdf.1.man}    |    0
 src/devices/gropdf/gropdf.am                       |   10 +++---
 src/devices/gropdf/{pdfmom.man => pdfmom.1.man}    |    0
 src/devices/grotty/{grotty.man => grotty.1.man}    |    0
 src/devices/grotty/grotty.am                       |    6 ++--
 .../xditview/{gxditview.man => gxditview.1.man}    |    0
 src/devices/xditview/xditview.am                   |    4 +-
 src/preproc/eqn/{eqn.man => eqn.1.man}             |    0
 src/preproc/eqn/eqn.am                             |    8 ++--
 src/preproc/eqn/{neqn.man => neqn.1.man}           |    0
 src/preproc/grn/{grn.man => grn.1.man}             |    0
 src/preproc/grn/grn.am                             |    6 ++--
 src/preproc/pic/{pic.man => pic.1.man}             |    0
 src/preproc/pic/pic.am                             |    6 ++--
 src/preproc/preconv/{preconv.man => preconv.1.man} |    0
 src/preproc/preconv/preconv.am                     |    6 ++--
 src/preproc/refer/{refer.man => refer.1.man}       |    0
 src/preproc/refer/refer.am                         |    6 ++--
 src/preproc/soelim/{soelim.man => soelim.1.man}    |    0
 src/preproc/soelim/soelim.am                       |    6 ++--
 src/preproc/tbl/{tbl.man => tbl.1.man}             |    0
 src/preproc/tbl/tbl.am                             |    6 ++--
 src/roff/groff/{groff.man => groff.1.man}          |    0
 src/roff/groff/groff.am                            |    6 ++--
 src/roff/grog/{grog.man => grog.1.man}             |    0
 src/roff/grog/grog.am                              |    4 +-
 src/roff/nroff/{nroff.man => nroff.1.man}          |    0
 src/roff/nroff/nroff.am                            |    6 ++--
 src/roff/troff/{troff.man => troff.1.man}          |    0
 src/roff/troff/troff.am                            |    6 ++--
 .../addftinfo/{addftinfo.man => addftinfo.1.man}   |    0
 src/utils/addftinfo/addftinfo.am                   |    4 +-
 .../afmtodit/{afmtodit.man => afmtodit.1.man}      |    0
 src/utils/afmtodit/afmtodit.am                     |    6 ++--
 .../hpftodit/{hpftodit.man => hpftodit.1.man}      |    0
 src/utils/hpftodit/hpftodit.am                     |    6 ++--
 src/utils/indxbib/{indxbib.man => indxbib.1.man}   |    0
 src/utils/indxbib/indxbib.am                       |    6 ++--
 src/utils/lkbib/{lkbib.man => lkbib.1.man}         |    0
 src/utils/lkbib/lkbib.am                           |    6 ++--
 src/utils/lookbib/{lookbib.man => lookbib.1.man}   |    0
 src/utils/lookbib/lookbib.am                       |    4 +-
 src/utils/pfbtops/{pfbtops.man => pfbtops.1.man}   |    0
 src/utils/pfbtops/pfbtops.am                       |    6 ++--
 .../tfmtodit/{tfmtodit.man => tfmtodit.1.man}      |    0
 src/utils/tfmtodit/tfmtodit.am                     |    6 ++--
 .../xtotroff/{xtotroff.man => xtotroff.1.man}      |    0
 src/utils/xtotroff/xtotroff.am                     |    6 ++--
 tmac/{groff_man.man => groff_man.7.man}            |    0
 tmac/{groff_mdoc.man => groff_mdoc.7.man}          |    0
 tmac/{groff_me.man => groff_me.7.man}              |    0
 tmac/{groff_ms.man => groff_ms.7.man}              |    0
 tmac/{groff_trace.man => groff_trace.7.man}        |    0
 tmac/{groff_www.man => groff_www.7.man}            |    0
 tmac/tmac.am                                       |   26 +++++++-------
 116 files changed, 234 insertions(+), 186 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2a51ffd..9894b05 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2015-08-07  Bernd Warken  <groff-bernd.warken-72@web.de>
+
+	Add section name to all man-page names.
+
+	* Makefile.am: In `install-prefix-man' and `uninstall-prefix-man'
+	change `sed' commands.  Correct saving in man[157]_MANS.
+
+	* all *.man in source tree: Rename `manpage.man' to
+	`manpage.[157].man'.
+
+	* all makefile.am in source tree: Add new man-page file name.
+
 2015-08-05  Bernd Warken  <groff-bernd.warken-72@web.de>
 
 	* Makefile.am, arch/mingw/mingw.am, arch/misc/misc.am,
diff --git a/Makefile.am b/Makefile.am
index 17e10ad..6e9bfb7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@
 # Original Makefile.in written by James Clark (jjc@jclark.com)
 # Migrated to Automake by Bertrand Garrigues
 #
-# Last update: 5 Aug 2015
+# Last update: 7 Aug 2015
 #
 # This file is part of groff.
 #
@@ -708,34 +708,34 @@ if USEPROGRAMPREFIX
 generate_man_files: $(PREFIXMAN1)
 install-prefix-man:
 	for f in $(PREFIXMAN1); do \
-	  manfile_final_name=`basename $$f | sed 's/n$$/1/'`; \
+	  manfile_final_name=`basename $$f | sed 's/\.[0-9]\.n$$//'`; \
 	  cp -f $$f $(DESTDIR)$(man1dir)/$(NAMEPREFIX)$$manfile_final_name; \
 	done
 	for f in $(PREFIXMAN5); do \
-	  manfile_final_name=`basename $$f | sed 's/n$$/5/'`; \
+	  manfile_final_name=`basename $$f | sed 's/\.[0-9]\.n$$//'`; \
 	  cp -f $$f $(DESTDIR)$(man5dir)/$(NAMEPREFIX)$$manfile_final_name; \
 	done
 	for f in $(PREFIXMAN7); do \
-	  manfile_final_name=`basename $$f | sed 's/n$$/7/'`; \
+	  manfile_final_name=`basename $$f | sed 's/\.[0-9]\.n$$//'`; \
 	  cp -f $$f $(DESTDIR)$(man7dir)/$(NAMEPREFIX)$$manfile_final_name; \
 	done
 uninstall-prefix-man:
 	for f in $(PREFIXMAN1); do \
-	  manfile_final_name=`basename $$f | sed 's/n$$/1/'`; \
+	  manfile_final_name=`basename $$f | sed 's/\.[0-9]\.n$$//'`; \
 	  rm -f $(DESTDIR)$(man1dir)/$(NAMEPREFIX)$$manfile_final_name; \
 	done
 	for f in $(PREFIXMAN5); do \
-	  manfile_final_name=`basename $$f | sed 's/n$$/5/'`; \
+	  manfile_final_name=`basename $$f | sed 's/\.[0-9]\.n$$//'`; \
 	  rm -f $(DESTDIR)$(man5dir)/$(NAMEPREFIX)$$manfile_final_name; \
 	done
 	for f in $(PREFIXMAN7); do \
-	  manfile_final_name=`basename $$f | sed 's/n$$/7/'`; \
+	  manfile_final_name=`basename $$f | sed 's/\.[0-9]\.n$$//'`; \
 	  rm -f $(DESTDIR)$(man7dir)/$(NAMEPREFIX)$$manfile_final_name; \
 	done
 else
 man1_MANS += $(PREFIXMAN1)
-man1_MANS += $(PREFIXMAN5)
-man1_MANS += $(PREFIXMAN7)
+man5_MANS += $(PREFIXMAN5)
+man7_MANS += $(PREFIXMAN7)
 install-prefix-man:
 uninstall-prefix-man:
 generate_man_files:
diff --git a/contrib/chem/chem.man b/contrib/chem/chem.1.man
similarity index 100%
rename from contrib/chem/chem.man
rename to contrib/chem/chem.1.man
diff --git a/contrib/chem/chem.am b/contrib/chem/chem.am
index a8ca170..a3b6446 100644
--- a/contrib/chem/chem.am
+++ b/contrib/chem/chem.am
@@ -7,7 +7,7 @@
 # Written by Bernd Warken <groff-bernd.warken-72@web.de>.
 # Moved to automake by Bertrand Garrigues
 #
-# Last update: 6 Aug 2015
+# Last update: 7 Aug 2015
 #
 # This file is part of `chem' which is part of `groff'.
 #
@@ -56,14 +56,14 @@ nodist_chemexample122_DATA = contrib/chem/examples/122/README
 endif
 EXTRA_DIST += \
   contrib/chem/ChangeLog \
-  contrib/chem/chem.man \
+  contrib/chem/chem.1.man \
   contrib/chem/chem.pic \
   contrib/chem/chem.pl \
   contrib/chem/README.txt \
   contrib/chem/examples/README.txt \
   contrib/chem/examples/122/README.txt
 
-man1_MANS += contrib/chem/chem.n
+man1_MANS += contrib/chem/chem.1.n
 MOSTLYCLEANFILES += $(CHEM_GENEXAMPLES) $(nodist_chemexample122_DATA) \
   contrib/chem/README
 
diff --git a/contrib/eqn2graph/eqn2graph.man b/contrib/eqn2graph/eqn2graph.1.man
similarity index 100%
rename from contrib/eqn2graph/eqn2graph.man
rename to contrib/eqn2graph/eqn2graph.1.man
diff --git a/contrib/eqn2graph/eqn2graph.am b/contrib/eqn2graph/eqn2graph.am
index 6ffa0ec..fc1bc0d 100644
--- a/contrib/eqn2graph/eqn2graph.am
+++ b/contrib/eqn2graph/eqn2graph.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2002-2014
 #   Free Software Foundation, Inc.
 #
-# Last update: 5 Aug 2015
+# Last update: 7 Aug 2015
 #
 # This file is part of groff.
 #
@@ -23,9 +23,9 @@
 
 eqn2graph_srcdir = $(top_srcdir)/contrib/eqn2graph
 bin_SCRIPTS += eqn2graph
-man1_MANS += contrib/eqn2graph/eqn2graph.n
+man1_MANS += contrib/eqn2graph/eqn2graph.1.n
 EXTRA_DIST += \
-  contrib/eqn2graph/eqn2graph.man \
+  contrib/eqn2graph/eqn2graph.1.man \
   contrib/eqn2graph/eqn2graph.sh
 
 eqn2graph: $(top_srcdir)/contrib/eqn2graph/eqn2graph.sh
diff --git a/contrib/gdiffmk/ChangeLog b/contrib/gdiffmk/ChangeLog
index d51c07a..da16587 100644
--- a/contrib/gdiffmk/ChangeLog
+++ b/contrib/gdiffmk/ChangeLog
@@ -1,3 +1,7 @@
+2015-08-07  Bernd Warken  <groff-bernd.warken-72@web.de>
+
+	* gdiffmk.1.man, gdiffmk.am: Rename gdiffmk.man.
+
 2015-08-05  Bernd Warken  <groff-bernd.warken-72@web.de>
 
 	* gdiffmk.am: Add `Last update'.  Setup Emacs mode.
diff --git a/contrib/gdiffmk/gdiffmk.man b/contrib/gdiffmk/gdiffmk.1.man
similarity index 100%
rename from contrib/gdiffmk/gdiffmk.man
rename to contrib/gdiffmk/gdiffmk.1.man
diff --git a/contrib/gdiffmk/gdiffmk.am b/contrib/gdiffmk/gdiffmk.am
index 6dbcf02..df6ef67 100644
--- a/contrib/gdiffmk/gdiffmk.am
+++ b/contrib/gdiffmk/gdiffmk.am
@@ -28,9 +28,9 @@
 gdiffmk_srcdir = $(top_srcdir)/contrib/gdiffmk
 bin_SCRIPTS += gdiffmk
 TESTS += contrib/gdiffmk/tests/gdiffmk_tests.sh
-man1_MANS += contrib/gdiffmk/gdiffmk.n
+man1_MANS += contrib/gdiffmk/gdiffmk.1.n
 EXTRA_DIST += \
-  contrib/gdiffmk/gdiffmk.man \
+  contrib/gdiffmk/gdiffmk.1.man \
   contrib/gdiffmk/ChangeLog \
   contrib/gdiffmk/README \
   contrib/gdiffmk/gdiffmk.sh \
diff --git a/contrib/glilypond/ChangeLog b/contrib/glilypond/ChangeLog
index 1c0acfd..a1b6c28 100644
--- a/contrib/glilypond/ChangeLog
+++ b/contrib/glilypond/ChangeLog
@@ -1,5 +1,9 @@
 2015-08-05  Bernd Warken  <groff-bernd.warken-72@web.de>
 
+	glilypond.1.man, glilypond.am: Rename `glilypond.man'.
+
+2015-08-05  Bernd Warken  <groff-bernd.warken-72@web.de>
+
 	* glilypond.am: Add `Last update'.  Setup Emacs mode.
 
 2015-04-03  Werner LEMBERG  <wl@gnu.org>
diff --git a/contrib/glilypond/glilypond.man b/contrib/glilypond/glilypond.1.man
similarity index 100%
rename from contrib/glilypond/glilypond.man
rename to contrib/glilypond/glilypond.1.man
diff --git a/contrib/glilypond/glilypond.am b/contrib/glilypond/glilypond.am
index 56018c1..b417347 100644
--- a/contrib/glilypond/glilypond.am
+++ b/contrib/glilypond/glilypond.am
@@ -8,7 +8,7 @@
 # Bernd Warken <groff-bernd.warken-72@web.de>.
 # Automake migration by Bertrand Garrigues
 
-# Last update: 5 Aug 2015
+# Last update: 7 Aug 2015
 
 # This file is part of `glilypond' which is part of `groff'.
 
@@ -28,7 +28,7 @@
 ########################################################################
 glilypond_srcdir = $(top_srcdir)/contrib/glilypond
 bin_SCRIPTS += glilypond
-man1_MANS += contrib/glilypond/glilypond.n
+man1_MANS += contrib/glilypond/glilypond.1.n
 
 # files going to lib directory `$(glilypond_dir)'
 # TODO glilypond_dir is subsitued by configure.ac, check if this could be removed
@@ -41,7 +41,7 @@ dist_glilypond_DATA = \
 EXTRA_DIST += \
   contrib/glilypond/ChangeLog \
   contrib/glilypond/ChangeLog.0x \
-  contrib/glilypond/glilypond.man \
+  contrib/glilypond/glilypond.1.man \
   contrib/glilypond/glilypond.pl \
   contrib/glilypond/README.txt \
   contrib/glilypond/examples/example.groff
diff --git a/contrib/gperl/ChangeLog b/contrib/gperl/ChangeLog
index 0d8b7c0..6ce945b 100644
--- a/contrib/gperl/ChangeLog
+++ b/contrib/gperl/ChangeLog
@@ -1,3 +1,7 @@
+2015-08-07  Bernd Warken  <groff-bernd.warken-72@web.de>
+
+	* gperl.1.man, gperl.am: Rename `gperl.man'.
+
 2015-08-05  Bernd Warken  <groff-bernd.warken-72@web.de>
 
 	* gperl.am: Add `Last update'.  Setup Emacs mode.
diff --git a/contrib/gperl/gperl.man b/contrib/gperl/gperl.1.man
similarity index 100%
rename from contrib/gperl/gperl.man
rename to contrib/gperl/gperl.1.man
diff --git a/contrib/gperl/gperl.am b/contrib/gperl/gperl.am
index 79d0e92..34c6e98 100644
--- a/contrib/gperl/gperl.am
+++ b/contrib/gperl/gperl.am
@@ -6,7 +6,7 @@
 # Written by Bernd Warken <groff-bernd.warken-72@web.de>.
 # Automake migration by Bertrand Garrigues
 
-# Last update: 5 Aug 2015
+# Last update: 7 Aug 2015
 
 # This file is part of `gperl' which is part of `groff'.
 
@@ -27,10 +27,10 @@
 ########################################################################
 
 bin_SCRIPTS += gperl
-man1_MANS += contrib/gperl/gperl.n
+man1_MANS += contrib/gperl/gperl.1.n
 EXTRA_DIST += \
   contrib/gperl/ChangeLog \
-  contrib/gperl/gperl.man \
+  contrib/gperl/gperl.1.man \
   contrib/gperl/gperl.pl
 gperl: $(top_srcdir)/contrib/gperl/gperl.pl shdeps.sed
 	$(RM) $@
diff --git a/contrib/gpinyin/ChangeLog b/contrib/gpinyin/ChangeLog
index a3b2630..c1352de 100644
--- a/contrib/gpinyin/ChangeLog
+++ b/contrib/gpinyin/ChangeLog
@@ -1,5 +1,9 @@
 2015-08-05  Bernd Warken  <groff-bernd.warken-72@web.de>
 
+	* gpinyin.1.man, gpinyin.am: Rename `gpinyin.man'.
+
+2015-08-05  Bernd Warken  <groff-bernd.warken-72@web.de>
+
 	* gpinyin.am: Add `Last update'.  Setup Emacs mode.
 
 2015-04-03  Werner LEMBERG  <wl@gnu.org>
diff --git a/contrib/gpinyin/gpinyin.man b/contrib/gpinyin/gpinyin.1.man
similarity index 100%
rename from contrib/gpinyin/gpinyin.man
rename to contrib/gpinyin/gpinyin.1.man
diff --git a/contrib/gpinyin/gpinyin.am b/contrib/gpinyin/gpinyin.am
index 09dcb59..f580743 100644
--- a/contrib/gpinyin/gpinyin.am
+++ b/contrib/gpinyin/gpinyin.am
@@ -7,7 +7,7 @@
 # Written by Bernd Warken <groff-bernd.warken-72@web.de>.
 # Moved to automake by Bertrand Garrigues
 
-# Last update: 5 Aug 2015
+# Last update: 7 Aug 2015
 
 # This file is part of `gpinyin' which is part of `groff'.
 
@@ -31,10 +31,10 @@ gpinyin_srcdir = $(top_srcdir)/contrib/gpinyin
 bin_SCRIPTS += gpinyin
 gpinyindir = $(gpinyin_dir)
 dist_gpinyin_DATA = contrib/gpinyin/subs.pl
-man1_MANS += contrib/gpinyin/gpinyin.n
+man1_MANS += contrib/gpinyin/gpinyin.1.n
 EXTRA_DIST += \
   contrib/gpinyin/ChangeLog \
-  contrib/gpinyin/gpinyin.man \
+  contrib/gpinyin/gpinyin.1.man \
   contrib/gpinyin/gpinyin.pl
 
 gpinyin: contrib/gpinyin/gpinyin.pl
diff --git a/contrib/grap2graph/grap2graph.man b/contrib/grap2graph/grap2graph.1.man
similarity index 100%
rename from contrib/grap2graph/grap2graph.man
rename to contrib/grap2graph/grap2graph.1.man
diff --git a/contrib/grap2graph/grap2graph.am b/contrib/grap2graph/grap2graph.am
index 6c0b51b..6018f17 100644
--- a/contrib/grap2graph/grap2graph.am
+++ b/contrib/grap2graph/grap2graph.am
@@ -1,6 +1,6 @@
 # Copyright (C) 2003-2015  Free Software Foundation, Inc.
 #
-# Last update: 5 Aug 2015
+# Last update: 7 Aug 2015
 #
 # This file is part of groff.
 #
@@ -22,10 +22,10 @@
 
 grap2graph_srcdir = $(top_srcdir)/contrib/grap2graph
 bin_SCRIPTS += grap2graph
-man1_MANS += contrib/grap2graph/grap2graph.n
+man1_MANS += contrib/grap2graph/grap2graph.1.n
 EXTRA_DIST += \
   $(grap2graph_srcdir)/grap2graph.sh \
-  $(grap2graph_srcdir)/grap2graph.man
+  $(grap2graph_srcdir)/grap2graph.1.man
 grap2graph: $(grap2graph_srcdir)/grap2graph.sh
 	sed -e "s|[@]g[@]|$(g)|g" \
 	    -e "s|[@]VERSION[@]|$(VERSION)|" \
diff --git a/contrib/groff_filenames/groff_filenames.man b/contrib/groff_filenames/groff_filenames.7.man
similarity index 100%
rename from contrib/groff_filenames/groff_filenames.man
rename to contrib/groff_filenames/groff_filenames.7.man
diff --git a/contrib/groff_filenames/groff_filenames.am b/contrib/groff_filenames/groff_filenames.am
index 4c76eaf..a18ac07 100644
--- a/contrib/groff_filenames/groff_filenames.am
+++ b/contrib/groff_filenames/groff_filenames.am
@@ -4,7 +4,7 @@
 
 # Copyright (C) 2013-2015  Free Software Foundation, Inc.
 
-# Last update: 5 Aug 2015
+# Last update: 7 Aug 2015
 
 # Written by Bernd Warken <groff-bernd.warken-72@web.de>.
 # Automake migration by Bertrand Garrigues
@@ -26,10 +26,10 @@
 
 ########################################################################
 
-man7_MANS += contrib/groff_filenames/groff_filenames.n
+man7_MANS += contrib/groff_filenames/groff_filenames.7.n
 EXTRA_DIST += \
   contrib/groff_filenames/ChangeLog \
-  contrib/groff_filenames/groff_filenames.man
+  contrib/groff_filenames/groff_filenames.7.man
 
 
 ########################################################################
diff --git a/contrib/groffer/ChangeLog b/contrib/groffer/ChangeLog
index d9948a4..a79cc42 100644
--- a/contrib/groffer/ChangeLog
+++ b/contrib/groffer/ChangeLog
@@ -1,3 +1,7 @@
+2015-08-07  Bernd Warken  <groff-bernd.warken-72@web.de>
+
+	Rename all man-pages by adding a section number.
+
 2015-08-05  Bernd Warken  <groff-bernd.warken-72@web.de>
 
 	* groffer.am: Add `Last update'.  Setup Emacs mode.
diff --git a/contrib/groffer/groffer.man b/contrib/groffer/groffer.1.man
similarity index 100%
rename from contrib/groffer/groffer.man
rename to contrib/groffer/groffer.1.man
diff --git a/contrib/groffer/groffer.am b/contrib/groffer/groffer.am
index fa3f45b..1793365 100644
--- a/contrib/groffer/groffer.am
+++ b/contrib/groffer/groffer.am
@@ -8,7 +8,7 @@
 # Bernd Warken <groff-bernd.warken-72@web.de>.
 # Automake migration by Bertrand Garrigues
 
-# Last update: 5 Aug 2015
+# Last update: 7 Aug 2015
 
 # This file is part of `groffer' which is part of `groff'.
 
@@ -40,12 +40,12 @@ ROFF2PROGS = \
 
 # Generated man templates
 ROFF2MAN = \
-  contrib/groffer/roff2dvi.man \
-  contrib/groffer/roff2html.man \
-  contrib/groffer/roff2pdf.man \
-  contrib/groffer/roff2ps.man \
-  contrib/groffer/roff2text.man \
-  contrib/groffer/roff2x.man
+  contrib/groffer/roff2dvi.1.man \
+  contrib/groffer/roff2html.1.man \
+  contrib/groffer/roff2pdf.1.man \
+  contrib/groffer/roff2ps.1.man \
+  contrib/groffer/roff2text.1.man \
+  contrib/groffer/roff2x.1.man
 
 GROFFER_PERL = \
   contrib/groffer/main_subs.pl \
@@ -54,9 +54,9 @@ GROFFER_PERL = \
   contrib/groffer/subs.pl
 
 GROFFER_REST = \
-  contrib/groffer/roff2.man \
+  contrib/groffer/roff2.1.man \
   contrib/groffer/version.sh \
-  contrib/groffer/groffer.man \
+  contrib/groffer/groffer.1.man \
   contrib/groffer/groffer.pl \
   contrib/groffer/roff2.pl
 
@@ -70,13 +70,13 @@ grofferdir = $(groffer_dir)
 bin_SCRIPTS += groffer $(ROFF2PROGS)
 groffer_DATA = $(GROFFER_PERL) contrib/groffer/version.sh
 man1_MANS += \
-  contrib/groffer/groffer.n \
-  contrib/groffer/roff2dvi.n \
-  contrib/groffer/roff2html.n \
-  contrib/groffer/roff2pdf.n \
-  contrib/groffer/roff2ps.n \
-  contrib/groffer/roff2text.n \
-  contrib/groffer/roff2x.n
+  contrib/groffer/groffer.1.n \
+  contrib/groffer/roff2dvi.1.n \
+  contrib/groffer/roff2html.1.n \
+  contrib/groffer/roff2pdf.1.n \
+  contrib/groffer/roff2ps.1.n \
+  contrib/groffer/roff2text.1.n \
+  contrib/groffer/roff2x.1.n
 MOSTLYCLEANFILES += $(ROFF2MAN)
 
 $(ROFF2PROGS): $(groffer_srcdir)/roff2.pl
@@ -84,10 +84,10 @@ $(ROFF2PROGS): $(groffer_srcdir)/roff2.pl
 
 # we take roff2.man and replace the @ROFF2MODE@ by the type of file
 # (dvi, pdf, html etc ...)
-$(ROFF2MAN):  $(groffer_srcdir)/roff2.man
+$(ROFF2MAN):  $(groffer_srcdir)/roff2.1.man
 	@$(MKDIR_P) contrib/groffer
-	FILEMODE=`echo $@ | sed 's|contrib/groffer/roff2\([a-z][a-z]*\)\.man|\1|g'` \
-	  && sed -e 's/[@]ROFF2MODE[@]/'"$$FILEMODE"'/g' $(groffer_srcdir)/roff2.man > $@;
+	FILEMODE=`echo $@ | sed 's|contrib/groffer/roff2\([a-z][a-z]*\)\.1\.man|\1|g'` \
+	  && sed -e 's/[@]ROFF2MODE[@]/'"$$FILEMODE"'/g' $(groffer_srcdir)/roff2.1.man > $@;
 
 groffer: $(GROFFER_PERL) $(GROFFER_REST) $(SH_DEPS_SED_SCRIPT)
 	echo "Using perl version of groffer."; \
diff --git a/contrib/groffer/roff2.man b/contrib/groffer/roff2.1.man
similarity index 100%
rename from contrib/groffer/roff2.man
rename to contrib/groffer/roff2.1.man
diff --git a/contrib/hdtbl/ChangeLog b/contrib/hdtbl/ChangeLog
index 77e10ac..36631de 100644
--- a/contrib/hdtbl/ChangeLog
+++ b/contrib/hdtbl/ChangeLog
@@ -1,5 +1,9 @@
 2015-08-05  Bernd Warken  <groff-bernd.warken-72@web.de>
 
+	* groff_hdtbl.7.man,  hdtbl.am: Rename groff_hdtbl.man.
+
+2015-08-05  Bernd Warken  <groff-bernd.warken-72@web.de>
+
 	* hdtbl.am: Add `Last update'.  Setup Emacs mode.
 
 2015-04-03  Werner LEMBERG  <wl@gnu.org>
diff --git a/contrib/hdtbl/groff_hdtbl.man b/contrib/hdtbl/groff_hdtbl.7.man
similarity index 100%
rename from contrib/hdtbl/groff_hdtbl.man
rename to contrib/hdtbl/groff_hdtbl.7.man
diff --git a/contrib/hdtbl/hdtbl.am b/contrib/hdtbl/hdtbl.am
index 6a7ec92..7ec3cc0 100644
--- a/contrib/hdtbl/hdtbl.am
+++ b/contrib/hdtbl/hdtbl.am
@@ -2,7 +2,7 @@
 #      Written by Werner Lemberg (wl@gnu.org)
 #      Automake migration by Bertrand Garrigues
 #
-# Last update: 5 Aug 2015
+# Last update: 7 Aug 2015
 #
 # This file is part of groff.
 #
@@ -22,7 +22,7 @@
 hdtbl_srcdir = $(top_srcdir)/contrib/hdtbl
 hdtbl_builddir = $(top_builddir)/contrib/hdtbl
 
-man7_MANS += contrib/hdtbl/groff_hdtbl.n
+man7_MANS += contrib/hdtbl/groff_hdtbl.7.n
 
 # Groff command used to generate .ps files
 HDTBL_TFLAG = -M$(hdtbl_srcdir) -M$(hdtbl_builddir)
@@ -97,7 +97,7 @@ MOSTLYCLEANFILES += $(HDTBLGENFILES) $(HDTBLPROCESSEDEXAMPLEFILES) \
 EXTRA_DIST += \
   contrib/hdtbl/ChangeLog \
   contrib/hdtbl/TODO \
-  contrib/hdtbl/groff_hdtbl.man \
+  contrib/hdtbl/groff_hdtbl.1.man \
   contrib/hdtbl/hdtbl.tmac-u \
   contrib/hdtbl/hdmisc.tmac-u
 
@@ -122,7 +122,7 @@ $(HDTBLSTRIPFILES): $(top_srcdir)/tmac/strip.sed
 	sed -f $(top_srcdir)/tmac/strip.sed $(hdtbl_srcdir)/`basename $@`-u > $@;
 
 uninstall_groffdirs: uninstall-hdtbl-hook
-uninstall-hdtbl-hook:
+ninstall-hdtbl-hook:
 	if test -d $(DESTDIR)$(hdtblexampledir); then \
 	  rmdir $(DESTDIR)$(hdtblexampledir); \
 	fi
diff --git a/contrib/mm/ChangeLog b/contrib/mm/ChangeLog
index 6223f33..e533bbd 100644
--- a/contrib/mm/ChangeLog
+++ b/contrib/mm/ChangeLog
@@ -1,5 +1,9 @@
 2015-08-05  Bernd Warken  <groff-bernd.warken-72@web.de>
 
+	Rename all man-pages by adding a section number.
+
+2015-08-05  Bernd Warken  <groff-bernd.warken-72@web.de>
+
 	* mm.am, Makefile.sim: Add `Last update'.  Setup Emacs mode.
 
 Thu Jul 16 11:52:03 2015  Carsten Kunze  <carsten.kunze@arcor.de>
diff --git a/contrib/mm/Makefile.sim b/contrib/mm/Makefile.sim
index dc167e7..c96f2c6 100644
--- a/contrib/mm/Makefile.sim
+++ b/contrib/mm/Makefile.sim
@@ -1,8 +1,8 @@
 # Copyright 1991-2015  Free Software Foundation, Inc.
 #
-# Last update: 5 Aug 2015
+# Last update: 7 Aug 2015
 #
-# This file is part of groff.
+# This file is part of hdtbl, which is part of groff.
 #
 # groff is free software; you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free
@@ -46,11 +46,11 @@ mdate = 2002-05-11
 
 all:
 
-install: groff_mm.n groff_mmse.n
+install: groff_mm.7.n groff_mmse.7.n
 	$(MAKE) -f Makefile.sub tmacdir=$(tmacdir) srcdir=$(srcdir) \
 	  INSTALL_DATA='$(install)' tmac_m=$(tmac_m) install
 
-uninstall: groff_mm.n groff_mmse.n
+uninstall: groff_mm.7.n groff_mmse.7.n
 	$(MAKE) -f Makefile.sub tmacdir=$(tmacdir) srcdir=$(srcdir) \
 	  INSTALL_DATA='$(install)' tmac_m=$(tmac_m) uninstall_sub
 
diff --git a/contrib/mm/groff_mm.man b/contrib/mm/groff_mm.7.man
similarity index 100%
rename from contrib/mm/groff_mm.man
rename to contrib/mm/groff_mm.7.man
diff --git a/contrib/mm/groff_mmse.man b/contrib/mm/groff_mmse.7.man
similarity index 100%
rename from contrib/mm/groff_mmse.man
rename to contrib/mm/groff_mmse.7.man
diff --git a/contrib/mm/mm.am b/contrib/mm/mm.am
index 318c0c5..77f4cf9 100644
--- a/contrib/mm/mm.am
+++ b/contrib/mm/mm.am
@@ -1,7 +1,7 @@
 # Copyright 1991-2015
 #   Free Software Foundation, Inc.
 #
-# Last update: 5 Aug 2015
+# Last update: 7 Aug 2015
 #
 # This file is part of groff.
 #
@@ -26,10 +26,10 @@ mm_builddir = $(top_builddir)/contrib/mm
 
 bin_SCRIPTS += mmroff
 
-man1_MANS += contrib/mm/mmroff.n
+man1_MANS += contrib/mm/mmroff.1.n
 man7_MANS += \
-  contrib/mm/groff_mm.n \
-  contrib/mm/groff_mmse.n
+  contrib/mm/groff_mm.7.n \
+  contrib/mm/groff_mmse.7.n
 
 # Files installed in $(tmacdir)/mm
 MMFILES = \
@@ -57,9 +57,9 @@ EXTRA_DIST += \
   contrib/mm/mm \
   contrib/mm/NOTES \
   contrib/mm/README \
-  contrib/mm/groff_mm.man \
-  contrib/mm/groff_mmse.man \
-  contrib/mm/mmroff.man \
+  contrib/mm/groff_mm.7.man \
+  contrib/mm/groff_mmse.7.man \
+  contrib/mm/mmroff.1.man \
   contrib/mm/mmroff.pl
 
 mmroff: $(mm_srcdir)/mmroff.pl
diff --git a/contrib/mm/mmroff.man b/contrib/mm/mmroff.1.man
similarity index 100%
rename from contrib/mm/mmroff.man
rename to contrib/mm/mmroff.1.man
diff --git a/contrib/mom/ChangeLog b/contrib/mom/ChangeLog
index 10defb2..5d328fb 100644
--- a/contrib/mom/ChangeLog
+++ b/contrib/mom/ChangeLog
@@ -1,5 +1,9 @@
 2015-08-05  Bernd Warken  <groff-bernd.warken-72@web.de>
 
+	* groff_mom.7.man, mom.am: Rename `groff_mom.man'.
+
+2015-08-05  Bernd Warken  <groff-bernd.warken-72@web.de>
+
 	* mom.am: Add `Last update'.  Setup Emacs mode.
 
 * Sun Jul 26 2015
diff --git a/contrib/mom/groff_mom.man b/contrib/mom/groff_mom.7.man
similarity index 100%
rename from contrib/mom/groff_mom.man
rename to contrib/mom/groff_mom.7.man
diff --git a/contrib/mom/mom.am b/contrib/mom/mom.am
index db94742..19918a2 100644
--- a/contrib/mom/mom.am
+++ b/contrib/mom/mom.am
@@ -3,7 +3,7 @@
 #      Written by Werner Lemberg (wl@gnu.org)
 #      Automake migration by Bertrand Garrigues
 #
-# Last update: 5 Aug 2015
+# Last update: 7 Aug 2015
 #
 # This file is part of groff.
 #
@@ -32,7 +32,7 @@ MOMPDFMOM = \
   PDFMOM_BIN_PATH="$(top_builddir)" \
   $(PDFMOMBIN) $(FFLAG) $(TFLAG) $(MOM_TFLAG) $(MOM_KFLAG)
 
-man7_MANS += contrib/mom/groff_mom.n
+man7_MANS += contrib/mom/groff_mom.7.n
 
 # Files installed in $(tmacdir).
 # MOMNORMALFILES are located in the source tree.
@@ -119,7 +119,7 @@ EXTRA_DIST += $(MOMHTMLDOCFILES) $(MOMEXAMPLEFILES) \
   contrib/mom/NEWS \
   contrib/mom/TODO \
   contrib/mom/copyright \
-  contrib/mom/groff_mom.man \
+  contrib/mom/groff_mom.7.man \
   contrib/mom/om.tmac-u
 
 MOSTLYCLEANFILES += \
diff --git a/contrib/pdfmark/ChangeLog b/contrib/pdfmark/ChangeLog
index 6a7c894..a255803 100644
--- a/contrib/pdfmark/ChangeLog
+++ b/contrib/pdfmark/ChangeLog
@@ -1,3 +1,7 @@
+2015-08-07  Bernd Warken  <groff-bernd.warken-72@web.de>
+
+	* pdfroff.1.man, pdfmark.am: Rename `pdfroff.man'.
+
 2015-08-05  Bernd Warken  <groff-bernd.warken-72@web.de>
 
 	* pdfmark.am: Add `Last update'.  Setup Emacs mode.
diff --git a/contrib/pdfmark/pdfmark.am b/contrib/pdfmark/pdfmark.am
index 6ebc6d9..58e6226 100644
--- a/contrib/pdfmark/pdfmark.am
+++ b/contrib/pdfmark/pdfmark.am
@@ -3,7 +3,7 @@
 #      Written by Keith Marshall (keith.d.marshall@ntlworld.com)
 #      Automake migration by Bertrand Garrigues
 #
-# Last update: 5 Aug 2015
+# Last update: 7 Aug 2015
 #
 # This file is part of groff.
 #
@@ -23,7 +23,7 @@
 pdfmark_srcdir = $(top_srcdir)/contrib/pdfmark
 pdfmark_builddir = $(top_builddir)/contrib/pdfmark
 
-man1_MANS += contrib/pdfmark/pdfroff.n
+man1_MANS += contrib/pdfmark/pdfroff.1.n
 
 bin_SCRIPTS += pdfroff
 
@@ -52,7 +52,7 @@ EXTRA_DIST += \
   contrib/pdfmark/README \
   contrib/pdfmark/PROBLEMS \
   contrib/pdfmark/TODO \
-  contrib/pdfmark/pdfroff.man \
+  contrib/pdfmark/pdfroff.1.man \
   contrib/pdfmark/pdfroff.sh
 
 PDFMARK_PFLAG =-dpaper=$(PAGE) -P-p$(PAGE)
diff --git a/contrib/pdfmark/pdfroff.man b/contrib/pdfmark/pdfroff.1.man
similarity index 100%
rename from contrib/pdfmark/pdfroff.man
rename to contrib/pdfmark/pdfroff.1.man
diff --git a/contrib/pic2graph/pic2graph.man b/contrib/pic2graph/pic2graph.1.man
similarity index 100%
rename from contrib/pic2graph/pic2graph.man
rename to contrib/pic2graph/pic2graph.1.man
diff --git a/contrib/pic2graph/pic2graph.am b/contrib/pic2graph/pic2graph.am
index 78b6635..37adc92 100644
--- a/contrib/pic2graph/pic2graph.am
+++ b/contrib/pic2graph/pic2graph.am
@@ -1,6 +1,6 @@
 # Copyright (C) 2001-2015  Free Software Foundation, Inc.
 #
-# Last update: 5 Aug 2015
+# Last update: 7 Aug 2015
 #
 # This file is part of groff.
 #
@@ -21,11 +21,11 @@
 #
 
 pic2graph_srcdir = $(top_srcdir)/contrib/pic2graph
-man1_MANS += contrib/pic2graph/pic2graph.n
+man1_MANS += contrib/pic2graph/pic2graph.1.n
 bin_SCRIPTS += pic2graph
 EXTRA_DIST += \
   contrib/pic2graph/pic2graph.sh \
-  contrib/pic2graph/pic2graph.man
+  contrib/pic2graph/pic2graph.1.man
 pic2graph: $(pic2graph_srcdir)/pic2graph.sh
 	sed -e "s|[@]g[@]|$(g)|g" \
 	    -e "s|[@]VERSION[@]|$(VERSION)|" \
diff --git a/man/ditroff.man b/man/ditroff.7.man
similarity index 100%
rename from man/ditroff.man
rename to man/ditroff.7.man
diff --git a/man/groff.man b/man/groff.7.man
similarity index 100%
rename from man/groff.man
rename to man/groff.7.man
diff --git a/man/groff_char.man b/man/groff_char.7.man
similarity index 100%
rename from man/groff_char.man
rename to man/groff_char.7.man
diff --git a/man/groff_diff.man b/man/groff_diff.7.man
similarity index 100%
rename from man/groff_diff.man
rename to man/groff_diff.7.man
diff --git a/man/groff_font.man b/man/groff_font.5.man
similarity index 100%
rename from man/groff_font.man
rename to man/groff_font.5.man
diff --git a/man/groff_out.man b/man/groff_out.5.man
similarity index 100%
rename from man/groff_out.man
rename to man/groff_out.5.man
diff --git a/man/groff_tmac.man b/man/groff_tmac.5.man
similarity index 100%
rename from man/groff_tmac.man
rename to man/groff_tmac.5.man
diff --git a/man/man.am b/man/man.am
index 9d6ff2d..55560e5 100644
--- a/man/man.am
+++ b/man/man.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-15
 #   Free Software Foundation, Inc.
 #
-# Last update: 5 Aug 2015
+# Last update: 7 Aug 2015
 #
 # This file is part of `groff'
 #
@@ -19,24 +19,24 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 man5_MANS += \
-  man/groff_font.n \
-  man/groff_out.n \
-  man/groff_tmac.n
+  man/groff_font.5.n \
+  man/groff_out.5.n \
+  man/groff_tmac.5.n
 man7_MANS += \
-  man/ditroff.n \
-  man/groff_char.n \
-  man/groff_diff.n \
-  man/groff.n \
-  man/roff.n
+  man/ditroff.7.n \
+  man/groff_char.7.n \
+  man/groff_diff.7.n \
+  man/groff.7.n \
+  man/roff.7.n
 EXTRA_DIST += \
-  man/groff_font.man \
-  man/groff_out.man \
-  man/groff_tmac.man \
-  man/ditroff.man \
-  man/groff_char.man \
-  man/groff_diff.man \
-  man/groff.man \
-  man/roff.man
+  man/groff_font.5.man \
+  man/groff_out.5.man \
+  man/groff_tmac.5.man \
+  man/ditroff.7.man \
+  man/groff_char.7.man \
+  man/groff_diff.7.man \
+  man/groff.7.man \
+  man/roff.7.man
 
 # Case of out-of-source build: we must create the 'man' directory.
 BUILT_SOURCES += man
diff --git a/man/roff.man b/man/roff.7.man
similarity index 100%
rename from man/roff.man
rename to man/roff.7.man
diff --git a/src/devices/grodvi/grodvi.man b/src/devices/grodvi/grodvi.1.man
similarity index 100%
rename from src/devices/grodvi/grodvi.man
rename to src/devices/grodvi/grodvi.1.man
diff --git a/src/devices/grodvi/grodvi.am b/src/devices/grodvi/grodvi.am
index 53af681..eaf3e15 100644
--- a/src/devices/grodvi/grodvi.am
+++ b/src/devices/grodvi/grodvi.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-15
 #      Free Software Foundation, Inc.
 #
-# Last update: 5 Aug 2015
+# Last update: 7 Aug 2015
 #
 # This file is part of groff.
 #
@@ -24,8 +24,8 @@ grodvi_LDADD = \
   libdriver.a \
   libgroff.a \
   lib/libgnu.a $(LIBM)
-man1_MANS += src/devices/grodvi/grodvi.n
-EXTRA_DIST += src/devices/grodvi/grodvi.man
+man1_MANS += src/devices/grodvi/grodvi.1.n
+EXTRA_DIST += src/devices/grodvi/grodvi.1.man
 
 
 ########################################################################
diff --git a/src/devices/grohtml/grohtml.man b/src/devices/grohtml/grohtml.1.man
similarity index 100%
rename from src/devices/grohtml/grohtml.man
rename to src/devices/grohtml/grohtml.1.man
diff --git a/src/devices/grohtml/grohtml.am b/src/devices/grohtml/grohtml.am
index 8d33f8f..e2d864a 100644
--- a/src/devices/grohtml/grohtml.am
+++ b/src/devices/grohtml/grohtml.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-15
 #      Free Software Foundation, Inc.
 #
-# Last update: 5 Aug 2015
+# Last update: 7 Aug 2015
 #
 # This file is part of groff.
 #
@@ -32,8 +32,8 @@ post_grohtml_LDADD = $(LIBM) \
   libdriver.a \
   libgroff.a \
   lib/libgnu.a 
-man1_MANS += src/devices/grohtml/grohtml.n
-EXTRA_DIST += src/devices/grohtml/grohtml.man
+man1_MANS += src/devices/grohtml/grohtml.1.n
+EXTRA_DIST += src/devices/grohtml/grohtml.1.man
 
 
 ########################################################################
diff --git a/src/devices/grolbp/grolbp.man b/src/devices/grolbp/grolbp.1.man
similarity index 100%
rename from src/devices/grolbp/grolbp.man
rename to src/devices/grolbp/grolbp.1.man
diff --git a/src/devices/grolbp/grolbp.am b/src/devices/grolbp/grolbp.am
index a7f1ffe..2a7c225 100644
--- a/src/devices/grolbp/grolbp.am
+++ b/src/devices/grolbp/grolbp.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-15
 #      Free Software Foundation, Inc.
 #
-# Last update: 5 Aug 2015
+# Last update: 7 Aug 2015
 #
 # This file is part of groff.
 #
@@ -28,8 +28,8 @@ grolbp_LDADD = $(LIBM) \
   libdriver.a \
   libgroff.a \
   lib/libgnu.a
-man1_MANS += src/devices/grolbp/grolbp.n
-EXTRA_DIST += src/devices/grolbp/grolbp.man
+man1_MANS += src/devices/grolbp/grolbp.1.n
+EXTRA_DIST += src/devices/grolbp/grolbp.1.man
 
 
 ########################################################################
diff --git a/src/devices/grolj4/grolj4.man b/src/devices/grolj4/grolj4.1.man
similarity index 100%
rename from src/devices/grolj4/grolj4.man
rename to src/devices/grolj4/grolj4.1.man
diff --git a/src/devices/grolj4/grolj4.am b/src/devices/grolj4/grolj4.am
index 7d4b5bf..e941f1f 100644
--- a/src/devices/grolj4/grolj4.am
+++ b/src/devices/grolj4/grolj4.am
@@ -24,11 +24,11 @@ grolj4_LDADD = $(LIBM) \
   libdriver.a \
   libgroff.a \
   lib/libgnu.a
-man1_MANS += src/devices/grolj4/grolj4.n
-man5_MANS += src/devices/grolj4/lj4_font.n
+man1_MANS += src/devices/grolj4/grolj4.1.n
+man5_MANS += src/devices/grolj4/lj4_font.5.n
 EXTRA_DIST += \
-  src/devices/grolj4/grolj4.man \
-  src/devices/grolj4/lj4_font.man
+  src/devices/grolj4/grolj4.1.man \
+  src/devices/grolj4/lj4_font.5.man
 
 ########################################################################
 ### Emacs settings
diff --git a/src/devices/grolj4/lj4_font.man b/src/devices/grolj4/lj4_font.5.man
similarity index 100%
rename from src/devices/grolj4/lj4_font.man
rename to src/devices/grolj4/lj4_font.5.man
diff --git a/src/devices/gropdf/gropdf.man b/src/devices/gropdf/gropdf.1.man
similarity index 100%
rename from src/devices/gropdf/gropdf.man
rename to src/devices/gropdf/gropdf.1.man
diff --git a/src/devices/gropdf/gropdf.am b/src/devices/gropdf/gropdf.am
index 4d41d96..86aba15 100644
--- a/src/devices/gropdf/gropdf.am
+++ b/src/devices/gropdf/gropdf.am
@@ -3,7 +3,7 @@
 #  Original Makefile.sub written by Deri James <deri@chuzzlewit.demon.co.uk>.
 #  Automake migration by Bertrand Garrigues
 #
-# Last update: 5 Aug 2015
+# Last update: 7 Aug 2015
 #
 # This file is part of groff.
 #
@@ -27,12 +27,12 @@ EXTRA_DIST += \
   src/devices/gropdf/TODO \
   src/devices/gropdf/gropdf.pl \
   src/devices/gropdf/pdfmom.pl \
-  src/devices/gropdf/gropdf.man \
-  src/devices/gropdf/pdfmom.man
+  src/devices/gropdf/gropdf.1.man \
+  src/devices/gropdf/pdfmom.1.man
 
 man1_MANS += \
-  src/devices/gropdf/gropdf.n \
-  src/devices/gropdf/pdfmom.n
+  src/devices/gropdf/gropdf.1.n \
+  src/devices/gropdf/pdfmom.1.n
 
 gropdf: $(gropdf_dir)/gropdf.pl $(SH_DEPS_SED_SCRIPT)
 	$(RM) $@
diff --git a/src/devices/gropdf/pdfmom.man b/src/devices/gropdf/pdfmom.1.man
similarity index 100%
rename from src/devices/gropdf/pdfmom.man
rename to src/devices/gropdf/pdfmom.1.man
diff --git a/src/devices/grotty/grotty.man b/src/devices/grotty/grotty.1.man
similarity index 100%
rename from src/devices/grotty/grotty.man
rename to src/devices/grotty/grotty.1.man
diff --git a/src/devices/grotty/grotty.am b/src/devices/grotty/grotty.am
index d200e5d..3f52fbd 100644
--- a/src/devices/grotty/grotty.am
+++ b/src/devices/grotty/grotty.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-15
 #      Free Software Foundation, Inc.
 #
-# Last update: 5 Aug 2015
+# Last update: 7 Aug 2015
 #
 # This file is part of groff.
 #
@@ -24,9 +24,9 @@ grotty_LDADD = $(LIBM) \
   libdriver.a \
   libgroff.a \
   lib/libgnu.a
-man1_MANS += src/devices/grotty/grotty.n
+man1_MANS += src/devices/grotty/grotty.1.n
 EXTRA_DIST += \
-  src/devices/grotty/grotty.man \
+  src/devices/grotty/grotty.1.man \
   src/devices/grotty/TODO
 
 
diff --git a/src/devices/xditview/gxditview.man b/src/devices/xditview/gxditview.1.man
similarity index 100%
rename from src/devices/xditview/gxditview.man
rename to src/devices/xditview/gxditview.1.man
diff --git a/src/devices/xditview/xditview.am b/src/devices/xditview/xditview.am
index d4c65a0..52009ee 100644
--- a/src/devices/xditview/xditview.am
+++ b/src/devices/xditview/xditview.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-15
 #      Free Software Foundation, Inc.
 #
-# Last update: 5 Aug 2015
+# Last update: 7 Aug 2015
 #
 # This file is part of groff.
 #
@@ -46,7 +46,7 @@ gxditview_SOURCES = $(GXDITVIEWSOURCES)
 nodist_gxditview_SOURCES = $(XDITVIEW_GENHDRS)
 CLEANFILES += $(XDITVIEW_GENHDRS)
 
-man1_MANS += src/devices/xditview/gxditview.n
+man1_MANS += src/devices/xditview/gxditview.1.n
 
 # Because we defined gxditview_CPPFLAGS, automake renames all the xditview's 
 # objects, adding an "gxditview-" prefix. 
diff --git a/src/preproc/eqn/eqn.man b/src/preproc/eqn/eqn.1.man
similarity index 100%
rename from src/preproc/eqn/eqn.man
rename to src/preproc/eqn/eqn.1.man
diff --git a/src/preproc/eqn/eqn.am b/src/preproc/eqn/eqn.am
index 9184e33..310bb45 100644
--- a/src/preproc/eqn/eqn.am
+++ b/src/preproc/eqn/eqn.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-15
 #      Free Software Foundation, Inc.
 #
-# Latest update: 5 Aug 2015
+# Latest update: 7 Aug 2015
 #
 # This file is part of groff.
 #
@@ -45,12 +45,12 @@ eqn_SOURCES = \
   src/preproc/eqn/pbox.h \
   src/preproc/eqn/eqn.h
 
-PREFIXMAN1 += src/preproc/eqn/eqn.n src/preproc/eqn/neqn.n
+PREFIXMAN1 += src/preproc/eqn/eqn.1.n src/preproc/eqn/neqn.1.n
 EXTRA_DIST += \
   src/preproc/eqn/TODO \
   src/preproc/eqn/neqn.sh \
-  src/preproc/eqn/eqn.man \
-  src/preproc/eqn/neqn.man
+  src/preproc/eqn/eqn.1.man \
+  src/preproc/eqn/neqn.1.man
 
 src/preproc/eqn/eqn-lex.$(OBJEXT): src/preproc/eqn/eqn.hpp
 CLEANFILES += \
diff --git a/src/preproc/eqn/neqn.man b/src/preproc/eqn/neqn.1.man
similarity index 100%
rename from src/preproc/eqn/neqn.man
rename to src/preproc/eqn/neqn.1.man
diff --git a/src/preproc/grn/grn.man b/src/preproc/grn/grn.1.man
similarity index 100%
rename from src/preproc/grn/grn.man
rename to src/preproc/grn/grn.1.man
diff --git a/src/preproc/grn/grn.am b/src/preproc/grn/grn.am
index 9691bff..96ee4a1 100644
--- a/src/preproc/grn/grn.am
+++ b/src/preproc/grn/grn.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-15
 #      Free Software Foundation, Inc.
 #
-# Latest update: 5 Aug 2015
+# Latest update: 7 Aug 2015
 #
 # This file is part of groff.
 #
@@ -27,8 +27,8 @@ grn_SOURCES = \
   src/preproc/grn/gprint.h
 src/preproc/grn/main.$(OBJEXT): defs.h
 grn_LDADD = libgroff.a lib/libgnu.a $(LIBM)
-PREFIXMAN1 += src/preproc/grn/grn.n
-EXTRA_DIST += src/preproc/grn/README src/preproc/grn/grn.man
+PREFIXMAN1 += src/preproc/grn/grn.1.n
+EXTRA_DIST += src/preproc/grn/README src/preproc/grn/grn.1.man
 
 
 ########################################################################
diff --git a/src/preproc/pic/pic.man b/src/preproc/pic/pic.1.man
similarity index 100%
rename from src/preproc/pic/pic.man
rename to src/preproc/pic/pic.1.man
diff --git a/src/preproc/pic/pic.am b/src/preproc/pic/pic.am
index 18ee0e5..cae82db 100644
--- a/src/preproc/pic/pic.am
+++ b/src/preproc/pic/pic.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-15
 #      Free Software Foundation, Inc.
 #
-# Latest update: 5 Aug 2015
+# Latest update: 7 Aug 2015
 #
 # This file is part of groff.
 #
@@ -38,11 +38,11 @@ pic_SOURCES = \
 pic_CPPFLAGS = $(AM_CPPFLAGS) \
   -I $(top_srcdir)/src/preproc/pic \
   -I $(top_builddir)/src/preproc/pic
-PREFIXMAN1 += src/preproc/pic/pic.n
+PREFIXMAN1 += src/preproc/pic/pic.1.n
 
 src/preproc/pic/pic-lex.$(OBJEXT): src/preproc/pic/pic.hpp
 EXTRA_DIST += \
-  src/preproc/pic/pic.man \
+  src/preproc/pic/pic.1.man \
   src/preproc/pic/TODO
 CLEANFILES += \
   src/preproc/pic/pic.cpp \
diff --git a/src/preproc/preconv/preconv.man b/src/preproc/preconv/preconv.1.man
similarity index 100%
rename from src/preproc/preconv/preconv.man
rename to src/preproc/preconv/preconv.1.man
diff --git a/src/preproc/preconv/preconv.am b/src/preproc/preconv/preconv.am
index e4130e1..66a792f 100644
--- a/src/preproc/preconv/preconv.am
+++ b/src/preproc/preconv/preconv.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-15
 #      Free Software Foundation, Inc.
 #
-# Latest update: 5 Aug 2015
+# Latest update: 7 Aug 2015
 #
 # This file is part of groff.
 #
@@ -21,8 +21,8 @@
 bin_PROGRAMS += preconv
 preconv_LDADD = libgroff.a $(LIBM) $(LIBICONV)
 preconv_SOURCES = src/preproc/preconv/preconv.cpp
-man1_MANS += src/preproc/preconv/preconv.n
-EXTRA_DIST += src/preproc/preconv/preconv.man
+man1_MANS += src/preproc/preconv/preconv.1.n
+EXTRA_DIST += src/preproc/preconv/preconv.1.man
 
 
 ########################################################################
diff --git a/src/preproc/refer/refer.man b/src/preproc/refer/refer.1.man
similarity index 100%
rename from src/preproc/refer/refer.man
rename to src/preproc/refer/refer.1.man
diff --git a/src/preproc/refer/refer.am b/src/preproc/refer/refer.am
index 33b4ca9..94800ac 100644
--- a/src/preproc/refer/refer.am
+++ b/src/preproc/refer/refer.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-15
 #      Free Software Foundation, Inc.
 #
-# Latest update: 5 Aug 2015
+# Latest update: 7 Aug 2015
 #
 # This file is part of groff.
 #
@@ -31,8 +31,8 @@ refer_SOURCES =  \
   src/preproc/refer/ref.h \
   src/preproc/refer/token.h \
   src/preproc/refer/command.h
-PREFIXMAN1 += src/preproc/refer/refer.n
-EXTRA_DIST += src/preproc/refer/TODO src/preproc/refer/refer.man
+PREFIXMAN1 += src/preproc/refer/refer.1.n
+EXTRA_DIST += src/preproc/refer/TODO src/preproc/refer/refer.1.man
 CLEANFILES += \
   src/preproc/refer/label.cpp \
   src/preproc/refer/label.hpp \
diff --git a/src/preproc/soelim/soelim.man b/src/preproc/soelim/soelim.1.man
similarity index 100%
rename from src/preproc/soelim/soelim.man
rename to src/preproc/soelim/soelim.1.man
diff --git a/src/preproc/soelim/soelim.am b/src/preproc/soelim/soelim.am
index debc1ae..d7b10c9 100644
--- a/src/preproc/soelim/soelim.am
+++ b/src/preproc/soelim/soelim.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-15
 #      Free Software Foundation, Inc.
 #
-# Latest update: 5 Aug 2015
+# Latest update: 7 Aug 2015
 #
 # This file is part of groff.
 #
@@ -21,10 +21,10 @@
 prefixexecbin_PROGRAMS += soelim
 soelim_LDADD = libgroff.a $(LIBM)
 soelim_SOURCES = src/preproc/soelim/soelim.cpp
-PREFIXMAN1 += src/preproc/soelim/soelim.n
+PREFIXMAN1 += src/preproc/soelim/soelim.1.n
 EXTRA_DIST += \
   src/preproc/soelim/TODO \
-  src/preproc/soelim/soelim.man
+  src/preproc/soelim/soelim.1.man
 
 
 ########################################################################
diff --git a/src/preproc/tbl/tbl.man b/src/preproc/tbl/tbl.1.man
similarity index 100%
rename from src/preproc/tbl/tbl.man
rename to src/preproc/tbl/tbl.1.man
diff --git a/src/preproc/tbl/tbl.am b/src/preproc/tbl/tbl.am
index 5b41f3c..dbb795f 100644
--- a/src/preproc/tbl/tbl.am
+++ b/src/preproc/tbl/tbl.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-15
 #      Free Software Foundation, Inc.
 #
-# Latest update: 5 Aug 2015
+# Latest update: 7 Aug 2015
 #
 # This file is part of groff.
 #
@@ -24,8 +24,8 @@ tbl_SOURCES = \
   src/preproc/tbl/main.cpp \
   src/preproc/tbl/table.cpp \
   src/preproc/tbl/table.h
-PREFIXMAN1 += src/preproc/tbl/tbl.n
-EXTRA_DIST += src/preproc/tbl/tbl.man
+PREFIXMAN1 += src/preproc/tbl/tbl.1.n
+EXTRA_DIST += src/preproc/tbl/tbl.1.man
 
 
 ########################################################################
diff --git a/src/roff/groff/groff.man b/src/roff/groff/groff.1.man
similarity index 100%
rename from src/roff/groff/groff.man
rename to src/roff/groff/groff.1.man
diff --git a/src/roff/groff/groff.am b/src/roff/groff/groff.am
index 169c9d7..a2ba730 100644
--- a/src/roff/groff/groff.am
+++ b/src/roff/groff/groff.am
@@ -8,7 +8,7 @@
 #   Automake migration by 
 #   Bertrand Garrigues <bertrand.garrigues@laposte.net>
 #
-# Latest update: 5 Aug 2015
+# Latest update: 7 Aug 2015
 #
 # `groff' is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -35,8 +35,8 @@ groff_SOURCES = \
   src/roff/groff/pipeline.c \
   src/roff/groff/pipeline.h
 src/roff/groff/groff.$(OBJEXT): defs.h
-man1_MANS += src/roff/groff/groff.n
-EXTRA_DIST += src/roff/groff/groff.man
+man1_MANS += src/roff/groff/groff.1.n
+EXTRA_DIST += src/roff/groff/groff.1.man
 GROFF_OPTS_OUTPUT = \
   groff_opts_no_arg.txt \
   groff_opts_with_arg.txt
diff --git a/src/roff/grog/grog.man b/src/roff/grog/grog.1.man
similarity index 100%
rename from src/roff/grog/grog.man
rename to src/roff/grog/grog.1.man
diff --git a/src/roff/grog/grog.am b/src/roff/grog/grog.am
index b1dcb35..ab35dab 100644
--- a/src/roff/grog/grog.am
+++ b/src/roff/grog/grog.am
@@ -29,9 +29,9 @@ GROG = src/roff/grog/subs.pl
 # grog_dir is defined by a m4 macro
 grogdir = $(grog_dir)
 dist_grog_DATA = $(GROG)
-man1_MANS += src/roff/grog/grog.n
+man1_MANS += src/roff/grog/grog.1.n
 EXTRA_DIST += \
-  src/roff/grog/grog.man \
+  src/roff/grog/grog.1.man \
   src/roff/grog/grog.pl
 
 # Perl version works for all parts of `groff'.
diff --git a/src/roff/nroff/nroff.man b/src/roff/nroff/nroff.1.man
similarity index 100%
rename from src/roff/nroff/nroff.man
rename to src/roff/nroff/nroff.1.man
diff --git a/src/roff/nroff/nroff.am b/src/roff/nroff/nroff.am
index f0ad935..5ea1354 100644
--- a/src/roff/nroff/nroff.am
+++ b/src/roff/nroff/nroff.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-15
 #      Free Software Foundation, Inc.
 #
-# Latest update: 5 Aug 2015
+# Latest update: 7 Aug 2015
 #
 # This file is part of groff.
 #
@@ -20,9 +20,9 @@
 
 prefixexecbin_SCRIPTS += nroff
 nroff_srcdir = $(top_srcdir)/src/roff/nroff
-PREFIXMAN1 += src/roff/nroff/nroff.n
+PREFIXMAN1 += src/roff/nroff/nroff.1.n
 EXTRA_DIST += \
-  src/roff/nroff/nroff.man \
+  src/roff/nroff/nroff.1.man \
   src/roff/nroff/nroff.sh
 
 nroff: $(nroff_srcdir)/nroff.sh $(SH_DEPS_SED_SCRIPT)
diff --git a/src/roff/troff/troff.man b/src/roff/troff/troff.1.man
similarity index 100%
rename from src/roff/troff/troff.man
rename to src/roff/troff/troff.1.man
diff --git a/src/roff/troff/troff.am b/src/roff/troff/troff.am
index 50091a2..699438b 100644
--- a/src/roff/troff/troff.am
+++ b/src/roff/troff/troff.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-15
 #      Free Software Foundation, Inc.
 #
-# Latest update: 5 Aug 2015
+# Latest update: 7 Aug 2015
 #
 # This file is part of groff.
 #
@@ -19,10 +19,10 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 prefixexecbin_PROGRAMS += troff
-PREFIXMAN1 += src/roff/troff/troff.n
+PREFIXMAN1 += src/roff/troff/troff.1.n
 EXTRA_DIST += \
   src/roff/troff/column.cpp \
-  src/roff/troff/troff.man \
+  src/roff/troff/troff.1.man \
   src/roff/troff/TODO
 troff_LDADD = libgroff.a lib/libgnu.a $(LIBM)
 troff_SOURCES = \
diff --git a/src/utils/addftinfo/addftinfo.man b/src/utils/addftinfo/addftinfo.1.man
similarity index 100%
rename from src/utils/addftinfo/addftinfo.man
rename to src/utils/addftinfo/addftinfo.1.man
diff --git a/src/utils/addftinfo/addftinfo.am b/src/utils/addftinfo/addftinfo.am
index b029685..40fef40 100644
--- a/src/utils/addftinfo/addftinfo.am
+++ b/src/utils/addftinfo/addftinfo.am
@@ -23,8 +23,8 @@
 ########################################################################
 
 bin_PROGRAMS += addftinfo
-man1_MANS += src/utils/addftinfo/addftinfo.n
-EXTRA_DIST += src/utils/addftinfo/addftinfo.man
+man1_MANS += src/utils/addftinfo/addftinfo.1.n
+EXTRA_DIST += src/utils/addftinfo/addftinfo.1.man
 addftinfo_LDADD = libgroff.a
 addftinfo_SOURCES = \
   src/utils/addftinfo/addftinfo.cpp \
diff --git a/src/utils/afmtodit/afmtodit.man b/src/utils/afmtodit/afmtodit.1.man
similarity index 100%
rename from src/utils/afmtodit/afmtodit.man
rename to src/utils/afmtodit/afmtodit.1.man
diff --git a/src/utils/afmtodit/afmtodit.am b/src/utils/afmtodit/afmtodit.am
index 707880f..e57a928 100644
--- a/src/utils/afmtodit/afmtodit.am
+++ b/src/utils/afmtodit/afmtodit.am
@@ -4,7 +4,7 @@
 #
 # Copyright (C) 2013-2015  Free Software Foundation, Inc.
 #
-# Latest update: 5 Aug 2015
+# Latest update: 7 Aug 2015
 #
 # This file is part of groff.
 #
@@ -26,9 +26,9 @@
 afmtodit_srcdir = $(top_srcdir)/src/utils/afmtodit
 
 bin_SCRIPTS += afmtodit
-man1_MANS += src/utils/afmtodit/afmtodit.n
+man1_MANS += src/utils/afmtodit/afmtodit.1.n
 EXTRA_DIST += \
-  src/utils/afmtodit/afmtodit.man \
+  src/utils/afmtodit/afmtodit.1.man \
   src/utils/afmtodit/afmtodit.pl \
   src/utils/afmtodit/afmtodit.tables \
   src/utils/afmtodit/make-afmtodit-tables
diff --git a/src/utils/hpftodit/hpftodit.man b/src/utils/hpftodit/hpftodit.1.man
similarity index 100%
rename from src/utils/hpftodit/hpftodit.man
rename to src/utils/hpftodit/hpftodit.1.man
diff --git a/src/utils/hpftodit/hpftodit.am b/src/utils/hpftodit/hpftodit.am
index cb9d27b..4172919 100644
--- a/src/utils/hpftodit/hpftodit.am
+++ b/src/utils/hpftodit/hpftodit.am
@@ -4,7 +4,7 @@
 #
 # Copyright (C) 2014-2015  Free Software Foundation, Inc.
 #
-# Latest update: 5 Aug 2015
+# Latest update: 7 Aug 2015
 #
 # `groff' is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -23,8 +23,8 @@
 ########################################################################
 
 bin_PROGRAMS += hpftodit
-man1_MANS += src/utils/hpftodit/hpftodit.n
-EXTRA_DIST += src/utils/hpftodit/hpftodit.man
+man1_MANS += src/utils/hpftodit/hpftodit.1.n
+EXTRA_DIST += src/utils/hpftodit/hpftodit.1.man
 hpftodit_LDADD = libgroff.a $(LIBM)
 hpftodit_SOURCES = \
   src/utils/hpftodit/hpftodit.cpp \
diff --git a/src/utils/indxbib/indxbib.man b/src/utils/indxbib/indxbib.1.man
similarity index 100%
rename from src/utils/indxbib/indxbib.man
rename to src/utils/indxbib/indxbib.1.man
diff --git a/src/utils/indxbib/indxbib.am b/src/utils/indxbib/indxbib.am
index c2651f4..8c666f8 100644
--- a/src/utils/indxbib/indxbib.am
+++ b/src/utils/indxbib/indxbib.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-2015
 #      Free Software Foundation, Inc.
 #
-# Latest update: 5 Aug 2015
+# Latest update: 7 Aug 2015
 #
 # This file is part of groff.
 #
@@ -25,9 +25,9 @@ indxbib_SOURCES = \
   src/utils/indxbib/signal.c
 src/utils/indxbib/indxbib.$(OBJEXT): defs.h
 indxbib_LDADD = libbib.a libgroff.a $(LIBM)
-PREFIXMAN1 += src/utils/indxbib/indxbib.n
+PREFIXMAN1 += src/utils/indxbib/indxbib.1.n
 EXTRA_DIST += \
-  src/utils/indxbib/indxbib.man \
+  src/utils/indxbib/indxbib.1.man \
   src/utils/indxbib/eign
 
 install-data-local: install_indxbib
diff --git a/src/utils/lkbib/lkbib.man b/src/utils/lkbib/lkbib.1.man
similarity index 100%
rename from src/utils/lkbib/lkbib.man
rename to src/utils/lkbib/lkbib.1.man
diff --git a/src/utils/lkbib/lkbib.am b/src/utils/lkbib/lkbib.am
index 3b15076..5049352 100644
--- a/src/utils/lkbib/lkbib.am
+++ b/src/utils/lkbib/lkbib.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-2015
 #      Free Software Foundation, Inc.
 #
-# Latest update: 5 Aug 2015
+# Latest update: 7 Aug 2015
 #
 # This file is part of groff.
 #
@@ -19,8 +19,8 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 bin_PROGRAMS += lkbib
-man1_MANS += src/utils/lkbib/lkbib.n
-EXTRA_DIST += src/utils/lkbib/lkbib.man
+man1_MANS += src/utils/lkbib/lkbib.1.n
+EXTRA_DIST += src/utils/lkbib/lkbib.1.man
 lkbib_LDADD = libbib.a libgroff.a $(LIBM)
 lkbib_SOURCES = src/utils/lkbib/lkbib.cpp
 src/utils/lkbib/lkbib.$(OBJEXT): defs.h
diff --git a/src/utils/lookbib/lookbib.man b/src/utils/lookbib/lookbib.1.man
similarity index 100%
rename from src/utils/lookbib/lookbib.man
rename to src/utils/lookbib/lookbib.1.man
diff --git a/src/utils/lookbib/lookbib.am b/src/utils/lookbib/lookbib.am
index 7fda71a..f0db884 100644
--- a/src/utils/lookbib/lookbib.am
+++ b/src/utils/lookbib/lookbib.am
@@ -19,8 +19,8 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 prefixexecbin_PROGRAMS += lookbib
-PREFIXMAN1 += src/utils/lookbib/lookbib.n
-EXTRA_DIST += src/utils/lookbib/lookbib.man
+PREFIXMAN1 += src/utils/lookbib/lookbib.1.n
+EXTRA_DIST += src/utils/lookbib/lookbib.1.man
 lookbib_LDADD = libbib.a libgroff.a $(LIBM)
 lookbib_SOURCES = src/utils/lookbib/lookbib.cpp
 
diff --git a/src/utils/pfbtops/pfbtops.man b/src/utils/pfbtops/pfbtops.1.man
similarity index 100%
rename from src/utils/pfbtops/pfbtops.man
rename to src/utils/pfbtops/pfbtops.1.man
diff --git a/src/utils/pfbtops/pfbtops.am b/src/utils/pfbtops/pfbtops.am
index bc99cfd..8275968 100644
--- a/src/utils/pfbtops/pfbtops.am
+++ b/src/utils/pfbtops/pfbtops.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-2015
 #      Free Software Foundation, Inc.
 #
-# Latest update: 5 Aug 2015
+# Latest update: 7 Aug 2015
 #
 # This file is part of groff.
 #
@@ -19,8 +19,8 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 bin_PROGRAMS += pfbtops
-man1_MANS += src/utils/pfbtops/pfbtops.n
-EXTRA_DIST += src/utils/pfbtops/pfbtops.man
+man1_MANS += src/utils/pfbtops/pfbtops.1.n
+EXTRA_DIST += src/utils/pfbtops/pfbtops.1.man
 pfbtops_SOURCES = src/utils/pfbtops/pfbtops.c
 pfbtops_LDADD = libgroff.a $(LIBM)
 # We use the following trick to force the use of C++ compiler
diff --git a/src/utils/tfmtodit/tfmtodit.man b/src/utils/tfmtodit/tfmtodit.1.man
similarity index 100%
rename from src/utils/tfmtodit/tfmtodit.man
rename to src/utils/tfmtodit/tfmtodit.1.man
diff --git a/src/utils/tfmtodit/tfmtodit.am b/src/utils/tfmtodit/tfmtodit.am
index 00ee06f..fa92c3c 100644
--- a/src/utils/tfmtodit/tfmtodit.am
+++ b/src/utils/tfmtodit/tfmtodit.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-2015
 #      Free Software Foundation, Inc.
 #
-# Latest update: 5 Aug 2015
+# Latest update: 7 Aug 2015
 #
 # This file is part of groff.
 #
@@ -19,8 +19,8 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 bin_PROGRAMS += tfmtodit
-man1_MANS += src/utils/tfmtodit/tfmtodit.n
-EXTRA_DIST += src/utils/tfmtodit/tfmtodit.man
+man1_MANS += src/utils/tfmtodit/tfmtodit.1.n
+EXTRA_DIST += src/utils/tfmtodit/tfmtodit.1.man
 tfmtodit_SOURCES = src/utils/tfmtodit/tfmtodit.cpp
 tfmtodit_LDADD = libgroff.a $(LIBM)
 
diff --git a/src/utils/xtotroff/xtotroff.man b/src/utils/xtotroff/xtotroff.1.man
similarity index 100%
rename from src/utils/xtotroff/xtotroff.man
rename to src/utils/xtotroff/xtotroff.1.man
diff --git a/src/utils/xtotroff/xtotroff.am b/src/utils/xtotroff/xtotroff.am
index fc43ba0..5960364 100644
--- a/src/utils/xtotroff/xtotroff.am
+++ b/src/utils/xtotroff/xtotroff.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-2015
 #      Free Software Foundation, Inc.
 #
-# Latest update: 5 Aug 2015
+# Latest update: 7 Aug 2015
 #
 # This file is part of groff.
 #
@@ -20,14 +20,14 @@
 
 if !WITHOUT_X11
 bin_PROGRAMS += xtotroff
-man1_MANS += src/utils/xtotroff/xtotroff.n
+man1_MANS += src/utils/xtotroff/xtotroff.1.n
 xtotroff_SOURCES = src/utils/xtotroff/xtotroff.c
 XLIBS=$(LIBXUTIL) $(LIBGROFF)
 xtotroff_LDADD = libxutil.a libgroff.a $(X_LIBS) $(X_PRE_LIBS) \
   -lXaw -lXt -lX11 $(X_EXTRA_LIBS) $(LIBM)
 xtotroff_CPPFLAGS = $(AM_CPPFLAGS) $(X_CFLAGS)
 endif
-EXTRA_DIST += src/utils/xtotroff/xtotroff.man
+EXTRA_DIST += src/utils/xtotroff/xtotroff.1.man
 
 
 ########################################################################
diff --git a/tmac/groff_man.man b/tmac/groff_man.7.man
similarity index 100%
rename from tmac/groff_man.man
rename to tmac/groff_man.7.man
diff --git a/tmac/groff_mdoc.man b/tmac/groff_mdoc.7.man
similarity index 100%
rename from tmac/groff_mdoc.man
rename to tmac/groff_mdoc.7.man
diff --git a/tmac/groff_me.man b/tmac/groff_me.7.man
similarity index 100%
rename from tmac/groff_me.man
rename to tmac/groff_me.7.man
diff --git a/tmac/groff_ms.man b/tmac/groff_ms.7.man
similarity index 100%
rename from tmac/groff_ms.man
rename to tmac/groff_ms.7.man
diff --git a/tmac/groff_trace.man b/tmac/groff_trace.7.man
similarity index 100%
rename from tmac/groff_trace.man
rename to tmac/groff_trace.7.man
diff --git a/tmac/groff_www.man b/tmac/groff_www.7.man
similarity index 100%
rename from tmac/groff_www.man
rename to tmac/groff_www.7.man
diff --git a/tmac/tmac.am b/tmac/tmac.am
index c387892..410ffb8 100644
--- a/tmac/tmac.am
+++ b/tmac/tmac.am
@@ -3,7 +3,7 @@
 #      Written by James Clark (jjc@jclark.com)
 #      Automake migration by Bertrand Garrigues
 #
-# Latest update: 5 Aug 2015
+# Latest update: 7 Aug 2015
 #
 # This file is part of groff.
 #
@@ -23,12 +23,12 @@ tmac_srcdir = $(top_srcdir)/tmac
 tmac_builddir = $(top_builddir)/tmac
 
 man7_MANS += \
-  tmac/groff_ms.n \
-  tmac/groff_man.n \
-  tmac/groff_me.n \
-  tmac/groff_mdoc.n \
-  tmac/groff_trace.n \
-  tmac/groff_www.n
+  tmac/groff_ms.7.n \
+  tmac/groff_man.7.n \
+  tmac/groff_me.7.n \
+  tmac/groff_mdoc.7.n \
+  tmac/groff_trace.7.n \
+  tmac/groff_www.7.n
 
 TMACNORMALFILES = \
   tmac/man.tmac \
@@ -121,12 +121,12 @@ MOSTLYCLEANFILES += $(TMACMDOCFILES) tmac/www.tmac $(TMACSTRIPFILES) \
 
 EXTRA_DIST += \
   tmac/fixmacros.sed \
-  tmac/groff_ms.man \
-  tmac/groff_man.man \
-  tmac/groff_me.man \
-  tmac/groff_mdoc.man \
-  tmac/groff_trace.man \
-  tmac/groff_www.man \
+  tmac/groff_ms.7.man \
+  tmac/groff_man.7.man \
+  tmac/groff_me.7.man \
+  tmac/groff_mdoc.7.man \
+  tmac/groff_trace.7.man \
+  tmac/groff_www.7.man \
   tmac/hyphenex.pl \
   tmac/LOCALIZATION \
   tmac/man.ultrix \


From MAILER-DAEMON Sat Aug 08 23:32:39 2015
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1ZOHLj-000757-Qf
	for mharc-groff-commit@gnu.org; Sat, 08 Aug 2015 23:32:39 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:36470)
	by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <wl@gnu.org>)
	id 1ZOHLb-00073u-H6
	for groff-commit@gnu.org; Sat, 08 Aug 2015 23:32:38 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <wl@gnu.org>) id 1ZOHLU-00074R-Q0
	for groff-commit@gnu.org; Sat, 08 Aug 2015 23:32:31 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:52925)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <wl@gnu.org>)
	id 1ZOHLU-00074B-LB
	for groff-commit@gnu.org; Sat, 08 Aug 2015 23:32:24 -0400
Received: from wl by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <wl@gnu.org>) id 1ZOHLT-0008Jx-A3
	for groff-commit@gnu.org; Sun, 09 Aug 2015 03:32:23 +0000
Date: Sun, 09 Aug 2015 03:32:23 +0000
Message-Id: <E1ZOHLT-0008Jx-A3@vcs.savannah.gnu.org>
To: groff-commit@gnu.org
Subject: [groff] 01/01: Revert previous commit,
	since it doesn't work correctly yet.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
In-Reply-To: groff@gnu.org
References: <20150809033223.31954.66996@vcs.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: e89eadb042a8aacd3dc85768249eb8166a890d24
Auto-Submitted: auto-generated
From: Werner LEMBERG <wl@gnu.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 140.186.70.72
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: groff@gnu.org
List-Id: <groff-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/groff-commit>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 09 Aug 2015 03:32:38 -0000

wl pushed a commit to branch master
in repository groff.

commit e89eadb042a8aacd3dc85768249eb8166a890d24
Author: Werner Lemberg <wl@gnu.org>
Date:   Sun Aug 9 05:31:00 2015 +0200

    Revert previous commit, since it doesn't work correctly yet.
---
 ChangeLog                                          |    4 ++
 Makefile.am                                        |   18 +++++-----
 contrib/chem/chem.am                               |    6 ++--
 contrib/chem/{chem.1.man => chem.man}              |    0
 contrib/eqn2graph/eqn2graph.am                     |    6 ++--
 .../eqn2graph/{eqn2graph.1.man => eqn2graph.man}   |    0
 contrib/gdiffmk/ChangeLog                          |    4 --
 contrib/gdiffmk/gdiffmk.am                         |    4 +-
 contrib/gdiffmk/{gdiffmk.1.man => gdiffmk.man}     |    0
 contrib/glilypond/ChangeLog                        |    4 --
 contrib/glilypond/glilypond.am                     |    6 ++--
 .../glilypond/{glilypond.1.man => glilypond.man}   |    0
 contrib/gperl/ChangeLog                            |    4 --
 contrib/gperl/gperl.am                             |    6 ++--
 contrib/gperl/{gperl.1.man => gperl.man}           |    0
 contrib/gpinyin/ChangeLog                          |    4 --
 contrib/gpinyin/gpinyin.am                         |    6 ++--
 contrib/gpinyin/{gpinyin.1.man => gpinyin.man}     |    0
 contrib/grap2graph/grap2graph.am                   |    6 ++--
 .../{grap2graph.1.man => grap2graph.man}           |    0
 contrib/groff_filenames/groff_filenames.am         |    6 ++--
 .../{groff_filenames.7.man => groff_filenames.man} |    0
 contrib/groffer/ChangeLog                          |    4 --
 contrib/groffer/groffer.am                         |   38 ++++++++++----------
 contrib/groffer/{groffer.1.man => groffer.man}     |    0
 contrib/groffer/{roff2.1.man => roff2.man}         |    0
 contrib/hdtbl/ChangeLog                            |    4 --
 .../hdtbl/{groff_hdtbl.7.man => groff_hdtbl.man}   |    0
 contrib/hdtbl/hdtbl.am                             |    8 ++--
 contrib/mm/ChangeLog                               |    4 --
 contrib/mm/Makefile.sim                            |    8 ++--
 contrib/mm/{groff_mm.7.man => groff_mm.man}        |    0
 contrib/mm/{groff_mmse.7.man => groff_mmse.man}    |    0
 contrib/mm/mm.am                                   |   14 ++++----
 contrib/mm/{mmroff.1.man => mmroff.man}            |    0
 contrib/mom/ChangeLog                              |    4 --
 contrib/mom/{groff_mom.7.man => groff_mom.man}     |    0
 contrib/mom/mom.am                                 |    6 ++--
 contrib/pdfmark/ChangeLog                          |    4 --
 contrib/pdfmark/pdfmark.am                         |    6 ++--
 contrib/pdfmark/{pdfroff.1.man => pdfroff.man}     |    0
 contrib/pic2graph/pic2graph.am                     |    6 ++--
 .../pic2graph/{pic2graph.1.man => pic2graph.man}   |    0
 man/{ditroff.7.man => ditroff.man}                 |    0
 man/{groff.7.man => groff.man}                     |    0
 man/{groff_char.7.man => groff_char.man}           |    0
 man/{groff_diff.7.man => groff_diff.man}           |    0
 man/{groff_font.5.man => groff_font.man}           |    0
 man/{groff_out.5.man => groff_out.man}             |    0
 man/{groff_tmac.5.man => groff_tmac.man}           |    0
 man/man.am                                         |   34 +++++++++---------
 man/{roff.7.man => roff.man}                       |    0
 src/devices/grodvi/grodvi.am                       |    6 ++--
 src/devices/grodvi/{grodvi.1.man => grodvi.man}    |    0
 src/devices/grohtml/grohtml.am                     |    6 ++--
 src/devices/grohtml/{grohtml.1.man => grohtml.man} |    0
 src/devices/grolbp/grolbp.am                       |    6 ++--
 src/devices/grolbp/{grolbp.1.man => grolbp.man}    |    0
 src/devices/grolj4/grolj4.am                       |    8 ++--
 src/devices/grolj4/{grolj4.1.man => grolj4.man}    |    0
 .../grolj4/{lj4_font.5.man => lj4_font.man}        |    0
 src/devices/gropdf/gropdf.am                       |   10 +++---
 src/devices/gropdf/{gropdf.1.man => gropdf.man}    |    0
 src/devices/gropdf/{pdfmom.1.man => pdfmom.man}    |    0
 src/devices/grotty/grotty.am                       |    6 ++--
 src/devices/grotty/{grotty.1.man => grotty.man}    |    0
 .../xditview/{gxditview.1.man => gxditview.man}    |    0
 src/devices/xditview/xditview.am                   |    4 +-
 src/preproc/eqn/eqn.am                             |    8 ++--
 src/preproc/eqn/{eqn.1.man => eqn.man}             |    0
 src/preproc/eqn/{neqn.1.man => neqn.man}           |    0
 src/preproc/grn/grn.am                             |    6 ++--
 src/preproc/grn/{grn.1.man => grn.man}             |    0
 src/preproc/pic/pic.am                             |    6 ++--
 src/preproc/pic/{pic.1.man => pic.man}             |    0
 src/preproc/preconv/preconv.am                     |    6 ++--
 src/preproc/preconv/{preconv.1.man => preconv.man} |    0
 src/preproc/refer/refer.am                         |    6 ++--
 src/preproc/refer/{refer.1.man => refer.man}       |    0
 src/preproc/soelim/soelim.am                       |    6 ++--
 src/preproc/soelim/{soelim.1.man => soelim.man}    |    0
 src/preproc/tbl/tbl.am                             |    6 ++--
 src/preproc/tbl/{tbl.1.man => tbl.man}             |    0
 src/roff/groff/groff.am                            |    6 ++--
 src/roff/groff/{groff.1.man => groff.man}          |    0
 src/roff/grog/grog.am                              |    4 +-
 src/roff/grog/{grog.1.man => grog.man}             |    0
 src/roff/nroff/nroff.am                            |    6 ++--
 src/roff/nroff/{nroff.1.man => nroff.man}          |    0
 src/roff/troff/troff.am                            |    6 ++--
 src/roff/troff/{troff.1.man => troff.man}          |    0
 src/utils/addftinfo/addftinfo.am                   |    4 +-
 .../addftinfo/{addftinfo.1.man => addftinfo.man}   |    0
 src/utils/afmtodit/afmtodit.am                     |    6 ++--
 .../afmtodit/{afmtodit.1.man => afmtodit.man}      |    0
 src/utils/hpftodit/hpftodit.am                     |    6 ++--
 .../hpftodit/{hpftodit.1.man => hpftodit.man}      |    0
 src/utils/indxbib/indxbib.am                       |    6 ++--
 src/utils/indxbib/{indxbib.1.man => indxbib.man}   |    0
 src/utils/lkbib/lkbib.am                           |    6 ++--
 src/utils/lkbib/{lkbib.1.man => lkbib.man}         |    0
 src/utils/lookbib/lookbib.am                       |    4 +-
 src/utils/lookbib/{lookbib.1.man => lookbib.man}   |    0
 src/utils/pfbtops/pfbtops.am                       |    6 ++--
 src/utils/pfbtops/{pfbtops.1.man => pfbtops.man}   |    0
 src/utils/tfmtodit/tfmtodit.am                     |    6 ++--
 .../tfmtodit/{tfmtodit.1.man => tfmtodit.man}      |    0
 src/utils/xtotroff/xtotroff.am                     |    6 ++--
 .../xtotroff/{xtotroff.1.man => xtotroff.man}      |    0
 tmac/{groff_man.7.man => groff_man.man}            |    0
 tmac/{groff_mdoc.7.man => groff_mdoc.man}          |    0
 tmac/{groff_me.7.man => groff_me.man}              |    0
 tmac/{groff_ms.7.man => groff_ms.man}              |    0
 tmac/{groff_trace.7.man => groff_trace.man}        |    0
 tmac/{groff_www.7.man => groff_www.man}            |    0
 tmac/tmac.am                                       |   26 +++++++-------
 116 files changed, 190 insertions(+), 222 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9894b05..fae9ea6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-08-09  werner LEMBERG  <wl@gnu.org>
+
+	Revert previous commit, since it doesn't work correctly yet.
+
 2015-08-07  Bernd Warken  <groff-bernd.warken-72@web.de>
 
 	Add section name to all man-page names.
diff --git a/Makefile.am b/Makefile.am
index 6e9bfb7..17e10ad 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@
 # Original Makefile.in written by James Clark (jjc@jclark.com)
 # Migrated to Automake by Bertrand Garrigues
 #
-# Last update: 7 Aug 2015
+# Last update: 5 Aug 2015
 #
 # This file is part of groff.
 #
@@ -708,34 +708,34 @@ if USEPROGRAMPREFIX
 generate_man_files: $(PREFIXMAN1)
 install-prefix-man:
 	for f in $(PREFIXMAN1); do \
-	  manfile_final_name=`basename $$f | sed 's/\.[0-9]\.n$$//'`; \
+	  manfile_final_name=`basename $$f | sed 's/n$$/1/'`; \
 	  cp -f $$f $(DESTDIR)$(man1dir)/$(NAMEPREFIX)$$manfile_final_name; \
 	done
 	for f in $(PREFIXMAN5); do \
-	  manfile_final_name=`basename $$f | sed 's/\.[0-9]\.n$$//'`; \
+	  manfile_final_name=`basename $$f | sed 's/n$$/5/'`; \
 	  cp -f $$f $(DESTDIR)$(man5dir)/$(NAMEPREFIX)$$manfile_final_name; \
 	done
 	for f in $(PREFIXMAN7); do \
-	  manfile_final_name=`basename $$f | sed 's/\.[0-9]\.n$$//'`; \
+	  manfile_final_name=`basename $$f | sed 's/n$$/7/'`; \
 	  cp -f $$f $(DESTDIR)$(man7dir)/$(NAMEPREFIX)$$manfile_final_name; \
 	done
 uninstall-prefix-man:
 	for f in $(PREFIXMAN1); do \
-	  manfile_final_name=`basename $$f | sed 's/\.[0-9]\.n$$//'`; \
+	  manfile_final_name=`basename $$f | sed 's/n$$/1/'`; \
 	  rm -f $(DESTDIR)$(man1dir)/$(NAMEPREFIX)$$manfile_final_name; \
 	done
 	for f in $(PREFIXMAN5); do \
-	  manfile_final_name=`basename $$f | sed 's/\.[0-9]\.n$$//'`; \
+	  manfile_final_name=`basename $$f | sed 's/n$$/5/'`; \
 	  rm -f $(DESTDIR)$(man5dir)/$(NAMEPREFIX)$$manfile_final_name; \
 	done
 	for f in $(PREFIXMAN7); do \
-	  manfile_final_name=`basename $$f | sed 's/\.[0-9]\.n$$//'`; \
+	  manfile_final_name=`basename $$f | sed 's/n$$/7/'`; \
 	  rm -f $(DESTDIR)$(man7dir)/$(NAMEPREFIX)$$manfile_final_name; \
 	done
 else
 man1_MANS += $(PREFIXMAN1)
-man5_MANS += $(PREFIXMAN5)
-man7_MANS += $(PREFIXMAN7)
+man1_MANS += $(PREFIXMAN5)
+man1_MANS += $(PREFIXMAN7)
 install-prefix-man:
 uninstall-prefix-man:
 generate_man_files:
diff --git a/contrib/chem/chem.am b/contrib/chem/chem.am
index a3b6446..a8ca170 100644
--- a/contrib/chem/chem.am
+++ b/contrib/chem/chem.am
@@ -7,7 +7,7 @@
 # Written by Bernd Warken <groff-bernd.warken-72@web.de>.
 # Moved to automake by Bertrand Garrigues
 #
-# Last update: 7 Aug 2015
+# Last update: 6 Aug 2015
 #
 # This file is part of `chem' which is part of `groff'.
 #
@@ -56,14 +56,14 @@ nodist_chemexample122_DATA = contrib/chem/examples/122/README
 endif
 EXTRA_DIST += \
   contrib/chem/ChangeLog \
-  contrib/chem/chem.1.man \
+  contrib/chem/chem.man \
   contrib/chem/chem.pic \
   contrib/chem/chem.pl \
   contrib/chem/README.txt \
   contrib/chem/examples/README.txt \
   contrib/chem/examples/122/README.txt
 
-man1_MANS += contrib/chem/chem.1.n
+man1_MANS += contrib/chem/chem.n
 MOSTLYCLEANFILES += $(CHEM_GENEXAMPLES) $(nodist_chemexample122_DATA) \
   contrib/chem/README
 
diff --git a/contrib/chem/chem.1.man b/contrib/chem/chem.man
similarity index 100%
rename from contrib/chem/chem.1.man
rename to contrib/chem/chem.man
diff --git a/contrib/eqn2graph/eqn2graph.am b/contrib/eqn2graph/eqn2graph.am
index fc1bc0d..6ffa0ec 100644
--- a/contrib/eqn2graph/eqn2graph.am
+++ b/contrib/eqn2graph/eqn2graph.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2002-2014
 #   Free Software Foundation, Inc.
 #
-# Last update: 7 Aug 2015
+# Last update: 5 Aug 2015
 #
 # This file is part of groff.
 #
@@ -23,9 +23,9 @@
 
 eqn2graph_srcdir = $(top_srcdir)/contrib/eqn2graph
 bin_SCRIPTS += eqn2graph
-man1_MANS += contrib/eqn2graph/eqn2graph.1.n
+man1_MANS += contrib/eqn2graph/eqn2graph.n
 EXTRA_DIST += \
-  contrib/eqn2graph/eqn2graph.1.man \
+  contrib/eqn2graph/eqn2graph.man \
   contrib/eqn2graph/eqn2graph.sh
 
 eqn2graph: $(top_srcdir)/contrib/eqn2graph/eqn2graph.sh
diff --git a/contrib/eqn2graph/eqn2graph.1.man b/contrib/eqn2graph/eqn2graph.man
similarity index 100%
rename from contrib/eqn2graph/eqn2graph.1.man
rename to contrib/eqn2graph/eqn2graph.man
diff --git a/contrib/gdiffmk/ChangeLog b/contrib/gdiffmk/ChangeLog
index da16587..d51c07a 100644
--- a/contrib/gdiffmk/ChangeLog
+++ b/contrib/gdiffmk/ChangeLog
@@ -1,7 +1,3 @@
-2015-08-07  Bernd Warken  <groff-bernd.warken-72@web.de>
-
-	* gdiffmk.1.man, gdiffmk.am: Rename gdiffmk.man.
-
 2015-08-05  Bernd Warken  <groff-bernd.warken-72@web.de>
 
 	* gdiffmk.am: Add `Last update'.  Setup Emacs mode.
diff --git a/contrib/gdiffmk/gdiffmk.am b/contrib/gdiffmk/gdiffmk.am
index df6ef67..6dbcf02 100644
--- a/contrib/gdiffmk/gdiffmk.am
+++ b/contrib/gdiffmk/gdiffmk.am
@@ -28,9 +28,9 @@
 gdiffmk_srcdir = $(top_srcdir)/contrib/gdiffmk
 bin_SCRIPTS += gdiffmk
 TESTS += contrib/gdiffmk/tests/gdiffmk_tests.sh
-man1_MANS += contrib/gdiffmk/gdiffmk.1.n
+man1_MANS += contrib/gdiffmk/gdiffmk.n
 EXTRA_DIST += \
-  contrib/gdiffmk/gdiffmk.1.man \
+  contrib/gdiffmk/gdiffmk.man \
   contrib/gdiffmk/ChangeLog \
   contrib/gdiffmk/README \
   contrib/gdiffmk/gdiffmk.sh \
diff --git a/contrib/gdiffmk/gdiffmk.1.man b/contrib/gdiffmk/gdiffmk.man
similarity index 100%
rename from contrib/gdiffmk/gdiffmk.1.man
rename to contrib/gdiffmk/gdiffmk.man
diff --git a/contrib/glilypond/ChangeLog b/contrib/glilypond/ChangeLog
index a1b6c28..1c0acfd 100644
--- a/contrib/glilypond/ChangeLog
+++ b/contrib/glilypond/ChangeLog
@@ -1,9 +1,5 @@
 2015-08-05  Bernd Warken  <groff-bernd.warken-72@web.de>
 
-	glilypond.1.man, glilypond.am: Rename `glilypond.man'.
-
-2015-08-05  Bernd Warken  <groff-bernd.warken-72@web.de>
-
 	* glilypond.am: Add `Last update'.  Setup Emacs mode.
 
 2015-04-03  Werner LEMBERG  <wl@gnu.org>
diff --git a/contrib/glilypond/glilypond.am b/contrib/glilypond/glilypond.am
index b417347..56018c1 100644
--- a/contrib/glilypond/glilypond.am
+++ b/contrib/glilypond/glilypond.am
@@ -8,7 +8,7 @@
 # Bernd Warken <groff-bernd.warken-72@web.de>.
 # Automake migration by Bertrand Garrigues
 
-# Last update: 7 Aug 2015
+# Last update: 5 Aug 2015
 
 # This file is part of `glilypond' which is part of `groff'.
 
@@ -28,7 +28,7 @@
 ########################################################################
 glilypond_srcdir = $(top_srcdir)/contrib/glilypond
 bin_SCRIPTS += glilypond
-man1_MANS += contrib/glilypond/glilypond.1.n
+man1_MANS += contrib/glilypond/glilypond.n
 
 # files going to lib directory `$(glilypond_dir)'
 # TODO glilypond_dir is subsitued by configure.ac, check if this could be removed
@@ -41,7 +41,7 @@ dist_glilypond_DATA = \
 EXTRA_DIST += \
   contrib/glilypond/ChangeLog \
   contrib/glilypond/ChangeLog.0x \
-  contrib/glilypond/glilypond.1.man \
+  contrib/glilypond/glilypond.man \
   contrib/glilypond/glilypond.pl \
   contrib/glilypond/README.txt \
   contrib/glilypond/examples/example.groff
diff --git a/contrib/glilypond/glilypond.1.man b/contrib/glilypond/glilypond.man
similarity index 100%
rename from contrib/glilypond/glilypond.1.man
rename to contrib/glilypond/glilypond.man
diff --git a/contrib/gperl/ChangeLog b/contrib/gperl/ChangeLog
index 6ce945b..0d8b7c0 100644
--- a/contrib/gperl/ChangeLog
+++ b/contrib/gperl/ChangeLog
@@ -1,7 +1,3 @@
-2015-08-07  Bernd Warken  <groff-bernd.warken-72@web.de>
-
-	* gperl.1.man, gperl.am: Rename `gperl.man'.
-
 2015-08-05  Bernd Warken  <groff-bernd.warken-72@web.de>
 
 	* gperl.am: Add `Last update'.  Setup Emacs mode.
diff --git a/contrib/gperl/gperl.am b/contrib/gperl/gperl.am
index 34c6e98..79d0e92 100644
--- a/contrib/gperl/gperl.am
+++ b/contrib/gperl/gperl.am
@@ -6,7 +6,7 @@
 # Written by Bernd Warken <groff-bernd.warken-72@web.de>.
 # Automake migration by Bertrand Garrigues
 
-# Last update: 7 Aug 2015
+# Last update: 5 Aug 2015
 
 # This file is part of `gperl' which is part of `groff'.
 
@@ -27,10 +27,10 @@
 ########################################################################
 
 bin_SCRIPTS += gperl
-man1_MANS += contrib/gperl/gperl.1.n
+man1_MANS += contrib/gperl/gperl.n
 EXTRA_DIST += \
   contrib/gperl/ChangeLog \
-  contrib/gperl/gperl.1.man \
+  contrib/gperl/gperl.man \
   contrib/gperl/gperl.pl
 gperl: $(top_srcdir)/contrib/gperl/gperl.pl shdeps.sed
 	$(RM) $@
diff --git a/contrib/gperl/gperl.1.man b/contrib/gperl/gperl.man
similarity index 100%
rename from contrib/gperl/gperl.1.man
rename to contrib/gperl/gperl.man
diff --git a/contrib/gpinyin/ChangeLog b/contrib/gpinyin/ChangeLog
index c1352de..a3b2630 100644
--- a/contrib/gpinyin/ChangeLog
+++ b/contrib/gpinyin/ChangeLog
@@ -1,9 +1,5 @@
 2015-08-05  Bernd Warken  <groff-bernd.warken-72@web.de>
 
-	* gpinyin.1.man, gpinyin.am: Rename `gpinyin.man'.
-
-2015-08-05  Bernd Warken  <groff-bernd.warken-72@web.de>
-
 	* gpinyin.am: Add `Last update'.  Setup Emacs mode.
 
 2015-04-03  Werner LEMBERG  <wl@gnu.org>
diff --git a/contrib/gpinyin/gpinyin.am b/contrib/gpinyin/gpinyin.am
index f580743..09dcb59 100644
--- a/contrib/gpinyin/gpinyin.am
+++ b/contrib/gpinyin/gpinyin.am
@@ -7,7 +7,7 @@
 # Written by Bernd Warken <groff-bernd.warken-72@web.de>.
 # Moved to automake by Bertrand Garrigues
 
-# Last update: 7 Aug 2015
+# Last update: 5 Aug 2015
 
 # This file is part of `gpinyin' which is part of `groff'.
 
@@ -31,10 +31,10 @@ gpinyin_srcdir = $(top_srcdir)/contrib/gpinyin
 bin_SCRIPTS += gpinyin
 gpinyindir = $(gpinyin_dir)
 dist_gpinyin_DATA = contrib/gpinyin/subs.pl
-man1_MANS += contrib/gpinyin/gpinyin.1.n
+man1_MANS += contrib/gpinyin/gpinyin.n
 EXTRA_DIST += \
   contrib/gpinyin/ChangeLog \
-  contrib/gpinyin/gpinyin.1.man \
+  contrib/gpinyin/gpinyin.man \
   contrib/gpinyin/gpinyin.pl
 
 gpinyin: contrib/gpinyin/gpinyin.pl
diff --git a/contrib/gpinyin/gpinyin.1.man b/contrib/gpinyin/gpinyin.man
similarity index 100%
rename from contrib/gpinyin/gpinyin.1.man
rename to contrib/gpinyin/gpinyin.man
diff --git a/contrib/grap2graph/grap2graph.am b/contrib/grap2graph/grap2graph.am
index 6018f17..6c0b51b 100644
--- a/contrib/grap2graph/grap2graph.am
+++ b/contrib/grap2graph/grap2graph.am
@@ -1,6 +1,6 @@
 # Copyright (C) 2003-2015  Free Software Foundation, Inc.
 #
-# Last update: 7 Aug 2015
+# Last update: 5 Aug 2015
 #
 # This file is part of groff.
 #
@@ -22,10 +22,10 @@
 
 grap2graph_srcdir = $(top_srcdir)/contrib/grap2graph
 bin_SCRIPTS += grap2graph
-man1_MANS += contrib/grap2graph/grap2graph.1.n
+man1_MANS += contrib/grap2graph/grap2graph.n
 EXTRA_DIST += \
   $(grap2graph_srcdir)/grap2graph.sh \
-  $(grap2graph_srcdir)/grap2graph.1.man
+  $(grap2graph_srcdir)/grap2graph.man
 grap2graph: $(grap2graph_srcdir)/grap2graph.sh
 	sed -e "s|[@]g[@]|$(g)|g" \
 	    -e "s|[@]VERSION[@]|$(VERSION)|" \
diff --git a/contrib/grap2graph/grap2graph.1.man b/contrib/grap2graph/grap2graph.man
similarity index 100%
rename from contrib/grap2graph/grap2graph.1.man
rename to contrib/grap2graph/grap2graph.man
diff --git a/contrib/groff_filenames/groff_filenames.am b/contrib/groff_filenames/groff_filenames.am
index a18ac07..4c76eaf 100644
--- a/contrib/groff_filenames/groff_filenames.am
+++ b/contrib/groff_filenames/groff_filenames.am
@@ -4,7 +4,7 @@
 
 # Copyright (C) 2013-2015  Free Software Foundation, Inc.
 
-# Last update: 7 Aug 2015
+# Last update: 5 Aug 2015
 
 # Written by Bernd Warken <groff-bernd.warken-72@web.de>.
 # Automake migration by Bertrand Garrigues
@@ -26,10 +26,10 @@
 
 ########################################################################
 
-man7_MANS += contrib/groff_filenames/groff_filenames.7.n
+man7_MANS += contrib/groff_filenames/groff_filenames.n
 EXTRA_DIST += \
   contrib/groff_filenames/ChangeLog \
-  contrib/groff_filenames/groff_filenames.7.man
+  contrib/groff_filenames/groff_filenames.man
 
 
 ########################################################################
diff --git a/contrib/groff_filenames/groff_filenames.7.man b/contrib/groff_filenames/groff_filenames.man
similarity index 100%
rename from contrib/groff_filenames/groff_filenames.7.man
rename to contrib/groff_filenames/groff_filenames.man
diff --git a/contrib/groffer/ChangeLog b/contrib/groffer/ChangeLog
index a79cc42..d9948a4 100644
--- a/contrib/groffer/ChangeLog
+++ b/contrib/groffer/ChangeLog
@@ -1,7 +1,3 @@
-2015-08-07  Bernd Warken  <groff-bernd.warken-72@web.de>
-
-	Rename all man-pages by adding a section number.
-
 2015-08-05  Bernd Warken  <groff-bernd.warken-72@web.de>
 
 	* groffer.am: Add `Last update'.  Setup Emacs mode.
diff --git a/contrib/groffer/groffer.am b/contrib/groffer/groffer.am
index 1793365..fa3f45b 100644
--- a/contrib/groffer/groffer.am
+++ b/contrib/groffer/groffer.am
@@ -8,7 +8,7 @@
 # Bernd Warken <groff-bernd.warken-72@web.de>.
 # Automake migration by Bertrand Garrigues
 
-# Last update: 7 Aug 2015
+# Last update: 5 Aug 2015
 
 # This file is part of `groffer' which is part of `groff'.
 
@@ -40,12 +40,12 @@ ROFF2PROGS = \
 
 # Generated man templates
 ROFF2MAN = \
-  contrib/groffer/roff2dvi.1.man \
-  contrib/groffer/roff2html.1.man \
-  contrib/groffer/roff2pdf.1.man \
-  contrib/groffer/roff2ps.1.man \
-  contrib/groffer/roff2text.1.man \
-  contrib/groffer/roff2x.1.man
+  contrib/groffer/roff2dvi.man \
+  contrib/groffer/roff2html.man \
+  contrib/groffer/roff2pdf.man \
+  contrib/groffer/roff2ps.man \
+  contrib/groffer/roff2text.man \
+  contrib/groffer/roff2x.man
 
 GROFFER_PERL = \
   contrib/groffer/main_subs.pl \
@@ -54,9 +54,9 @@ GROFFER_PERL = \
   contrib/groffer/subs.pl
 
 GROFFER_REST = \
-  contrib/groffer/roff2.1.man \
+  contrib/groffer/roff2.man \
   contrib/groffer/version.sh \
-  contrib/groffer/groffer.1.man \
+  contrib/groffer/groffer.man \
   contrib/groffer/groffer.pl \
   contrib/groffer/roff2.pl
 
@@ -70,13 +70,13 @@ grofferdir = $(groffer_dir)
 bin_SCRIPTS += groffer $(ROFF2PROGS)
 groffer_DATA = $(GROFFER_PERL) contrib/groffer/version.sh
 man1_MANS += \
-  contrib/groffer/groffer.1.n \
-  contrib/groffer/roff2dvi.1.n \
-  contrib/groffer/roff2html.1.n \
-  contrib/groffer/roff2pdf.1.n \
-  contrib/groffer/roff2ps.1.n \
-  contrib/groffer/roff2text.1.n \
-  contrib/groffer/roff2x.1.n
+  contrib/groffer/groffer.n \
+  contrib/groffer/roff2dvi.n \
+  contrib/groffer/roff2html.n \
+  contrib/groffer/roff2pdf.n \
+  contrib/groffer/roff2ps.n \
+  contrib/groffer/roff2text.n \
+  contrib/groffer/roff2x.n
 MOSTLYCLEANFILES += $(ROFF2MAN)
 
 $(ROFF2PROGS): $(groffer_srcdir)/roff2.pl
@@ -84,10 +84,10 @@ $(ROFF2PROGS): $(groffer_srcdir)/roff2.pl
 
 # we take roff2.man and replace the @ROFF2MODE@ by the type of file
 # (dvi, pdf, html etc ...)
-$(ROFF2MAN):  $(groffer_srcdir)/roff2.1.man
+$(ROFF2MAN):  $(groffer_srcdir)/roff2.man
 	@$(MKDIR_P) contrib/groffer
-	FILEMODE=`echo $@ | sed 's|contrib/groffer/roff2\([a-z][a-z]*\)\.1\.man|\1|g'` \
-	  && sed -e 's/[@]ROFF2MODE[@]/'"$$FILEMODE"'/g' $(groffer_srcdir)/roff2.1.man > $@;
+	FILEMODE=`echo $@ | sed 's|contrib/groffer/roff2\([a-z][a-z]*\)\.man|\1|g'` \
+	  && sed -e 's/[@]ROFF2MODE[@]/'"$$FILEMODE"'/g' $(groffer_srcdir)/roff2.man > $@;
 
 groffer: $(GROFFER_PERL) $(GROFFER_REST) $(SH_DEPS_SED_SCRIPT)
 	echo "Using perl version of groffer."; \
diff --git a/contrib/groffer/groffer.1.man b/contrib/groffer/groffer.man
similarity index 100%
rename from contrib/groffer/groffer.1.man
rename to contrib/groffer/groffer.man
diff --git a/contrib/groffer/roff2.1.man b/contrib/groffer/roff2.man
similarity index 100%
rename from contrib/groffer/roff2.1.man
rename to contrib/groffer/roff2.man
diff --git a/contrib/hdtbl/ChangeLog b/contrib/hdtbl/ChangeLog
index 36631de..77e10ac 100644
--- a/contrib/hdtbl/ChangeLog
+++ b/contrib/hdtbl/ChangeLog
@@ -1,9 +1,5 @@
 2015-08-05  Bernd Warken  <groff-bernd.warken-72@web.de>
 
-	* groff_hdtbl.7.man,  hdtbl.am: Rename groff_hdtbl.man.
-
-2015-08-05  Bernd Warken  <groff-bernd.warken-72@web.de>
-
 	* hdtbl.am: Add `Last update'.  Setup Emacs mode.
 
 2015-04-03  Werner LEMBERG  <wl@gnu.org>
diff --git a/contrib/hdtbl/groff_hdtbl.7.man b/contrib/hdtbl/groff_hdtbl.man
similarity index 100%
rename from contrib/hdtbl/groff_hdtbl.7.man
rename to contrib/hdtbl/groff_hdtbl.man
diff --git a/contrib/hdtbl/hdtbl.am b/contrib/hdtbl/hdtbl.am
index 7ec3cc0..6a7ec92 100644
--- a/contrib/hdtbl/hdtbl.am
+++ b/contrib/hdtbl/hdtbl.am
@@ -2,7 +2,7 @@
 #      Written by Werner Lemberg (wl@gnu.org)
 #      Automake migration by Bertrand Garrigues
 #
-# Last update: 7 Aug 2015
+# Last update: 5 Aug 2015
 #
 # This file is part of groff.
 #
@@ -22,7 +22,7 @@
 hdtbl_srcdir = $(top_srcdir)/contrib/hdtbl
 hdtbl_builddir = $(top_builddir)/contrib/hdtbl
 
-man7_MANS += contrib/hdtbl/groff_hdtbl.7.n
+man7_MANS += contrib/hdtbl/groff_hdtbl.n
 
 # Groff command used to generate .ps files
 HDTBL_TFLAG = -M$(hdtbl_srcdir) -M$(hdtbl_builddir)
@@ -97,7 +97,7 @@ MOSTLYCLEANFILES += $(HDTBLGENFILES) $(HDTBLPROCESSEDEXAMPLEFILES) \
 EXTRA_DIST += \
   contrib/hdtbl/ChangeLog \
   contrib/hdtbl/TODO \
-  contrib/hdtbl/groff_hdtbl.1.man \
+  contrib/hdtbl/groff_hdtbl.man \
   contrib/hdtbl/hdtbl.tmac-u \
   contrib/hdtbl/hdmisc.tmac-u
 
@@ -122,7 +122,7 @@ $(HDTBLSTRIPFILES): $(top_srcdir)/tmac/strip.sed
 	sed -f $(top_srcdir)/tmac/strip.sed $(hdtbl_srcdir)/`basename $@`-u > $@;
 
 uninstall_groffdirs: uninstall-hdtbl-hook
-ninstall-hdtbl-hook:
+uninstall-hdtbl-hook:
 	if test -d $(DESTDIR)$(hdtblexampledir); then \
 	  rmdir $(DESTDIR)$(hdtblexampledir); \
 	fi
diff --git a/contrib/mm/ChangeLog b/contrib/mm/ChangeLog
index e533bbd..6223f33 100644
--- a/contrib/mm/ChangeLog
+++ b/contrib/mm/ChangeLog
@@ -1,9 +1,5 @@
 2015-08-05  Bernd Warken  <groff-bernd.warken-72@web.de>
 
-	Rename all man-pages by adding a section number.
-
-2015-08-05  Bernd Warken  <groff-bernd.warken-72@web.de>
-
 	* mm.am, Makefile.sim: Add `Last update'.  Setup Emacs mode.
 
 Thu Jul 16 11:52:03 2015  Carsten Kunze  <carsten.kunze@arcor.de>
diff --git a/contrib/mm/Makefile.sim b/contrib/mm/Makefile.sim
index c96f2c6..dc167e7 100644
--- a/contrib/mm/Makefile.sim
+++ b/contrib/mm/Makefile.sim
@@ -1,8 +1,8 @@
 # Copyright 1991-2015  Free Software Foundation, Inc.
 #
-# Last update: 7 Aug 2015
+# Last update: 5 Aug 2015
 #
-# This file is part of hdtbl, which is part of groff.
+# This file is part of groff.
 #
 # groff is free software; you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free
@@ -46,11 +46,11 @@ mdate = 2002-05-11
 
 all:
 
-install: groff_mm.7.n groff_mmse.7.n
+install: groff_mm.n groff_mmse.n
 	$(MAKE) -f Makefile.sub tmacdir=$(tmacdir) srcdir=$(srcdir) \
 	  INSTALL_DATA='$(install)' tmac_m=$(tmac_m) install
 
-uninstall: groff_mm.7.n groff_mmse.7.n
+uninstall: groff_mm.n groff_mmse.n
 	$(MAKE) -f Makefile.sub tmacdir=$(tmacdir) srcdir=$(srcdir) \
 	  INSTALL_DATA='$(install)' tmac_m=$(tmac_m) uninstall_sub
 
diff --git a/contrib/mm/groff_mm.7.man b/contrib/mm/groff_mm.man
similarity index 100%
rename from contrib/mm/groff_mm.7.man
rename to contrib/mm/groff_mm.man
diff --git a/contrib/mm/groff_mmse.7.man b/contrib/mm/groff_mmse.man
similarity index 100%
rename from contrib/mm/groff_mmse.7.man
rename to contrib/mm/groff_mmse.man
diff --git a/contrib/mm/mm.am b/contrib/mm/mm.am
index 77f4cf9..318c0c5 100644
--- a/contrib/mm/mm.am
+++ b/contrib/mm/mm.am
@@ -1,7 +1,7 @@
 # Copyright 1991-2015
 #   Free Software Foundation, Inc.
 #
-# Last update: 7 Aug 2015
+# Last update: 5 Aug 2015
 #
 # This file is part of groff.
 #
@@ -26,10 +26,10 @@ mm_builddir = $(top_builddir)/contrib/mm
 
 bin_SCRIPTS += mmroff
 
-man1_MANS += contrib/mm/mmroff.1.n
+man1_MANS += contrib/mm/mmroff.n
 man7_MANS += \
-  contrib/mm/groff_mm.7.n \
-  contrib/mm/groff_mmse.7.n
+  contrib/mm/groff_mm.n \
+  contrib/mm/groff_mmse.n
 
 # Files installed in $(tmacdir)/mm
 MMFILES = \
@@ -57,9 +57,9 @@ EXTRA_DIST += \
   contrib/mm/mm \
   contrib/mm/NOTES \
   contrib/mm/README \
-  contrib/mm/groff_mm.7.man \
-  contrib/mm/groff_mmse.7.man \
-  contrib/mm/mmroff.1.man \
+  contrib/mm/groff_mm.man \
+  contrib/mm/groff_mmse.man \
+  contrib/mm/mmroff.man \
   contrib/mm/mmroff.pl
 
 mmroff: $(mm_srcdir)/mmroff.pl
diff --git a/contrib/mm/mmroff.1.man b/contrib/mm/mmroff.man
similarity index 100%
rename from contrib/mm/mmroff.1.man
rename to contrib/mm/mmroff.man
diff --git a/contrib/mom/ChangeLog b/contrib/mom/ChangeLog
index 5d328fb..10defb2 100644
--- a/contrib/mom/ChangeLog
+++ b/contrib/mom/ChangeLog
@@ -1,9 +1,5 @@
 2015-08-05  Bernd Warken  <groff-bernd.warken-72@web.de>
 
-	* groff_mom.7.man, mom.am: Rename `groff_mom.man'.
-
-2015-08-05  Bernd Warken  <groff-bernd.warken-72@web.de>
-
 	* mom.am: Add `Last update'.  Setup Emacs mode.
 
 * Sun Jul 26 2015
diff --git a/contrib/mom/groff_mom.7.man b/contrib/mom/groff_mom.man
similarity index 100%
rename from contrib/mom/groff_mom.7.man
rename to contrib/mom/groff_mom.man
diff --git a/contrib/mom/mom.am b/contrib/mom/mom.am
index 19918a2..db94742 100644
--- a/contrib/mom/mom.am
+++ b/contrib/mom/mom.am
@@ -3,7 +3,7 @@
 #      Written by Werner Lemberg (wl@gnu.org)
 #      Automake migration by Bertrand Garrigues
 #
-# Last update: 7 Aug 2015
+# Last update: 5 Aug 2015
 #
 # This file is part of groff.
 #
@@ -32,7 +32,7 @@ MOMPDFMOM = \
   PDFMOM_BIN_PATH="$(top_builddir)" \
   $(PDFMOMBIN) $(FFLAG) $(TFLAG) $(MOM_TFLAG) $(MOM_KFLAG)
 
-man7_MANS += contrib/mom/groff_mom.7.n
+man7_MANS += contrib/mom/groff_mom.n
 
 # Files installed in $(tmacdir).
 # MOMNORMALFILES are located in the source tree.
@@ -119,7 +119,7 @@ EXTRA_DIST += $(MOMHTMLDOCFILES) $(MOMEXAMPLEFILES) \
   contrib/mom/NEWS \
   contrib/mom/TODO \
   contrib/mom/copyright \
-  contrib/mom/groff_mom.7.man \
+  contrib/mom/groff_mom.man \
   contrib/mom/om.tmac-u
 
 MOSTLYCLEANFILES += \
diff --git a/contrib/pdfmark/ChangeLog b/contrib/pdfmark/ChangeLog
index a255803..6a7c894 100644
--- a/contrib/pdfmark/ChangeLog
+++ b/contrib/pdfmark/ChangeLog
@@ -1,7 +1,3 @@
-2015-08-07  Bernd Warken  <groff-bernd.warken-72@web.de>
-
-	* pdfroff.1.man, pdfmark.am: Rename `pdfroff.man'.
-
 2015-08-05  Bernd Warken  <groff-bernd.warken-72@web.de>
 
 	* pdfmark.am: Add `Last update'.  Setup Emacs mode.
diff --git a/contrib/pdfmark/pdfmark.am b/contrib/pdfmark/pdfmark.am
index 58e6226..6ebc6d9 100644
--- a/contrib/pdfmark/pdfmark.am
+++ b/contrib/pdfmark/pdfmark.am
@@ -3,7 +3,7 @@
 #      Written by Keith Marshall (keith.d.marshall@ntlworld.com)
 #      Automake migration by Bertrand Garrigues
 #
-# Last update: 7 Aug 2015
+# Last update: 5 Aug 2015
 #
 # This file is part of groff.
 #
@@ -23,7 +23,7 @@
 pdfmark_srcdir = $(top_srcdir)/contrib/pdfmark
 pdfmark_builddir = $(top_builddir)/contrib/pdfmark
 
-man1_MANS += contrib/pdfmark/pdfroff.1.n
+man1_MANS += contrib/pdfmark/pdfroff.n
 
 bin_SCRIPTS += pdfroff
 
@@ -52,7 +52,7 @@ EXTRA_DIST += \
   contrib/pdfmark/README \
   contrib/pdfmark/PROBLEMS \
   contrib/pdfmark/TODO \
-  contrib/pdfmark/pdfroff.1.man \
+  contrib/pdfmark/pdfroff.man \
   contrib/pdfmark/pdfroff.sh
 
 PDFMARK_PFLAG =-dpaper=$(PAGE) -P-p$(PAGE)
diff --git a/contrib/pdfmark/pdfroff.1.man b/contrib/pdfmark/pdfroff.man
similarity index 100%
rename from contrib/pdfmark/pdfroff.1.man
rename to contrib/pdfmark/pdfroff.man
diff --git a/contrib/pic2graph/pic2graph.am b/contrib/pic2graph/pic2graph.am
index 37adc92..78b6635 100644
--- a/contrib/pic2graph/pic2graph.am
+++ b/contrib/pic2graph/pic2graph.am
@@ -1,6 +1,6 @@
 # Copyright (C) 2001-2015  Free Software Foundation, Inc.
 #
-# Last update: 7 Aug 2015
+# Last update: 5 Aug 2015
 #
 # This file is part of groff.
 #
@@ -21,11 +21,11 @@
 #
 
 pic2graph_srcdir = $(top_srcdir)/contrib/pic2graph
-man1_MANS += contrib/pic2graph/pic2graph.1.n
+man1_MANS += contrib/pic2graph/pic2graph.n
 bin_SCRIPTS += pic2graph
 EXTRA_DIST += \
   contrib/pic2graph/pic2graph.sh \
-  contrib/pic2graph/pic2graph.1.man
+  contrib/pic2graph/pic2graph.man
 pic2graph: $(pic2graph_srcdir)/pic2graph.sh
 	sed -e "s|[@]g[@]|$(g)|g" \
 	    -e "s|[@]VERSION[@]|$(VERSION)|" \
diff --git a/contrib/pic2graph/pic2graph.1.man b/contrib/pic2graph/pic2graph.man
similarity index 100%
rename from contrib/pic2graph/pic2graph.1.man
rename to contrib/pic2graph/pic2graph.man
diff --git a/man/ditroff.7.man b/man/ditroff.man
similarity index 100%
rename from man/ditroff.7.man
rename to man/ditroff.man
diff --git a/man/groff.7.man b/man/groff.man
similarity index 100%
rename from man/groff.7.man
rename to man/groff.man
diff --git a/man/groff_char.7.man b/man/groff_char.man
similarity index 100%
rename from man/groff_char.7.man
rename to man/groff_char.man
diff --git a/man/groff_diff.7.man b/man/groff_diff.man
similarity index 100%
rename from man/groff_diff.7.man
rename to man/groff_diff.man
diff --git a/man/groff_font.5.man b/man/groff_font.man
similarity index 100%
rename from man/groff_font.5.man
rename to man/groff_font.man
diff --git a/man/groff_out.5.man b/man/groff_out.man
similarity index 100%
rename from man/groff_out.5.man
rename to man/groff_out.man
diff --git a/man/groff_tmac.5.man b/man/groff_tmac.man
similarity index 100%
rename from man/groff_tmac.5.man
rename to man/groff_tmac.man
diff --git a/man/man.am b/man/man.am
index 55560e5..9d6ff2d 100644
--- a/man/man.am
+++ b/man/man.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-15
 #   Free Software Foundation, Inc.
 #
-# Last update: 7 Aug 2015
+# Last update: 5 Aug 2015
 #
 # This file is part of `groff'
 #
@@ -19,24 +19,24 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 man5_MANS += \
-  man/groff_font.5.n \
-  man/groff_out.5.n \
-  man/groff_tmac.5.n
+  man/groff_font.n \
+  man/groff_out.n \
+  man/groff_tmac.n
 man7_MANS += \
-  man/ditroff.7.n \
-  man/groff_char.7.n \
-  man/groff_diff.7.n \
-  man/groff.7.n \
-  man/roff.7.n
+  man/ditroff.n \
+  man/groff_char.n \
+  man/groff_diff.n \
+  man/groff.n \
+  man/roff.n
 EXTRA_DIST += \
-  man/groff_font.5.man \
-  man/groff_out.5.man \
-  man/groff_tmac.5.man \
-  man/ditroff.7.man \
-  man/groff_char.7.man \
-  man/groff_diff.7.man \
-  man/groff.7.man \
-  man/roff.7.man
+  man/groff_font.man \
+  man/groff_out.man \
+  man/groff_tmac.man \
+  man/ditroff.man \
+  man/groff_char.man \
+  man/groff_diff.man \
+  man/groff.man \
+  man/roff.man
 
 # Case of out-of-source build: we must create the 'man' directory.
 BUILT_SOURCES += man
diff --git a/man/roff.7.man b/man/roff.man
similarity index 100%
rename from man/roff.7.man
rename to man/roff.man
diff --git a/src/devices/grodvi/grodvi.am b/src/devices/grodvi/grodvi.am
index eaf3e15..53af681 100644
--- a/src/devices/grodvi/grodvi.am
+++ b/src/devices/grodvi/grodvi.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-15
 #      Free Software Foundation, Inc.
 #
-# Last update: 7 Aug 2015
+# Last update: 5 Aug 2015
 #
 # This file is part of groff.
 #
@@ -24,8 +24,8 @@ grodvi_LDADD = \
   libdriver.a \
   libgroff.a \
   lib/libgnu.a $(LIBM)
-man1_MANS += src/devices/grodvi/grodvi.1.n
-EXTRA_DIST += src/devices/grodvi/grodvi.1.man
+man1_MANS += src/devices/grodvi/grodvi.n
+EXTRA_DIST += src/devices/grodvi/grodvi.man
 
 
 ########################################################################
diff --git a/src/devices/grodvi/grodvi.1.man b/src/devices/grodvi/grodvi.man
similarity index 100%
rename from src/devices/grodvi/grodvi.1.man
rename to src/devices/grodvi/grodvi.man
diff --git a/src/devices/grohtml/grohtml.am b/src/devices/grohtml/grohtml.am
index e2d864a..8d33f8f 100644
--- a/src/devices/grohtml/grohtml.am
+++ b/src/devices/grohtml/grohtml.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-15
 #      Free Software Foundation, Inc.
 #
-# Last update: 7 Aug 2015
+# Last update: 5 Aug 2015
 #
 # This file is part of groff.
 #
@@ -32,8 +32,8 @@ post_grohtml_LDADD = $(LIBM) \
   libdriver.a \
   libgroff.a \
   lib/libgnu.a 
-man1_MANS += src/devices/grohtml/grohtml.1.n
-EXTRA_DIST += src/devices/grohtml/grohtml.1.man
+man1_MANS += src/devices/grohtml/grohtml.n
+EXTRA_DIST += src/devices/grohtml/grohtml.man
 
 
 ########################################################################
diff --git a/src/devices/grohtml/grohtml.1.man b/src/devices/grohtml/grohtml.man
similarity index 100%
rename from src/devices/grohtml/grohtml.1.man
rename to src/devices/grohtml/grohtml.man
diff --git a/src/devices/grolbp/grolbp.am b/src/devices/grolbp/grolbp.am
index 2a7c225..a7f1ffe 100644
--- a/src/devices/grolbp/grolbp.am
+++ b/src/devices/grolbp/grolbp.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-15
 #      Free Software Foundation, Inc.
 #
-# Last update: 7 Aug 2015
+# Last update: 5 Aug 2015
 #
 # This file is part of groff.
 #
@@ -28,8 +28,8 @@ grolbp_LDADD = $(LIBM) \
   libdriver.a \
   libgroff.a \
   lib/libgnu.a
-man1_MANS += src/devices/grolbp/grolbp.1.n
-EXTRA_DIST += src/devices/grolbp/grolbp.1.man
+man1_MANS += src/devices/grolbp/grolbp.n
+EXTRA_DIST += src/devices/grolbp/grolbp.man
 
 
 ########################################################################
diff --git a/src/devices/grolbp/grolbp.1.man b/src/devices/grolbp/grolbp.man
similarity index 100%
rename from src/devices/grolbp/grolbp.1.man
rename to src/devices/grolbp/grolbp.man
diff --git a/src/devices/grolj4/grolj4.am b/src/devices/grolj4/grolj4.am
index e941f1f..7d4b5bf 100644
--- a/src/devices/grolj4/grolj4.am
+++ b/src/devices/grolj4/grolj4.am
@@ -24,11 +24,11 @@ grolj4_LDADD = $(LIBM) \
   libdriver.a \
   libgroff.a \
   lib/libgnu.a
-man1_MANS += src/devices/grolj4/grolj4.1.n
-man5_MANS += src/devices/grolj4/lj4_font.5.n
+man1_MANS += src/devices/grolj4/grolj4.n
+man5_MANS += src/devices/grolj4/lj4_font.n
 EXTRA_DIST += \
-  src/devices/grolj4/grolj4.1.man \
-  src/devices/grolj4/lj4_font.5.man
+  src/devices/grolj4/grolj4.man \
+  src/devices/grolj4/lj4_font.man
 
 ########################################################################
 ### Emacs settings
diff --git a/src/devices/grolj4/grolj4.1.man b/src/devices/grolj4/grolj4.man
similarity index 100%
rename from src/devices/grolj4/grolj4.1.man
rename to src/devices/grolj4/grolj4.man
diff --git a/src/devices/grolj4/lj4_font.5.man b/src/devices/grolj4/lj4_font.man
similarity index 100%
rename from src/devices/grolj4/lj4_font.5.man
rename to src/devices/grolj4/lj4_font.man
diff --git a/src/devices/gropdf/gropdf.am b/src/devices/gropdf/gropdf.am
index 86aba15..4d41d96 100644
--- a/src/devices/gropdf/gropdf.am
+++ b/src/devices/gropdf/gropdf.am
@@ -3,7 +3,7 @@
 #  Original Makefile.sub written by Deri James <deri@chuzzlewit.demon.co.uk>.
 #  Automake migration by Bertrand Garrigues
 #
-# Last update: 7 Aug 2015
+# Last update: 5 Aug 2015
 #
 # This file is part of groff.
 #
@@ -27,12 +27,12 @@ EXTRA_DIST += \
   src/devices/gropdf/TODO \
   src/devices/gropdf/gropdf.pl \
   src/devices/gropdf/pdfmom.pl \
-  src/devices/gropdf/gropdf.1.man \
-  src/devices/gropdf/pdfmom.1.man
+  src/devices/gropdf/gropdf.man \
+  src/devices/gropdf/pdfmom.man
 
 man1_MANS += \
-  src/devices/gropdf/gropdf.1.n \
-  src/devices/gropdf/pdfmom.1.n
+  src/devices/gropdf/gropdf.n \
+  src/devices/gropdf/pdfmom.n
 
 gropdf: $(gropdf_dir)/gropdf.pl $(SH_DEPS_SED_SCRIPT)
 	$(RM) $@
diff --git a/src/devices/gropdf/gropdf.1.man b/src/devices/gropdf/gropdf.man
similarity index 100%
rename from src/devices/gropdf/gropdf.1.man
rename to src/devices/gropdf/gropdf.man
diff --git a/src/devices/gropdf/pdfmom.1.man b/src/devices/gropdf/pdfmom.man
similarity index 100%
rename from src/devices/gropdf/pdfmom.1.man
rename to src/devices/gropdf/pdfmom.man
diff --git a/src/devices/grotty/grotty.am b/src/devices/grotty/grotty.am
index 3f52fbd..d200e5d 100644
--- a/src/devices/grotty/grotty.am
+++ b/src/devices/grotty/grotty.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-15
 #      Free Software Foundation, Inc.
 #
-# Last update: 7 Aug 2015
+# Last update: 5 Aug 2015
 #
 # This file is part of groff.
 #
@@ -24,9 +24,9 @@ grotty_LDADD = $(LIBM) \
   libdriver.a \
   libgroff.a \
   lib/libgnu.a
-man1_MANS += src/devices/grotty/grotty.1.n
+man1_MANS += src/devices/grotty/grotty.n
 EXTRA_DIST += \
-  src/devices/grotty/grotty.1.man \
+  src/devices/grotty/grotty.man \
   src/devices/grotty/TODO
 
 
diff --git a/src/devices/grotty/grotty.1.man b/src/devices/grotty/grotty.man
similarity index 100%
rename from src/devices/grotty/grotty.1.man
rename to src/devices/grotty/grotty.man
diff --git a/src/devices/xditview/gxditview.1.man b/src/devices/xditview/gxditview.man
similarity index 100%
rename from src/devices/xditview/gxditview.1.man
rename to src/devices/xditview/gxditview.man
diff --git a/src/devices/xditview/xditview.am b/src/devices/xditview/xditview.am
index 52009ee..d4c65a0 100644
--- a/src/devices/xditview/xditview.am
+++ b/src/devices/xditview/xditview.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-15
 #      Free Software Foundation, Inc.
 #
-# Last update: 7 Aug 2015
+# Last update: 5 Aug 2015
 #
 # This file is part of groff.
 #
@@ -46,7 +46,7 @@ gxditview_SOURCES = $(GXDITVIEWSOURCES)
 nodist_gxditview_SOURCES = $(XDITVIEW_GENHDRS)
 CLEANFILES += $(XDITVIEW_GENHDRS)
 
-man1_MANS += src/devices/xditview/gxditview.1.n
+man1_MANS += src/devices/xditview/gxditview.n
 
 # Because we defined gxditview_CPPFLAGS, automake renames all the xditview's 
 # objects, adding an "gxditview-" prefix. 
diff --git a/src/preproc/eqn/eqn.am b/src/preproc/eqn/eqn.am
index 310bb45..9184e33 100644
--- a/src/preproc/eqn/eqn.am
+++ b/src/preproc/eqn/eqn.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-15
 #      Free Software Foundation, Inc.
 #
-# Latest update: 7 Aug 2015
+# Latest update: 5 Aug 2015
 #
 # This file is part of groff.
 #
@@ -45,12 +45,12 @@ eqn_SOURCES = \
   src/preproc/eqn/pbox.h \
   src/preproc/eqn/eqn.h
 
-PREFIXMAN1 += src/preproc/eqn/eqn.1.n src/preproc/eqn/neqn.1.n
+PREFIXMAN1 += src/preproc/eqn/eqn.n src/preproc/eqn/neqn.n
 EXTRA_DIST += \
   src/preproc/eqn/TODO \
   src/preproc/eqn/neqn.sh \
-  src/preproc/eqn/eqn.1.man \
-  src/preproc/eqn/neqn.1.man
+  src/preproc/eqn/eqn.man \
+  src/preproc/eqn/neqn.man
 
 src/preproc/eqn/eqn-lex.$(OBJEXT): src/preproc/eqn/eqn.hpp
 CLEANFILES += \
diff --git a/src/preproc/eqn/eqn.1.man b/src/preproc/eqn/eqn.man
similarity index 100%
rename from src/preproc/eqn/eqn.1.man
rename to src/preproc/eqn/eqn.man
diff --git a/src/preproc/eqn/neqn.1.man b/src/preproc/eqn/neqn.man
similarity index 100%
rename from src/preproc/eqn/neqn.1.man
rename to src/preproc/eqn/neqn.man
diff --git a/src/preproc/grn/grn.am b/src/preproc/grn/grn.am
index 96ee4a1..9691bff 100644
--- a/src/preproc/grn/grn.am
+++ b/src/preproc/grn/grn.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-15
 #      Free Software Foundation, Inc.
 #
-# Latest update: 7 Aug 2015
+# Latest update: 5 Aug 2015
 #
 # This file is part of groff.
 #
@@ -27,8 +27,8 @@ grn_SOURCES = \
   src/preproc/grn/gprint.h
 src/preproc/grn/main.$(OBJEXT): defs.h
 grn_LDADD = libgroff.a lib/libgnu.a $(LIBM)
-PREFIXMAN1 += src/preproc/grn/grn.1.n
-EXTRA_DIST += src/preproc/grn/README src/preproc/grn/grn.1.man
+PREFIXMAN1 += src/preproc/grn/grn.n
+EXTRA_DIST += src/preproc/grn/README src/preproc/grn/grn.man
 
 
 ########################################################################
diff --git a/src/preproc/grn/grn.1.man b/src/preproc/grn/grn.man
similarity index 100%
rename from src/preproc/grn/grn.1.man
rename to src/preproc/grn/grn.man
diff --git a/src/preproc/pic/pic.am b/src/preproc/pic/pic.am
index cae82db..18ee0e5 100644
--- a/src/preproc/pic/pic.am
+++ b/src/preproc/pic/pic.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-15
 #      Free Software Foundation, Inc.
 #
-# Latest update: 7 Aug 2015
+# Latest update: 5 Aug 2015
 #
 # This file is part of groff.
 #
@@ -38,11 +38,11 @@ pic_SOURCES = \
 pic_CPPFLAGS = $(AM_CPPFLAGS) \
   -I $(top_srcdir)/src/preproc/pic \
   -I $(top_builddir)/src/preproc/pic
-PREFIXMAN1 += src/preproc/pic/pic.1.n
+PREFIXMAN1 += src/preproc/pic/pic.n
 
 src/preproc/pic/pic-lex.$(OBJEXT): src/preproc/pic/pic.hpp
 EXTRA_DIST += \
-  src/preproc/pic/pic.1.man \
+  src/preproc/pic/pic.man \
   src/preproc/pic/TODO
 CLEANFILES += \
   src/preproc/pic/pic.cpp \
diff --git a/src/preproc/pic/pic.1.man b/src/preproc/pic/pic.man
similarity index 100%
rename from src/preproc/pic/pic.1.man
rename to src/preproc/pic/pic.man
diff --git a/src/preproc/preconv/preconv.am b/src/preproc/preconv/preconv.am
index 66a792f..e4130e1 100644
--- a/src/preproc/preconv/preconv.am
+++ b/src/preproc/preconv/preconv.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-15
 #      Free Software Foundation, Inc.
 #
-# Latest update: 7 Aug 2015
+# Latest update: 5 Aug 2015
 #
 # This file is part of groff.
 #
@@ -21,8 +21,8 @@
 bin_PROGRAMS += preconv
 preconv_LDADD = libgroff.a $(LIBM) $(LIBICONV)
 preconv_SOURCES = src/preproc/preconv/preconv.cpp
-man1_MANS += src/preproc/preconv/preconv.1.n
-EXTRA_DIST += src/preproc/preconv/preconv.1.man
+man1_MANS += src/preproc/preconv/preconv.n
+EXTRA_DIST += src/preproc/preconv/preconv.man
 
 
 ########################################################################
diff --git a/src/preproc/preconv/preconv.1.man b/src/preproc/preconv/preconv.man
similarity index 100%
rename from src/preproc/preconv/preconv.1.man
rename to src/preproc/preconv/preconv.man
diff --git a/src/preproc/refer/refer.am b/src/preproc/refer/refer.am
index 94800ac..33b4ca9 100644
--- a/src/preproc/refer/refer.am
+++ b/src/preproc/refer/refer.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-15
 #      Free Software Foundation, Inc.
 #
-# Latest update: 7 Aug 2015
+# Latest update: 5 Aug 2015
 #
 # This file is part of groff.
 #
@@ -31,8 +31,8 @@ refer_SOURCES =  \
   src/preproc/refer/ref.h \
   src/preproc/refer/token.h \
   src/preproc/refer/command.h
-PREFIXMAN1 += src/preproc/refer/refer.1.n
-EXTRA_DIST += src/preproc/refer/TODO src/preproc/refer/refer.1.man
+PREFIXMAN1 += src/preproc/refer/refer.n
+EXTRA_DIST += src/preproc/refer/TODO src/preproc/refer/refer.man
 CLEANFILES += \
   src/preproc/refer/label.cpp \
   src/preproc/refer/label.hpp \
diff --git a/src/preproc/refer/refer.1.man b/src/preproc/refer/refer.man
similarity index 100%
rename from src/preproc/refer/refer.1.man
rename to src/preproc/refer/refer.man
diff --git a/src/preproc/soelim/soelim.am b/src/preproc/soelim/soelim.am
index d7b10c9..debc1ae 100644
--- a/src/preproc/soelim/soelim.am
+++ b/src/preproc/soelim/soelim.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-15
 #      Free Software Foundation, Inc.
 #
-# Latest update: 7 Aug 2015
+# Latest update: 5 Aug 2015
 #
 # This file is part of groff.
 #
@@ -21,10 +21,10 @@
 prefixexecbin_PROGRAMS += soelim
 soelim_LDADD = libgroff.a $(LIBM)
 soelim_SOURCES = src/preproc/soelim/soelim.cpp
-PREFIXMAN1 += src/preproc/soelim/soelim.1.n
+PREFIXMAN1 += src/preproc/soelim/soelim.n
 EXTRA_DIST += \
   src/preproc/soelim/TODO \
-  src/preproc/soelim/soelim.1.man
+  src/preproc/soelim/soelim.man
 
 
 ########################################################################
diff --git a/src/preproc/soelim/soelim.1.man b/src/preproc/soelim/soelim.man
similarity index 100%
rename from src/preproc/soelim/soelim.1.man
rename to src/preproc/soelim/soelim.man
diff --git a/src/preproc/tbl/tbl.am b/src/preproc/tbl/tbl.am
index dbb795f..5b41f3c 100644
--- a/src/preproc/tbl/tbl.am
+++ b/src/preproc/tbl/tbl.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-15
 #      Free Software Foundation, Inc.
 #
-# Latest update: 7 Aug 2015
+# Latest update: 5 Aug 2015
 #
 # This file is part of groff.
 #
@@ -24,8 +24,8 @@ tbl_SOURCES = \
   src/preproc/tbl/main.cpp \
   src/preproc/tbl/table.cpp \
   src/preproc/tbl/table.h
-PREFIXMAN1 += src/preproc/tbl/tbl.1.n
-EXTRA_DIST += src/preproc/tbl/tbl.1.man
+PREFIXMAN1 += src/preproc/tbl/tbl.n
+EXTRA_DIST += src/preproc/tbl/tbl.man
 
 
 ########################################################################
diff --git a/src/preproc/tbl/tbl.1.man b/src/preproc/tbl/tbl.man
similarity index 100%
rename from src/preproc/tbl/tbl.1.man
rename to src/preproc/tbl/tbl.man
diff --git a/src/roff/groff/groff.am b/src/roff/groff/groff.am
index a2ba730..169c9d7 100644
--- a/src/roff/groff/groff.am
+++ b/src/roff/groff/groff.am
@@ -8,7 +8,7 @@
 #   Automake migration by 
 #   Bertrand Garrigues <bertrand.garrigues@laposte.net>
 #
-# Latest update: 7 Aug 2015
+# Latest update: 5 Aug 2015
 #
 # `groff' is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -35,8 +35,8 @@ groff_SOURCES = \
   src/roff/groff/pipeline.c \
   src/roff/groff/pipeline.h
 src/roff/groff/groff.$(OBJEXT): defs.h
-man1_MANS += src/roff/groff/groff.1.n
-EXTRA_DIST += src/roff/groff/groff.1.man
+man1_MANS += src/roff/groff/groff.n
+EXTRA_DIST += src/roff/groff/groff.man
 GROFF_OPTS_OUTPUT = \
   groff_opts_no_arg.txt \
   groff_opts_with_arg.txt
diff --git a/src/roff/groff/groff.1.man b/src/roff/groff/groff.man
similarity index 100%
rename from src/roff/groff/groff.1.man
rename to src/roff/groff/groff.man
diff --git a/src/roff/grog/grog.am b/src/roff/grog/grog.am
index ab35dab..b1dcb35 100644
--- a/src/roff/grog/grog.am
+++ b/src/roff/grog/grog.am
@@ -29,9 +29,9 @@ GROG = src/roff/grog/subs.pl
 # grog_dir is defined by a m4 macro
 grogdir = $(grog_dir)
 dist_grog_DATA = $(GROG)
-man1_MANS += src/roff/grog/grog.1.n
+man1_MANS += src/roff/grog/grog.n
 EXTRA_DIST += \
-  src/roff/grog/grog.1.man \
+  src/roff/grog/grog.man \
   src/roff/grog/grog.pl
 
 # Perl version works for all parts of `groff'.
diff --git a/src/roff/grog/grog.1.man b/src/roff/grog/grog.man
similarity index 100%
rename from src/roff/grog/grog.1.man
rename to src/roff/grog/grog.man
diff --git a/src/roff/nroff/nroff.am b/src/roff/nroff/nroff.am
index 5ea1354..f0ad935 100644
--- a/src/roff/nroff/nroff.am
+++ b/src/roff/nroff/nroff.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-15
 #      Free Software Foundation, Inc.
 #
-# Latest update: 7 Aug 2015
+# Latest update: 5 Aug 2015
 #
 # This file is part of groff.
 #
@@ -20,9 +20,9 @@
 
 prefixexecbin_SCRIPTS += nroff
 nroff_srcdir = $(top_srcdir)/src/roff/nroff
-PREFIXMAN1 += src/roff/nroff/nroff.1.n
+PREFIXMAN1 += src/roff/nroff/nroff.n
 EXTRA_DIST += \
-  src/roff/nroff/nroff.1.man \
+  src/roff/nroff/nroff.man \
   src/roff/nroff/nroff.sh
 
 nroff: $(nroff_srcdir)/nroff.sh $(SH_DEPS_SED_SCRIPT)
diff --git a/src/roff/nroff/nroff.1.man b/src/roff/nroff/nroff.man
similarity index 100%
rename from src/roff/nroff/nroff.1.man
rename to src/roff/nroff/nroff.man
diff --git a/src/roff/troff/troff.am b/src/roff/troff/troff.am
index 699438b..50091a2 100644
--- a/src/roff/troff/troff.am
+++ b/src/roff/troff/troff.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-15
 #      Free Software Foundation, Inc.
 #
-# Latest update: 7 Aug 2015
+# Latest update: 5 Aug 2015
 #
 # This file is part of groff.
 #
@@ -19,10 +19,10 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 prefixexecbin_PROGRAMS += troff
-PREFIXMAN1 += src/roff/troff/troff.1.n
+PREFIXMAN1 += src/roff/troff/troff.n
 EXTRA_DIST += \
   src/roff/troff/column.cpp \
-  src/roff/troff/troff.1.man \
+  src/roff/troff/troff.man \
   src/roff/troff/TODO
 troff_LDADD = libgroff.a lib/libgnu.a $(LIBM)
 troff_SOURCES = \
diff --git a/src/roff/troff/troff.1.man b/src/roff/troff/troff.man
similarity index 100%
rename from src/roff/troff/troff.1.man
rename to src/roff/troff/troff.man
diff --git a/src/utils/addftinfo/addftinfo.am b/src/utils/addftinfo/addftinfo.am
index 40fef40..b029685 100644
--- a/src/utils/addftinfo/addftinfo.am
+++ b/src/utils/addftinfo/addftinfo.am
@@ -23,8 +23,8 @@
 ########################################################################
 
 bin_PROGRAMS += addftinfo
-man1_MANS += src/utils/addftinfo/addftinfo.1.n
-EXTRA_DIST += src/utils/addftinfo/addftinfo.1.man
+man1_MANS += src/utils/addftinfo/addftinfo.n
+EXTRA_DIST += src/utils/addftinfo/addftinfo.man
 addftinfo_LDADD = libgroff.a
 addftinfo_SOURCES = \
   src/utils/addftinfo/addftinfo.cpp \
diff --git a/src/utils/addftinfo/addftinfo.1.man b/src/utils/addftinfo/addftinfo.man
similarity index 100%
rename from src/utils/addftinfo/addftinfo.1.man
rename to src/utils/addftinfo/addftinfo.man
diff --git a/src/utils/afmtodit/afmtodit.am b/src/utils/afmtodit/afmtodit.am
index e57a928..707880f 100644
--- a/src/utils/afmtodit/afmtodit.am
+++ b/src/utils/afmtodit/afmtodit.am
@@ -4,7 +4,7 @@
 #
 # Copyright (C) 2013-2015  Free Software Foundation, Inc.
 #
-# Latest update: 7 Aug 2015
+# Latest update: 5 Aug 2015
 #
 # This file is part of groff.
 #
@@ -26,9 +26,9 @@
 afmtodit_srcdir = $(top_srcdir)/src/utils/afmtodit
 
 bin_SCRIPTS += afmtodit
-man1_MANS += src/utils/afmtodit/afmtodit.1.n
+man1_MANS += src/utils/afmtodit/afmtodit.n
 EXTRA_DIST += \
-  src/utils/afmtodit/afmtodit.1.man \
+  src/utils/afmtodit/afmtodit.man \
   src/utils/afmtodit/afmtodit.pl \
   src/utils/afmtodit/afmtodit.tables \
   src/utils/afmtodit/make-afmtodit-tables
diff --git a/src/utils/afmtodit/afmtodit.1.man b/src/utils/afmtodit/afmtodit.man
similarity index 100%
rename from src/utils/afmtodit/afmtodit.1.man
rename to src/utils/afmtodit/afmtodit.man
diff --git a/src/utils/hpftodit/hpftodit.am b/src/utils/hpftodit/hpftodit.am
index 4172919..cb9d27b 100644
--- a/src/utils/hpftodit/hpftodit.am
+++ b/src/utils/hpftodit/hpftodit.am
@@ -4,7 +4,7 @@
 #
 # Copyright (C) 2014-2015  Free Software Foundation, Inc.
 #
-# Latest update: 7 Aug 2015
+# Latest update: 5 Aug 2015
 #
 # `groff' is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -23,8 +23,8 @@
 ########################################################################
 
 bin_PROGRAMS += hpftodit
-man1_MANS += src/utils/hpftodit/hpftodit.1.n
-EXTRA_DIST += src/utils/hpftodit/hpftodit.1.man
+man1_MANS += src/utils/hpftodit/hpftodit.n
+EXTRA_DIST += src/utils/hpftodit/hpftodit.man
 hpftodit_LDADD = libgroff.a $(LIBM)
 hpftodit_SOURCES = \
   src/utils/hpftodit/hpftodit.cpp \
diff --git a/src/utils/hpftodit/hpftodit.1.man b/src/utils/hpftodit/hpftodit.man
similarity index 100%
rename from src/utils/hpftodit/hpftodit.1.man
rename to src/utils/hpftodit/hpftodit.man
diff --git a/src/utils/indxbib/indxbib.am b/src/utils/indxbib/indxbib.am
index 8c666f8..c2651f4 100644
--- a/src/utils/indxbib/indxbib.am
+++ b/src/utils/indxbib/indxbib.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-2015
 #      Free Software Foundation, Inc.
 #
-# Latest update: 7 Aug 2015
+# Latest update: 5 Aug 2015
 #
 # This file is part of groff.
 #
@@ -25,9 +25,9 @@ indxbib_SOURCES = \
   src/utils/indxbib/signal.c
 src/utils/indxbib/indxbib.$(OBJEXT): defs.h
 indxbib_LDADD = libbib.a libgroff.a $(LIBM)
-PREFIXMAN1 += src/utils/indxbib/indxbib.1.n
+PREFIXMAN1 += src/utils/indxbib/indxbib.n
 EXTRA_DIST += \
-  src/utils/indxbib/indxbib.1.man \
+  src/utils/indxbib/indxbib.man \
   src/utils/indxbib/eign
 
 install-data-local: install_indxbib
diff --git a/src/utils/indxbib/indxbib.1.man b/src/utils/indxbib/indxbib.man
similarity index 100%
rename from src/utils/indxbib/indxbib.1.man
rename to src/utils/indxbib/indxbib.man
diff --git a/src/utils/lkbib/lkbib.am b/src/utils/lkbib/lkbib.am
index 5049352..3b15076 100644
--- a/src/utils/lkbib/lkbib.am
+++ b/src/utils/lkbib/lkbib.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-2015
 #      Free Software Foundation, Inc.
 #
-# Latest update: 7 Aug 2015
+# Latest update: 5 Aug 2015
 #
 # This file is part of groff.
 #
@@ -19,8 +19,8 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 bin_PROGRAMS += lkbib
-man1_MANS += src/utils/lkbib/lkbib.1.n
-EXTRA_DIST += src/utils/lkbib/lkbib.1.man
+man1_MANS += src/utils/lkbib/lkbib.n
+EXTRA_DIST += src/utils/lkbib/lkbib.man
 lkbib_LDADD = libbib.a libgroff.a $(LIBM)
 lkbib_SOURCES = src/utils/lkbib/lkbib.cpp
 src/utils/lkbib/lkbib.$(OBJEXT): defs.h
diff --git a/src/utils/lkbib/lkbib.1.man b/src/utils/lkbib/lkbib.man
similarity index 100%
rename from src/utils/lkbib/lkbib.1.man
rename to src/utils/lkbib/lkbib.man
diff --git a/src/utils/lookbib/lookbib.am b/src/utils/lookbib/lookbib.am
index f0db884..7fda71a 100644
--- a/src/utils/lookbib/lookbib.am
+++ b/src/utils/lookbib/lookbib.am
@@ -19,8 +19,8 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 prefixexecbin_PROGRAMS += lookbib
-PREFIXMAN1 += src/utils/lookbib/lookbib.1.n
-EXTRA_DIST += src/utils/lookbib/lookbib.1.man
+PREFIXMAN1 += src/utils/lookbib/lookbib.n
+EXTRA_DIST += src/utils/lookbib/lookbib.man
 lookbib_LDADD = libbib.a libgroff.a $(LIBM)
 lookbib_SOURCES = src/utils/lookbib/lookbib.cpp
 
diff --git a/src/utils/lookbib/lookbib.1.man b/src/utils/lookbib/lookbib.man
similarity index 100%
rename from src/utils/lookbib/lookbib.1.man
rename to src/utils/lookbib/lookbib.man
diff --git a/src/utils/pfbtops/pfbtops.am b/src/utils/pfbtops/pfbtops.am
index 8275968..bc99cfd 100644
--- a/src/utils/pfbtops/pfbtops.am
+++ b/src/utils/pfbtops/pfbtops.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-2015
 #      Free Software Foundation, Inc.
 #
-# Latest update: 7 Aug 2015
+# Latest update: 5 Aug 2015
 #
 # This file is part of groff.
 #
@@ -19,8 +19,8 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 bin_PROGRAMS += pfbtops
-man1_MANS += src/utils/pfbtops/pfbtops.1.n
-EXTRA_DIST += src/utils/pfbtops/pfbtops.1.man
+man1_MANS += src/utils/pfbtops/pfbtops.n
+EXTRA_DIST += src/utils/pfbtops/pfbtops.man
 pfbtops_SOURCES = src/utils/pfbtops/pfbtops.c
 pfbtops_LDADD = libgroff.a $(LIBM)
 # We use the following trick to force the use of C++ compiler
diff --git a/src/utils/pfbtops/pfbtops.1.man b/src/utils/pfbtops/pfbtops.man
similarity index 100%
rename from src/utils/pfbtops/pfbtops.1.man
rename to src/utils/pfbtops/pfbtops.man
diff --git a/src/utils/tfmtodit/tfmtodit.am b/src/utils/tfmtodit/tfmtodit.am
index fa92c3c..00ee06f 100644
--- a/src/utils/tfmtodit/tfmtodit.am
+++ b/src/utils/tfmtodit/tfmtodit.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-2015
 #      Free Software Foundation, Inc.
 #
-# Latest update: 7 Aug 2015
+# Latest update: 5 Aug 2015
 #
 # This file is part of groff.
 #
@@ -19,8 +19,8 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 bin_PROGRAMS += tfmtodit
-man1_MANS += src/utils/tfmtodit/tfmtodit.1.n
-EXTRA_DIST += src/utils/tfmtodit/tfmtodit.1.man
+man1_MANS += src/utils/tfmtodit/tfmtodit.n
+EXTRA_DIST += src/utils/tfmtodit/tfmtodit.man
 tfmtodit_SOURCES = src/utils/tfmtodit/tfmtodit.cpp
 tfmtodit_LDADD = libgroff.a $(LIBM)
 
diff --git a/src/utils/tfmtodit/tfmtodit.1.man b/src/utils/tfmtodit/tfmtodit.man
similarity index 100%
rename from src/utils/tfmtodit/tfmtodit.1.man
rename to src/utils/tfmtodit/tfmtodit.man
diff --git a/src/utils/xtotroff/xtotroff.am b/src/utils/xtotroff/xtotroff.am
index 5960364..fc43ba0 100644
--- a/src/utils/xtotroff/xtotroff.am
+++ b/src/utils/xtotroff/xtotroff.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-2015
 #      Free Software Foundation, Inc.
 #
-# Latest update: 7 Aug 2015
+# Latest update: 5 Aug 2015
 #
 # This file is part of groff.
 #
@@ -20,14 +20,14 @@
 
 if !WITHOUT_X11
 bin_PROGRAMS += xtotroff
-man1_MANS += src/utils/xtotroff/xtotroff.1.n
+man1_MANS += src/utils/xtotroff/xtotroff.n
 xtotroff_SOURCES = src/utils/xtotroff/xtotroff.c
 XLIBS=$(LIBXUTIL) $(LIBGROFF)
 xtotroff_LDADD = libxutil.a libgroff.a $(X_LIBS) $(X_PRE_LIBS) \
   -lXaw -lXt -lX11 $(X_EXTRA_LIBS) $(LIBM)
 xtotroff_CPPFLAGS = $(AM_CPPFLAGS) $(X_CFLAGS)
 endif
-EXTRA_DIST += src/utils/xtotroff/xtotroff.1.man
+EXTRA_DIST += src/utils/xtotroff/xtotroff.man
 
 
 ########################################################################
diff --git a/src/utils/xtotroff/xtotroff.1.man b/src/utils/xtotroff/xtotroff.man
similarity index 100%
rename from src/utils/xtotroff/xtotroff.1.man
rename to src/utils/xtotroff/xtotroff.man
diff --git a/tmac/groff_man.7.man b/tmac/groff_man.man
similarity index 100%
rename from tmac/groff_man.7.man
rename to tmac/groff_man.man
diff --git a/tmac/groff_mdoc.7.man b/tmac/groff_mdoc.man
similarity index 100%
rename from tmac/groff_mdoc.7.man
rename to tmac/groff_mdoc.man
diff --git a/tmac/groff_me.7.man b/tmac/groff_me.man
similarity index 100%
rename from tmac/groff_me.7.man
rename to tmac/groff_me.man
diff --git a/tmac/groff_ms.7.man b/tmac/groff_ms.man
similarity index 100%
rename from tmac/groff_ms.7.man
rename to tmac/groff_ms.man
diff --git a/tmac/groff_trace.7.man b/tmac/groff_trace.man
similarity index 100%
rename from tmac/groff_trace.7.man
rename to tmac/groff_trace.man
diff --git a/tmac/groff_www.7.man b/tmac/groff_www.man
similarity index 100%
rename from tmac/groff_www.7.man
rename to tmac/groff_www.man
diff --git a/tmac/tmac.am b/tmac/tmac.am
index 410ffb8..c387892 100644
--- a/tmac/tmac.am
+++ b/tmac/tmac.am
@@ -3,7 +3,7 @@
 #      Written by James Clark (jjc@jclark.com)
 #      Automake migration by Bertrand Garrigues
 #
-# Latest update: 7 Aug 2015
+# Latest update: 5 Aug 2015
 #
 # This file is part of groff.
 #
@@ -23,12 +23,12 @@ tmac_srcdir = $(top_srcdir)/tmac
 tmac_builddir = $(top_builddir)/tmac
 
 man7_MANS += \
-  tmac/groff_ms.7.n \
-  tmac/groff_man.7.n \
-  tmac/groff_me.7.n \
-  tmac/groff_mdoc.7.n \
-  tmac/groff_trace.7.n \
-  tmac/groff_www.7.n
+  tmac/groff_ms.n \
+  tmac/groff_man.n \
+  tmac/groff_me.n \
+  tmac/groff_mdoc.n \
+  tmac/groff_trace.n \
+  tmac/groff_www.n
 
 TMACNORMALFILES = \
   tmac/man.tmac \
@@ -121,12 +121,12 @@ MOSTLYCLEANFILES += $(TMACMDOCFILES) tmac/www.tmac $(TMACSTRIPFILES) \
 
 EXTRA_DIST += \
   tmac/fixmacros.sed \
-  tmac/groff_ms.7.man \
-  tmac/groff_man.7.man \
-  tmac/groff_me.7.man \
-  tmac/groff_mdoc.7.man \
-  tmac/groff_trace.7.man \
-  tmac/groff_www.7.man \
+  tmac/groff_ms.man \
+  tmac/groff_man.man \
+  tmac/groff_me.man \
+  tmac/groff_mdoc.man \
+  tmac/groff_trace.man \
+  tmac/groff_www.man \
   tmac/hyphenex.pl \
   tmac/LOCALIZATION \
   tmac/man.ultrix \


From MAILER-DAEMON Thu Aug 13 09:28:57 2015
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1ZPsYz-0003ON-Dw
	for mharc-groff-commit@gnu.org; Thu, 13 Aug 2015 09:28:57 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:54365)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <bernd.warken@web.de>) id 1ZPsYo-00037n-Tw
	for groff-commit@gnu.org; Thu, 13 Aug 2015 09:28:55 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <bernd.warken@web.de>) id 1ZPsYi-00083l-56
	for groff-commit@gnu.org; Thu, 13 Aug 2015 09:28:46 -0400
Received: from vcs.savannah.gnu.org ([208.118.235.72]:43511)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <bernd.warken@web.de>) id 1ZPsYi-00083Z-0j
	for groff-commit@gnu.org; Thu, 13 Aug 2015 09:28:40 -0400
Received: from bwarken by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <bernd.warken@web.de>) id 1ZPsYg-0002mL-Ir
	for groff-commit@gnu.org; Thu, 13 Aug 2015 13:28:39 +0000
Date: Thu, 13 Aug 2015 13:28:38 +0000
Message-Id: <E1ZPsYg-0002mL-Ir@vcs.savannah.gnu.org>
To: groff-commit@gnu.org
Subject: [groff] 01/01: all *.am: correct Emacs mode to "# End:"
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
In-Reply-To: groff@gnu.org
References: <20150813132838.10650.29082@vcs.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: 60d89462c4e67a034430e5877c4b715f0398e36a
Auto-Submitted: auto-generated
From: Bernd Warken <bernd.warken@web.de>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 208.118.235.72
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: groff@gnu.org
List-Id: <groff-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/groff-commit>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 13 Aug 2015 13:28:55 -0000

bwarken pushed a commit to branch master
in repository groff.

commit 60d89462c4e67a034430e5877c4b715f0398e36a
Author: Bernd Warken <groff-bernd.warken-72@web.de>
Date:   Thu Aug 13 15:27:10 2015 +0200

    all *.am: correct Emacs mode to "# End:"
---
 ChangeLog                                  |    4 ++++
 Makefile.am                                |    2 +-
 arch/mingw/mingw.am                        |    4 ++--
 arch/misc/misc.am                          |    4 ++--
 contrib/chem/chem.am                       |    4 ++--
 contrib/eqn2graph/eqn2graph.am             |    4 ++--
 contrib/gdiffmk/gdiffmk.am                 |    4 ++--
 contrib/glilypond/glilypond.am             |    4 ++--
 contrib/gperl/gperl.am                     |    4 ++--
 contrib/gpinyin/gpinyin.am                 |    6 +++---
 contrib/grap2graph/grap2graph.am           |    4 ++--
 contrib/groff_filenames/groff_filenames.am |    4 ++--
 contrib/groffer/groffer.am                 |    4 ++--
 contrib/hdtbl/hdtbl.am                     |    4 ++--
 contrib/mm/mm.am                           |    4 ++--
 contrib/mom/mom.am                         |    4 ++--
 contrib/pdfmark/pdfmark.am                 |    4 ++--
 contrib/pic2graph/pic2graph.am             |    4 ++--
 doc/doc.am                                 |    4 ++--
 font/devX100-12/devX100-12.am              |    4 ++--
 font/devX100/devX100.am                    |    4 ++--
 font/devX75-12/devX75-12.am                |    4 ++--
 font/devX75/devX75.am                      |    6 +++---
 font/devascii/devascii.am                  |    4 ++--
 font/devcp1047/devcp1047.am                |    4 ++--
 font/devdvi/devdvi.am                      |    4 ++--
 font/devhtml/devhtml.am                    |    4 ++--
 font/devlatin1/devlatin1.am                |    4 ++--
 font/devlbp/devlbp.am                      |    4 ++--
 font/devlj4/devlj4.am                      |    4 ++--
 font/devpdf/devpdf.am                      |    4 ++--
 font/devps/devps.am                        |    4 ++--
 font/devutf8/devutf8.am                    |    4 ++--
 font/scripts/scripts.am                    |    4 ++--
 man/man.am                                 |    4 ++--
 src/devices/grodvi/grodvi.am               |    4 ++--
 src/devices/grohtml/grohtml.am             |    4 ++--
 src/devices/grolbp/grolbp.am               |    4 ++--
 src/devices/grolj4/grolj4.am               |    4 ++--
 src/devices/gropdf/gropdf.am               |    4 ++--
 src/devices/grops/grops.am                 |    4 ++--
 src/devices/grotty/grotty.am               |    4 ++--
 src/devices/xditview/xditview.am           |    4 ++--
 src/include/include.am                     |    6 +++---
 src/libs/libbib/libbib.am                  |    6 +++---
 src/libs/libdriver/libdriver.am            |    6 +++---
 src/libs/libgroff/libgroff.am              |    6 +++---
 src/libs/libxutil/libxutil.am              |    6 +++---
 src/preproc/eqn/eqn.am                     |    6 +++---
 src/preproc/grn/grn.am                     |    6 +++---
 src/preproc/html/html.am                   |    6 +++---
 src/preproc/pic/pic.am                     |    6 +++---
 src/preproc/preconv/preconv.am             |    6 +++---
 src/preproc/refer/refer.am                 |    6 +++---
 src/preproc/soelim/soelim.am               |    6 +++---
 src/preproc/tbl/tbl.am                     |    6 +++---
 src/roff/groff/groff.am                    |    4 ++--
 src/roff/grog/grog.am                      |    4 ++--
 src/roff/nroff/nroff.am                    |    6 +++---
 src/roff/troff/troff.am                    |    6 +++---
 src/utils/addftinfo/addftinfo.am           |    6 +++---
 src/utils/afmtodit/afmtodit.am             |    4 ++--
 src/utils/hpftodit/hpftodit.am             |    4 ++--
 src/utils/indxbib/indxbib.am               |    4 ++--
 src/utils/lkbib/lkbib.am                   |    4 ++--
 src/utils/lookbib/lookbib.am               |    4 ++--
 src/utils/pfbtops/pfbtops.am               |    4 ++--
 src/utils/tfmtodit/tfmtodit.am             |    4 ++--
 src/utils/xtotroff/xtotroff.am             |    4 ++--
 tmac/tmac.am                               |    4 ++--
 70 files changed, 159 insertions(+), 155 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index fae9ea6..8c8b6fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-08-13  Bernd Warken  <groff-bernd.warken-72@web.de>
+
+	* all *.am: Correct Emacs mode `End:' instead of `End.'.
+
 2015-08-09  werner LEMBERG  <wl@gnu.org>
 
 	Revert previous commit, since it doesn't work correctly yet.
diff --git a/Makefile.am b/Makefile.am
index 17e10ad..8c2ca10 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -899,4 +899,4 @@ MOSTLYCLEANFILES += $(prefixexecbin_SCRIPTS) $(bin_SCRIPTS) \
 ### Emacs settings
 # Local Variables:
 # mode: makefile-automake
-# End.
+# End:
diff --git a/arch/mingw/mingw.am b/arch/mingw/mingw.am
index c3c6f0b..9cce746 100644
--- a/arch/mingw/mingw.am
+++ b/arch/mingw/mingw.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-15
 #   Free Software Foundation, Inc.
 #
-# Last update: 5 Aug 2015
+# Last update: 13 Aug 2015
 #
 # This file is part of groff.
 #
@@ -50,4 +50,4 @@ endif
 ### Emacs settings
 # Local Variables:
 # mode: makefile-automake
-# End.
+# End:
diff --git a/arch/misc/misc.am b/arch/misc/misc.am
index e80d8bc..addf480 100644
--- a/arch/misc/misc.am
+++ b/arch/misc/misc.am
@@ -3,7 +3,7 @@
 #   (keith.d.marshall@ntlworld.com).
 # Adapted to Automake by Bertrand Garrigues (bertrand.garrigues@laposte.net).
 #
-# Last update: 6 Aug 2015
+# Last update: 13 Aug 2015
 #
 # This file is part of groff.
 #
@@ -30,4 +30,4 @@ shdeps.sed: $(top_srcdir)/arch/misc/shdeps.sh
 ### Emacs settings
 # Local Variables:
 # mode: makefile-automake
-# End.
+# End:
diff --git a/contrib/chem/chem.am b/contrib/chem/chem.am
index a8ca170..d0b2667 100644
--- a/contrib/chem/chem.am
+++ b/contrib/chem/chem.am
@@ -7,7 +7,7 @@
 # Written by Bernd Warken <groff-bernd.warken-72@web.de>.
 # Moved to automake by Bertrand Garrigues
 #
-# Last update: 6 Aug 2015
+# Last update: 13 Aug 2015
 #
 # This file is part of `chem' which is part of `groff'.
 #
@@ -127,4 +127,4 @@ dist_chem:
 ### Emacs settings
 # Local Variables:
 # mode: makefile-automake
-# End.
+# End:
diff --git a/contrib/eqn2graph/eqn2graph.am b/contrib/eqn2graph/eqn2graph.am
index 6ffa0ec..6f41d1f 100644
--- a/contrib/eqn2graph/eqn2graph.am
+++ b/contrib/eqn2graph/eqn2graph.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2002-2014
 #   Free Software Foundation, Inc.
 #
-# Last update: 5 Aug 2015
+# Last update: 13 Aug 2015
 #
 # This file is part of groff.
 #
@@ -39,4 +39,4 @@ eqn2graph: $(top_srcdir)/contrib/eqn2graph/eqn2graph.sh
 ### Emacs settings
 # Local Variables:
 # mode: makefile-automake
-# End.
+# End:
diff --git a/contrib/gdiffmk/gdiffmk.am b/contrib/gdiffmk/gdiffmk.am
index 6dbcf02..ee7ab6a 100644
--- a/contrib/gdiffmk/gdiffmk.am
+++ b/contrib/gdiffmk/gdiffmk.am
@@ -7,7 +7,7 @@
 # Written by Mike Bianchi <MBianchi@Foveal.com <mailto:MBianchi@Foveal.com>>
 # Automake migration by Bertrand Garrigues
 #
-# Last update: 5 Aug 2015
+# Last update: 13 Aug 2015
 #
 # This file is part of the gdiffmk utility, which is part of groff.
 #
@@ -68,4 +68,4 @@ clean_gdiffmk_check:
 ### Emacs settings
 # Local Variables:
 # mode: makefile-automake
-# End.
+# End:
diff --git a/contrib/glilypond/glilypond.am b/contrib/glilypond/glilypond.am
index 56018c1..57f8ad4 100644
--- a/contrib/glilypond/glilypond.am
+++ b/contrib/glilypond/glilypond.am
@@ -8,7 +8,7 @@
 # Bernd Warken <groff-bernd.warken-72@web.de>.
 # Automake migration by Bertrand Garrigues
 
-# Last update: 5 Aug 2015
+# Last update: 13 Aug 2015
 
 # This file is part of `glilypond' which is part of `groff'.
 
@@ -69,4 +69,4 @@ uninstall-glilypond-hook:
 ### Emacs settings
 # Local Variables:
 # mode: makefile-automake
-# End.
+# End:
diff --git a/contrib/gperl/gperl.am b/contrib/gperl/gperl.am
index 79d0e92..6aa38d2 100644
--- a/contrib/gperl/gperl.am
+++ b/contrib/gperl/gperl.am
@@ -6,7 +6,7 @@
 # Written by Bernd Warken <groff-bernd.warken-72@web.de>.
 # Automake migration by Bertrand Garrigues
 
-# Last update: 5 Aug 2015
+# Last update: 18 Aug 2015
 
 # This file is part of `gperl' which is part of `groff'.
 
@@ -47,4 +47,4 @@ gperl: $(top_srcdir)/contrib/gperl/gperl.pl shdeps.sed
 ### Emacs settings
 # Local Variables:
 # mode: makefile-automake
-# End.
+# End:
diff --git a/contrib/gpinyin/gpinyin.am b/contrib/gpinyin/gpinyin.am
index 09dcb59..4f7e64a 100644
--- a/contrib/gpinyin/gpinyin.am
+++ b/contrib/gpinyin/gpinyin.am
@@ -2,12 +2,12 @@
 
 # File position: <groff-source>/contrib/gpinyin/gpinyin.am
 
-# Copyright (C) 2014-15
+# Copyright (C) 2014-2015
 #   Free Software Foundation, Inc.
 # Written by Bernd Warken <groff-bernd.warken-72@web.de>.
 # Moved to automake by Bertrand Garrigues
 
-# Last update: 5 Aug 2015
+# Last update: 2013 Aug 2015
 
 # This file is part of `gpinyin' which is part of `groff'.
 
@@ -58,4 +58,4 @@ uninstall-gpinyin-hook:
 ### Emacs settings
 # Local Variables:
 # mode: makefile-automake
-# End.
+# End:
diff --git a/contrib/grap2graph/grap2graph.am b/contrib/grap2graph/grap2graph.am
index 6c0b51b..e1a7aea 100644
--- a/contrib/grap2graph/grap2graph.am
+++ b/contrib/grap2graph/grap2graph.am
@@ -1,6 +1,6 @@
 # Copyright (C) 2003-2015  Free Software Foundation, Inc.
 #
-# Last update: 5 Aug 2015
+# Last update: 13 Aug 2015
 #
 # This file is part of groff.
 #
@@ -37,4 +37,4 @@ grap2graph: $(grap2graph_srcdir)/grap2graph.sh
 ### Emacs settings
 # Local Variables:
 # mode: makefile-automake
-# End.
+# End:
diff --git a/contrib/groff_filenames/groff_filenames.am b/contrib/groff_filenames/groff_filenames.am
index 4c76eaf..0f14ef4 100644
--- a/contrib/groff_filenames/groff_filenames.am
+++ b/contrib/groff_filenames/groff_filenames.am
@@ -4,7 +4,7 @@
 
 # Copyright (C) 2013-2015  Free Software Foundation, Inc.
 
-# Last update: 5 Aug 2015
+# Last update: 13 Aug 2015
 
 # Written by Bernd Warken <groff-bernd.warken-72@web.de>.
 # Automake migration by Bertrand Garrigues
@@ -36,4 +36,4 @@ EXTRA_DIST += \
 ### Emacs settings
 # Local Variables:
 # mode: makefile-automake
-# End.
+# End:
diff --git a/contrib/groffer/groffer.am b/contrib/groffer/groffer.am
index fa3f45b..87e2493 100644
--- a/contrib/groffer/groffer.am
+++ b/contrib/groffer/groffer.am
@@ -8,7 +8,7 @@
 # Bernd Warken <groff-bernd.warken-72@web.de>.
 # Automake migration by Bertrand Garrigues
 
-# Last update: 5 Aug 2015
+# Last update: 13 Aug 2015
 
 # This file is part of `groffer' which is part of `groff'.
 
@@ -112,4 +112,4 @@ uninstall-groffer-hook:
 ### Emacs settings
 # Local Variables:
 # mode: makefile-automake
-# End.
+# End:
diff --git a/contrib/hdtbl/hdtbl.am b/contrib/hdtbl/hdtbl.am
index 6a7ec92..61250e2 100644
--- a/contrib/hdtbl/hdtbl.am
+++ b/contrib/hdtbl/hdtbl.am
@@ -2,7 +2,7 @@
 #      Written by Werner Lemberg (wl@gnu.org)
 #      Automake migration by Bertrand Garrigues
 #
-# Last update: 5 Aug 2015
+# Last update: 13 Aug 2015
 #
 # This file is part of groff.
 #
@@ -132,4 +132,4 @@ uninstall-hdtbl-hook:
 ### Emacs settings
 # Local Variables:
 # mode: makefile-automake
-# End.
+# End:
diff --git a/contrib/mm/mm.am b/contrib/mm/mm.am
index 318c0c5..48929fa 100644
--- a/contrib/mm/mm.am
+++ b/contrib/mm/mm.am
@@ -1,7 +1,7 @@
 # Copyright 1991-2015
 #   Free Software Foundation, Inc.
 #
-# Last update: 5 Aug 2015
+# Last update: 13 Aug 2015
 #
 # This file is part of groff.
 #
@@ -112,4 +112,4 @@ dist_mm:
 ### Emacs settings
 # Local Variables:
 # mode: makefile-automake
-# End.
+# End:
diff --git a/contrib/mom/mom.am b/contrib/mom/mom.am
index db94742..503f919 100644
--- a/contrib/mom/mom.am
+++ b/contrib/mom/mom.am
@@ -3,7 +3,7 @@
 #      Written by Werner Lemberg (wl@gnu.org)
 #      Automake migration by Bertrand Garrigues
 #
-# Last update: 5 Aug 2015
+# Last update: 13 Aug 2015
 #
 # This file is part of groff.
 #
@@ -174,4 +174,4 @@ uninstall_mom:
 ### Emacs settings
 # Local Variables:
 # mode: makefile-automake
-# End.
+# End:
diff --git a/contrib/pdfmark/pdfmark.am b/contrib/pdfmark/pdfmark.am
index 6ebc6d9..451c8da 100644
--- a/contrib/pdfmark/pdfmark.am
+++ b/contrib/pdfmark/pdfmark.am
@@ -3,7 +3,7 @@
 #      Written by Keith Marshall (keith.d.marshall@ntlworld.com)
 #      Automake migration by Bertrand Garrigues
 #
-# Last update: 5 Aug 2015
+# Last update: 13 Aug 2015
 #
 # This file is part of groff.
 #
@@ -99,4 +99,4 @@ endif
 ### Emacs settings
 # Local Variables:
 # mode: makefile-automake
-# End.
+# End:
diff --git a/contrib/pic2graph/pic2graph.am b/contrib/pic2graph/pic2graph.am
index 78b6635..b8bf261 100644
--- a/contrib/pic2graph/pic2graph.am
+++ b/contrib/pic2graph/pic2graph.am
@@ -1,6 +1,6 @@
 # Copyright (C) 2001-2015  Free Software Foundation, Inc.
 #
-# Last update: 5 Aug 2015
+# Last update: 13 Aug 2015
 #
 # This file is part of groff.
 #
@@ -37,4 +37,4 @@ pic2graph: $(pic2graph_srcdir)/pic2graph.sh
 ### Emacs settings
 # Local Variables:
 # mode: makefile-automake
-# End.
+# End:
diff --git a/doc/doc.am b/doc/doc.am
index 1db4e14..27f47d6 100644
--- a/doc/doc.am
+++ b/doc/doc.am
@@ -3,7 +3,7 @@
 #      Automake migration by 
 #      Bertrand Garrigues <bertrand.garrigues@laposte.net>
 #
-# LAst update: 5 Aug 2015
+# LAst update: 13 Aug 2015
 #
 # This file is part of groff.
 #
@@ -446,4 +446,4 @@ dist-gnueps:
 ### Emacs settings
 # Local Variables:
 # mode: makefile-automake
-# End.
+# End:
diff --git a/font/devX100-12/devX100-12.am b/font/devX100-12/devX100-12.am
index ef73b62..c4bf9f6 100644
--- a/font/devX100-12/devX100-12.am
+++ b/font/devX100-12/devX100-12.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-15
 #   Free Software Foundation, Inc.
 #
-# Last update: 5 Aug 2015
+# Last update: 13 Aug 2015
 #
 # This file is part of `groff'.
 #
@@ -50,4 +50,4 @@ EXTRA_DIST += $(DEVX10012FONTS)
 ### Emacs settings
 # Local Variables:
 # mode: makefile-automake
-# End.
+# End:
diff --git a/font/devX100/devX100.am b/font/devX100/devX100.am
index b5f9ad3..439348d 100644
--- a/font/devX100/devX100.am
+++ b/font/devX100/devX100.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-15
 #   Free Software Foundation, Inc.
 #
-# Last update: 5 Aug 2015
+# Last update: 13 Aug 2015
 #
 # This file is part of `groff'.
 #
@@ -50,4 +50,4 @@ EXTRA_DIST += $(DEVX100FONTS)
 ### Emacs settings
 # Local Variables:
 # mode: makefile-automake
-# End.
+# End:
diff --git a/font/devX75-12/devX75-12.am b/font/devX75-12/devX75-12.am
index 4cd60f4..b8b32c5 100644
--- a/font/devX75-12/devX75-12.am
+++ b/font/devX75-12/devX75-12.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-15
 #   Free Software Foundation, Inc.
 #
-# Last update: 5 Aug 2015
+# Last update: 13 Aug 2015
 #
 # This file is part of `groff'
 #
@@ -48,4 +48,4 @@ EXTRA_DIST += $(DEVX7512FONTS)
 ### Emacs settings
 # Local Variables:
 # mode: makefile-automake
-# End.
+# End:
diff --git a/font/devX75/devX75.am b/font/devX75/devX75.am
index 4eb683c..00f2b6e 100644
--- a/font/devX75/devX75.am
+++ b/font/devX75/devX75.am
@@ -1,7 +1,7 @@
-# Copyright (C) 2014-15
+# Copyright (C) 2014-2015
 #   Free Software Foundation, Inc.
 #
-# Last update: 5 Aug 2015
+# Last update: 13 Aug 2015
 #
 # This file is part of `groff'
 #
@@ -50,4 +50,4 @@ EXTRA_DIST += $(DEVX75FONTS)
 ### Emacs settings
 # Local Variables:
 # mode: makefile-automake
-# End.
+# End:
diff --git a/font/devascii/devascii.am b/font/devascii/devascii.am
index 8b30675..bbb470c 100644
--- a/font/devascii/devascii.am
+++ b/font/devascii/devascii.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-15
 #   Free Software Foundation, Inc.
 #
-# Last update: 5 Aug 2015
+# Last update: 13 Aug 2015
 #
 # This file is part of `groff'
 #
@@ -52,4 +52,4 @@ font/devascii/DESC: $(devascii_srcdir)/DESC.proto
 ### Emacs settings
 # Local Variables:
 # mode: makefile-automake
-# End.
+# End:
diff --git a/font/devcp1047/devcp1047.am b/font/devcp1047/devcp1047.am
index d7f4a14..617c8f4 100644
--- a/font/devcp1047/devcp1047.am
+++ b/font/devcp1047/devcp1047.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-15
 #   Free Software Foundation, Inc.
 #
-# Last update: 5 Aug 2015
+# Last update: 13 Aug 2015
 #
 # This file is part of `groff'
 #
@@ -50,4 +50,4 @@ font/devcp1047/DESC: $(devcp1047_srcdir)/DESC.proto
 ### Emacs settings
 # Local Variables:
 # mode: makefile-automake
-# End.
+# End:
diff --git a/font/devdvi/devdvi.am b/font/devdvi/devdvi.am
index 1cb16b8..353bc6a 100644
--- a/font/devdvi/devdvi.am
+++ b/font/devdvi/devdvi.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-15
 #   Free Software Foundation, Inc.
 #
-# Last update: 5 Aug 2015
+# Last update: 13 Aug 2015
 #
 # This file is part of `groff'
 #
@@ -96,4 +96,4 @@ font/devdvi/DESC: $(devdvi_srcdir)/DESC.in
 ### Emacs settings
 # Local Variables:
 # mode: makefile-automake
-# End.
+# End:
diff --git a/font/devhtml/devhtml.am b/font/devhtml/devhtml.am
index 9f0f254..e2a39d6 100644
--- a/font/devhtml/devhtml.am
+++ b/font/devhtml/devhtml.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-15
 #   Free Software Foundation, Inc.
 #
-# Last update: 5 Aug 2015
+# Last update: 13 Aug 2015
 #
 # This file is part of `groff'
 #
@@ -62,4 +62,4 @@ font/devhtml/DESC: $(devhtml_srcdir)/DESC.proto
 ### Emacs settings
 # Local Variables:
 # mode: makefile-automake
-# End.
+# End:
diff --git a/font/devlatin1/devlatin1.am b/font/devlatin1/devlatin1.am
index f2ba32c..98730e1 100644
--- a/font/devlatin1/devlatin1.am
+++ b/font/devlatin1/devlatin1.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-15
 #   Free Software Foundation, Inc.
 #
-# Last update: 5 Aug 2015
+# Last update: 13 Aug 2015
 #
 # This file is part of `groff'
 #
@@ -50,4 +50,4 @@ font/devlatin1/DESC: $(devlatin1_srcdir)/DESC.proto
 ### Emacs settings
 # Local Variables:
 # mode: makefile-automake
-# End.
+# End:
diff --git a/font/devlbp/devlbp.am b/font/devlbp/devlbp.am
index 2b350df..f98e9ae 100644
--- a/font/devlbp/devlbp.am
+++ b/font/devlbp/devlbp.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-15
 #   Free Software Foundation, Inc.
 #
-# Last update: 5 Aug 2015
+# Last update: 13 Aug 2015
 #
 # This file is part of `groff'
 #
@@ -60,4 +60,4 @@ font/devlbp/DESC: $(devlbp_srcdir)/DESC.in
 ### Emacs settings
 # Local Variables:
 # mode: makefile-automake
-# End.
+# End:
diff --git a/font/devlj4/devlj4.am b/font/devlj4/devlj4.am
index 2687f5e..37477fc 100644
--- a/font/devlj4/devlj4.am
+++ b/font/devlj4/devlj4.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-15
 #   Free Software Foundation, Inc.
 #
-# Last update: 5 Aug 2015
+# Last update: 13 Aug 2015
 #
 # This file is part of `groff'
 #
@@ -110,4 +110,4 @@ devlj4_fonts: hpftodit font/devlj4/DESC
 ### Emacs settings
 # Local Variables:
 # mode: makefile-automake
-# End.
+# End:
diff --git a/font/devpdf/devpdf.am b/font/devpdf/devpdf.am
index 893000a..067da3f 100644
--- a/font/devpdf/devpdf.am
+++ b/font/devpdf/devpdf.am
@@ -4,7 +4,7 @@
 #      by Deri James <deri@chuzzlewit.demon.co.uk>
 #      Automake migration by Bertrand Garrigues
 #
-# Last update: 2015
+# Last update: 13 Aug 2015
 #
 # This file is part of groff.
 #
@@ -173,4 +173,4 @@ uninstall_devpdf:
 ### Emacs settings
 # Local Variables:
 # mode: makefile-automake
-# End.
+# End:
diff --git a/font/devps/devps.am b/font/devps/devps.am
index 9ea9d01..72c6799 100644
--- a/font/devps/devps.am
+++ b/font/devps/devps.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-15
 #   Free Software Foundation, Inc.
 #
-# Last update: 5 Aug 2015
+# Last update: 13 Aug 2015
 #
 # This file is part of `groff'
 #
@@ -176,4 +176,4 @@ font/devps/symbolsl.pfa: $(devps_srcdir)/symbolsl.ps
 ### Emacs settings
 # Local Variables:
 # mode: makefile-automake
-# End.
+# End:
diff --git a/font/devutf8/devutf8.am b/font/devutf8/devutf8.am
index 636ad02..574b632 100644
--- a/font/devutf8/devutf8.am
+++ b/font/devutf8/devutf8.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-15
 #   Free Software Foundation, Inc.
 #
-# Last update: 5 Aug 2015
+# Last update: 13 Aug 2015
 #
 # This file is part of `groff'
 #
@@ -54,4 +54,4 @@ font/devutf8/DESC: $(devutf8_srcdir)/DESC.proto
 ### Emacs settings
 # Local Variables:
 # mode: makefile-automake
-# End.
+# End:
diff --git a/font/scripts/scripts.am b/font/scripts/scripts.am
index 9a6dfbc..65e183f 100644
--- a/font/scripts/scripts.am
+++ b/font/scripts/scripts.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2015
 #   Free Software Foundation, Inc.
 #
-# Last update: 5 Aug 2015
+# Last update: 13 Aug 2015
 #
 # This file is part of groff.
 #
@@ -27,4 +27,4 @@ EXTRA_DIST += $(GENFONTSSH) $(GENDESCSH)
 ### Emacs settings
 # Local Variables:
 # mode: makefile-automake
-# End.
+# End:
diff --git a/man/man.am b/man/man.am
index 9d6ff2d..2428df1 100644
--- a/man/man.am
+++ b/man/man.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-15
 #   Free Software Foundation, Inc.
 #
-# Last update: 5 Aug 2015
+# Last update: 13 Aug 2015
 #
 # This file is part of `groff'
 #
@@ -48,4 +48,4 @@ man:
 ### Emacs settings
 # Local Variables:
 # mode: makefile-automake
-# End.
+# End:
diff --git a/src/devices/grodvi/grodvi.am b/src/devices/grodvi/grodvi.am
index 53af681..e7e59cd 100644
--- a/src/devices/grodvi/grodvi.am
+++ b/src/devices/grodvi/grodvi.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-15
 #      Free Software Foundation, Inc.
 #
-# Last update: 5 Aug 2015
+# Last update: 13 Aug 2015
 #
 # This file is part of groff.
 #
@@ -32,4 +32,4 @@ EXTRA_DIST += src/devices/grodvi/grodvi.man
 ### Emacs settings
 # Local Variables:
 # mode: makefile-automake
-# End.
+# End:
diff --git a/src/devices/grohtml/grohtml.am b/src/devices/grohtml/grohtml.am
index 8d33f8f..59d7d57 100644
--- a/src/devices/grohtml/grohtml.am
+++ b/src/devices/grohtml/grohtml.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-15
 #      Free Software Foundation, Inc.
 #
-# Last update: 5 Aug 2015
+# Last update: 13 Aug 2015
 #
 # This file is part of groff.
 #
@@ -40,4 +40,4 @@ EXTRA_DIST += src/devices/grohtml/grohtml.man
 ### Emacs settings
 # Local Variables:
 # mode: makefile-automake
-# End.
+# End:
diff --git a/src/devices/grolbp/grolbp.am b/src/devices/grolbp/grolbp.am
index a7f1ffe..ac829c3 100644
--- a/src/devices/grolbp/grolbp.am
+++ b/src/devices/grolbp/grolbp.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-15
 #      Free Software Foundation, Inc.
 #
-# Last update: 5 Aug 2015
+# Last update: 13 Aug 2015
 #
 # This file is part of groff.
 #
@@ -36,4 +36,4 @@ EXTRA_DIST += src/devices/grolbp/grolbp.man
 ### Emacs settings
 # Local Variables:
 # mode: makefile-automake
-# End.
+# End:
diff --git a/src/devices/grolj4/grolj4.am b/src/devices/grolj4/grolj4.am
index 7d4b5bf..5bb4271 100644
--- a/src/devices/grolj4/grolj4.am
+++ b/src/devices/grolj4/grolj4.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-15
 #      Free Software Foundation, Inc.
 #
-# Last update: 5 Aug 2015
+# Last update: 13 Aug 2015
 #
 # This file is part of groff.
 #
@@ -34,4 +34,4 @@ EXTRA_DIST += \
 ### Emacs settings
 # Local Variables:
 # mode: makefile-automake
-# End.
+# End:
diff --git a/src/devices/gropdf/gropdf.am b/src/devices/gropdf/gropdf.am
index 4d41d96..3e3d0e2 100644
--- a/src/devices/gropdf/gropdf.am
+++ b/src/devices/gropdf/gropdf.am
@@ -3,7 +3,7 @@
 #  Original Makefile.sub written by Deri James <deri@chuzzlewit.demon.co.uk>.
 #  Automake migration by Bertrand Garrigues
 #
-# Last update: 5 Aug 2015
+# Last update: 13 Aug 2015
 #
 # This file is part of groff.
 #
@@ -56,4 +56,4 @@ pdfmom: $(gropdf_dir)/pdfmom.pl $(SH_DEPS_SED_SCRIPT)
 ### Emacs settings
 # Local Variables:
 # mode: makefile-automake
-# End.
+# End:
diff --git a/src/devices/grops/grops.am b/src/devices/grops/grops.am
index 5edecf1..dffaae2 100644
--- a/src/devices/grops/grops.am
+++ b/src/devices/grops/grops.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-15
 #      Free Software Foundation, Inc.
 #
-# Last update: 5 Aug 2015
+# Last update: 13 Aug 2015
 #
 # This file is part of groff.
 #
@@ -38,4 +38,4 @@ EXTRA_DIST += \
 ### Emacs settings
 # Local Variables:
 # mode: makefile-automake
-# End.
+# End:
diff --git a/src/devices/grotty/grotty.am b/src/devices/grotty/grotty.am
index d200e5d..ad9cd2c 100644
--- a/src/devices/grotty/grotty.am
+++ b/src/devices/grotty/grotty.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-15
 #      Free Software Foundation, Inc.
 #
-# Last update: 5 Aug 2015
+# Last update: 13 Aug 2015
 #
 # This file is part of groff.
 #
@@ -34,4 +34,4 @@ EXTRA_DIST += \
 ### Emacs settings
 # Local Variables:
 # mode: makefile-automake
-# End.
+# End:
diff --git a/src/devices/xditview/xditview.am b/src/devices/xditview/xditview.am
index d4c65a0..2c90097 100644
--- a/src/devices/xditview/xditview.am
+++ b/src/devices/xditview/xditview.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-15
 #      Free Software Foundation, Inc.
 #
-# Last update: 5 Aug 2015
+# Last update: 13 Aug 2015
 #
 # This file is part of groff.
 #
@@ -114,4 +114,4 @@ endif
 ### Emacs settings
 # Local Variables:
 # mode: makefile-automake
-# End.
+# End:
diff --git a/src/include/include.am b/src/include/include.am
index 3b877f9..56577cc 100644
--- a/src/include/include.am
+++ b/src/include/include.am
@@ -2,9 +2,9 @@
 #
 # File position: <groff-source>/src/include/include.am
 #
-# Copyright (C) 2014-15  Free Software Foundation, Inc.
+# Copyright (C) 2014-2015  Free Software Foundation, Inc.
 #
-# Latest update: 5 Aug 2015
+# Latest update: 13 Aug 2015
 #
 # `groff' is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -48,4 +48,4 @@ dist_include:
 ### Emacs settings
 # Local Variables:
 # mode: makefile-automake
-# End.
+# End:
diff --git a/src/libs/libbib/libbib.am b/src/libs/libbib/libbib.am
index e889aed..63b140f 100644
--- a/src/libs/libbib/libbib.am
+++ b/src/libs/libbib/libbib.am
@@ -2,9 +2,9 @@
 #
 # File position: <groff-source>/src/libs/libbib/libbib.am
 #
-# Copyright (C) 2014-15  Free Software Foundation, Inc.
+# Copyright (C) 2014-2015  Free Software Foundation, Inc.
 #
-# Latest update: 5 Aug 2015
+# Latest update: 13 Aug 2015
 #
 # `groff' is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -36,4 +36,4 @@ src/libs/libbib/index.$(OBJEXT): defs.h
 ### Emacs settings
 # Local Variables:
 # mode: makefile-automake
-# End.
+# End:
diff --git a/src/libs/libdriver/libdriver.am b/src/libs/libdriver/libdriver.am
index eec328a..34497ca 100644
--- a/src/libs/libdriver/libdriver.am
+++ b/src/libs/libdriver/libdriver.am
@@ -2,9 +2,9 @@
 #
 # File position: <groff-source>/src/libs/libdriver/libdriver.am
 #
-# Copyright (C) 2014-15  Free Software Foundation, Inc.
+# Copyright (C) 2014-2015  Free Software Foundation, Inc.
 #
-# Latest update: 5 Aug 2015
+# Latest update: 13 Aug 2015
 #
 # `groff' is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -32,4 +32,4 @@ libdriver_a_SOURCES = \
 ### Emacs settings
 # Local Variables:
 # mode: makefile-automake
-# End.
+# End:
diff --git a/src/libs/libgroff/libgroff.am b/src/libs/libgroff/libgroff.am
index 6eb6959..78e3394 100644
--- a/src/libs/libgroff/libgroff.am
+++ b/src/libs/libgroff/libgroff.am
@@ -1,7 +1,7 @@
-# Copyright (C) 2014-15
+# Copyright (C) 2014-2015
 #      Free Software Foundation, Inc.
 #
-# Latest update: 5 Aug 2015
+# Latest update: 13 Aug 2015
 #
 # This file is part of groff.
 #
@@ -178,4 +178,4 @@ uninstall_charset_data:
 ### Emacs settings
 # Local Variables:
 # mode: makefile-automake
-# End.
+# End:
diff --git a/src/libs/libxutil/libxutil.am b/src/libs/libxutil/libxutil.am
index 83b964f..93eb378 100644
--- a/src/libs/libxutil/libxutil.am
+++ b/src/libs/libxutil/libxutil.am
@@ -2,9 +2,9 @@
 #
 # File position: <groff-source>/src/libs/libxutil/libxutil.am
 #
-# Copyright (C) 2014-15 Free Software Foundation, Inc.
+# Copyright (C) 2014-2015 Free Software Foundation, Inc.
 #
-# Latest update: 5 Aug 2015
+# Latest update: 13 Aug 2015
 #
 # `groff' is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -36,4 +36,4 @@ endif
 ### Emacs settings
 # Local Variables:
 # mode: makefile-automake
-# End.
+# End:
diff --git a/src/preproc/eqn/eqn.am b/src/preproc/eqn/eqn.am
index 9184e33..b6ad937 100644
--- a/src/preproc/eqn/eqn.am
+++ b/src/preproc/eqn/eqn.am
@@ -1,7 +1,7 @@
-# Copyright (C) 2014-15
+# Copyright (C) 2014-2015
 #      Free Software Foundation, Inc.
 #
-# Latest update: 5 Aug 2015
+# Latest update: 13 Aug 2015
 #
 # This file is part of groff.
 #
@@ -70,4 +70,4 @@ neqn: $(top_srcdir)/src/preproc/eqn/neqn.sh $(SH_DEPS_SED_SCRIPT)
 ### Emacs settings
 # Local Variables:
 # mode: makefile-automake
-# End.
+# End:
diff --git a/src/preproc/grn/grn.am b/src/preproc/grn/grn.am
index 9691bff..b385386 100644
--- a/src/preproc/grn/grn.am
+++ b/src/preproc/grn/grn.am
@@ -1,7 +1,7 @@
-# Copyright (C) 2014-15
+# Copyright (C) 2014-2015
 #      Free Software Foundation, Inc.
 #
-# Latest update: 5 Aug 2015
+# Latest update: 13 Aug 2015
 #
 # This file is part of groff.
 #
@@ -35,4 +35,4 @@ EXTRA_DIST += src/preproc/grn/README src/preproc/grn/grn.man
 ### Emacs settings
 # Local Variables:
 # mode: makefile-automake
-# End.
+# End:
diff --git a/src/preproc/html/html.am b/src/preproc/html/html.am
index c9a449f..2a9d8d2 100644
--- a/src/preproc/html/html.am
+++ b/src/preproc/html/html.am
@@ -1,7 +1,7 @@
-# Copyright (C) 2014-15
+# Copyright (C) 2014-2015
 #      Free Software Foundation, Inc.
 #
-# Latest update: 5 Aug 2015
+# Latest update: 13 Aug 2015
 #
 # This file is part of groff.
 #
@@ -32,4 +32,4 @@ src/preproc/html/pre-html.$(OBJEXT): defs.h
 ### Emacs settings
 # Local Variables:
 # mode: makefile-automake
-# End.
+# End:
diff --git a/src/preproc/pic/pic.am b/src/preproc/pic/pic.am
index 18ee0e5..ced4780 100644
--- a/src/preproc/pic/pic.am
+++ b/src/preproc/pic/pic.am
@@ -1,7 +1,7 @@
-# Copyright (C) 2014-15
+# Copyright (C) 2014-2015
 #      Free Software Foundation, Inc.
 #
-# Latest update: 5 Aug 2015
+# Latest update: 13 Aug 2015
 #
 # This file is part of groff.
 #
@@ -54,4 +54,4 @@ CLEANFILES += \
 ### Emacs settings
 # Local Variables:
 # mode: makefile-automake
-# End.
+# End:
diff --git a/src/preproc/preconv/preconv.am b/src/preproc/preconv/preconv.am
index e4130e1..e5c119e 100644
--- a/src/preproc/preconv/preconv.am
+++ b/src/preproc/preconv/preconv.am
@@ -1,7 +1,7 @@
-# Copyright (C) 2014-15
+# Copyright (C) 2014-2015
 #      Free Software Foundation, Inc.
 #
-# Latest update: 5 Aug 2015
+# Latest update: 13 Aug 2015
 #
 # This file is part of groff.
 #
@@ -29,4 +29,4 @@ EXTRA_DIST += src/preproc/preconv/preconv.man
 ### Emacs settings
 # Local Variables:
 # mode: makefile-automake
-# End.
+# End:
diff --git a/src/preproc/refer/refer.am b/src/preproc/refer/refer.am
index 33b4ca9..6d82898 100644
--- a/src/preproc/refer/refer.am
+++ b/src/preproc/refer/refer.am
@@ -1,7 +1,7 @@
-# Copyright (C) 2014-15
+# Copyright (C) 2014-2015
 #      Free Software Foundation, Inc.
 #
-# Latest update: 5 Aug 2015
+# Latest update: 13 Aug 2015
 #
 # This file is part of groff.
 #
@@ -49,4 +49,4 @@ src/preproc/refer/refer-label.$(OBJEXT): defs.h
 ### Emacs settings
 # Local Variables:
 # mode: makefile-automake
-# End.
+# End:
diff --git a/src/preproc/soelim/soelim.am b/src/preproc/soelim/soelim.am
index debc1ae..c5d9d87 100644
--- a/src/preproc/soelim/soelim.am
+++ b/src/preproc/soelim/soelim.am
@@ -1,7 +1,7 @@
-# Copyright (C) 2014-15
+# Copyright (C) 2014-2015
 #      Free Software Foundation, Inc.
 #
-# Latest update: 5 Aug 2015
+# Latest update: 13 Aug 2015
 #
 # This file is part of groff.
 #
@@ -31,4 +31,4 @@ EXTRA_DIST += \
 ### Emacs settings
 # Local Variables:
 # mode: makefile-automake
-# End.
+# End:
diff --git a/src/preproc/tbl/tbl.am b/src/preproc/tbl/tbl.am
index 5b41f3c..ce03299 100644
--- a/src/preproc/tbl/tbl.am
+++ b/src/preproc/tbl/tbl.am
@@ -1,7 +1,7 @@
-# Copyright (C) 2014-15
+# Copyright (C) 2014-2015
 #      Free Software Foundation, Inc.
 #
-# Latest update: 5 Aug 2015
+# Latest update: 13 Aug 2015
 #
 # This file is part of groff.
 #
@@ -32,4 +32,4 @@ EXTRA_DIST += src/preproc/tbl/tbl.man
 ### Emacs settings
 # Local Variables:
 # mode: makefile-automake
-# End.
+# End:
diff --git a/src/roff/groff/groff.am b/src/roff/groff/groff.am
index 169c9d7..3c90715 100644
--- a/src/roff/groff/groff.am
+++ b/src/roff/groff/groff.am
@@ -8,7 +8,7 @@
 #   Automake migration by 
 #   Bertrand Garrigues <bertrand.garrigues@laposte.net>
 #
-# Latest update: 5 Aug 2015
+# Latest update: 13 Aug 2015
 #
 # `groff' is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -66,4 +66,4 @@ groff_opts_with_arg.txt: groff_opts_no_arg.txt
 ### Emacs settings
 # Local Variables:
 # mode: makefile-automake
-# End.
+# End:
diff --git a/src/roff/grog/grog.am b/src/roff/grog/grog.am
index b1dcb35..2e7382f 100644
--- a/src/roff/grog/grog.am
+++ b/src/roff/grog/grog.am
@@ -5,7 +5,7 @@
 # Copyright (C) 1993-2015
 #   Free Software Foundation, Inc.
 #
-# Latest update: 5 Aug 2015
+# Latest update: 13 Aug 2015
 #
 # This file is part of `grog' which is part of `groff'.
 #
@@ -55,4 +55,4 @@ grog: $(grog_srcdir)/grog.pl $(GROG) $(SH_DEPS_SED_SCRIPT)
 ### Emacs settings
 # Local Variables:
 # mode: makefile-automake
-# End.
+# End:
diff --git a/src/roff/nroff/nroff.am b/src/roff/nroff/nroff.am
index f0ad935..b8d462f 100644
--- a/src/roff/nroff/nroff.am
+++ b/src/roff/nroff/nroff.am
@@ -1,7 +1,7 @@
-# Copyright (C) 2014-15
+# Copyright (C) 2014-2015
 #      Free Software Foundation, Inc.
 #
-# Latest update: 5 Aug 2015
+# Latest update: 13 Aug 2015
 #
 # This file is part of groff.
 #
@@ -37,4 +37,4 @@ nroff: $(nroff_srcdir)/nroff.sh $(SH_DEPS_SED_SCRIPT)
 ### Emacs settings
 # Local Variables:
 # mode: makefile-automake
-# End.
+# End:
diff --git a/src/roff/troff/troff.am b/src/roff/troff/troff.am
index 50091a2..f5e0695 100644
--- a/src/roff/troff/troff.am
+++ b/src/roff/troff/troff.am
@@ -1,7 +1,7 @@
-# Copyright (C) 2014-15
+# Copyright (C) 2014-2015
 #      Free Software Foundation, Inc.
 #
-# Latest update: 5 Aug 2015
+# Latest update: 13 Aug 2015
 #
 # This file is part of groff.
 #
@@ -67,4 +67,4 @@ src/roff/troff/majorminor.cpp: $(top_srcdir)/VERSION $(top_srcdir)/REVISION
 ### Emacs settings
 # Local Variables:
 # mode: makefile-automake
-# End.
+# End:
diff --git a/src/utils/addftinfo/addftinfo.am b/src/utils/addftinfo/addftinfo.am
index b029685..58e0ab6 100644
--- a/src/utils/addftinfo/addftinfo.am
+++ b/src/utils/addftinfo/addftinfo.am
@@ -2,9 +2,9 @@
 #
 # File position: <groff-source>/src/utils/addftinfo/addftinfo.am
 #
-# Copyright (C) 2014-15  Free Software Foundation, Inc.
+# Copyright (C) 2014-2015  Free Software Foundation, Inc.
 #
-# Latest update: 5 Aug 2015
+# Latest update: 13 Aug 2015
 #
 # `groff' is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -36,4 +36,4 @@ addftinfo_SOURCES = \
 ### Emacs settings
 # Local Variables:
 # mode: makefile-automake
-# End.
+# End:
diff --git a/src/utils/afmtodit/afmtodit.am b/src/utils/afmtodit/afmtodit.am
index 707880f..bf9f3ec 100644
--- a/src/utils/afmtodit/afmtodit.am
+++ b/src/utils/afmtodit/afmtodit.am
@@ -4,7 +4,7 @@
 #
 # Copyright (C) 2013-2015  Free Software Foundation, Inc.
 #
-# Latest update: 5 Aug 2015
+# Latest update: 13 Aug 2015
 #
 # This file is part of groff.
 #
@@ -55,4 +55,4 @@ afmtodit: $(afmtodit_srcdir)/afmtodit.pl $(afmtodit_srcdir)/afmtodit.tables
 ### Emacs settings
 # Local Variables:
 # mode: makefile-automake
-# End.
+# End:
diff --git a/src/utils/hpftodit/hpftodit.am b/src/utils/hpftodit/hpftodit.am
index cb9d27b..dc9e18f 100644
--- a/src/utils/hpftodit/hpftodit.am
+++ b/src/utils/hpftodit/hpftodit.am
@@ -4,7 +4,7 @@
 #
 # Copyright (C) 2014-2015  Free Software Foundation, Inc.
 #
-# Latest update: 5 Aug 2015
+# Latest update: 13 Aug 2015
 #
 # `groff' is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -35,4 +35,4 @@ hpftodit_SOURCES = \
 ### Emacs settings
 # Local Variables:
 # mode: makefile-automake
-# End.
+# End:
diff --git a/src/utils/indxbib/indxbib.am b/src/utils/indxbib/indxbib.am
index c2651f4..826d439 100644
--- a/src/utils/indxbib/indxbib.am
+++ b/src/utils/indxbib/indxbib.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-2015
 #      Free Software Foundation, Inc.
 #
-# Latest update: 5 Aug 2015
+# Latest update: 13 Aug 2015
 #
 # This file is part of groff.
 #
@@ -57,4 +57,4 @@ uninstall_indxbib:
 ### Emacs settings
 # Local Variables:
 # mode: makefile-automake
-# End.
+# End:
diff --git a/src/utils/lkbib/lkbib.am b/src/utils/lkbib/lkbib.am
index 3b15076..0a6ae30 100644
--- a/src/utils/lkbib/lkbib.am
+++ b/src/utils/lkbib/lkbib.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-2015
 #      Free Software Foundation, Inc.
 #
-# Latest update: 5 Aug 2015
+# Latest update: 13 Aug 2015
 #
 # This file is part of groff.
 #
@@ -30,4 +30,4 @@ src/utils/lkbib/lkbib.$(OBJEXT): defs.h
 ### Emacs settings
 # Local Variables:
 # mode: makefile-automake
-# End.
+# End:
diff --git a/src/utils/lookbib/lookbib.am b/src/utils/lookbib/lookbib.am
index 7fda71a..5c19c20 100644
--- a/src/utils/lookbib/lookbib.am
+++ b/src/utils/lookbib/lookbib.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-2015
 #      Free Software Foundation, Inc.
 #
-# Latest update: 5 Aug 2015
+# Latest update: 13 Aug 2015
 #
 # This file is part of groff.
 #
@@ -29,4 +29,4 @@ lookbib_SOURCES = src/utils/lookbib/lookbib.cpp
 ### Emacs settings
 # Local Variables:
 # mode: makefile-automake
-# End.
+# End:
diff --git a/src/utils/pfbtops/pfbtops.am b/src/utils/pfbtops/pfbtops.am
index bc99cfd..4e8f520 100644
--- a/src/utils/pfbtops/pfbtops.am
+++ b/src/utils/pfbtops/pfbtops.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-2015
 #      Free Software Foundation, Inc.
 #
-# Latest update: 5 Aug 2015
+# Latest update: 13 Aug 2015
 #
 # This file is part of groff.
 #
@@ -32,4 +32,4 @@ nodist_EXTRA_pfbtops_SOURCES = src/utils/pfbtops/dummy.cpp
 ### Emacs settings
 # Local Variables:
 # mode: makefile-automake
-# End.
+# End:
diff --git a/src/utils/tfmtodit/tfmtodit.am b/src/utils/tfmtodit/tfmtodit.am
index 00ee06f..728f47c 100644
--- a/src/utils/tfmtodit/tfmtodit.am
+++ b/src/utils/tfmtodit/tfmtodit.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-2015
 #      Free Software Foundation, Inc.
 #
-# Latest update: 5 Aug 2015
+# Latest update: 13 Aug 2015
 #
 # This file is part of groff.
 #
@@ -29,4 +29,4 @@ tfmtodit_LDADD = libgroff.a $(LIBM)
 ### Emacs settings
 # Local Variables:
 # mode: makefile-automake
-# End.
+# End:
diff --git a/src/utils/xtotroff/xtotroff.am b/src/utils/xtotroff/xtotroff.am
index fc43ba0..3fad985 100644
--- a/src/utils/xtotroff/xtotroff.am
+++ b/src/utils/xtotroff/xtotroff.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-2015
 #      Free Software Foundation, Inc.
 #
-# Latest update: 5 Aug 2015
+# Latest update: 13 Aug 2015
 #
 # This file is part of groff.
 #
@@ -34,4 +34,4 @@ EXTRA_DIST += src/utils/xtotroff/xtotroff.man
 ### Emacs settings
 # Local Variables:
 # mode: makefile-automake
-# End.
+# End:
diff --git a/tmac/tmac.am b/tmac/tmac.am
index c387892..f26a24d 100644
--- a/tmac/tmac.am
+++ b/tmac/tmac.am
@@ -3,7 +3,7 @@
 #      Written by James Clark (jjc@jclark.com)
 #      Automake migration by Bertrand Garrigues
 #
-# Latest update: 5 Aug 2015
+# Latest update: 13 Aug 2015
 #
 # This file is part of groff.
 #
@@ -256,4 +256,4 @@ uninstall_tmac_hook:
 ### Emacs settings
 # Local Variables:
 # mode: makefile-automake
-# End.
+# End:


From MAILER-DAEMON Thu Aug 20 02:27:57 2015
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1ZSJKP-0007FV-F7
	for mharc-groff-commit@gnu.org; Thu, 20 Aug 2015 02:27:57 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:56687)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <bernd.warken@web.de>) id 1ZSJKL-0007C1-N0
	for groff-commit@gnu.org; Thu, 20 Aug 2015 02:27:54 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <bernd.warken@web.de>) id 1ZSJKK-0004cg-M2
	for groff-commit@gnu.org; Thu, 20 Aug 2015 02:27:53 -0400
Received: from vcs.savannah.gnu.org ([208.118.235.72]:58407)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <bernd.warken@web.de>) id 1ZSJKK-0004c0-C2
	for groff-commit@gnu.org; Thu, 20 Aug 2015 02:27:52 -0400
Received: from bwarken by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <bernd.warken@web.de>) id 1ZSJKJ-0004QS-3Q
	for groff-commit@gnu.org; Thu, 20 Aug 2015 06:27:51 +0000
Date: Thu, 20 Aug 2015 06:27:51 +0000
Message-Id: <E1ZSJKJ-0004QS-3Q@vcs.savannah.gnu.org>
To: groff-commit@gnu.org
Subject: [groff] 01/01: Makefile.am: fix definitions of man[157]_MANS.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
In-Reply-To: groff@gnu.org
References: <20150820062750.16978.43336@vcs.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: 0bd7697884d4e8c73ecca9ef60342097f02121d4
Auto-Submitted: auto-generated
From: Bernd Warken <bernd.warken@web.de>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 208.118.235.72
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: groff@gnu.org
List-Id: <groff-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/groff-commit>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 20 Aug 2015 06:27:55 -0000

bwarken pushed a commit to branch master
in repository groff.

commit 0bd7697884d4e8c73ecca9ef60342097f02121d4
Author: Bernd Warken <groff-bernd.warken-72@web.de>
Date:   Thu Aug 20 08:27:37 2015 +0200

    Makefile.am: fix definitions of man[157]_MANS.
---
 ChangeLog   |    4 ++++
 Makefile.am |    6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8c8b6fc..201c33f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-08-20  Bernd Warken  <groff-bernd.warken-72@web.de>
+
+	* Makefile.am: Fix definition of man[157]_MANS.
+
 2015-08-13  Bernd Warken  <groff-bernd.warken-72@web.de>
 
 	* all *.am: Correct Emacs mode `End:' instead of `End.'.
diff --git a/Makefile.am b/Makefile.am
index 8c2ca10..1d991ce 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@
 # Original Makefile.in written by James Clark (jjc@jclark.com)
 # Migrated to Automake by Bertrand Garrigues
 #
-# Last update: 5 Aug 2015
+# Last update: 20 Aug 2015
 #
 # This file is part of groff.
 #
@@ -734,8 +734,8 @@ uninstall-prefix-man:
 	done
 else
 man1_MANS += $(PREFIXMAN1)
-man1_MANS += $(PREFIXMAN5)
-man1_MANS += $(PREFIXMAN7)
+man5_MANS += $(PREFIXMAN5)
+man7_MANS += $(PREFIXMAN7)
 install-prefix-man:
 uninstall-prefix-man:
 generate_man_files:


From MAILER-DAEMON Sat Aug 22 07:30:50 2015
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1ZT70c-0002Ej-Qk
	for mharc-groff-commit@gnu.org; Sat, 22 Aug 2015 07:30:50 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:34780)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <bernd.warken@web.de>) id 1ZT70V-0002Bj-M8
	for groff-commit@gnu.org; Sat, 22 Aug 2015 07:30:49 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <bernd.warken@web.de>) id 1ZT70Q-0003np-7A
	for groff-commit@gnu.org; Sat, 22 Aug 2015 07:30:43 -0400
Received: from vcs.savannah.gnu.org ([208.118.235.72]:45673)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <bernd.warken@web.de>) id 1ZT70Q-0003nl-31
	for groff-commit@gnu.org; Sat, 22 Aug 2015 07:30:38 -0400
Received: from bwarken by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <bernd.warken@web.de>) id 1ZT70P-0001g9-8k
	for groff-commit@gnu.org; Sat, 22 Aug 2015 11:30:37 +0000
Date: Sat, 22 Aug 2015 11:30:37 +0000
Message-Id: <E1ZT70P-0001g9-8k@vcs.savannah.gnu.org>
To: groff-commit@gnu.org
Subject: [groff] 01/01: To each man page *.man add a section number. Give
	these informations to all automake Makefiles *.am.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
In-Reply-To: groff@gnu.org
References: <20150822113037.6422.44330@vcs.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: 929dfe4b3bbc2c3ed35f4361c7253e5411332cde
Auto-Submitted: auto-generated
From: Bernd Warken <bernd.warken@web.de>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 208.118.235.72
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: groff@gnu.org
List-Id: <groff-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/groff-commit>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 22 Aug 2015 11:30:49 -0000

bwarken pushed a commit to branch master
in repository groff.

commit 929dfe4b3bbc2c3ed35f4361c7253e5411332cde
Author: Bernd Warken <groff-bernd.warken-72@web.de>
Date:   Sat Aug 22 13:30:16 2015 +0200

    To each man page *.man add a section number.  Give these informations to all automake Makefiles *.am.
---
 Makefile.am                                        |   87 +++++++++++++++++++-
 contrib/chem/{chem.man => chem.1.man}              |    0
 contrib/chem/chem.am                               |    6 +-
 .../eqn2graph/{eqn2graph.man => eqn2graph.1.man}   |    0
 contrib/eqn2graph/eqn2graph.am                     |    6 +-
 contrib/gdiffmk/{gdiffmk.man => gdiffmk.1.man}     |    0
 contrib/gdiffmk/gdiffmk.am                         |    6 +-
 .../glilypond/{glilypond.man => glilypond.1.man}   |    0
 contrib/glilypond/glilypond.am                     |    4 +-
 contrib/gperl/{gperl.man => gperl.1.man}           |    0
 contrib/gperl/gperl.am                             |    6 +-
 contrib/gpinyin/{gpinyin.man => gpinyin.1.man}     |    0
 contrib/gpinyin/gpinyin.am                         |    4 +-
 .../{grap2graph.man => grap2graph.1.man}           |    0
 contrib/grap2graph/grap2graph.am                   |    4 +-
 .../{groff_filenames.man => groff_filenames.1.man} |    0
 contrib/groff_filenames/groff_filenames.am         |    4 +-
 contrib/groffer/{groffer.man => groffer.1.man}     |    0
 contrib/groffer/groffer.am                         |   24 +++---
 contrib/groffer/{roff2.man => roff2.1.man}         |    0
 .../hdtbl/{groff_hdtbl.man => groff_hdtbl.7.man}   |    0
 contrib/hdtbl/hdtbl.am                             |    4 +-
 contrib/mm/{groff_mm.man => groff_mm.7.man}        |    0
 contrib/mm/{groff_mmse.man => groff_mmse.7.man}    |    0
 contrib/mm/mm.am                                   |    8 +-
 contrib/mm/{mmroff.man => mmroff.1.man}            |    0
 contrib/mom/{groff_mom.man => groff_mom.7.man}     |    0
 contrib/mom/mom.am                                 |    4 +-
 contrib/pdfmark/pdfmark.am                         |    4 +-
 contrib/pdfmark/{pdfroff.man => pdfroff.1.man}     |    0
 .../pic2graph/{pic2graph.man => pic2graph.1.man}   |    0
 contrib/pic2graph/pic2graph.am                     |    4 +-
 man/{ditroff.man => ditroff.7.man}                 |    0
 man/{groff.man => groff.7.man}                     |    0
 man/{groff_char.man => groff_char.7.man}           |    0
 man/{groff_diff.man => groff_diff.7.man}           |    0
 man/{groff_font.man => groff_font.5.man}           |    0
 man/{groff_out.man => groff_out.5.man}             |    0
 man/{groff_tmac.man => groff_tmac.5.man}           |    0
 man/man.am                                         |   16 ++--
 man/{roff.man => roff.7.man}                       |    0
 src/devices/grodvi/{grodvi.man => grodvi.1.man}    |    0
 src/devices/grodvi/grodvi.am                       |    4 +-
 src/devices/grohtml/{grohtml.man => grohtml.1.man} |    0
 src/devices/grohtml/grohtml.am                     |    4 +-
 src/devices/grolbp/{grolbp.man => grolbp.1.man}    |    0
 src/devices/grolbp/grolbp.am                       |    2 +-
 src/devices/grolj4/{grolj4.man => grolj4.1.man}    |    0
 src/devices/grolj4/grolj4.am                       |    6 +-
 .../grolj4/{lj4_font.man => lj4_font.5.man}        |    0
 src/devices/gropdf/{gropdf.man => gropdf.1.man}    |    0
 src/devices/gropdf/gropdf.am                       |    6 +-
 src/devices/gropdf/{pdfmom.man => pdfmom.1.man}    |    0
 src/devices/grops/{grops.man => grops.1.man}       |    0
 src/devices/grops/grops.am                         |    4 +-
 src/devices/grotty/{grotty.man => grotty.1.man}    |    0
 src/devices/grotty/grotty.am                       |    6 +-
 .../xditview/{gxditview.man => gxditview.1.man}    |    0
 src/devices/xditview/xditview.am                   |    6 +-
 src/preproc/eqn/{eqn.man => eqn.1.man}             |    0
 src/preproc/eqn/eqn.am                             |    6 +-
 src/preproc/eqn/{neqn.man => neqn.1.man}           |    0
 src/preproc/grn/{grn.man => grn.1.man}             |    0
 src/preproc/grn/grn.am                             |    4 +-
 src/preproc/pic/{pic.man => pic.1.man}             |    0
 src/preproc/pic/pic.am                             |    4 +-
 src/preproc/preconv/{preconv.man => preconv.1.man} |    0
 src/preproc/preconv/preconv.am                     |    4 +-
 src/preproc/refer/{refer.man => refer.1.man}       |    0
 src/preproc/refer/refer.am                         |    4 +-
 src/preproc/soelim/{soelim.man => soelim.1.man}    |    0
 src/preproc/soelim/soelim.am                       |    4 +-
 src/preproc/tbl/{tbl.man => tbl.1.man}             |    0
 src/preproc/tbl/tbl.am                             |    4 +-
 src/roff/groff/{groff.man => groff.1.man}          |    0
 src/roff/groff/groff.am                            |    4 +-
 src/roff/grog/{grog.man => grog.1.man}             |    0
 src/roff/grog/grog.am                              |    4 +-
 src/roff/nroff/{nroff.man => nroff.1.man}          |    0
 src/roff/nroff/nroff.am                            |    4 +-
 src/roff/troff/{troff.man => troff.1.man}          |    0
 src/roff/troff/troff.am                            |    4 +-
 .../addftinfo/{addftinfo.man => addftinfo.1.man}   |    0
 src/utils/addftinfo/addftinfo.am                   |    4 +-
 .../afmtodit/{afmtodit.man => afmtodit.1.man}      |    0
 src/utils/afmtodit/afmtodit.am                     |    4 +-
 .../hpftodit/{hpftodit.man => hpftodit.1.man}      |    0
 src/utils/hpftodit/hpftodit.am                     |    4 +-
 src/utils/indxbib/{indxbib.man => indxbib.1.man}   |    0
 src/utils/indxbib/indxbib.am                       |    4 +-
 src/utils/lkbib/{lkbib.man => lkbib.1.man}         |    0
 src/utils/lkbib/lkbib.am                           |    4 +-
 src/utils/lookbib/{lookbib.man => lookbib.1.man}   |    0
 src/utils/lookbib/lookbib.am                       |    4 +-
 src/utils/pfbtops/{pfbtops.man => pfbtops.1.man}   |    0
 src/utils/pfbtops/pfbtops.am                       |    4 +-
 .../tfmtodit/{tfmtodit.man => tfmtodit.1.man}      |    0
 src/utils/tfmtodit/tfmtodit.am                     |    4 +-
 .../xtotroff/{xtotroff.man => xtotroff.1.man}      |    0
 src/utils/xtotroff/xtotroff.am                     |    4 +-
 tmac/{groff_man.man => groff_man.7.man}            |    0
 tmac/{groff_mdoc.man => groff_mdoc.7.man}          |    0
 tmac/{groff_me.man => groff_me.7.man}              |    0
 tmac/{groff_ms.man => groff_ms.7.man}              |    0
 tmac/{groff_trace.man => groff_trace.7.man}        |    0
 tmac/{groff_www.man => groff_www.7.man}            |    0
 tmac/tmac.am                                       |   14 ++--
 107 files changed, 204 insertions(+), 121 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 1d991ce..32303c0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@
 # Original Makefile.in written by James Clark (jjc@jclark.com)
 # Migrated to Automake by Bertrand Garrigues
 #
-# Last update: 20 Aug 2015
+# Last update: 22 Aug 2015
 #
 # This file is part of groff.
 #
@@ -856,7 +856,90 @@ MOSTLYCLEANFILES += $(prefixexecbin_SCRIPTS) $(bin_SCRIPTS) \
 
 # Rule to build .man files. The brackets around the @ are used to prevent the 
 # substitution of the variable by automake. 
-.man.n:
+
+SUFFIXES = .1.man .n
+
+.1.man.n:
+	@echo Making $@ from $<
+	rm -f $@
+	$(MKDIR_P) `dirname $@`
+	@LC_ALL=C \
+	 sed -e "s|[@]APPRESDIR[@]|$(appresdir)|g" \
+	     -e "s|[@]BINDIR[@]|$(bindir)|g" \
+	     -e "s|[@]BROKEN_SPOOLER_FLAGS[@]|$(BROKEN_SPOOLER_FLAGS)|g" \
+	     -e "s|[@]COMMON_WORDS_FILE[@]|$(common_words_file)|g" \
+	     -e "s|[@]DATASUBDIR[@]|$(datasubdir)|g" \
+	     -e "s|[@]DEFAULT_INDEX[@]|$(indexdir)/$(indexname)|g" \
+	     -e "s|[@]DEFAULT_INDEX_NAME[@]|$(indexname)|g" \
+	     -e "s|[@]DEVICE[@]|$(DEVICE)|g" \
+	     -e "s|[@]DOCDIR[@]|$(docdir)|g" \
+	     -e "s|[@]EXAMPLEDIR[@]|$(exampledir)|g" \
+	     -e "s|[@]FONTDIR[@]|$(fontdir)|g" \
+	     -e "s|[@]g[@]|$(g)|g" \
+	     -e "s![@]G[@]!`echo $(g) | tr [a-z] [A-Z]`!g" \
+	     -e "s|[@]HTMLDOCDIR[@]|$(htmldocdir)|g" \
+	     -e "s|[@]INDEX_SUFFIX[@]|$(indexext)|g" \
+	     -e "s|[@]LEGACYFONTDIR[@]|$(legacyfontdir)|g" \
+	     -e "s|[@]LOCALFONTDIR[@]|$(localfontdir)|g" \
+	     -e "s|[@]LOCALMACRODIR[@]|$(localtmacdir)|g" \
+	     -e "s|[@]MACRODIR[@]|$(tmacdir)|g" \
+	     -e "s|[@]MAN1EXT[@]|$(man1ext)|g" \
+	     -e "s|[@]MAN5EXT[@]|$(man5ext)|g" \
+	     -e "s|[@]MAN7EXT[@]|$(man7ext)|g" \
+	     -e "s|[@]MDATE[@]|`$(SHELL) $(top_srcdir)/mdate.sh $<`|g" \
+	     -e "s|[@]OLDFONTDIR[@]|$(oldfontdir)|g" \
+	     -e "s|[@]PDFDOCDIR[@]|$(pdfdocdir)|g" \
+	     -e "s|[@]SYSTEMMACRODIR[@]|$(systemtmacdir)|g" \
+	     -e "s|[@]TMAC_AN_PREFIX[@]|$(tmac_an_prefix)|g" \
+	     -e "s|[@]TMAC_M_PREFIX[@]|$(tmac_m_prefix)|g" \
+	     -e "s|[@]TMAC_MDIR[@]|$(tmacdir)/mm|g" \
+	     -e "s|[@]TMAC_S_PREFIX[@]|$(tmac_s_prefix)|g" \
+	     -e "s|[@]VERSION[@]|$(VERSION)|g" \
+	 $< >$@
+
+SUFFIXES = .5.man .n
+
+.5.man.n:
+	@echo Making $@ from $<
+	rm -f $@
+	$(MKDIR_P) `dirname $@`
+	@LC_ALL=C \
+	 sed -e "s|[@]APPRESDIR[@]|$(appresdir)|g" \
+	     -e "s|[@]BINDIR[@]|$(bindir)|g" \
+	     -e "s|[@]BROKEN_SPOOLER_FLAGS[@]|$(BROKEN_SPOOLER_FLAGS)|g" \
+	     -e "s|[@]COMMON_WORDS_FILE[@]|$(common_words_file)|g" \
+	     -e "s|[@]DATASUBDIR[@]|$(datasubdir)|g" \
+	     -e "s|[@]DEFAULT_INDEX[@]|$(indexdir)/$(indexname)|g" \
+	     -e "s|[@]DEFAULT_INDEX_NAME[@]|$(indexname)|g" \
+	     -e "s|[@]DEVICE[@]|$(DEVICE)|g" \
+	     -e "s|[@]DOCDIR[@]|$(docdir)|g" \
+	     -e "s|[@]EXAMPLEDIR[@]|$(exampledir)|g" \
+	     -e "s|[@]FONTDIR[@]|$(fontdir)|g" \
+	     -e "s|[@]g[@]|$(g)|g" \
+	     -e "s![@]G[@]!`echo $(g) | tr [a-z] [A-Z]`!g" \
+	     -e "s|[@]HTMLDOCDIR[@]|$(htmldocdir)|g" \
+	     -e "s|[@]INDEX_SUFFIX[@]|$(indexext)|g" \
+	     -e "s|[@]LEGACYFONTDIR[@]|$(legacyfontdir)|g" \
+	     -e "s|[@]LOCALFONTDIR[@]|$(localfontdir)|g" \
+	     -e "s|[@]LOCALMACRODIR[@]|$(localtmacdir)|g" \
+	     -e "s|[@]MACRODIR[@]|$(tmacdir)|g" \
+	     -e "s|[@]MAN1EXT[@]|$(man1ext)|g" \
+	     -e "s|[@]MAN5EXT[@]|$(man5ext)|g" \
+	     -e "s|[@]MAN7EXT[@]|$(man7ext)|g" \
+	     -e "s|[@]MDATE[@]|`$(SHELL) $(top_srcdir)/mdate.sh $<`|g" \
+	     -e "s|[@]OLDFONTDIR[@]|$(oldfontdir)|g" \
+	     -e "s|[@]PDFDOCDIR[@]|$(pdfdocdir)|g" \
+	     -e "s|[@]SYSTEMMACRODIR[@]|$(systemtmacdir)|g" \
+	     -e "s|[@]TMAC_AN_PREFIX[@]|$(tmac_an_prefix)|g" \
+	     -e "s|[@]TMAC_M_PREFIX[@]|$(tmac_m_prefix)|g" \
+	     -e "s|[@]TMAC_MDIR[@]|$(tmacdir)/mm|g" \
+	     -e "s|[@]TMAC_S_PREFIX[@]|$(tmac_s_prefix)|g" \
+	     -e "s|[@]VERSION[@]|$(VERSION)|g" \
+	 $< >$@
+
+SUFFIXES = .7.man .n
+
+.7.man.n:
 	@echo Making $@ from $<
 	rm -f $@
 	$(MKDIR_P) `dirname $@`
diff --git a/contrib/chem/chem.man b/contrib/chem/chem.1.man
similarity index 100%
rename from contrib/chem/chem.man
rename to contrib/chem/chem.1.man
diff --git a/contrib/chem/chem.am b/contrib/chem/chem.am
index d0b2667..671d2b4 100644
--- a/contrib/chem/chem.am
+++ b/contrib/chem/chem.am
@@ -2,12 +2,12 @@
 
 # File position: <groff-source>/contrib/chem/chem.am
 
-# Copyright (C) 2006-14
+# Copyright (C) 2006-2015
 #   Free Software Foundation, Inc.
 # Written by Bernd Warken <groff-bernd.warken-72@web.de>.
 # Moved to automake by Bertrand Garrigues
 #
-# Last update: 13 Aug 2015
+# Last update: 22 Aug 2015
 #
 # This file is part of `chem' which is part of `groff'.
 #
@@ -56,7 +56,7 @@ nodist_chemexample122_DATA = contrib/chem/examples/122/README
 endif
 EXTRA_DIST += \
   contrib/chem/ChangeLog \
-  contrib/chem/chem.man \
+  contrib/chem/chem.1.man \
   contrib/chem/chem.pic \
   contrib/chem/chem.pl \
   contrib/chem/README.txt \
diff --git a/contrib/eqn2graph/eqn2graph.man b/contrib/eqn2graph/eqn2graph.1.man
similarity index 100%
rename from contrib/eqn2graph/eqn2graph.man
rename to contrib/eqn2graph/eqn2graph.1.man
diff --git a/contrib/eqn2graph/eqn2graph.am b/contrib/eqn2graph/eqn2graph.am
index 6f41d1f..89bd76e 100644
--- a/contrib/eqn2graph/eqn2graph.am
+++ b/contrib/eqn2graph/eqn2graph.am
@@ -1,7 +1,7 @@
-# Copyright (C) 2002-2014
+# Copyright (C) 2002-2015
 #   Free Software Foundation, Inc.
 #
-# Last update: 13 Aug 2015
+# Last update: 22 Aug 2015
 #
 # This file is part of groff.
 #
@@ -25,7 +25,7 @@ eqn2graph_srcdir = $(top_srcdir)/contrib/eqn2graph
 bin_SCRIPTS += eqn2graph
 man1_MANS += contrib/eqn2graph/eqn2graph.n
 EXTRA_DIST += \
-  contrib/eqn2graph/eqn2graph.man \
+  contrib/eqn2graph/eqn2graph.1.man \
   contrib/eqn2graph/eqn2graph.sh
 
 eqn2graph: $(top_srcdir)/contrib/eqn2graph/eqn2graph.sh
diff --git a/contrib/gdiffmk/gdiffmk.man b/contrib/gdiffmk/gdiffmk.1.man
similarity index 100%
rename from contrib/gdiffmk/gdiffmk.man
rename to contrib/gdiffmk/gdiffmk.1.man
diff --git a/contrib/gdiffmk/gdiffmk.am b/contrib/gdiffmk/gdiffmk.am
index ee7ab6a..e6bf07e 100644
--- a/contrib/gdiffmk/gdiffmk.am
+++ b/contrib/gdiffmk/gdiffmk.am
@@ -2,12 +2,12 @@
 #
 # File position: <groff-source>/contrib/gdiffmk/gdiffmk.am
 #
-# Copyright (C) 2004, 2006, 2009, 2014-15
+# Copyright (C) 2004, 2006, 2009, 2014-2015
 #    Free Software Foundation, Inc.
 # Written by Mike Bianchi <MBianchi@Foveal.com <mailto:MBianchi@Foveal.com>>
 # Automake migration by Bertrand Garrigues
 #
-# Last update: 13 Aug 2015
+# Last update: 20 Aug 2015
 #
 # This file is part of the gdiffmk utility, which is part of groff.
 #
@@ -30,7 +30,7 @@ bin_SCRIPTS += gdiffmk
 TESTS += contrib/gdiffmk/tests/gdiffmk_tests.sh
 man1_MANS += contrib/gdiffmk/gdiffmk.n
 EXTRA_DIST += \
-  contrib/gdiffmk/gdiffmk.man \
+  contrib/gdiffmk/gdiffmk.1.man \
   contrib/gdiffmk/ChangeLog \
   contrib/gdiffmk/README \
   contrib/gdiffmk/gdiffmk.sh \
diff --git a/contrib/glilypond/glilypond.man b/contrib/glilypond/glilypond.1.man
similarity index 100%
rename from contrib/glilypond/glilypond.man
rename to contrib/glilypond/glilypond.1.man
diff --git a/contrib/glilypond/glilypond.am b/contrib/glilypond/glilypond.am
index 57f8ad4..a831a46 100644
--- a/contrib/glilypond/glilypond.am
+++ b/contrib/glilypond/glilypond.am
@@ -8,7 +8,7 @@
 # Bernd Warken <groff-bernd.warken-72@web.de>.
 # Automake migration by Bertrand Garrigues
 
-# Last update: 13 Aug 2015
+# Last update: 22 Aug 2015
 
 # This file is part of `glilypond' which is part of `groff'.
 
@@ -41,7 +41,7 @@ dist_glilypond_DATA = \
 EXTRA_DIST += \
   contrib/glilypond/ChangeLog \
   contrib/glilypond/ChangeLog.0x \
-  contrib/glilypond/glilypond.man \
+  contrib/glilypond/glilypond.1.man \
   contrib/glilypond/glilypond.pl \
   contrib/glilypond/README.txt \
   contrib/glilypond/examples/example.groff
diff --git a/contrib/gperl/gperl.man b/contrib/gperl/gperl.1.man
similarity index 100%
rename from contrib/gperl/gperl.man
rename to contrib/gperl/gperl.1.man
diff --git a/contrib/gperl/gperl.am b/contrib/gperl/gperl.am
index 6aa38d2..6add9f9 100644
--- a/contrib/gperl/gperl.am
+++ b/contrib/gperl/gperl.am
@@ -2,11 +2,11 @@
 
 # File position: <groff-source>/contrib/gperl/gperl.am
 
-# Copyright (C) 2014-15  Free Software Foundation, Inc.
+# Copyright (C) 2014-2015  Free Software Foundation, Inc.
 # Written by Bernd Warken <groff-bernd.warken-72@web.de>.
 # Automake migration by Bertrand Garrigues
 
-# Last update: 18 Aug 2015
+# Last update: 22 Aug 2015
 
 # This file is part of `gperl' which is part of `groff'.
 
@@ -30,7 +30,7 @@ bin_SCRIPTS += gperl
 man1_MANS += contrib/gperl/gperl.n
 EXTRA_DIST += \
   contrib/gperl/ChangeLog \
-  contrib/gperl/gperl.man \
+  contrib/gperl/gperl.1.man \
   contrib/gperl/gperl.pl
 gperl: $(top_srcdir)/contrib/gperl/gperl.pl shdeps.sed
 	$(RM) $@
diff --git a/contrib/gpinyin/gpinyin.man b/contrib/gpinyin/gpinyin.1.man
similarity index 100%
rename from contrib/gpinyin/gpinyin.man
rename to contrib/gpinyin/gpinyin.1.man
diff --git a/contrib/gpinyin/gpinyin.am b/contrib/gpinyin/gpinyin.am
index 4f7e64a..44596e8 100644
--- a/contrib/gpinyin/gpinyin.am
+++ b/contrib/gpinyin/gpinyin.am
@@ -7,7 +7,7 @@
 # Written by Bernd Warken <groff-bernd.warken-72@web.de>.
 # Moved to automake by Bertrand Garrigues
 
-# Last update: 2013 Aug 2015
+# Last update: 22 Aug 2015
 
 # This file is part of `gpinyin' which is part of `groff'.
 
@@ -34,7 +34,7 @@ dist_gpinyin_DATA = contrib/gpinyin/subs.pl
 man1_MANS += contrib/gpinyin/gpinyin.n
 EXTRA_DIST += \
   contrib/gpinyin/ChangeLog \
-  contrib/gpinyin/gpinyin.man \
+  contrib/gpinyin/gpinyin.1.man \
   contrib/gpinyin/gpinyin.pl
 
 gpinyin: contrib/gpinyin/gpinyin.pl
diff --git a/contrib/grap2graph/grap2graph.man b/contrib/grap2graph/grap2graph.1.man
similarity index 100%
rename from contrib/grap2graph/grap2graph.man
rename to contrib/grap2graph/grap2graph.1.man
diff --git a/contrib/grap2graph/grap2graph.am b/contrib/grap2graph/grap2graph.am
index e1a7aea..9a25dab 100644
--- a/contrib/grap2graph/grap2graph.am
+++ b/contrib/grap2graph/grap2graph.am
@@ -1,6 +1,6 @@
 # Copyright (C) 2003-2015  Free Software Foundation, Inc.
 #
-# Last update: 13 Aug 2015
+# Last update: 22 Aug 2015
 #
 # This file is part of groff.
 #
@@ -25,7 +25,7 @@ bin_SCRIPTS += grap2graph
 man1_MANS += contrib/grap2graph/grap2graph.n
 EXTRA_DIST += \
   $(grap2graph_srcdir)/grap2graph.sh \
-  $(grap2graph_srcdir)/grap2graph.man
+  $(grap2graph_srcdir)/grap2graph.1.man
 grap2graph: $(grap2graph_srcdir)/grap2graph.sh
 	sed -e "s|[@]g[@]|$(g)|g" \
 	    -e "s|[@]VERSION[@]|$(VERSION)|" \
diff --git a/contrib/groff_filenames/groff_filenames.man b/contrib/groff_filenames/groff_filenames.1.man
similarity index 100%
rename from contrib/groff_filenames/groff_filenames.man
rename to contrib/groff_filenames/groff_filenames.1.man
diff --git a/contrib/groff_filenames/groff_filenames.am b/contrib/groff_filenames/groff_filenames.am
index 0f14ef4..a43cfe1 100644
--- a/contrib/groff_filenames/groff_filenames.am
+++ b/contrib/groff_filenames/groff_filenames.am
@@ -4,7 +4,7 @@
 
 # Copyright (C) 2013-2015  Free Software Foundation, Inc.
 
-# Last update: 13 Aug 2015
+# Last update: 22 Aug 2015
 
 # Written by Bernd Warken <groff-bernd.warken-72@web.de>.
 # Automake migration by Bertrand Garrigues
@@ -29,7 +29,7 @@
 man7_MANS += contrib/groff_filenames/groff_filenames.n
 EXTRA_DIST += \
   contrib/groff_filenames/ChangeLog \
-  contrib/groff_filenames/groff_filenames.man
+  contrib/groff_filenames/groff_filenames.1.man
 
 
 ########################################################################
diff --git a/contrib/groffer/groffer.man b/contrib/groffer/groffer.1.man
similarity index 100%
rename from contrib/groffer/groffer.man
rename to contrib/groffer/groffer.1.man
diff --git a/contrib/groffer/groffer.am b/contrib/groffer/groffer.am
index 87e2493..f3365ed 100644
--- a/contrib/groffer/groffer.am
+++ b/contrib/groffer/groffer.am
@@ -8,7 +8,7 @@
 # Bernd Warken <groff-bernd.warken-72@web.de>.
 # Automake migration by Bertrand Garrigues
 
-# Last update: 13 Aug 2015
+# Last update: 22 Aug 2015
 
 # This file is part of `groffer' which is part of `groff'.
 
@@ -40,12 +40,12 @@ ROFF2PROGS = \
 
 # Generated man templates
 ROFF2MAN = \
-  contrib/groffer/roff2dvi.man \
-  contrib/groffer/roff2html.man \
-  contrib/groffer/roff2pdf.man \
-  contrib/groffer/roff2ps.man \
-  contrib/groffer/roff2text.man \
-  contrib/groffer/roff2x.man
+  contrib/groffer/roff2dvi.1.man \
+  contrib/groffer/roff2html.1.man \
+  contrib/groffer/roff2pdf.1.man \
+  contrib/groffer/roff2ps.1.man \
+  contrib/groffer/roff2text.1.man \
+  contrib/groffer/roff2x.1.man
 
 GROFFER_PERL = \
   contrib/groffer/main_subs.pl \
@@ -54,9 +54,9 @@ GROFFER_PERL = \
   contrib/groffer/subs.pl
 
 GROFFER_REST = \
-  contrib/groffer/roff2.man \
+  contrib/groffer/roff2.1.man \
   contrib/groffer/version.sh \
-  contrib/groffer/groffer.man \
+  contrib/groffer/groffer.1.man \
   contrib/groffer/groffer.pl \
   contrib/groffer/roff2.pl
 
@@ -84,10 +84,10 @@ $(ROFF2PROGS): $(groffer_srcdir)/roff2.pl
 
 # we take roff2.man and replace the @ROFF2MODE@ by the type of file
 # (dvi, pdf, html etc ...)
-$(ROFF2MAN):  $(groffer_srcdir)/roff2.man
+$(ROFF2MAN):  $(groffer_srcdir)/roff2.1.man
 	@$(MKDIR_P) contrib/groffer
-	FILEMODE=`echo $@ | sed 's|contrib/groffer/roff2\([a-z][a-z]*\)\.man|\1|g'` \
-	  && sed -e 's/[@]ROFF2MODE[@]/'"$$FILEMODE"'/g' $(groffer_srcdir)/roff2.man > $@;
+	FILEMODE=`echo $@ | sed 's|contrib/groffer/roff2\([a-z][a-z]*\)\.1\.man|\1|g'` \
+	  && sed -e 's/[@]ROFF2MODE[@]/'"$$FILEMODE"'/g' $(groffer_srcdir)/roff2.1.man > $@;
 
 groffer: $(GROFFER_PERL) $(GROFFER_REST) $(SH_DEPS_SED_SCRIPT)
 	echo "Using perl version of groffer."; \
diff --git a/contrib/groffer/roff2.man b/contrib/groffer/roff2.1.man
similarity index 100%
rename from contrib/groffer/roff2.man
rename to contrib/groffer/roff2.1.man
diff --git a/contrib/hdtbl/groff_hdtbl.man b/contrib/hdtbl/groff_hdtbl.7.man
similarity index 100%
rename from contrib/hdtbl/groff_hdtbl.man
rename to contrib/hdtbl/groff_hdtbl.7.man
diff --git a/contrib/hdtbl/hdtbl.am b/contrib/hdtbl/hdtbl.am
index 61250e2..dd634a1 100644
--- a/contrib/hdtbl/hdtbl.am
+++ b/contrib/hdtbl/hdtbl.am
@@ -2,7 +2,7 @@
 #      Written by Werner Lemberg (wl@gnu.org)
 #      Automake migration by Bertrand Garrigues
 #
-# Last update: 13 Aug 2015
+# Last update: 22 Aug 2015
 #
 # This file is part of groff.
 #
@@ -97,7 +97,7 @@ MOSTLYCLEANFILES += $(HDTBLGENFILES) $(HDTBLPROCESSEDEXAMPLEFILES) \
 EXTRA_DIST += \
   contrib/hdtbl/ChangeLog \
   contrib/hdtbl/TODO \
-  contrib/hdtbl/groff_hdtbl.man \
+  contrib/hdtbl/groff_hdtbl.7.man \
   contrib/hdtbl/hdtbl.tmac-u \
   contrib/hdtbl/hdmisc.tmac-u
 
diff --git a/contrib/mm/groff_mm.man b/contrib/mm/groff_mm.7.man
similarity index 100%
rename from contrib/mm/groff_mm.man
rename to contrib/mm/groff_mm.7.man
diff --git a/contrib/mm/groff_mmse.man b/contrib/mm/groff_mmse.7.man
similarity index 100%
rename from contrib/mm/groff_mmse.man
rename to contrib/mm/groff_mmse.7.man
diff --git a/contrib/mm/mm.am b/contrib/mm/mm.am
index 48929fa..76fdc25 100644
--- a/contrib/mm/mm.am
+++ b/contrib/mm/mm.am
@@ -1,7 +1,7 @@
 # Copyright 1991-2015
 #   Free Software Foundation, Inc.
 #
-# Last update: 13 Aug 2015
+# Last update: 22 Aug 2015
 #
 # This file is part of groff.
 #
@@ -57,9 +57,9 @@ EXTRA_DIST += \
   contrib/mm/mm \
   contrib/mm/NOTES \
   contrib/mm/README \
-  contrib/mm/groff_mm.man \
-  contrib/mm/groff_mmse.man \
-  contrib/mm/mmroff.man \
+  contrib/mm/groff_mm.7.man \
+  contrib/mm/groff_mmse.7.man \
+  contrib/mm/mmroff.1.man \
   contrib/mm/mmroff.pl
 
 mmroff: $(mm_srcdir)/mmroff.pl
diff --git a/contrib/mm/mmroff.man b/contrib/mm/mmroff.1.man
similarity index 100%
rename from contrib/mm/mmroff.man
rename to contrib/mm/mmroff.1.man
diff --git a/contrib/mom/groff_mom.man b/contrib/mom/groff_mom.7.man
similarity index 100%
rename from contrib/mom/groff_mom.man
rename to contrib/mom/groff_mom.7.man
diff --git a/contrib/mom/mom.am b/contrib/mom/mom.am
index 503f919..08d1d7d 100644
--- a/contrib/mom/mom.am
+++ b/contrib/mom/mom.am
@@ -3,7 +3,7 @@
 #      Written by Werner Lemberg (wl@gnu.org)
 #      Automake migration by Bertrand Garrigues
 #
-# Last update: 13 Aug 2015
+# Last update: 22 Aug 2015
 #
 # This file is part of groff.
 #
@@ -119,7 +119,7 @@ EXTRA_DIST += $(MOMHTMLDOCFILES) $(MOMEXAMPLEFILES) \
   contrib/mom/NEWS \
   contrib/mom/TODO \
   contrib/mom/copyright \
-  contrib/mom/groff_mom.man \
+  contrib/mom/groff_mom.7.man \
   contrib/mom/om.tmac-u
 
 MOSTLYCLEANFILES += \
diff --git a/contrib/pdfmark/pdfmark.am b/contrib/pdfmark/pdfmark.am
index 451c8da..13c1020 100644
--- a/contrib/pdfmark/pdfmark.am
+++ b/contrib/pdfmark/pdfmark.am
@@ -3,7 +3,7 @@
 #      Written by Keith Marshall (keith.d.marshall@ntlworld.com)
 #      Automake migration by Bertrand Garrigues
 #
-# Last update: 13 Aug 2015
+# Last update: 22 Aug 2015
 #
 # This file is part of groff.
 #
@@ -52,7 +52,7 @@ EXTRA_DIST += \
   contrib/pdfmark/README \
   contrib/pdfmark/PROBLEMS \
   contrib/pdfmark/TODO \
-  contrib/pdfmark/pdfroff.man \
+  contrib/pdfmark/pdfroff.1.man \
   contrib/pdfmark/pdfroff.sh
 
 PDFMARK_PFLAG =-dpaper=$(PAGE) -P-p$(PAGE)
diff --git a/contrib/pdfmark/pdfroff.man b/contrib/pdfmark/pdfroff.1.man
similarity index 100%
rename from contrib/pdfmark/pdfroff.man
rename to contrib/pdfmark/pdfroff.1.man
diff --git a/contrib/pic2graph/pic2graph.man b/contrib/pic2graph/pic2graph.1.man
similarity index 100%
rename from contrib/pic2graph/pic2graph.man
rename to contrib/pic2graph/pic2graph.1.man
diff --git a/contrib/pic2graph/pic2graph.am b/contrib/pic2graph/pic2graph.am
index b8bf261..008cbfd 100644
--- a/contrib/pic2graph/pic2graph.am
+++ b/contrib/pic2graph/pic2graph.am
@@ -1,6 +1,6 @@
 # Copyright (C) 2001-2015  Free Software Foundation, Inc.
 #
-# Last update: 13 Aug 2015
+# Last update: 22 Aug 2015
 #
 # This file is part of groff.
 #
@@ -25,7 +25,7 @@ man1_MANS += contrib/pic2graph/pic2graph.n
 bin_SCRIPTS += pic2graph
 EXTRA_DIST += \
   contrib/pic2graph/pic2graph.sh \
-  contrib/pic2graph/pic2graph.man
+  contrib/pic2graph/pic2graph.1.man
 pic2graph: $(pic2graph_srcdir)/pic2graph.sh
 	sed -e "s|[@]g[@]|$(g)|g" \
 	    -e "s|[@]VERSION[@]|$(VERSION)|" \
diff --git a/man/ditroff.man b/man/ditroff.7.man
similarity index 100%
rename from man/ditroff.man
rename to man/ditroff.7.man
diff --git a/man/groff.man b/man/groff.7.man
similarity index 100%
rename from man/groff.man
rename to man/groff.7.man
diff --git a/man/groff_char.man b/man/groff_char.7.man
similarity index 100%
rename from man/groff_char.man
rename to man/groff_char.7.man
diff --git a/man/groff_diff.man b/man/groff_diff.7.man
similarity index 100%
rename from man/groff_diff.man
rename to man/groff_diff.7.man
diff --git a/man/groff_font.man b/man/groff_font.5.man
similarity index 100%
rename from man/groff_font.man
rename to man/groff_font.5.man
diff --git a/man/groff_out.man b/man/groff_out.5.man
similarity index 100%
rename from man/groff_out.man
rename to man/groff_out.5.man
diff --git a/man/groff_tmac.man b/man/groff_tmac.5.man
similarity index 100%
rename from man/groff_tmac.man
rename to man/groff_tmac.5.man
diff --git a/man/man.am b/man/man.am
index 2428df1..d5b50b6 100644
--- a/man/man.am
+++ b/man/man.am
@@ -29,14 +29,14 @@ man7_MANS += \
   man/groff.n \
   man/roff.n
 EXTRA_DIST += \
-  man/groff_font.man \
-  man/groff_out.man \
-  man/groff_tmac.man \
-  man/ditroff.man \
-  man/groff_char.man \
-  man/groff_diff.man \
-  man/groff.man \
-  man/roff.man
+  man/groff_font.5.man \
+  man/groff_out.5.man \
+  man/groff_tmac.5.man \
+  man/ditroff.7.man \
+  man/groff_char.7.man \
+  man/groff_diff.7.man \
+  man/groff.7.man \
+  man/roff.7.man
 
 # Case of out-of-source build: we must create the 'man' directory.
 BUILT_SOURCES += man
diff --git a/man/roff.man b/man/roff.7.man
similarity index 100%
rename from man/roff.man
rename to man/roff.7.man
diff --git a/src/devices/grodvi/grodvi.man b/src/devices/grodvi/grodvi.1.man
similarity index 100%
rename from src/devices/grodvi/grodvi.man
rename to src/devices/grodvi/grodvi.1.man
diff --git a/src/devices/grodvi/grodvi.am b/src/devices/grodvi/grodvi.am
index e7e59cd..d1bfe48 100644
--- a/src/devices/grodvi/grodvi.am
+++ b/src/devices/grodvi/grodvi.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-15
 #      Free Software Foundation, Inc.
 #
-# Last update: 13 Aug 2015
+# Last update: 22 Aug 2015
 #
 # This file is part of groff.
 #
@@ -25,7 +25,7 @@ grodvi_LDADD = \
   libgroff.a \
   lib/libgnu.a $(LIBM)
 man1_MANS += src/devices/grodvi/grodvi.n
-EXTRA_DIST += src/devices/grodvi/grodvi.man
+EXTRA_DIST += src/devices/grodvi/grodvi.1.man
 
 
 ########################################################################
diff --git a/src/devices/grohtml/grohtml.man b/src/devices/grohtml/grohtml.1.man
similarity index 100%
rename from src/devices/grohtml/grohtml.man
rename to src/devices/grohtml/grohtml.1.man
diff --git a/src/devices/grohtml/grohtml.am b/src/devices/grohtml/grohtml.am
index 59d7d57..de00fea 100644
--- a/src/devices/grohtml/grohtml.am
+++ b/src/devices/grohtml/grohtml.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-15
 #      Free Software Foundation, Inc.
 #
-# Last update: 13 Aug 2015
+# Last update: 22 Aug 2015
 #
 # This file is part of groff.
 #
@@ -33,7 +33,7 @@ post_grohtml_LDADD = $(LIBM) \
   libgroff.a \
   lib/libgnu.a 
 man1_MANS += src/devices/grohtml/grohtml.n
-EXTRA_DIST += src/devices/grohtml/grohtml.man
+EXTRA_DIST += src/devices/grohtml/grohtml.1.man
 
 
 ########################################################################
diff --git a/src/devices/grolbp/grolbp.man b/src/devices/grolbp/grolbp.1.man
similarity index 100%
rename from src/devices/grolbp/grolbp.man
rename to src/devices/grolbp/grolbp.1.man
diff --git a/src/devices/grolbp/grolbp.am b/src/devices/grolbp/grolbp.am
index ac829c3..a81c48f 100644
--- a/src/devices/grolbp/grolbp.am
+++ b/src/devices/grolbp/grolbp.am
@@ -29,7 +29,7 @@ grolbp_LDADD = $(LIBM) \
   libgroff.a \
   lib/libgnu.a
 man1_MANS += src/devices/grolbp/grolbp.n
-EXTRA_DIST += src/devices/grolbp/grolbp.man
+EXTRA_DIST += src/devices/grolbp/grolbp.1.man
 
 
 ########################################################################
diff --git a/src/devices/grolj4/grolj4.man b/src/devices/grolj4/grolj4.1.man
similarity index 100%
rename from src/devices/grolj4/grolj4.man
rename to src/devices/grolj4/grolj4.1.man
diff --git a/src/devices/grolj4/grolj4.am b/src/devices/grolj4/grolj4.am
index 5bb4271..35acb7d 100644
--- a/src/devices/grolj4/grolj4.am
+++ b/src/devices/grolj4/grolj4.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-15
 #      Free Software Foundation, Inc.
 #
-# Last update: 13 Aug 2015
+# Last update: 22 Aug 2015
 #
 # This file is part of groff.
 #
@@ -27,8 +27,8 @@ grolj4_LDADD = $(LIBM) \
 man1_MANS += src/devices/grolj4/grolj4.n
 man5_MANS += src/devices/grolj4/lj4_font.n
 EXTRA_DIST += \
-  src/devices/grolj4/grolj4.man \
-  src/devices/grolj4/lj4_font.man
+  src/devices/grolj4/grolj4.1.man \
+  src/devices/grolj4/lj4_font.5.man
 
 ########################################################################
 ### Emacs settings
diff --git a/src/devices/grolj4/lj4_font.man b/src/devices/grolj4/lj4_font.5.man
similarity index 100%
rename from src/devices/grolj4/lj4_font.man
rename to src/devices/grolj4/lj4_font.5.man
diff --git a/src/devices/gropdf/gropdf.man b/src/devices/gropdf/gropdf.1.man
similarity index 100%
rename from src/devices/gropdf/gropdf.man
rename to src/devices/gropdf/gropdf.1.man
diff --git a/src/devices/gropdf/gropdf.am b/src/devices/gropdf/gropdf.am
index 3e3d0e2..ece55f1 100644
--- a/src/devices/gropdf/gropdf.am
+++ b/src/devices/gropdf/gropdf.am
@@ -3,7 +3,7 @@
 #  Original Makefile.sub written by Deri James <deri@chuzzlewit.demon.co.uk>.
 #  Automake migration by Bertrand Garrigues
 #
-# Last update: 13 Aug 2015
+# Last update: 22 Aug 2015
 #
 # This file is part of groff.
 #
@@ -27,8 +27,8 @@ EXTRA_DIST += \
   src/devices/gropdf/TODO \
   src/devices/gropdf/gropdf.pl \
   src/devices/gropdf/pdfmom.pl \
-  src/devices/gropdf/gropdf.man \
-  src/devices/gropdf/pdfmom.man
+  src/devices/gropdf/gropdf.1.man \
+  src/devices/gropdf/pdfmom.1.man
 
 man1_MANS += \
   src/devices/gropdf/gropdf.n \
diff --git a/src/devices/gropdf/pdfmom.man b/src/devices/gropdf/pdfmom.1.man
similarity index 100%
rename from src/devices/gropdf/pdfmom.man
rename to src/devices/gropdf/pdfmom.1.man
diff --git a/src/devices/grops/grops.man b/src/devices/grops/grops.1.man
similarity index 100%
rename from src/devices/grops/grops.man
rename to src/devices/grops/grops.1.man
diff --git a/src/devices/grops/grops.am b/src/devices/grops/grops.am
index dffaae2..41adf1c 100644
--- a/src/devices/grops/grops.am
+++ b/src/devices/grops/grops.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-15
 #      Free Software Foundation, Inc.
 #
-# Last update: 13 Aug 2015
+# Last update: 22 Aug 2015
 #
 # This file is part of groff.
 #
@@ -29,7 +29,7 @@ grops_LDADD = $(LIBM) \
   lib/libgnu.a
 man1_MANS += src/devices/grops/grops.n
 EXTRA_DIST += \
-  src/devices/grops/grops.man \
+  src/devices/grops/grops.1.man \
   src/devices/grops/psfig.diff \
   src/devices/grops/TODO
 
diff --git a/src/devices/grotty/grotty.man b/src/devices/grotty/grotty.1.man
similarity index 100%
rename from src/devices/grotty/grotty.man
rename to src/devices/grotty/grotty.1.man
diff --git a/src/devices/grotty/grotty.am b/src/devices/grotty/grotty.am
index ad9cd2c..3dcc809 100644
--- a/src/devices/grotty/grotty.am
+++ b/src/devices/grotty/grotty.am
@@ -1,7 +1,7 @@
-# Copyright (C) 2014-15
+# Copyright (C) 2014-2015
 #      Free Software Foundation, Inc.
 #
-# Last update: 13 Aug 2015
+# Last update: 22 Aug 2015
 #
 # This file is part of groff.
 #
@@ -26,7 +26,7 @@ grotty_LDADD = $(LIBM) \
   lib/libgnu.a
 man1_MANS += src/devices/grotty/grotty.n
 EXTRA_DIST += \
-  src/devices/grotty/grotty.man \
+  src/devices/grotty/grotty.1.man \
   src/devices/grotty/TODO
 
 
diff --git a/src/devices/xditview/gxditview.man b/src/devices/xditview/gxditview.1.man
similarity index 100%
rename from src/devices/xditview/gxditview.man
rename to src/devices/xditview/gxditview.1.man
diff --git a/src/devices/xditview/xditview.am b/src/devices/xditview/xditview.am
index 2c90097..f2b4261 100644
--- a/src/devices/xditview/xditview.am
+++ b/src/devices/xditview/xditview.am
@@ -1,7 +1,7 @@
-# Copyright (C) 2014-15
+# Copyright (C) 2014-2015
 #      Free Software Foundation, Inc.
 #
-# Last update: 13 Aug 2015
+# Last update: 22 Aug 2015
 #
 # This file is part of groff.
 #
@@ -77,7 +77,7 @@ EXTRA_DIST += \
   src/devices/xditview/gray8.bm \
   src/devices/xditview/xdit.bm \
   src/devices/xditview/xdit_mask.bm \
-  src/devices/xditview/gxditview.man
+  src/devices/xditview/gxditview.1.man
 
 # Custom installation of GXditview.ad and GXditview-color.ad
 install-data-local: install_xditview
diff --git a/src/preproc/eqn/eqn.man b/src/preproc/eqn/eqn.1.man
similarity index 100%
rename from src/preproc/eqn/eqn.man
rename to src/preproc/eqn/eqn.1.man
diff --git a/src/preproc/eqn/eqn.am b/src/preproc/eqn/eqn.am
index b6ad937..8eb836a 100644
--- a/src/preproc/eqn/eqn.am
+++ b/src/preproc/eqn/eqn.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-2015
 #      Free Software Foundation, Inc.
 #
-# Latest update: 13 Aug 2015
+# Latest update: 22 Aug 2015
 #
 # This file is part of groff.
 #
@@ -49,8 +49,8 @@ PREFIXMAN1 += src/preproc/eqn/eqn.n src/preproc/eqn/neqn.n
 EXTRA_DIST += \
   src/preproc/eqn/TODO \
   src/preproc/eqn/neqn.sh \
-  src/preproc/eqn/eqn.man \
-  src/preproc/eqn/neqn.man
+  src/preproc/eqn/eqn.1.man \
+  src/preproc/eqn/neqn.1.man
 
 src/preproc/eqn/eqn-lex.$(OBJEXT): src/preproc/eqn/eqn.hpp
 CLEANFILES += \
diff --git a/src/preproc/eqn/neqn.man b/src/preproc/eqn/neqn.1.man
similarity index 100%
rename from src/preproc/eqn/neqn.man
rename to src/preproc/eqn/neqn.1.man
diff --git a/src/preproc/grn/grn.man b/src/preproc/grn/grn.1.man
similarity index 100%
rename from src/preproc/grn/grn.man
rename to src/preproc/grn/grn.1.man
diff --git a/src/preproc/grn/grn.am b/src/preproc/grn/grn.am
index b385386..f64d551 100644
--- a/src/preproc/grn/grn.am
+++ b/src/preproc/grn/grn.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-2015
 #      Free Software Foundation, Inc.
 #
-# Latest update: 13 Aug 2015
+# Latest update: 22 Aug 2015
 #
 # This file is part of groff.
 #
@@ -28,7 +28,7 @@ grn_SOURCES = \
 src/preproc/grn/main.$(OBJEXT): defs.h
 grn_LDADD = libgroff.a lib/libgnu.a $(LIBM)
 PREFIXMAN1 += src/preproc/grn/grn.n
-EXTRA_DIST += src/preproc/grn/README src/preproc/grn/grn.man
+EXTRA_DIST += src/preproc/grn/README src/preproc/grn/grn.1.man
 
 
 ########################################################################
diff --git a/src/preproc/pic/pic.man b/src/preproc/pic/pic.1.man
similarity index 100%
rename from src/preproc/pic/pic.man
rename to src/preproc/pic/pic.1.man
diff --git a/src/preproc/pic/pic.am b/src/preproc/pic/pic.am
index ced4780..bfdd76e 100644
--- a/src/preproc/pic/pic.am
+++ b/src/preproc/pic/pic.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-2015
 #      Free Software Foundation, Inc.
 #
-# Latest update: 13 Aug 2015
+# Latest update: 22 Aug 2015
 #
 # This file is part of groff.
 #
@@ -42,7 +42,7 @@ PREFIXMAN1 += src/preproc/pic/pic.n
 
 src/preproc/pic/pic-lex.$(OBJEXT): src/preproc/pic/pic.hpp
 EXTRA_DIST += \
-  src/preproc/pic/pic.man \
+  src/preproc/pic/pic.1.man \
   src/preproc/pic/TODO
 CLEANFILES += \
   src/preproc/pic/pic.cpp \
diff --git a/src/preproc/preconv/preconv.man b/src/preproc/preconv/preconv.1.man
similarity index 100%
rename from src/preproc/preconv/preconv.man
rename to src/preproc/preconv/preconv.1.man
diff --git a/src/preproc/preconv/preconv.am b/src/preproc/preconv/preconv.am
index e5c119e..b4d7132 100644
--- a/src/preproc/preconv/preconv.am
+++ b/src/preproc/preconv/preconv.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-2015
 #      Free Software Foundation, Inc.
 #
-# Latest update: 13 Aug 2015
+# Latest update: 22 Aug 2015
 #
 # This file is part of groff.
 #
@@ -22,7 +22,7 @@ bin_PROGRAMS += preconv
 preconv_LDADD = libgroff.a $(LIBM) $(LIBICONV)
 preconv_SOURCES = src/preproc/preconv/preconv.cpp
 man1_MANS += src/preproc/preconv/preconv.n
-EXTRA_DIST += src/preproc/preconv/preconv.man
+EXTRA_DIST += src/preproc/preconv/preconv.1.man
 
 
 ########################################################################
diff --git a/src/preproc/refer/refer.man b/src/preproc/refer/refer.1.man
similarity index 100%
rename from src/preproc/refer/refer.man
rename to src/preproc/refer/refer.1.man
diff --git a/src/preproc/refer/refer.am b/src/preproc/refer/refer.am
index 6d82898..a879eba 100644
--- a/src/preproc/refer/refer.am
+++ b/src/preproc/refer/refer.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-2015
 #      Free Software Foundation, Inc.
 #
-# Latest update: 13 Aug 2015
+# Latest update: 22 Aug 2015
 #
 # This file is part of groff.
 #
@@ -32,7 +32,7 @@ refer_SOURCES =  \
   src/preproc/refer/token.h \
   src/preproc/refer/command.h
 PREFIXMAN1 += src/preproc/refer/refer.n
-EXTRA_DIST += src/preproc/refer/TODO src/preproc/refer/refer.man
+EXTRA_DIST += src/preproc/refer/TODO src/preproc/refer/refer.1.man
 CLEANFILES += \
   src/preproc/refer/label.cpp \
   src/preproc/refer/label.hpp \
diff --git a/src/preproc/soelim/soelim.man b/src/preproc/soelim/soelim.1.man
similarity index 100%
rename from src/preproc/soelim/soelim.man
rename to src/preproc/soelim/soelim.1.man
diff --git a/src/preproc/soelim/soelim.am b/src/preproc/soelim/soelim.am
index c5d9d87..ad4901e 100644
--- a/src/preproc/soelim/soelim.am
+++ b/src/preproc/soelim/soelim.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-2015
 #      Free Software Foundation, Inc.
 #
-# Latest update: 13 Aug 2015
+# Latest update: 22 Aug 2015
 #
 # This file is part of groff.
 #
@@ -24,7 +24,7 @@ soelim_SOURCES = src/preproc/soelim/soelim.cpp
 PREFIXMAN1 += src/preproc/soelim/soelim.n
 EXTRA_DIST += \
   src/preproc/soelim/TODO \
-  src/preproc/soelim/soelim.man
+  src/preproc/soelim/soelim.1.man
 
 
 ########################################################################
diff --git a/src/preproc/tbl/tbl.man b/src/preproc/tbl/tbl.1.man
similarity index 100%
rename from src/preproc/tbl/tbl.man
rename to src/preproc/tbl/tbl.1.man
diff --git a/src/preproc/tbl/tbl.am b/src/preproc/tbl/tbl.am
index ce03299..b83ce77 100644
--- a/src/preproc/tbl/tbl.am
+++ b/src/preproc/tbl/tbl.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-2015
 #      Free Software Foundation, Inc.
 #
-# Latest update: 13 Aug 2015
+# Latest update: 22 Aug 2015
 #
 # This file is part of groff.
 #
@@ -25,7 +25,7 @@ tbl_SOURCES = \
   src/preproc/tbl/table.cpp \
   src/preproc/tbl/table.h
 PREFIXMAN1 += src/preproc/tbl/tbl.n
-EXTRA_DIST += src/preproc/tbl/tbl.man
+EXTRA_DIST += src/preproc/tbl/tbl.1.man
 
 
 ########################################################################
diff --git a/src/roff/groff/groff.man b/src/roff/groff/groff.1.man
similarity index 100%
rename from src/roff/groff/groff.man
rename to src/roff/groff/groff.1.man
diff --git a/src/roff/groff/groff.am b/src/roff/groff/groff.am
index 3c90715..6007e40 100644
--- a/src/roff/groff/groff.am
+++ b/src/roff/groff/groff.am
@@ -8,7 +8,7 @@
 #   Automake migration by 
 #   Bertrand Garrigues <bertrand.garrigues@laposte.net>
 #
-# Latest update: 13 Aug 2015
+# Latest update: 22 Aug 2015
 #
 # `groff' is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -36,7 +36,7 @@ groff_SOURCES = \
   src/roff/groff/pipeline.h
 src/roff/groff/groff.$(OBJEXT): defs.h
 man1_MANS += src/roff/groff/groff.n
-EXTRA_DIST += src/roff/groff/groff.man
+EXTRA_DIST += src/roff/groff/groff.1.man
 GROFF_OPTS_OUTPUT = \
   groff_opts_no_arg.txt \
   groff_opts_with_arg.txt
diff --git a/src/roff/grog/grog.man b/src/roff/grog/grog.1.man
similarity index 100%
rename from src/roff/grog/grog.man
rename to src/roff/grog/grog.1.man
diff --git a/src/roff/grog/grog.am b/src/roff/grog/grog.am
index 2e7382f..1aa6b69 100644
--- a/src/roff/grog/grog.am
+++ b/src/roff/grog/grog.am
@@ -5,7 +5,7 @@
 # Copyright (C) 1993-2015
 #   Free Software Foundation, Inc.
 #
-# Latest update: 13 Aug 2015
+# Latest update: 22 Aug 2015
 #
 # This file is part of `grog' which is part of `groff'.
 #
@@ -31,7 +31,7 @@ grogdir = $(grog_dir)
 dist_grog_DATA = $(GROG)
 man1_MANS += src/roff/grog/grog.n
 EXTRA_DIST += \
-  src/roff/grog/grog.man \
+  src/roff/grog/grog.1.man \
   src/roff/grog/grog.pl
 
 # Perl version works for all parts of `groff'.
diff --git a/src/roff/nroff/nroff.man b/src/roff/nroff/nroff.1.man
similarity index 100%
rename from src/roff/nroff/nroff.man
rename to src/roff/nroff/nroff.1.man
diff --git a/src/roff/nroff/nroff.am b/src/roff/nroff/nroff.am
index b8d462f..526efe9 100644
--- a/src/roff/nroff/nroff.am
+++ b/src/roff/nroff/nroff.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-2015
 #      Free Software Foundation, Inc.
 #
-# Latest update: 13 Aug 2015
+# Latest update: 22 Aug 2015
 #
 # This file is part of groff.
 #
@@ -22,7 +22,7 @@ prefixexecbin_SCRIPTS += nroff
 nroff_srcdir = $(top_srcdir)/src/roff/nroff
 PREFIXMAN1 += src/roff/nroff/nroff.n
 EXTRA_DIST += \
-  src/roff/nroff/nroff.man \
+  src/roff/nroff/nroff.1.man \
   src/roff/nroff/nroff.sh
 
 nroff: $(nroff_srcdir)/nroff.sh $(SH_DEPS_SED_SCRIPT)
diff --git a/src/roff/troff/troff.man b/src/roff/troff/troff.1.man
similarity index 100%
rename from src/roff/troff/troff.man
rename to src/roff/troff/troff.1.man
diff --git a/src/roff/troff/troff.am b/src/roff/troff/troff.am
index f5e0695..9ddacbc 100644
--- a/src/roff/troff/troff.am
+++ b/src/roff/troff/troff.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-2015
 #      Free Software Foundation, Inc.
 #
-# Latest update: 13 Aug 2015
+# Latest update: 22 Aug 2015
 #
 # This file is part of groff.
 #
@@ -22,7 +22,7 @@ prefixexecbin_PROGRAMS += troff
 PREFIXMAN1 += src/roff/troff/troff.n
 EXTRA_DIST += \
   src/roff/troff/column.cpp \
-  src/roff/troff/troff.man \
+  src/roff/troff/troff.1.man \
   src/roff/troff/TODO
 troff_LDADD = libgroff.a lib/libgnu.a $(LIBM)
 troff_SOURCES = \
diff --git a/src/utils/addftinfo/addftinfo.man b/src/utils/addftinfo/addftinfo.1.man
similarity index 100%
rename from src/utils/addftinfo/addftinfo.man
rename to src/utils/addftinfo/addftinfo.1.man
diff --git a/src/utils/addftinfo/addftinfo.am b/src/utils/addftinfo/addftinfo.am
index 58e0ab6..c399de6 100644
--- a/src/utils/addftinfo/addftinfo.am
+++ b/src/utils/addftinfo/addftinfo.am
@@ -4,7 +4,7 @@
 #
 # Copyright (C) 2014-2015  Free Software Foundation, Inc.
 #
-# Latest update: 13 Aug 2015
+# Latest update: 22 Aug 2015
 #
 # `groff' is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -24,7 +24,7 @@
 
 bin_PROGRAMS += addftinfo
 man1_MANS += src/utils/addftinfo/addftinfo.n
-EXTRA_DIST += src/utils/addftinfo/addftinfo.man
+EXTRA_DIST += src/utils/addftinfo/addftinfo.1.man
 addftinfo_LDADD = libgroff.a
 addftinfo_SOURCES = \
   src/utils/addftinfo/addftinfo.cpp \
diff --git a/src/utils/afmtodit/afmtodit.man b/src/utils/afmtodit/afmtodit.1.man
similarity index 100%
rename from src/utils/afmtodit/afmtodit.man
rename to src/utils/afmtodit/afmtodit.1.man
diff --git a/src/utils/afmtodit/afmtodit.am b/src/utils/afmtodit/afmtodit.am
index bf9f3ec..f38870e 100644
--- a/src/utils/afmtodit/afmtodit.am
+++ b/src/utils/afmtodit/afmtodit.am
@@ -4,7 +4,7 @@
 #
 # Copyright (C) 2013-2015  Free Software Foundation, Inc.
 #
-# Latest update: 13 Aug 2015
+# Latest update: 22 Aug 2015
 #
 # This file is part of groff.
 #
@@ -28,7 +28,7 @@ afmtodit_srcdir = $(top_srcdir)/src/utils/afmtodit
 bin_SCRIPTS += afmtodit
 man1_MANS += src/utils/afmtodit/afmtodit.n
 EXTRA_DIST += \
-  src/utils/afmtodit/afmtodit.man \
+  src/utils/afmtodit/afmtodit.1.man \
   src/utils/afmtodit/afmtodit.pl \
   src/utils/afmtodit/afmtodit.tables \
   src/utils/afmtodit/make-afmtodit-tables
diff --git a/src/utils/hpftodit/hpftodit.man b/src/utils/hpftodit/hpftodit.1.man
similarity index 100%
rename from src/utils/hpftodit/hpftodit.man
rename to src/utils/hpftodit/hpftodit.1.man
diff --git a/src/utils/hpftodit/hpftodit.am b/src/utils/hpftodit/hpftodit.am
index dc9e18f..0c06262 100644
--- a/src/utils/hpftodit/hpftodit.am
+++ b/src/utils/hpftodit/hpftodit.am
@@ -4,7 +4,7 @@
 #
 # Copyright (C) 2014-2015  Free Software Foundation, Inc.
 #
-# Latest update: 13 Aug 2015
+# Latest update: 22 Aug 2015
 #
 # `groff' is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -24,7 +24,7 @@
 
 bin_PROGRAMS += hpftodit
 man1_MANS += src/utils/hpftodit/hpftodit.n
-EXTRA_DIST += src/utils/hpftodit/hpftodit.man
+EXTRA_DIST += src/utils/hpftodit/hpftodit.1.man
 hpftodit_LDADD = libgroff.a $(LIBM)
 hpftodit_SOURCES = \
   src/utils/hpftodit/hpftodit.cpp \
diff --git a/src/utils/indxbib/indxbib.man b/src/utils/indxbib/indxbib.1.man
similarity index 100%
rename from src/utils/indxbib/indxbib.man
rename to src/utils/indxbib/indxbib.1.man
diff --git a/src/utils/indxbib/indxbib.am b/src/utils/indxbib/indxbib.am
index 826d439..fc30587 100644
--- a/src/utils/indxbib/indxbib.am
+++ b/src/utils/indxbib/indxbib.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-2015
 #      Free Software Foundation, Inc.
 #
-# Latest update: 13 Aug 2015
+# Latest update: 22 Aug 2015
 #
 # This file is part of groff.
 #
@@ -27,7 +27,7 @@ src/utils/indxbib/indxbib.$(OBJEXT): defs.h
 indxbib_LDADD = libbib.a libgroff.a $(LIBM)
 PREFIXMAN1 += src/utils/indxbib/indxbib.n
 EXTRA_DIST += \
-  src/utils/indxbib/indxbib.man \
+  src/utils/indxbib/indxbib.1.man \
   src/utils/indxbib/eign
 
 install-data-local: install_indxbib
diff --git a/src/utils/lkbib/lkbib.man b/src/utils/lkbib/lkbib.1.man
similarity index 100%
rename from src/utils/lkbib/lkbib.man
rename to src/utils/lkbib/lkbib.1.man
diff --git a/src/utils/lkbib/lkbib.am b/src/utils/lkbib/lkbib.am
index 0a6ae30..471025a 100644
--- a/src/utils/lkbib/lkbib.am
+++ b/src/utils/lkbib/lkbib.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-2015
 #      Free Software Foundation, Inc.
 #
-# Latest update: 13 Aug 2015
+# Latest update: 22 Aug 2015
 #
 # This file is part of groff.
 #
@@ -20,7 +20,7 @@
 
 bin_PROGRAMS += lkbib
 man1_MANS += src/utils/lkbib/lkbib.n
-EXTRA_DIST += src/utils/lkbib/lkbib.man
+EXTRA_DIST += src/utils/lkbib/lkbib.1.man
 lkbib_LDADD = libbib.a libgroff.a $(LIBM)
 lkbib_SOURCES = src/utils/lkbib/lkbib.cpp
 src/utils/lkbib/lkbib.$(OBJEXT): defs.h
diff --git a/src/utils/lookbib/lookbib.man b/src/utils/lookbib/lookbib.1.man
similarity index 100%
rename from src/utils/lookbib/lookbib.man
rename to src/utils/lookbib/lookbib.1.man
diff --git a/src/utils/lookbib/lookbib.am b/src/utils/lookbib/lookbib.am
index 5c19c20..b2e22de 100644
--- a/src/utils/lookbib/lookbib.am
+++ b/src/utils/lookbib/lookbib.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-2015
 #      Free Software Foundation, Inc.
 #
-# Latest update: 13 Aug 2015
+# Latest update: 22 Aug 2015
 #
 # This file is part of groff.
 #
@@ -20,7 +20,7 @@
 
 prefixexecbin_PROGRAMS += lookbib
 PREFIXMAN1 += src/utils/lookbib/lookbib.n
-EXTRA_DIST += src/utils/lookbib/lookbib.man
+EXTRA_DIST += src/utils/lookbib/lookbib.1.man
 lookbib_LDADD = libbib.a libgroff.a $(LIBM)
 lookbib_SOURCES = src/utils/lookbib/lookbib.cpp
 
diff --git a/src/utils/pfbtops/pfbtops.man b/src/utils/pfbtops/pfbtops.1.man
similarity index 100%
rename from src/utils/pfbtops/pfbtops.man
rename to src/utils/pfbtops/pfbtops.1.man
diff --git a/src/utils/pfbtops/pfbtops.am b/src/utils/pfbtops/pfbtops.am
index 4e8f520..1869c5b 100644
--- a/src/utils/pfbtops/pfbtops.am
+++ b/src/utils/pfbtops/pfbtops.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-2015
 #      Free Software Foundation, Inc.
 #
-# Latest update: 13 Aug 2015
+# Latest update: 22 Aug 2015
 #
 # This file is part of groff.
 #
@@ -20,7 +20,7 @@
 
 bin_PROGRAMS += pfbtops
 man1_MANS += src/utils/pfbtops/pfbtops.n
-EXTRA_DIST += src/utils/pfbtops/pfbtops.man
+EXTRA_DIST += src/utils/pfbtops/pfbtops.1.man
 pfbtops_SOURCES = src/utils/pfbtops/pfbtops.c
 pfbtops_LDADD = libgroff.a $(LIBM)
 # We use the following trick to force the use of C++ compiler
diff --git a/src/utils/tfmtodit/tfmtodit.man b/src/utils/tfmtodit/tfmtodit.1.man
similarity index 100%
rename from src/utils/tfmtodit/tfmtodit.man
rename to src/utils/tfmtodit/tfmtodit.1.man
diff --git a/src/utils/tfmtodit/tfmtodit.am b/src/utils/tfmtodit/tfmtodit.am
index 728f47c..6c6494a 100644
--- a/src/utils/tfmtodit/tfmtodit.am
+++ b/src/utils/tfmtodit/tfmtodit.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-2015
 #      Free Software Foundation, Inc.
 #
-# Latest update: 13 Aug 2015
+# Latest update: 22 Aug 2015
 #
 # This file is part of groff.
 #
@@ -20,7 +20,7 @@
 
 bin_PROGRAMS += tfmtodit
 man1_MANS += src/utils/tfmtodit/tfmtodit.n
-EXTRA_DIST += src/utils/tfmtodit/tfmtodit.man
+EXTRA_DIST += src/utils/tfmtodit/tfmtodit.1.man
 tfmtodit_SOURCES = src/utils/tfmtodit/tfmtodit.cpp
 tfmtodit_LDADD = libgroff.a $(LIBM)
 
diff --git a/src/utils/xtotroff/xtotroff.man b/src/utils/xtotroff/xtotroff.1.man
similarity index 100%
rename from src/utils/xtotroff/xtotroff.man
rename to src/utils/xtotroff/xtotroff.1.man
diff --git a/src/utils/xtotroff/xtotroff.am b/src/utils/xtotroff/xtotroff.am
index 3fad985..8d4fce6 100644
--- a/src/utils/xtotroff/xtotroff.am
+++ b/src/utils/xtotroff/xtotroff.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-2015
 #      Free Software Foundation, Inc.
 #
-# Latest update: 13 Aug 2015
+# Latest update: 22 Aug 2015
 #
 # This file is part of groff.
 #
@@ -27,7 +27,7 @@ xtotroff_LDADD = libxutil.a libgroff.a $(X_LIBS) $(X_PRE_LIBS) \
   -lXaw -lXt -lX11 $(X_EXTRA_LIBS) $(LIBM)
 xtotroff_CPPFLAGS = $(AM_CPPFLAGS) $(X_CFLAGS)
 endif
-EXTRA_DIST += src/utils/xtotroff/xtotroff.man
+EXTRA_DIST += src/utils/xtotroff/xtotroff.1.man
 
 
 ########################################################################
diff --git a/tmac/groff_man.man b/tmac/groff_man.7.man
similarity index 100%
rename from tmac/groff_man.man
rename to tmac/groff_man.7.man
diff --git a/tmac/groff_mdoc.man b/tmac/groff_mdoc.7.man
similarity index 100%
rename from tmac/groff_mdoc.man
rename to tmac/groff_mdoc.7.man
diff --git a/tmac/groff_me.man b/tmac/groff_me.7.man
similarity index 100%
rename from tmac/groff_me.man
rename to tmac/groff_me.7.man
diff --git a/tmac/groff_ms.man b/tmac/groff_ms.7.man
similarity index 100%
rename from tmac/groff_ms.man
rename to tmac/groff_ms.7.man
diff --git a/tmac/groff_trace.man b/tmac/groff_trace.7.man
similarity index 100%
rename from tmac/groff_trace.man
rename to tmac/groff_trace.7.man
diff --git a/tmac/groff_www.man b/tmac/groff_www.7.man
similarity index 100%
rename from tmac/groff_www.man
rename to tmac/groff_www.7.man
diff --git a/tmac/tmac.am b/tmac/tmac.am
index f26a24d..1bda6e4 100644
--- a/tmac/tmac.am
+++ b/tmac/tmac.am
@@ -3,7 +3,7 @@
 #      Written by James Clark (jjc@jclark.com)
 #      Automake migration by Bertrand Garrigues
 #
-# Latest update: 13 Aug 2015
+# Latest update: 22 Aug 2015
 #
 # This file is part of groff.
 #
@@ -121,12 +121,12 @@ MOSTLYCLEANFILES += $(TMACMDOCFILES) tmac/www.tmac $(TMACSTRIPFILES) \
 
 EXTRA_DIST += \
   tmac/fixmacros.sed \
-  tmac/groff_ms.man \
-  tmac/groff_man.man \
-  tmac/groff_me.man \
-  tmac/groff_mdoc.man \
-  tmac/groff_trace.man \
-  tmac/groff_www.man \
+  tmac/groff_ms.7.man \
+  tmac/groff_man.7.man \
+  tmac/groff_me.7.man \
+  tmac/groff_mdoc.7.man \
+  tmac/groff_trace.7.man \
+  tmac/groff_www.7.man \
   tmac/hyphenex.pl \
   tmac/LOCALIZATION \
   tmac/man.ultrix \


From MAILER-DAEMON Sat Aug 22 08:59:52 2015
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1ZT8Om-0003Dd-26
	for mharc-groff-commit@gnu.org; Sat, 22 Aug 2015 08:59:52 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:52129)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <bernd.warken@web.de>) id 1ZT8Oj-0003By-G0
	for groff-commit@gnu.org; Sat, 22 Aug 2015 08:59:50 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <bernd.warken@web.de>) id 1ZT8Oh-0002Iv-Nz
	for groff-commit@gnu.org; Sat, 22 Aug 2015 08:59:49 -0400
Received: from vcs.savannah.gnu.org ([208.118.235.72]:46493)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <bernd.warken@web.de>) id 1ZT8Oh-0002Ir-KS
	for groff-commit@gnu.org; Sat, 22 Aug 2015 08:59:47 -0400
Received: from bwarken by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <bernd.warken@web.de>) id 1ZT8Og-0004Tk-Pj
	for groff-commit@gnu.org; Sat, 22 Aug 2015 12:59:47 +0000
Date: Sat, 22 Aug 2015 12:59:46 +0000
Message-Id: <E1ZT8Og-0004Tk-Pj@vcs.savannah.gnu.org>
To: groff-commit@gnu.org
Subject: [groff] 01/01: Move man-page of contrib/groff_filenames to section 5.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
In-Reply-To: groff@gnu.org
References: <20150822125946.17185.28924@vcs.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: 84e02826ea9ccac6a907e336f825e18f4adbd310
Auto-Submitted: auto-generated
From: Bernd Warken <bernd.warken@web.de>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 208.118.235.72
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: groff@gnu.org
List-Id: <groff-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/groff-commit>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 22 Aug 2015 12:59:51 -0000

bwarken pushed a commit to branch master
in repository groff.

commit 84e02826ea9ccac6a907e336f825e18f4adbd310
Author: Bernd Warken <groff-bernd.warken-72@web.de>
Date:   Sat Aug 22 14:59:09 2015 +0200

    Move man-page of contrib/groff_filenames to section 5.
---
 ChangeLog                                          |   10 ++++++++++
 contrib/chem/ChangeLog                             |    8 +++++++-
 contrib/gdiffmk/ChangeLog                          |   14 ++++++++++----
 contrib/glilypond/ChangeLog                        |    6 ++++++
 contrib/gperl/ChangeLog                            |    6 ++++++
 contrib/gpinyin/ChangeLog                          |    6 ++++++
 contrib/groff_filenames/ChangeLog                  |   12 ++++++++++++
 ...groff_filenames.1.man => groff_filenames.5.man} |    0
 contrib/groff_filenames/groff_filenames.am         |    4 ++--
 contrib/groffer/ChangeLog                          |    8 ++++++++
 contrib/hdtbl/ChangeLog                            |    6 ++++++
 contrib/mm/ChangeLog                               |   10 ++++++++++
 contrib/mom/ChangeLog                              |    6 ++++++
 contrib/pdfmark/ChangeLog                          |    6 ++++++
 src/devices/xditview/ChangeLog                     |    6 ++++++
 15 files changed, 101 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 201c33f..fc1eef5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2015-08-22  Bernd Warken  <groff-bernd.warken-72@web.de>
+
+	* all man-pages *.man: Rename man-pages such that the man section
+	number before the final `.man'.
+
+	* all *.am: Include renaming.
+
+	* Makefile.am: Reset `.man.n' by `.[157].man.n' with SUFFIXES
+	`.[157].man .n'.
+
 2015-08-20  Bernd Warken  <groff-bernd.warken-72@web.de>
 
 	* Makefile.am: Fix definition of man[157]_MANS.
diff --git a/contrib/chem/ChangeLog b/contrib/chem/ChangeLog
index 9dff2d6..d64b1c2 100644
--- a/contrib/chem/ChangeLog
+++ b/contrib/chem/ChangeLog
@@ -1,6 +1,12 @@
+2015-08-22  Bernd Warken  <bernd.warken@web.de>
+
+	* chem.1.man: Rename `chem.man'.
+
+	* chem.am: Include renaming.
+
 2015-08-05  Bernd Warken  <bernd.warken@web.de>
 
-	* chen.am: Add `Last update'.  Setup Emacs makefile-automake-mode.
+	* chem.am: Add `Last update'.  Setup Emacs makefile-automake-mode.
 
 2015-04-03  Werner LEMBERG  <wl@gnu.org>
 
diff --git a/contrib/gdiffmk/ChangeLog b/contrib/gdiffmk/ChangeLog
index d51c07a..bfaf4a5 100644
--- a/contrib/gdiffmk/ChangeLog
+++ b/contrib/gdiffmk/ChangeLog
@@ -1,3 +1,9 @@
+2015-08-22  Bernd Warken  <groff-bernd.warken-72@web.de>
+
+	* gdiffmk.1.man: Rename `gdiffmk.man'.
+
+	* gdiffmk.am: Include renaming.
+
 2015-08-05  Bernd Warken  <groff-bernd.warken-72@web.de>
 
 	* gdiffmk.am: Add `Last update'.  Setup Emacs mode.
@@ -12,14 +18,14 @@
 			test -e ...  with  test -f
 
 			use  ${DIFFCMD}  for the last  diff
-		add	
+		add
 			-s SEDCMD  option
 			OPTION="$1"
-	
+
 		many other cosmetic changes documented in the bug Discussion.
 		especially:
 			capitalize variables  e.g.  CMD=`basename $0`
- 
+
 	fix  make check  tests within gdiffmk
 	* tests/gdiffmk_tests.sh
 		add  set -e
@@ -149,7 +155,7 @@
 
 	First import of gdiffmk files.
 
-Copyright 2004-2009, 2014
+Copyright 2004-2009, 2014-2015
   Free Software Foundation, Inc.
 
 Copying and distribution of this file, with or without modification,
diff --git a/contrib/glilypond/ChangeLog b/contrib/glilypond/ChangeLog
index 1c0acfd..44aaa6d 100644
--- a/contrib/glilypond/ChangeLog
+++ b/contrib/glilypond/ChangeLog
@@ -1,3 +1,9 @@
+2015-08-22  Bernd Warken  <groff-bernd.warken-72@web.de>
+
+	* glilypond.1.man: Rename `glilypond.man'.
+
+	* glilypond.am: Include renaming.
+
 2015-08-05  Bernd Warken  <groff-bernd.warken-72@web.de>
 
 	* glilypond.am: Add `Last update'.  Setup Emacs mode.
diff --git a/contrib/gperl/ChangeLog b/contrib/gperl/ChangeLog
index 0d8b7c0..6bba3d4 100644
--- a/contrib/gperl/ChangeLog
+++ b/contrib/gperl/ChangeLog
@@ -1,3 +1,9 @@
+2015-08-22  Bernd Warken  <groff-bernd.warken-72@web.de>
+
+	* gperl.1.man: Rename `gperl.man'.
+
+	* gperl.am: Include renaming.
+
 2015-08-05  Bernd Warken  <groff-bernd.warken-72@web.de>
 
 	* gperl.am: Add `Last update'.  Setup Emacs mode.
diff --git a/contrib/gpinyin/ChangeLog b/contrib/gpinyin/ChangeLog
index a3b2630..e9a688e 100644
--- a/contrib/gpinyin/ChangeLog
+++ b/contrib/gpinyin/ChangeLog
@@ -1,3 +1,9 @@
+2015-08-22  Bernd Warken  <groff-bernd.warken-72@web.de>
+
+	* gpinyin.1.man: Rename `gpinyin.man'.
+
+	* gpinyin.am: include renaming.
+
 2015-08-05  Bernd Warken  <groff-bernd.warken-72@web.de>
 
 	* gpinyin.am: Add `Last update'.  Setup Emacs mode.
diff --git a/contrib/groff_filenames/ChangeLog b/contrib/groff_filenames/ChangeLog
index 4ae6605..57f3845 100644
--- a/contrib/groff_filenames/ChangeLog
+++ b/contrib/groff_filenames/ChangeLog
@@ -1,3 +1,15 @@
+2015-08-22  Bernd Warken  <groff-bernd.warken-72@web.de>
+
+	* groff_filenames.5.man: Rename `groff_filenames.1.man'.
+
+	* groff_filenames.am: Include section changing.
+
+2015-08-22  Bernd Warken  <groff-bernd.warken-72@web.de>
+
+	* groff_filenames.1.man: Rename `groff_filenames.man'.
+
+	* groff_filenames.am: Include renaming.
+
 2015-08-05  Bernd Warken  <groff-bernd.warken-72@web.de>
 
 	* groff_filenames.am: Add `Last update'.  Setup Emacs mode.
diff --git a/contrib/groff_filenames/groff_filenames.1.man b/contrib/groff_filenames/groff_filenames.5.man
similarity index 100%
rename from contrib/groff_filenames/groff_filenames.1.man
rename to contrib/groff_filenames/groff_filenames.5.man
diff --git a/contrib/groff_filenames/groff_filenames.am b/contrib/groff_filenames/groff_filenames.am
index a43cfe1..d98ee12 100644
--- a/contrib/groff_filenames/groff_filenames.am
+++ b/contrib/groff_filenames/groff_filenames.am
@@ -26,10 +26,10 @@
 
 ########################################################################
 
-man7_MANS += contrib/groff_filenames/groff_filenames.n
+man5_MANS += contrib/groff_filenames/groff_filenames.n
 EXTRA_DIST += \
   contrib/groff_filenames/ChangeLog \
-  contrib/groff_filenames/groff_filenames.1.man
+  contrib/groff_filenames/groff_filenames.5.man
 
 
 ########################################################################
diff --git a/contrib/groffer/ChangeLog b/contrib/groffer/ChangeLog
index d9948a4..7b9954b 100644
--- a/contrib/groffer/ChangeLog
+++ b/contrib/groffer/ChangeLog
@@ -1,5 +1,13 @@
 2015-08-05  Bernd Warken  <groff-bernd.warken-72@web.de>
 
+	* groffer.1.man: Rename `groffer.man'.
+
+	* roff2.1.man: Rename `roff2.man'.
+
+	* groffer.am: Include renamings.
+
+2015-08-05  Bernd Warken  <groff-bernd.warken-72@web.de>
+
 	* groffer.am: Add `Last update'.  Setup Emacs mode.
 
 2015-04-04  Werner LEMBERG  <wl@gnu.org>
diff --git a/contrib/hdtbl/ChangeLog b/contrib/hdtbl/ChangeLog
index 77e10ac..a411507 100644
--- a/contrib/hdtbl/ChangeLog
+++ b/contrib/hdtbl/ChangeLog
@@ -1,3 +1,9 @@
+2015-08-22  Bernd Warken  <groff-bernd.warken-72@web.de>
+
+	* groff_hdtbl.7.man: Rename `groff_hdtbl.man'.
+
+	* hdtbl.am: Include renaming.
+
 2015-08-05  Bernd Warken  <groff-bernd.warken-72@web.de>
 
 	* hdtbl.am: Add `Last update'.  Setup Emacs mode.
diff --git a/contrib/mm/ChangeLog b/contrib/mm/ChangeLog
index 6223f33..7196ec6 100644
--- a/contrib/mm/ChangeLog
+++ b/contrib/mm/ChangeLog
@@ -1,3 +1,13 @@
+2015-08-22  Bernd Warken  <groff-bernd.warken-72@web.de>
+
+	* mmroff.1.man: Rename `mmroff.man'.
+
+	* groff_mm.7.man: Rename `groff_mm.man'.
+
+	* groff_mmse.7.man: Rename `groff_mmse.man'.
+
+	* mm.am: Include renamings.
+
 2015-08-05  Bernd Warken  <groff-bernd.warken-72@web.de>
 
 	* mm.am, Makefile.sim: Add `Last update'.  Setup Emacs mode.
diff --git a/contrib/mom/ChangeLog b/contrib/mom/ChangeLog
index 10defb2..ebcc3b8 100644
--- a/contrib/mom/ChangeLog
+++ b/contrib/mom/ChangeLog
@@ -1,3 +1,9 @@
+2015-08-22  Bernd Warken  <groff-bernd.warken-72@web.de>
+
+	* groff_mom.7.man: Rename `groff_mom.man'.
+
+	* mom.am: Include renaming.
+
 2015-08-05  Bernd Warken  <groff-bernd.warken-72@web.de>
 
 	* mom.am: Add `Last update'.  Setup Emacs mode.
diff --git a/contrib/pdfmark/ChangeLog b/contrib/pdfmark/ChangeLog
index 6a7c894..ef130df 100644
--- a/contrib/pdfmark/ChangeLog
+++ b/contrib/pdfmark/ChangeLog
@@ -1,3 +1,9 @@
+2015-08-22  Bernd Warken  <groff-bernd.warken-72@web.de>
+
+	* pdfroff.1.man: Rename `pdfroff.man'.
+
+	* pdfmark.am: Add `Last update'.  Setup Emacs mode.
+
 2015-08-05  Bernd Warken  <groff-bernd.warken-72@web.de>
 
 	* pdfmark.am: Add `Last update'.  Setup Emacs mode.
diff --git a/src/devices/xditview/ChangeLog b/src/devices/xditview/ChangeLog
index c24b01d..9f37820 100644
--- a/src/devices/xditview/ChangeLog
+++ b/src/devices/xditview/ChangeLog
@@ -1,3 +1,9 @@
+2015-08-22  Bernd Warken  <groff-bernd.warken-72@web.de>
+
+	* gxditview.1.man: Rename `gxditview.man'.
+
+	* xditview.am: Include renaming.
+
 2015-08-05  Bernd Warken  <groff-bernd.warken-72@web.de>
 
 	* xditview.am: Add `Last update'.  Setup Emacs mode.


From MAILER-DAEMON Sat Aug 22 09:18:29 2015
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1ZT8gn-0005gl-06
	for mharc-groff-commit@gnu.org; Sat, 22 Aug 2015 09:18:29 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:54794)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <bernd.warken@web.de>) id 1ZT8gk-0005fd-IH
	for groff-commit@gnu.org; Sat, 22 Aug 2015 09:18:27 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <bernd.warken@web.de>) id 1ZT8gj-0003gF-O3
	for groff-commit@gnu.org; Sat, 22 Aug 2015 09:18:26 -0400
Received: from vcs.savannah.gnu.org ([208.118.235.72]:46659)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <bernd.warken@web.de>) id 1ZT8gj-0003g6-LT
	for groff-commit@gnu.org; Sat, 22 Aug 2015 09:18:25 -0400
Received: from bwarken by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <bernd.warken@web.de>) id 1ZT8gi-0002ec-VO
	for groff-commit@gnu.org; Sat, 22 Aug 2015 13:18:25 +0000
Date: Sat, 22 Aug 2015 13:18:25 +0000
Message-Id: <E1ZT8gi-0002ec-VO@vcs.savannah.gnu.org>
To: groff-commit@gnu.org
Subject: [groff] 01/01: groff_filenames.5.man: Use section 5 within this
	man-page.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
In-Reply-To: groff@gnu.org
References: <20150822131824.10171.88577@vcs.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: b7441aee00f26cb2f68094d24eae9cc72eb0c678
Auto-Submitted: auto-generated
From: Bernd Warken <bernd.warken@web.de>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 208.118.235.72
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: groff@gnu.org
List-Id: <groff-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/groff-commit>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 22 Aug 2015 13:18:27 -0000

bwarken pushed a commit to branch master
in repository groff.

commit b7441aee00f26cb2f68094d24eae9cc72eb0c678
Author: Bernd Warken <groff-bernd.warken-72@web.de>
Date:   Sat Aug 22 15:17:51 2015 +0200

    groff_filenames.5.man: Use section 5 within this man-page.
---
 contrib/groff_filenames/ChangeLog             |    4 ++++
 contrib/groff_filenames/groff_filenames.5.man |    8 +++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/contrib/groff_filenames/ChangeLog b/contrib/groff_filenames/ChangeLog
index 57f3845..5aaa1cb 100644
--- a/contrib/groff_filenames/ChangeLog
+++ b/contrib/groff_filenames/ChangeLog
@@ -1,5 +1,9 @@
 2015-08-22  Bernd Warken  <groff-bernd.warken-72@web.de>
 
+	* groff_filenames.5.man: Use section 5 within this man-page.
+
+2015-08-22  Bernd Warken  <groff-bernd.warken-72@web.de>
+
 	* groff_filenames.5.man: Rename `groff_filenames.1.man'.
 
 	* groff_filenames.am: Include section changing.
diff --git a/contrib/groff_filenames/groff_filenames.5.man b/contrib/groff_filenames/groff_filenames.5.man
index b25765b..0a69c95 100644
--- a/contrib/groff_filenames/groff_filenames.5.man
+++ b/contrib/groff_filenames/groff_filenames.5.man
@@ -1,4 +1,4 @@
-.TH GROFF_FILENAMES @MAN7EXT@ "@MDATE@" "Groff Version @VERSION@"
+.TH GROFF_FILENAMES @MAN5EXT@ "@MDATE@" "Groff Version @VERSION@"
 .SH NAME
 groff_filenames \(em filename extensions for roff and groff
 .
@@ -10,7 +10,9 @@ groff_filenames \(em filename extensions for roff and groff
 .\" --------------------------------------------------------------------
 .
 .de co
-Copyright \(co 2013-2014 Free Software Foundation, Inc.
+Copyright \(co 2013-2015 Free Software Foundation, Inc.
+
+Last update: 22 Aug 2015
 
 This file is part of groff, a free software project.  You can
 redistribute it and/or modify it under the terms of the GNU General
@@ -588,7 +590,7 @@ pictures, see
 .
 .TP
 .IB <name> .pdfroff
-transform this file with
+ransform this file with
 .B pdfroff
 of the
 .I groff


From MAILER-DAEMON Thu Aug 27 07:28:07 2015
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1ZUvLj-0006es-Ho
	for mharc-groff-commit@gnu.org; Thu, 27 Aug 2015 07:28:07 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:34091)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <bernd.warken@web.de>) id 1ZUvLZ-0006UJ-UO
	for groff-commit@gnu.org; Thu, 27 Aug 2015 07:28:05 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <bernd.warken@web.de>) id 1ZUvLV-0004gR-HP
	for groff-commit@gnu.org; Thu, 27 Aug 2015 07:27:57 -0400
Received: from vcs.savannah.gnu.org ([208.118.235.72]:57377)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <bernd.warken@web.de>) id 1ZUvLV-0004gN-EE
	for groff-commit@gnu.org; Thu, 27 Aug 2015 07:27:53 -0400
Received: from bwarken by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <bernd.warken@web.de>) id 1ZUvLU-0005s3-M3
	for groff-commit@gnu.org; Thu, 27 Aug 2015 11:27:53 +0000
Date: Thu, 27 Aug 2015 11:27:52 +0000
Message-Id: <E1ZUvLU-0005s3-M3@vcs.savannah.gnu.org>
To: groff-commit@gnu.org
Subject: [groff] 01/01: Add new tmac file pdfpic.tmac and document this
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
In-Reply-To: groff@gnu.org
References: <20150827112752.22536.87207@vcs.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: 9d885c6b342f71594af5d45f37ce65c121641e25
Auto-Submitted: auto-generated
From: Bernd Warken <bernd.warken@web.de>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 208.118.235.72
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: groff@gnu.org
List-Id: <groff-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/groff-commit>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 27 Aug 2015 11:28:05 -0000

bwarken pushed a commit to branch master
in repository groff.

commit 9d885c6b342f71594af5d45f37ce65c121641e25
Author: Bernd Warken <groff-bernd.warken-72@web.de>
Date:   Thu Aug 27 13:27:25 2015 +0200

    Add new tmac file pdfpic.tmac and document this
---
 ChangeLog                                  |    8 ++
 Makefile.am                                |  111 +++--------------------
 contrib/chem/chem.am                       |    2 +-
 contrib/eqn2graph/eqn2graph.am             |    2 +-
 contrib/gdiffmk/gdiffmk.am                 |    2 +-
 contrib/glilypond/glilypond.am             |    2 +-
 contrib/gperl/gperl.am                     |    2 +-
 contrib/gpinyin/gpinyin.am                 |    2 +-
 contrib/grap2graph/grap2graph.am           |    2 +-
 contrib/groff_filenames/groff_filenames.am |    2 +-
 contrib/groffer/groffer.am                 |   14 ++--
 contrib/hdtbl/hdtbl.am                     |    2 +-
 contrib/mm/mm.am                           |    6 +-
 contrib/mom/mom.am                         |    2 +-
 contrib/pdfmark/pdfmark.am                 |    2 +-
 contrib/pic2graph/pic2graph.am             |    2 +-
 man/groff_tmac.5.man                       |   29 ++++++
 man/man.am                                 |   16 ++--
 src/devices/grodvi/grodvi.am               |    2 +-
 src/devices/grohtml/grohtml.am             |    2 +-
 src/devices/grolbp/grolbp.am               |    2 +-
 src/devices/grolj4/grolj4.am               |    4 +-
 src/devices/gropdf/gropdf.am               |    4 +-
 src/devices/grops/grops.am                 |    2 +-
 src/devices/grotty/grotty.am               |    2 +-
 src/devices/xditview/xditview.am           |    2 +-
 src/preproc/eqn/eqn.am                     |    2 +-
 src/preproc/grn/grn.am                     |    2 +-
 src/preproc/pic/pic.am                     |    2 +-
 src/preproc/preconv/preconv.am             |    2 +-
 src/preproc/refer/refer.am                 |    2 +-
 src/preproc/soelim/soelim.am               |    2 +-
 src/preproc/tbl/tbl.am                     |    2 +-
 src/roff/groff/groff.am                    |    2 +-
 src/roff/grog/grog.am                      |    2 +-
 src/roff/nroff/nroff.am                    |    2 +-
 src/roff/troff/troff.am                    |    2 +-
 src/utils/addftinfo/addftinfo.am           |    2 +-
 src/utils/afmtodit/afmtodit.am             |    2 +-
 src/utils/hpftodit/hpftodit.am             |    2 +-
 src/utils/indxbib/indxbib.am               |    2 +-
 src/utils/lkbib/lkbib.am                   |    2 +-
 src/utils/lookbib/lookbib.am               |    2 +-
 src/utils/pfbtops/pfbtops.am               |    2 +-
 src/utils/tfmtodit/tfmtodit.am             |    2 +-
 src/utils/xtotroff/xtotroff.am             |    2 +-
 tmac/pdfpic.tmac                           |  139 ++++++++++++++++++++++++++++
 tmac/tmac.am                               |   13 ++-
 48 files changed, 255 insertions(+), 165 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index fc1eef5..3f5cd60 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2015-08-27  Bernd Warken  <groff-bernd.warken-72@web.de>
+
+	* tmac/pfdpic.tmac: Add file for macro PDFPIC.
+
+	* tmac/tmac.am: Add new tmac file.
+
+	* man/groff_tmac.5.man: Add definition for the new tmac.
+
 2015-08-22  Bernd Warken  <groff-bernd.warken-72@web.de>
 
 	* all man-pages *.man: Rename man-pages such that the man section
diff --git a/Makefile.am b/Makefile.am
index 32303c0..2697115 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -708,29 +708,23 @@ if USEPROGRAMPREFIX
 generate_man_files: $(PREFIXMAN1)
 install-prefix-man:
 	for f in $(PREFIXMAN1); do \
-	  manfile_final_name=`basename $$f | sed 's/n$$/1/'`; \
-	  cp -f $$f $(DESTDIR)$(man1dir)/$(NAMEPREFIX)$$manfile_final_name; \
+	  cp -f $$f $(DESTDIR)$(man1dir)/$(NAMEPREFIX)`basename $$f`; \
 	done
 	for f in $(PREFIXMAN5); do \
-	  manfile_final_name=`basename $$f | sed 's/n$$/5/'`; \
-	  cp -f $$f $(DESTDIR)$(man5dir)/$(NAMEPREFIX)$$manfile_final_name; \
+	  cp -f $$f $(DESTDIR)$(man5dir)/$(NAMEPREFIX)`basename $$f`; \
 	done
 	for f in $(PREFIXMAN7); do \
-	  manfile_final_name=`basename $$f | sed 's/n$$/7/'`; \
-	  cp -f $$f $(DESTDIR)$(man7dir)/$(NAMEPREFIX)$$manfile_final_name; \
+	  cp -f $$f $(DESTDIR)$(man7dir)/$(NAMEPREFIX)`basename $$f`; \
 	done
 uninstall-prefix-man:
 	for f in $(PREFIXMAN1); do \
-	  manfile_final_name=`basename $$f | sed 's/n$$/1/'`; \
-	  rm -f $(DESTDIR)$(man1dir)/$(NAMEPREFIX)$$manfile_final_name; \
+	  rm -f $(DESTDIR)$(man1dir)/$(NAMEPREFIX)`basename $$f`; \
 	done
 	for f in $(PREFIXMAN5); do \
-	  manfile_final_name=`basename $$f | sed 's/n$$/5/'`; \
-	  rm -f $(DESTDIR)$(man5dir)/$(NAMEPREFIX)$$manfile_final_name; \
+	  rm -f $(DESTDIR)$(man5dir)/$(NAMEPREFIX)`basename $$f`; \
 	done
 	for f in $(PREFIXMAN7); do \
-	  manfile_final_name=`basename $$f | sed 's/n$$/7/'`; \
-	  rm -f $(DESTDIR)$(man7dir)/$(NAMEPREFIX)$$manfile_final_name; \
+	  rm -f $(DESTDIR)$(man7dir)/$(NAMEPREFIX)`basename $$f`; \
 	done
 else
 man1_MANS += $(PREFIXMAN1)
@@ -829,7 +823,7 @@ EXTRA_DIST += \
   ChangeLog.116 \
   ChangeLog.117 \
   ChangeLog.118 \
-  ChangeLog.119 \
+   ChangeLog.119 \
   ChangeLog.120 \
   ChangeLog.121 \
   FDL \
@@ -854,92 +848,11 @@ MOSTLYCLEANFILES += $(prefixexecbin_SCRIPTS) $(bin_SCRIPTS) \
   $(PREFIXMAN1) $(PREFIXMAN5) $(PREFIXMAN7) \
   test-groff
 
-# Rule to build .man files. The brackets around the @ are used to prevent the 
-# substitution of the variable by automake. 
-
-SUFFIXES = .1.man .n
-
-.1.man.n:
-	@echo Making $@ from $<
-	rm -f $@
-	$(MKDIR_P) `dirname $@`
-	@LC_ALL=C \
-	 sed -e "s|[@]APPRESDIR[@]|$(appresdir)|g" \
-	     -e "s|[@]BINDIR[@]|$(bindir)|g" \
-	     -e "s|[@]BROKEN_SPOOLER_FLAGS[@]|$(BROKEN_SPOOLER_FLAGS)|g" \
-	     -e "s|[@]COMMON_WORDS_FILE[@]|$(common_words_file)|g" \
-	     -e "s|[@]DATASUBDIR[@]|$(datasubdir)|g" \
-	     -e "s|[@]DEFAULT_INDEX[@]|$(indexdir)/$(indexname)|g" \
-	     -e "s|[@]DEFAULT_INDEX_NAME[@]|$(indexname)|g" \
-	     -e "s|[@]DEVICE[@]|$(DEVICE)|g" \
-	     -e "s|[@]DOCDIR[@]|$(docdir)|g" \
-	     -e "s|[@]EXAMPLEDIR[@]|$(exampledir)|g" \
-	     -e "s|[@]FONTDIR[@]|$(fontdir)|g" \
-	     -e "s|[@]g[@]|$(g)|g" \
-	     -e "s![@]G[@]!`echo $(g) | tr [a-z] [A-Z]`!g" \
-	     -e "s|[@]HTMLDOCDIR[@]|$(htmldocdir)|g" \
-	     -e "s|[@]INDEX_SUFFIX[@]|$(indexext)|g" \
-	     -e "s|[@]LEGACYFONTDIR[@]|$(legacyfontdir)|g" \
-	     -e "s|[@]LOCALFONTDIR[@]|$(localfontdir)|g" \
-	     -e "s|[@]LOCALMACRODIR[@]|$(localtmacdir)|g" \
-	     -e "s|[@]MACRODIR[@]|$(tmacdir)|g" \
-	     -e "s|[@]MAN1EXT[@]|$(man1ext)|g" \
-	     -e "s|[@]MAN5EXT[@]|$(man5ext)|g" \
-	     -e "s|[@]MAN7EXT[@]|$(man7ext)|g" \
-	     -e "s|[@]MDATE[@]|`$(SHELL) $(top_srcdir)/mdate.sh $<`|g" \
-	     -e "s|[@]OLDFONTDIR[@]|$(oldfontdir)|g" \
-	     -e "s|[@]PDFDOCDIR[@]|$(pdfdocdir)|g" \
-	     -e "s|[@]SYSTEMMACRODIR[@]|$(systemtmacdir)|g" \
-	     -e "s|[@]TMAC_AN_PREFIX[@]|$(tmac_an_prefix)|g" \
-	     -e "s|[@]TMAC_M_PREFIX[@]|$(tmac_m_prefix)|g" \
-	     -e "s|[@]TMAC_MDIR[@]|$(tmacdir)/mm|g" \
-	     -e "s|[@]TMAC_S_PREFIX[@]|$(tmac_s_prefix)|g" \
-	     -e "s|[@]VERSION[@]|$(VERSION)|g" \
-	 $< >$@
-
-SUFFIXES = .5.man .n
-
-.5.man.n:
-	@echo Making $@ from $<
-	rm -f $@
-	$(MKDIR_P) `dirname $@`
-	@LC_ALL=C \
-	 sed -e "s|[@]APPRESDIR[@]|$(appresdir)|g" \
-	     -e "s|[@]BINDIR[@]|$(bindir)|g" \
-	     -e "s|[@]BROKEN_SPOOLER_FLAGS[@]|$(BROKEN_SPOOLER_FLAGS)|g" \
-	     -e "s|[@]COMMON_WORDS_FILE[@]|$(common_words_file)|g" \
-	     -e "s|[@]DATASUBDIR[@]|$(datasubdir)|g" \
-	     -e "s|[@]DEFAULT_INDEX[@]|$(indexdir)/$(indexname)|g" \
-	     -e "s|[@]DEFAULT_INDEX_NAME[@]|$(indexname)|g" \
-	     -e "s|[@]DEVICE[@]|$(DEVICE)|g" \
-	     -e "s|[@]DOCDIR[@]|$(docdir)|g" \
-	     -e "s|[@]EXAMPLEDIR[@]|$(exampledir)|g" \
-	     -e "s|[@]FONTDIR[@]|$(fontdir)|g" \
-	     -e "s|[@]g[@]|$(g)|g" \
-	     -e "s![@]G[@]!`echo $(g) | tr [a-z] [A-Z]`!g" \
-	     -e "s|[@]HTMLDOCDIR[@]|$(htmldocdir)|g" \
-	     -e "s|[@]INDEX_SUFFIX[@]|$(indexext)|g" \
-	     -e "s|[@]LEGACYFONTDIR[@]|$(legacyfontdir)|g" \
-	     -e "s|[@]LOCALFONTDIR[@]|$(localfontdir)|g" \
-	     -e "s|[@]LOCALMACRODIR[@]|$(localtmacdir)|g" \
-	     -e "s|[@]MACRODIR[@]|$(tmacdir)|g" \
-	     -e "s|[@]MAN1EXT[@]|$(man1ext)|g" \
-	     -e "s|[@]MAN5EXT[@]|$(man5ext)|g" \
-	     -e "s|[@]MAN7EXT[@]|$(man7ext)|g" \
-	     -e "s|[@]MDATE[@]|`$(SHELL) $(top_srcdir)/mdate.sh $<`|g" \
-	     -e "s|[@]OLDFONTDIR[@]|$(oldfontdir)|g" \
-	     -e "s|[@]PDFDOCDIR[@]|$(pdfdocdir)|g" \
-	     -e "s|[@]SYSTEMMACRODIR[@]|$(systemtmacdir)|g" \
-	     -e "s|[@]TMAC_AN_PREFIX[@]|$(tmac_an_prefix)|g" \
-	     -e "s|[@]TMAC_M_PREFIX[@]|$(tmac_m_prefix)|g" \
-	     -e "s|[@]TMAC_MDIR[@]|$(tmacdir)/mm|g" \
-	     -e "s|[@]TMAC_S_PREFIX[@]|$(tmac_s_prefix)|g" \
-	     -e "s|[@]VERSION[@]|$(VERSION)|g" \
-	 $< >$@
-
-SUFFIXES = .7.man .n
-
-.7.man.n:
+# Suffixe rule to build .1, .5 and .7 files from .1.man, .5.man and
+# .7.man files.  The brackets around the @ are used to prevent the
+# substitution of the variable by automake.
+SUFFIXES += .man
+.man:
 	@echo Making $@ from $<
 	rm -f $@
 	$(MKDIR_P) `dirname $@`
diff --git a/contrib/chem/chem.am b/contrib/chem/chem.am
index 671d2b4..b6f6651 100644
--- a/contrib/chem/chem.am
+++ b/contrib/chem/chem.am
@@ -63,7 +63,7 @@ EXTRA_DIST += \
   contrib/chem/examples/README.txt \
   contrib/chem/examples/122/README.txt
 
-man1_MANS += contrib/chem/chem.n
+man1_MANS += contrib/chem/chem.1
 MOSTLYCLEANFILES += $(CHEM_GENEXAMPLES) $(nodist_chemexample122_DATA) \
   contrib/chem/README
 
diff --git a/contrib/eqn2graph/eqn2graph.am b/contrib/eqn2graph/eqn2graph.am
index 89bd76e..a631f64 100644
--- a/contrib/eqn2graph/eqn2graph.am
+++ b/contrib/eqn2graph/eqn2graph.am
@@ -23,7 +23,7 @@
 
 eqn2graph_srcdir = $(top_srcdir)/contrib/eqn2graph
 bin_SCRIPTS += eqn2graph
-man1_MANS += contrib/eqn2graph/eqn2graph.n
+man1_MANS += contrib/eqn2graph/eqn2graph.1
 EXTRA_DIST += \
   contrib/eqn2graph/eqn2graph.1.man \
   contrib/eqn2graph/eqn2graph.sh
diff --git a/contrib/gdiffmk/gdiffmk.am b/contrib/gdiffmk/gdiffmk.am
index e6bf07e..6a5a607 100644
--- a/contrib/gdiffmk/gdiffmk.am
+++ b/contrib/gdiffmk/gdiffmk.am
@@ -28,7 +28,7 @@
 gdiffmk_srcdir = $(top_srcdir)/contrib/gdiffmk
 bin_SCRIPTS += gdiffmk
 TESTS += contrib/gdiffmk/tests/gdiffmk_tests.sh
-man1_MANS += contrib/gdiffmk/gdiffmk.n
+man1_MANS += contrib/gdiffmk/gdiffmk.1
 EXTRA_DIST += \
   contrib/gdiffmk/gdiffmk.1.man \
   contrib/gdiffmk/ChangeLog \
diff --git a/contrib/glilypond/glilypond.am b/contrib/glilypond/glilypond.am
index a831a46..77ad477 100644
--- a/contrib/glilypond/glilypond.am
+++ b/contrib/glilypond/glilypond.am
@@ -28,7 +28,7 @@
 ########################################################################
 glilypond_srcdir = $(top_srcdir)/contrib/glilypond
 bin_SCRIPTS += glilypond
-man1_MANS += contrib/glilypond/glilypond.n
+man1_MANS += contrib/glilypond/glilypond.1
 
 # files going to lib directory `$(glilypond_dir)'
 # TODO glilypond_dir is subsitued by configure.ac, check if this could be removed
diff --git a/contrib/gperl/gperl.am b/contrib/gperl/gperl.am
index 6add9f9..9520a6b 100644
--- a/contrib/gperl/gperl.am
+++ b/contrib/gperl/gperl.am
@@ -27,7 +27,7 @@
 ########################################################################
 
 bin_SCRIPTS += gperl
-man1_MANS += contrib/gperl/gperl.n
+man1_MANS += contrib/gperl/gperl.1
 EXTRA_DIST += \
   contrib/gperl/ChangeLog \
   contrib/gperl/gperl.1.man \
diff --git a/contrib/gpinyin/gpinyin.am b/contrib/gpinyin/gpinyin.am
index 44596e8..bba0e6d 100644
--- a/contrib/gpinyin/gpinyin.am
+++ b/contrib/gpinyin/gpinyin.am
@@ -31,7 +31,7 @@ gpinyin_srcdir = $(top_srcdir)/contrib/gpinyin
 bin_SCRIPTS += gpinyin
 gpinyindir = $(gpinyin_dir)
 dist_gpinyin_DATA = contrib/gpinyin/subs.pl
-man1_MANS += contrib/gpinyin/gpinyin.n
+man1_MANS += contrib/gpinyin/gpinyin.1
 EXTRA_DIST += \
   contrib/gpinyin/ChangeLog \
   contrib/gpinyin/gpinyin.1.man \
diff --git a/contrib/grap2graph/grap2graph.am b/contrib/grap2graph/grap2graph.am
index 9a25dab..559e4da 100644
--- a/contrib/grap2graph/grap2graph.am
+++ b/contrib/grap2graph/grap2graph.am
@@ -22,7 +22,7 @@
 
 grap2graph_srcdir = $(top_srcdir)/contrib/grap2graph
 bin_SCRIPTS += grap2graph
-man1_MANS += contrib/grap2graph/grap2graph.n
+man1_MANS += contrib/grap2graph/grap2graph.1
 EXTRA_DIST += \
   $(grap2graph_srcdir)/grap2graph.sh \
   $(grap2graph_srcdir)/grap2graph.1.man
diff --git a/contrib/groff_filenames/groff_filenames.am b/contrib/groff_filenames/groff_filenames.am
index d98ee12..5fe9eae 100644
--- a/contrib/groff_filenames/groff_filenames.am
+++ b/contrib/groff_filenames/groff_filenames.am
@@ -26,7 +26,7 @@
 
 ########################################################################
 
-man5_MANS += contrib/groff_filenames/groff_filenames.n
+man5_MANS += contrib/groff_filenames/groff_filenames.5
 EXTRA_DIST += \
   contrib/groff_filenames/ChangeLog \
   contrib/groff_filenames/groff_filenames.5.man
diff --git a/contrib/groffer/groffer.am b/contrib/groffer/groffer.am
index f3365ed..7b64ca8 100644
--- a/contrib/groffer/groffer.am
+++ b/contrib/groffer/groffer.am
@@ -70,13 +70,13 @@ grofferdir = $(groffer_dir)
 bin_SCRIPTS += groffer $(ROFF2PROGS)
 groffer_DATA = $(GROFFER_PERL) contrib/groffer/version.sh
 man1_MANS += \
-  contrib/groffer/groffer.n \
-  contrib/groffer/roff2dvi.n \
-  contrib/groffer/roff2html.n \
-  contrib/groffer/roff2pdf.n \
-  contrib/groffer/roff2ps.n \
-  contrib/groffer/roff2text.n \
-  contrib/groffer/roff2x.n
+  contrib/groffer/groffer.1 \
+  contrib/groffer/roff2dvi.1 \
+  contrib/groffer/roff2html.1 \
+  contrib/groffer/roff2pdf.1 \
+  contrib/groffer/roff2ps.1 \
+  contrib/groffer/roff2text.1 \
+  contrib/groffer/roff2x.1
 MOSTLYCLEANFILES += $(ROFF2MAN)
 
 $(ROFF2PROGS): $(groffer_srcdir)/roff2.pl
diff --git a/contrib/hdtbl/hdtbl.am b/contrib/hdtbl/hdtbl.am
index dd634a1..ba18ce1 100644
--- a/contrib/hdtbl/hdtbl.am
+++ b/contrib/hdtbl/hdtbl.am
@@ -22,7 +22,7 @@
 hdtbl_srcdir = $(top_srcdir)/contrib/hdtbl
 hdtbl_builddir = $(top_builddir)/contrib/hdtbl
 
-man7_MANS += contrib/hdtbl/groff_hdtbl.n
+man7_MANS += contrib/hdtbl/groff_hdtbl.7
 
 # Groff command used to generate .ps files
 HDTBL_TFLAG = -M$(hdtbl_srcdir) -M$(hdtbl_builddir)
diff --git a/contrib/mm/mm.am b/contrib/mm/mm.am
index 76fdc25..abdc071 100644
--- a/contrib/mm/mm.am
+++ b/contrib/mm/mm.am
@@ -26,10 +26,10 @@ mm_builddir = $(top_builddir)/contrib/mm
 
 bin_SCRIPTS += mmroff
 
-man1_MANS += contrib/mm/mmroff.n
+man1_MANS += contrib/mm/mmroff.1
 man7_MANS += \
-  contrib/mm/groff_mm.n \
-  contrib/mm/groff_mmse.n
+  contrib/mm/groff_mm.7 \
+  contrib/mm/groff_mmse.7
 
 # Files installed in $(tmacdir)/mm
 MMFILES = \
diff --git a/contrib/mom/mom.am b/contrib/mom/mom.am
index 08d1d7d..9b66c81 100644
--- a/contrib/mom/mom.am
+++ b/contrib/mom/mom.am
@@ -32,7 +32,7 @@ MOMPDFMOM = \
   PDFMOM_BIN_PATH="$(top_builddir)" \
   $(PDFMOMBIN) $(FFLAG) $(TFLAG) $(MOM_TFLAG) $(MOM_KFLAG)
 
-man7_MANS += contrib/mom/groff_mom.n
+man7_MANS += contrib/mom/groff_mom.7
 
 # Files installed in $(tmacdir).
 # MOMNORMALFILES are located in the source tree.
diff --git a/contrib/pdfmark/pdfmark.am b/contrib/pdfmark/pdfmark.am
index 13c1020..6b02d42 100644
--- a/contrib/pdfmark/pdfmark.am
+++ b/contrib/pdfmark/pdfmark.am
@@ -23,7 +23,7 @@
 pdfmark_srcdir = $(top_srcdir)/contrib/pdfmark
 pdfmark_builddir = $(top_builddir)/contrib/pdfmark
 
-man1_MANS += contrib/pdfmark/pdfroff.n
+man1_MANS += contrib/pdfmark/pdfroff.1
 
 bin_SCRIPTS += pdfroff
 
diff --git a/contrib/pic2graph/pic2graph.am b/contrib/pic2graph/pic2graph.am
index 008cbfd..7913667 100644
--- a/contrib/pic2graph/pic2graph.am
+++ b/contrib/pic2graph/pic2graph.am
@@ -21,7 +21,7 @@
 #
 
 pic2graph_srcdir = $(top_srcdir)/contrib/pic2graph
-man1_MANS += contrib/pic2graph/pic2graph.n
+man1_MANS += contrib/pic2graph/pic2graph.1
 bin_SCRIPTS += pic2graph
 EXTRA_DIST += \
   contrib/pic2graph/pic2graph.sh \
diff --git a/man/groff_tmac.5.man b/man/groff_tmac.5.man
index 5423844..02d8989 100644
--- a/man/groff_tmac.5.man
+++ b/man/groff_tmac.5.man
@@ -386,6 +386,35 @@ orientation:
 .
 .
 .TP
+.B pdfpic
+A single macro is provided in this file,
+.BR PSPIC ,
+to include a PDF graphic in a document, i.e. under the output device
+.BR \-Tpdf .
+.
+For all other devices,
+.B pspic
+is used.
+.
+So
+.B pdfpic
+is an extension of
+.B pspic.
+.
+By that you can now even replace all
+.B PSPIC
+by
+.BR PDFPIC ,
+nothing gets lost by that.
+.
+The options of
+.B PDFPIC
+are identical to the
+.B PSDIF
+options.
+.
+.
+.TP
 .B pic
 This file provides proper definitions for the macros
 .B PS
diff --git a/man/man.am b/man/man.am
index d5b50b6..1818257 100644
--- a/man/man.am
+++ b/man/man.am
@@ -19,15 +19,15 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 man5_MANS += \
-  man/groff_font.n \
-  man/groff_out.n \
-  man/groff_tmac.n
+  man/groff_font.5 \
+  man/groff_out.5 \
+  man/groff_tmac.5
 man7_MANS += \
-  man/ditroff.n \
-  man/groff_char.n \
-  man/groff_diff.n \
-  man/groff.n \
-  man/roff.n
+  man/ditroff.7 \
+  man/groff_char.7 \
+  man/groff_diff.7 \
+  man/groff.7 \
+  man/roff.7
 EXTRA_DIST += \
   man/groff_font.5.man \
   man/groff_out.5.man \
diff --git a/src/devices/grodvi/grodvi.am b/src/devices/grodvi/grodvi.am
index d1bfe48..8583083 100644
--- a/src/devices/grodvi/grodvi.am
+++ b/src/devices/grodvi/grodvi.am
@@ -24,7 +24,7 @@ grodvi_LDADD = \
   libdriver.a \
   libgroff.a \
   lib/libgnu.a $(LIBM)
-man1_MANS += src/devices/grodvi/grodvi.n
+man1_MANS += src/devices/grodvi/grodvi.1
 EXTRA_DIST += src/devices/grodvi/grodvi.1.man
 
 
diff --git a/src/devices/grohtml/grohtml.am b/src/devices/grohtml/grohtml.am
index de00fea..3969a57 100644
--- a/src/devices/grohtml/grohtml.am
+++ b/src/devices/grohtml/grohtml.am
@@ -32,7 +32,7 @@ post_grohtml_LDADD = $(LIBM) \
   libdriver.a \
   libgroff.a \
   lib/libgnu.a 
-man1_MANS += src/devices/grohtml/grohtml.n
+man1_MANS += src/devices/grohtml/grohtml.1
 EXTRA_DIST += src/devices/grohtml/grohtml.1.man
 
 
diff --git a/src/devices/grolbp/grolbp.am b/src/devices/grolbp/grolbp.am
index a81c48f..505e8b4 100644
--- a/src/devices/grolbp/grolbp.am
+++ b/src/devices/grolbp/grolbp.am
@@ -28,7 +28,7 @@ grolbp_LDADD = $(LIBM) \
   libdriver.a \
   libgroff.a \
   lib/libgnu.a
-man1_MANS += src/devices/grolbp/grolbp.n
+man1_MANS += src/devices/grolbp/grolbp.1
 EXTRA_DIST += src/devices/grolbp/grolbp.1.man
 
 
diff --git a/src/devices/grolj4/grolj4.am b/src/devices/grolj4/grolj4.am
index 35acb7d..680f5db 100644
--- a/src/devices/grolj4/grolj4.am
+++ b/src/devices/grolj4/grolj4.am
@@ -24,8 +24,8 @@ grolj4_LDADD = $(LIBM) \
   libdriver.a \
   libgroff.a \
   lib/libgnu.a
-man1_MANS += src/devices/grolj4/grolj4.n
-man5_MANS += src/devices/grolj4/lj4_font.n
+man1_MANS += src/devices/grolj4/grolj4.1
+man5_MANS += src/devices/grolj4/lj4_font.5
 EXTRA_DIST += \
   src/devices/grolj4/grolj4.1.man \
   src/devices/grolj4/lj4_font.5.man
diff --git a/src/devices/gropdf/gropdf.am b/src/devices/gropdf/gropdf.am
index ece55f1..54d04b1 100644
--- a/src/devices/gropdf/gropdf.am
+++ b/src/devices/gropdf/gropdf.am
@@ -31,8 +31,8 @@ EXTRA_DIST += \
   src/devices/gropdf/pdfmom.1.man
 
 man1_MANS += \
-  src/devices/gropdf/gropdf.n \
-  src/devices/gropdf/pdfmom.n
+  src/devices/gropdf/gropdf.1 \
+  src/devices/gropdf/pdfmom.1
 
 gropdf: $(gropdf_dir)/gropdf.pl $(SH_DEPS_SED_SCRIPT)
 	$(RM) $@
diff --git a/src/devices/grops/grops.am b/src/devices/grops/grops.am
index 41adf1c..bd816f3 100644
--- a/src/devices/grops/grops.am
+++ b/src/devices/grops/grops.am
@@ -27,7 +27,7 @@ grops_LDADD = $(LIBM) \
   libdriver.a \
   libgroff.a \
   lib/libgnu.a
-man1_MANS += src/devices/grops/grops.n
+man1_MANS += src/devices/grops/grops.1
 EXTRA_DIST += \
   src/devices/grops/grops.1.man \
   src/devices/grops/psfig.diff \
diff --git a/src/devices/grotty/grotty.am b/src/devices/grotty/grotty.am
index 3dcc809..0e4a59a 100644
--- a/src/devices/grotty/grotty.am
+++ b/src/devices/grotty/grotty.am
@@ -24,7 +24,7 @@ grotty_LDADD = $(LIBM) \
   libdriver.a \
   libgroff.a \
   lib/libgnu.a
-man1_MANS += src/devices/grotty/grotty.n
+man1_MANS += src/devices/grotty/grotty.1
 EXTRA_DIST += \
   src/devices/grotty/grotty.1.man \
   src/devices/grotty/TODO
diff --git a/src/devices/xditview/xditview.am b/src/devices/xditview/xditview.am
index f2b4261..53c1c8e 100644
--- a/src/devices/xditview/xditview.am
+++ b/src/devices/xditview/xditview.am
@@ -46,7 +46,7 @@ gxditview_SOURCES = $(GXDITVIEWSOURCES)
 nodist_gxditview_SOURCES = $(XDITVIEW_GENHDRS)
 CLEANFILES += $(XDITVIEW_GENHDRS)
 
-man1_MANS += src/devices/xditview/gxditview.n
+man1_MANS += src/devices/xditview/gxditview.1
 
 # Because we defined gxditview_CPPFLAGS, automake renames all the xditview's 
 # objects, adding an "gxditview-" prefix. 
diff --git a/src/preproc/eqn/eqn.am b/src/preproc/eqn/eqn.am
index 8eb836a..8622fff 100644
--- a/src/preproc/eqn/eqn.am
+++ b/src/preproc/eqn/eqn.am
@@ -45,7 +45,7 @@ eqn_SOURCES = \
   src/preproc/eqn/pbox.h \
   src/preproc/eqn/eqn.h
 
-PREFIXMAN1 += src/preproc/eqn/eqn.n src/preproc/eqn/neqn.n
+PREFIXMAN1 += src/preproc/eqn/eqn.1 src/preproc/eqn/neqn.1
 EXTRA_DIST += \
   src/preproc/eqn/TODO \
   src/preproc/eqn/neqn.sh \
diff --git a/src/preproc/grn/grn.am b/src/preproc/grn/grn.am
index f64d551..fab54dc 100644
--- a/src/preproc/grn/grn.am
+++ b/src/preproc/grn/grn.am
@@ -27,7 +27,7 @@ grn_SOURCES = \
   src/preproc/grn/gprint.h
 src/preproc/grn/main.$(OBJEXT): defs.h
 grn_LDADD = libgroff.a lib/libgnu.a $(LIBM)
-PREFIXMAN1 += src/preproc/grn/grn.n
+PREFIXMAN1 += src/preproc/grn/grn.1
 EXTRA_DIST += src/preproc/grn/README src/preproc/grn/grn.1.man
 
 
diff --git a/src/preproc/pic/pic.am b/src/preproc/pic/pic.am
index bfdd76e..fb2637d 100644
--- a/src/preproc/pic/pic.am
+++ b/src/preproc/pic/pic.am
@@ -38,7 +38,7 @@ pic_SOURCES = \
 pic_CPPFLAGS = $(AM_CPPFLAGS) \
   -I $(top_srcdir)/src/preproc/pic \
   -I $(top_builddir)/src/preproc/pic
-PREFIXMAN1 += src/preproc/pic/pic.n
+PREFIXMAN1 += src/preproc/pic/pic.1
 
 src/preproc/pic/pic-lex.$(OBJEXT): src/preproc/pic/pic.hpp
 EXTRA_DIST += \
diff --git a/src/preproc/preconv/preconv.am b/src/preproc/preconv/preconv.am
index b4d7132..942eb0a 100644
--- a/src/preproc/preconv/preconv.am
+++ b/src/preproc/preconv/preconv.am
@@ -21,7 +21,7 @@
 bin_PROGRAMS += preconv
 preconv_LDADD = libgroff.a $(LIBM) $(LIBICONV)
 preconv_SOURCES = src/preproc/preconv/preconv.cpp
-man1_MANS += src/preproc/preconv/preconv.n
+man1_MANS += src/preproc/preconv/preconv.1
 EXTRA_DIST += src/preproc/preconv/preconv.1.man
 
 
diff --git a/src/preproc/refer/refer.am b/src/preproc/refer/refer.am
index a879eba..2d931c6 100644
--- a/src/preproc/refer/refer.am
+++ b/src/preproc/refer/refer.am
@@ -31,7 +31,7 @@ refer_SOURCES =  \
   src/preproc/refer/ref.h \
   src/preproc/refer/token.h \
   src/preproc/refer/command.h
-PREFIXMAN1 += src/preproc/refer/refer.n
+PREFIXMAN1 += src/preproc/refer/refer.1
 EXTRA_DIST += src/preproc/refer/TODO src/preproc/refer/refer.1.man
 CLEANFILES += \
   src/preproc/refer/label.cpp \
diff --git a/src/preproc/soelim/soelim.am b/src/preproc/soelim/soelim.am
index ad4901e..f8839fa 100644
--- a/src/preproc/soelim/soelim.am
+++ b/src/preproc/soelim/soelim.am
@@ -21,7 +21,7 @@
 prefixexecbin_PROGRAMS += soelim
 soelim_LDADD = libgroff.a $(LIBM)
 soelim_SOURCES = src/preproc/soelim/soelim.cpp
-PREFIXMAN1 += src/preproc/soelim/soelim.n
+PREFIXMAN1 += src/preproc/soelim/soelim.1
 EXTRA_DIST += \
   src/preproc/soelim/TODO \
   src/preproc/soelim/soelim.1.man
diff --git a/src/preproc/tbl/tbl.am b/src/preproc/tbl/tbl.am
index b83ce77..a641d3d 100644
--- a/src/preproc/tbl/tbl.am
+++ b/src/preproc/tbl/tbl.am
@@ -24,7 +24,7 @@ tbl_SOURCES = \
   src/preproc/tbl/main.cpp \
   src/preproc/tbl/table.cpp \
   src/preproc/tbl/table.h
-PREFIXMAN1 += src/preproc/tbl/tbl.n
+PREFIXMAN1 += src/preproc/tbl/tbl.1
 EXTRA_DIST += src/preproc/tbl/tbl.1.man
 
 
diff --git a/src/roff/groff/groff.am b/src/roff/groff/groff.am
index 6007e40..11c4fa6 100644
--- a/src/roff/groff/groff.am
+++ b/src/roff/groff/groff.am
@@ -35,7 +35,7 @@ groff_SOURCES = \
   src/roff/groff/pipeline.c \
   src/roff/groff/pipeline.h
 src/roff/groff/groff.$(OBJEXT): defs.h
-man1_MANS += src/roff/groff/groff.n
+man1_MANS += src/roff/groff/groff.1
 EXTRA_DIST += src/roff/groff/groff.1.man
 GROFF_OPTS_OUTPUT = \
   groff_opts_no_arg.txt \
diff --git a/src/roff/grog/grog.am b/src/roff/grog/grog.am
index 1aa6b69..2b668f0 100644
--- a/src/roff/grog/grog.am
+++ b/src/roff/grog/grog.am
@@ -29,7 +29,7 @@ GROG = src/roff/grog/subs.pl
 # grog_dir is defined by a m4 macro
 grogdir = $(grog_dir)
 dist_grog_DATA = $(GROG)
-man1_MANS += src/roff/grog/grog.n
+man1_MANS += src/roff/grog/grog.1
 EXTRA_DIST += \
   src/roff/grog/grog.1.man \
   src/roff/grog/grog.pl
diff --git a/src/roff/nroff/nroff.am b/src/roff/nroff/nroff.am
index 526efe9..4c14200 100644
--- a/src/roff/nroff/nroff.am
+++ b/src/roff/nroff/nroff.am
@@ -20,7 +20,7 @@
 
 prefixexecbin_SCRIPTS += nroff
 nroff_srcdir = $(top_srcdir)/src/roff/nroff
-PREFIXMAN1 += src/roff/nroff/nroff.n
+PREFIXMAN1 += src/roff/nroff/nroff.1
 EXTRA_DIST += \
   src/roff/nroff/nroff.1.man \
   src/roff/nroff/nroff.sh
diff --git a/src/roff/troff/troff.am b/src/roff/troff/troff.am
index 9ddacbc..648ec24 100644
--- a/src/roff/troff/troff.am
+++ b/src/roff/troff/troff.am
@@ -19,7 +19,7 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 prefixexecbin_PROGRAMS += troff
-PREFIXMAN1 += src/roff/troff/troff.n
+PREFIXMAN1 += src/roff/troff/troff.1
 EXTRA_DIST += \
   src/roff/troff/column.cpp \
   src/roff/troff/troff.1.man \
diff --git a/src/utils/addftinfo/addftinfo.am b/src/utils/addftinfo/addftinfo.am
index c399de6..9947979 100644
--- a/src/utils/addftinfo/addftinfo.am
+++ b/src/utils/addftinfo/addftinfo.am
@@ -23,7 +23,7 @@
 ########################################################################
 
 bin_PROGRAMS += addftinfo
-man1_MANS += src/utils/addftinfo/addftinfo.n
+man1_MANS += src/utils/addftinfo/addftinfo.1
 EXTRA_DIST += src/utils/addftinfo/addftinfo.1.man
 addftinfo_LDADD = libgroff.a
 addftinfo_SOURCES = \
diff --git a/src/utils/afmtodit/afmtodit.am b/src/utils/afmtodit/afmtodit.am
index f38870e..1bfc0c5 100644
--- a/src/utils/afmtodit/afmtodit.am
+++ b/src/utils/afmtodit/afmtodit.am
@@ -26,7 +26,7 @@
 afmtodit_srcdir = $(top_srcdir)/src/utils/afmtodit
 
 bin_SCRIPTS += afmtodit
-man1_MANS += src/utils/afmtodit/afmtodit.n
+man1_MANS += src/utils/afmtodit/afmtodit.1
 EXTRA_DIST += \
   src/utils/afmtodit/afmtodit.1.man \
   src/utils/afmtodit/afmtodit.pl \
diff --git a/src/utils/hpftodit/hpftodit.am b/src/utils/hpftodit/hpftodit.am
index 0c06262..ab847b8 100644
--- a/src/utils/hpftodit/hpftodit.am
+++ b/src/utils/hpftodit/hpftodit.am
@@ -23,7 +23,7 @@
 ########################################################################
 
 bin_PROGRAMS += hpftodit
-man1_MANS += src/utils/hpftodit/hpftodit.n
+man1_MANS += src/utils/hpftodit/hpftodit.1
 EXTRA_DIST += src/utils/hpftodit/hpftodit.1.man
 hpftodit_LDADD = libgroff.a $(LIBM)
 hpftodit_SOURCES = \
diff --git a/src/utils/indxbib/indxbib.am b/src/utils/indxbib/indxbib.am
index fc30587..7bdfc1a 100644
--- a/src/utils/indxbib/indxbib.am
+++ b/src/utils/indxbib/indxbib.am
@@ -25,7 +25,7 @@ indxbib_SOURCES = \
   src/utils/indxbib/signal.c
 src/utils/indxbib/indxbib.$(OBJEXT): defs.h
 indxbib_LDADD = libbib.a libgroff.a $(LIBM)
-PREFIXMAN1 += src/utils/indxbib/indxbib.n
+PREFIXMAN1 += src/utils/indxbib/indxbib.1
 EXTRA_DIST += \
   src/utils/indxbib/indxbib.1.man \
   src/utils/indxbib/eign
diff --git a/src/utils/lkbib/lkbib.am b/src/utils/lkbib/lkbib.am
index 471025a..e797795 100644
--- a/src/utils/lkbib/lkbib.am
+++ b/src/utils/lkbib/lkbib.am
@@ -19,7 +19,7 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 bin_PROGRAMS += lkbib
-man1_MANS += src/utils/lkbib/lkbib.n
+man1_MANS += src/utils/lkbib/lkbib.1
 EXTRA_DIST += src/utils/lkbib/lkbib.1.man
 lkbib_LDADD = libbib.a libgroff.a $(LIBM)
 lkbib_SOURCES = src/utils/lkbib/lkbib.cpp
diff --git a/src/utils/lookbib/lookbib.am b/src/utils/lookbib/lookbib.am
index b2e22de..3369d90 100644
--- a/src/utils/lookbib/lookbib.am
+++ b/src/utils/lookbib/lookbib.am
@@ -19,7 +19,7 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 prefixexecbin_PROGRAMS += lookbib
-PREFIXMAN1 += src/utils/lookbib/lookbib.n
+PREFIXMAN1 += src/utils/lookbib/lookbib.1
 EXTRA_DIST += src/utils/lookbib/lookbib.1.man
 lookbib_LDADD = libbib.a libgroff.a $(LIBM)
 lookbib_SOURCES = src/utils/lookbib/lookbib.cpp
diff --git a/src/utils/pfbtops/pfbtops.am b/src/utils/pfbtops/pfbtops.am
index 1869c5b..5216be2 100644
--- a/src/utils/pfbtops/pfbtops.am
+++ b/src/utils/pfbtops/pfbtops.am
@@ -19,7 +19,7 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 bin_PROGRAMS += pfbtops
-man1_MANS += src/utils/pfbtops/pfbtops.n
+man1_MANS += src/utils/pfbtops/pfbtops.1
 EXTRA_DIST += src/utils/pfbtops/pfbtops.1.man
 pfbtops_SOURCES = src/utils/pfbtops/pfbtops.c
 pfbtops_LDADD = libgroff.a $(LIBM)
diff --git a/src/utils/tfmtodit/tfmtodit.am b/src/utils/tfmtodit/tfmtodit.am
index 6c6494a..277869a 100644
--- a/src/utils/tfmtodit/tfmtodit.am
+++ b/src/utils/tfmtodit/tfmtodit.am
@@ -19,7 +19,7 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 bin_PROGRAMS += tfmtodit
-man1_MANS += src/utils/tfmtodit/tfmtodit.n
+man1_MANS += src/utils/tfmtodit/tfmtodit.1
 EXTRA_DIST += src/utils/tfmtodit/tfmtodit.1.man
 tfmtodit_SOURCES = src/utils/tfmtodit/tfmtodit.cpp
 tfmtodit_LDADD = libgroff.a $(LIBM)
diff --git a/src/utils/xtotroff/xtotroff.am b/src/utils/xtotroff/xtotroff.am
index 8d4fce6..14a84bd 100644
--- a/src/utils/xtotroff/xtotroff.am
+++ b/src/utils/xtotroff/xtotroff.am
@@ -20,7 +20,7 @@
 
 if !WITHOUT_X11
 bin_PROGRAMS += xtotroff
-man1_MANS += src/utils/xtotroff/xtotroff.n
+man1_MANS += src/utils/xtotroff/xtotroff.1
 xtotroff_SOURCES = src/utils/xtotroff/xtotroff.c
 XLIBS=$(LIBXUTIL) $(LIBGROFF)
 xtotroff_LDADD = libxutil.a libgroff.a $(X_LIBS) $(X_PRE_LIBS) \
diff --git a/tmac/pdfpic.tmac b/tmac/pdfpic.tmac
new file mode 100644
index 0000000..16ac9e1
--- /dev/null
+++ b/tmac/pdfpic.tmac
@@ -0,0 +1,139 @@
+.\" pdfpic.tmac
+.\"
+.\" Define the PDFPIC macro.
+.\"
+.\" When used other than with gropdf, the image is converted to .eps
+.\" and processing passed over to PSPIC.
+.\"
+.\" Usage:
+.\"
+.\"   .PDFPIC [-L|-R|-C|-I <indent>] <file> [<width> [<height>]]
+.\"
+.\" Requires the poppler-utils package (for pdfinfo and pdftops).
+.\" Requires running groff in unsafe mode.
+.
+.do if d PDFPIC .nx
+.
+.nr _C \n[.C]
+.cp 0
+.
+.de @abort
+.  ab [PDFPIC]: \\$* Aborting.
+..
+.de PDFPIC
+.  if !\\n[.U] \
+.    @abort Use of \\$0 requires giving groff the -U option.
+.
+.  nr convert-pdf 0
+.  if !'\\*[.T]'pdf' .nr convert-pdf 1
+.
+.  nr pdf-offset-mode 0
+.
+.  \" left-aligned?
+.  ie '\\$1'-L' \{\
+.    nr pdf-offset-mode 1
+.    if \\n[convert-pdf] .ds pspic-args \\$1 \"
+.    shift
+.  \}
+.  el \{\
+.    \" right-aligned?
+.    ie '\\$1'-R' \{\
+.      nr pdf-offset-mode 2
+.      if \\n[convert-pdf] .ds pspic-args \\$1 \"
+.      shift
+.    \}
+.    el \{\
+.      \" indented?
+.      ie '\\$1'-I' \{\
+.        nr pdf-offset-mode 3
+.        nr pdf-offset (m;\\$2)
+.        if \\n[convert-pdf] .ds pspic-args \\$1 \\$2 \"
+.        shift 2
+.      \}
+.      el \{\
+.        \" centered is the default
+.        ie '\\$1'-C' \{\
+.          if \\n[convert-pdf] .ds pspic-args \\$1 \"
+.          shift
+.        \}
+.        el .nr pdf-offset-mode 0
+.      \}
+.    \}
+.  \}
+.  br
+.
+.  ds is-pdf \\$1
+.  substring is-pdf -3
+.  if !'\\*[is-pdf]'pdf' \
+.    @abort \\$1 at line \\n[.c] is not a PDF file, or lacks a .pdf extension.
+.
+.\" if driver is not gropdf, convert image to .eps
+.  if \\n[convert-pdf] \{\
+.    ds img-file \\$1
+.    substring img-file 0 -5
+.
+.    sy pdftops -eps \\$1
+.    shift
+.
+.    as pspic-args \\*[img-file].eps \\$*
+.
+.    PSPIC \\*[pspic-args]
+.    return
+.  \}
+.
+.\" get image dimensions
+.  ec @
+.  sy pdfinfo @$1 | \
+grep "Page *size" | \
+sed -e 's/Page *size: *\\([[:digit:].]*\\) *x *\\([[:digit:].]*\\).*$/\
+.nr pdf-wid (p;\\1)\\n\
+.nr pdf-ht  (p;\\2)/' \
+> /tmp/pdfpic\n[$$]
+.  so /tmp/pdfpic\n[$$]
+.  sy rm /tmp/pdfpic\n[$$]
+.  ec
+.
+.  \" if we have a <width> parameter, use it as the final
+.  \" image width; otherwise we use the image's natural width
+.  \" or the current line length, whatever is smaller
+.  ie (\\n[.$] >= 2) \
+.    nr pdf-deswid (i;\\$2)
+.  el \
+.    nr pdf-deswid ((\\n[.l] - \\n[.i]) <? \\n[pdf-wid])
+.
+.  \" compute the final image height (with proper rounding),
+.  \" based on the image's aspect
+.  nr pdf-desht (\\n[pdf-deswid] * 1000 + (\\n[pdf-wid] / 2) \
+                / \\n[pdf-wid] * \\n[pdf-ht] \
+                + 500 / 1000)
+.
+.  \" if we have a <height> parameter, use it as the final
+.  \" image height in case it is smaller than the height
+.  \" value we have just computed
+.  if ((\\n[.$] >= 3) & (\\n[pdf-desht] > (i;0\\$3))) \{\
+.    nr pdf-desht (i;\\$3)
+.    \" recompute the final image width since we always
+.    \" keep the correct image aspect
+.    nr pdf-deswid (\\n[pdf-desht] * 1000 + (\\n[pdf-ht] / 2) \
+                   / \\n[pdf-ht] * \\n[pdf-wid] \
+                   + 500 / 1000)
+.  \}
+.
+.  \" reserve vertical space for image
+.  ne (\\n[pdf-desht]u + 1v)
+.
+.  \" compute image offset w.r.t. the current left margin
+.  if (\\n[pdf-offset-mode] == 0) \
+.    nr pdf-offset (\\n[.l] - \\n[.i] - \\n[pdf-deswid] / 2)
+.  if (\\n[pdf-offset-mode] == 1) \
+.    nr pdf-offset 0
+.  if (\\n[pdf-offset-mode] == 2) \
+.    nr pdf-offset (\\n[.l] - \\n[.i] - \\n[pdf-deswid])
+.
+\h'\\n[pdf-offset]u'\
+\X'pdf: pdfpic \\$1 -L \\n[pdf-deswid]z \\n[pdf-desht]z'
+..
+.
+.cp \n[_C]
+.
+.\" end of pdfpic.tmac
diff --git a/tmac/tmac.am b/tmac/tmac.am
index 1bda6e4..586b45a 100644
--- a/tmac/tmac.am
+++ b/tmac/tmac.am
@@ -23,12 +23,12 @@ tmac_srcdir = $(top_srcdir)/tmac
 tmac_builddir = $(top_builddir)/tmac
 
 man7_MANS += \
-  tmac/groff_ms.n \
-  tmac/groff_man.n \
-  tmac/groff_me.n \
-  tmac/groff_mdoc.n \
-  tmac/groff_trace.n \
-  tmac/groff_www.n
+  tmac/groff_ms.7 \
+  tmac/groff_man.7 \
+  tmac/groff_me.7 \
+  tmac/groff_mdoc.7 \
+  tmac/groff_trace.7 \
+  tmac/groff_www.7
 
 TMACNORMALFILES = \
   tmac/man.tmac \
@@ -48,6 +48,7 @@ TMACNORMALFILES = \
   tmac/trace.tmac \
   tmac/ps.tmac \
   tmac/psold.tmac \
+  tmac/pdfpic.tmac \
   tmac/pspic.tmac \
   tmac/psatk.tmac \
   tmac/pdf.tmac \


From MAILER-DAEMON Thu Aug 27 08:04:58 2015
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1ZUvvO-0005Cv-8n
	for mharc-groff-commit@gnu.org; Thu, 27 Aug 2015 08:04:58 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:45235)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <bernd.warken@web.de>) id 1ZUvvL-0005C0-Pq
	for groff-commit@gnu.org; Thu, 27 Aug 2015 08:04:57 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <bernd.warken@web.de>) id 1ZUvvK-0007WD-Cy
	for groff-commit@gnu.org; Thu, 27 Aug 2015 08:04:55 -0400
Received: from vcs.savannah.gnu.org ([208.118.235.72]:57698)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <bernd.warken@web.de>) id 1ZUvvK-0007W3-9R
	for groff-commit@gnu.org; Thu, 27 Aug 2015 08:04:54 -0400
Received: from bwarken by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <bernd.warken@web.de>) id 1ZUvvJ-0003Gj-Ek
	for groff-commit@gnu.org; Thu, 27 Aug 2015 12:04:53 +0000
Date: Thu, 27 Aug 2015 12:04:53 +0000
Message-Id: <E1ZUvvJ-0003Gj-Ek@vcs.savannah.gnu.org>
To: groff-commit@gnu.org
Subject: [groff] 01/01: groffer.11.man: Correct documen tation of --viewer
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
In-Reply-To: groff@gnu.org
References: <20150827120453.12533.76213@vcs.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: bee62acebfa8836fec2c901f7c5b69e09b5958a6
Auto-Submitted: auto-generated
From: Bernd Warken <bernd.warken@web.de>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 208.118.235.72
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: groff@gnu.org
List-Id: <groff-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/groff-commit>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 27 Aug 2015 12:04:57 -0000

bwarken pushed a commit to branch master
in repository groff.

commit bee62acebfa8836fec2c901f7c5b69e09b5958a6
Author: Bernd Warken <groff-bernd.warken-72@web.de>
Date:   Thu Aug 27 14:04:40 2015 +0200

    groffer.11.man: Correct documen tation of --viewer
---
 contrib/groffer/ChangeLog     |    4 ++
 contrib/groffer/groffer.1.man |   81 ++++++++---------------------------------
 2 files changed, 20 insertions(+), 65 deletions(-)

diff --git a/contrib/groffer/ChangeLog b/contrib/groffer/ChangeLog
index 7b9954b..3fa62bd 100644
--- a/contrib/groffer/ChangeLog
+++ b/contrib/groffer/ChangeLog
@@ -1,3 +1,7 @@
+2015-08-27  Bernd Warken  <groff-bernd.warken-72@web.de>
+
+	* groffer.1.man: Correct the documentation for `--viewer'.
+
 2015-08-05  Bernd Warken  <groff-bernd.warken-72@web.de>
 
 	* groffer.1.man: Rename `groffer.man'.
diff --git a/contrib/groffer/groffer.1.man b/contrib/groffer/groffer.1.man
index 4c76aa6..b873f58 100644
--- a/contrib/groffer/groffer.1.man
+++ b/contrib/groffer/groffer.1.man
@@ -19,7 +19,12 @@ groffer \- display groff files and man\~pages on X and tty
 .\" --------------------------------------------------------------------
 .
 .de co
-Copyright \(co 2001-2014 Free Software Foundation, Inc.
+Copyright \(co 2001-2015
+   Free Software Foundation, Inc.
+
+Author: Bernd Warken <groff-bernd.warken-72@web.de>
+
+Last update: 27 Aug 2015
 
 This file is part of groffer, which is part of groff, a free software
 project.
@@ -240,18 +245,6 @@ Long options can be abbreviated in several ways.
 .RE
 .
 .
-.ig
-Replace these options by --viewer
-.OP \-\-dvi\-viewer prog
-.OP \-\-html\-viewer prog
-.OP \-\-pdf\-viewer prog
-.OP \-\-ps\-viewer prog
-.OP \-\-tty\-viewer prog
-.OP \-\-www\-viewer prog
-.OP \-\-x\-viewer\~\fR|\fB\~\-\-X\-viewer prog
-..
-.
-.
 .TP
 .I options related to \%groff
 .RS
@@ -621,14 +614,6 @@ in this sequence.
 .B \-\-dvi
 Equivalent to
 .BR \-\-mode=\%dvi .
-.TQ
-.BI \-\-viewer \ prog
-Choose a viewer program for
-.IR \%dvi\~mode .
-.
-This can be a file name or a program to be searched in
-.SM
-.BR $PATH .
 .
 Known \%\f(CRX\~Window\fP
 .I \%dvi
@@ -637,8 +622,6 @@ viewers include
 and
 .BR \%dvilx (1).
 .
-In each case, arguments can be provided additionally.
-.
 .
 .TP
 .B \-\-groff
@@ -650,15 +633,6 @@ Equivalent to
 .B \-\-html
 Equivalent to
 .BR \-\-mode=html .
-.TQ
-.B \-\-viewer
-Choose a web browser program for viewing in
-.IR \%html\~mode .
-.
-It can be the path name of an executable file or a program in
-.BR $PATH .
-.
-In each case, arguments can be provided additionally.
 .
 .
 .TP
@@ -888,29 +862,12 @@ Equivalent to
 .B \-\-pdf2
 Equivalent to
 .BR \-\-mode=pdf2 .
-.TQ
-.BI \-\-viewer \ prog
-Choose a viewer program for
-.IR \%pdf\~mode .
-.
-This can be a file name or a program to be searched in
-.SM
-.BR $PATH ;
-arguments can be provided additionally.
 .
 .
 .TP
 .B \-\-ps
 Equivalent to
 .BR \-\-mode=ps .
-.TQ
-.BI \-\-viewer \ prog
-Choose a viewer program for
-.IR \%ps\~mode .
-.
-This can be a file name or a program to be searched in
-.SM
-.BR $PATH .
 .
 Common Postscript viewers include
 .BR \%okular (1),
@@ -947,10 +904,6 @@ It will not be displayed in graphical mode.
 .B \-\-tty
 Equivalent to
 .BR \-\-mode=tty .
-.TQ
-.BI \-\-viewer \ prog
-Choose a text pager for mode
-.IR tty .
 The standard pager is
 .BR less (1).
 This option is equivalent to
@@ -963,31 +916,30 @@ The option argument can be a file name or a program to be searched in
 arguments can be provided additionally.
 .
 .
+.TT
+.BI \-\-viewer \ prog
+Choose a viewer program for actual device or mode.
+.
+This can be a file name or a program to be searched in
+.SM
+.BR $PATH ;
+arguments can be provided additionally.
+.
+.
 .TP
 .B \-\-www
 Equivalent to
 .BR \-\-mode=html .
-.TQ
-.B \-\-viewer
-.IR prog .
 .
 .
 .TP
 .B \-\-X\~\fR|\fB\~\-\-x
 Equivalent to
 .BR \-\-mode=x .
-.TQ
-.BI \-\-viewer " prog"
-Choose a viewer program for
-.IR \%x\~mode .
 Suitable viewer programs are
 .BR \%gxditview (@MAN1EXT@)
 which is the default and
 .BR \%xditview (1).
-The argument can be any executable file or a program in
-.SM
-.BR $PATH ;
-arguments can be provided additionally.
 .
 .
 .TP
@@ -3331,7 +3283,6 @@ or
 \-\-foreground=DarkBlue
 \-\-resolution=100
 \-\-viewer=gxditview \-geometry 900x1200
-\-\-viewer xpdf \-Z 150
 .fi
 .hy
 .ft


From MAILER-DAEMON Thu Aug 27 09:36:37 2015
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1ZUxM5-0001Ca-S2
	for mharc-groff-commit@gnu.org; Thu, 27 Aug 2015 09:36:37 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:44874)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <bernd.warken@web.de>) id 1ZUxM1-0001BS-Pj
	for groff-commit@gnu.org; Thu, 27 Aug 2015 09:36:35 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <bernd.warken@web.de>) id 1ZUxLz-0005VZ-SL
	for groff-commit@gnu.org; Thu, 27 Aug 2015 09:36:33 -0400
Received: from vcs.savannah.gnu.org ([208.118.235.72]:58823)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <bernd.warken@web.de>) id 1ZUxLz-0005VV-PQ
	for groff-commit@gnu.org; Thu, 27 Aug 2015 09:36:31 -0400
Received: from bwarken by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <bernd.warken@web.de>) id 1ZUxLy-0002V5-RK
	for groff-commit@gnu.org; Thu, 27 Aug 2015 13:36:31 +0000
Date: Thu, 27 Aug 2015 13:36:30 +0000
Message-Id: <E1ZUxLy-0002V5-RK@vcs.savannah.gnu.org>
To: groff-commit@gnu.org
Subject: [groff] 01/01: groffer: add device/mode xhtml
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
In-Reply-To: groff@gnu.org
References: <20150827133630.9560.30075@vcs.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: 13db0b14d564d7824e68eb751d6e084304f7387f
Auto-Submitted: auto-generated
From: Bernd Warken <bernd.warken@web.de>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 208.118.235.72
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: groff@gnu.org
List-Id: <groff-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/groff-commit>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 27 Aug 2015 13:36:35 -0000

bwarken pushed a commit to branch master
in repository groff.

commit 13db0b14d564d7824e68eb751d6e084304f7387f
Author: Bernd Warken <groff-bernd.warken-72@web.de>
Date:   Thu Aug 27 15:36:02 2015 +0200

    groffer: add device/mode xhtml
---
 contrib/groffer/ChangeLog     |    6 ++++++
 contrib/groffer/groffer.1.man |   36 ++++++++++++++++++++++++++++++++----
 contrib/groffer/groffer.pl    |   10 ++++++++--
 contrib/groffer/main_subs.pl  |   32 ++++++++++++++++++++++++++------
 contrib/groffer/subs.pl       |    9 ++++++---
 5 files changed, 78 insertions(+), 15 deletions(-)

diff --git a/contrib/groffer/ChangeLog b/contrib/groffer/ChangeLog
index 3fa62bd..8e8e603 100644
--- a/contrib/groffer/ChangeLog
+++ b/contrib/groffer/ChangeLog
@@ -1,5 +1,11 @@
 2015-08-27  Bernd Warken  <groff-bernd.warken-72@web.de>
 
+	* *.pl: Add device (mode) `xhtml'.
+
+	* groffer.1.man: Add documentation for device `xhtml'.
+
+2015-08-27  Bernd Warken  <groff-bernd.warken-72@web.de>
+
 	* groffer.1.man: Correct the documentation for `--viewer'.
 
 2015-08-05  Bernd Warken  <groff-bernd.warken-72@web.de>
diff --git a/contrib/groffer/groffer.1.man b/contrib/groffer/groffer.1.man
index b873f58..5505ced 100644
--- a/contrib/groffer/groffer.1.man
+++ b/contrib/groffer/groffer.1.man
@@ -22,8 +22,6 @@ groffer \- display groff files and man\~pages on X and tty
 Copyright \(co 2001-2015
    Free Software Foundation, Inc.
 
-Author: Bernd Warken <groff-bernd.warken-72@web.de>
-
 Last update: 27 Aug 2015
 
 This file is part of groffer, which is part of groff, a free software
@@ -163,6 +161,8 @@ or
 .I \%dvi
 display program, a web browser by generating
 .I \%html
+or
+.I \%xhtml
 in
 .IR \%www\~mode ,
 or several
@@ -240,6 +240,7 @@ Long options can be abbreviated in several ways.
 .OP \-\-utf8
 .OP \-\-viewer prog
 .OP \-\-www
+.OP \-\-xhtml
 .OP \-\-x\~\fR|\fB\~\-\-X
 .YS
 .RE
@@ -524,6 +525,7 @@ The default modes are
 .IR "mode pdf" ,
 .IR "mode ps" ,
 .IR "mode html" ,
+.IR "mode xhtml" ,
 .IR "mode x" ,
 and
 .I "mode dvi"
@@ -694,6 +696,14 @@ and
 The text html viewer is
 .BR \%lynx (1).
 .
+By default, the existence of a sequence of standard web browsers is
+tested, starting with
+.BR \%konqueror (1)
+and
+.BR \%mozilla (1).
+The text html viewer is
+.BR \%lynx (1).
+.
 .
 .TP
 .B pdf
@@ -822,6 +832,19 @@ Equivalent to
 .BR \-\-mode=x .
 .
 .
+.TP
+.B xhtml
+Translate the input into
+.I xhtml
+format, which is an
+.I XML
+version of
+.IR html .
+.
+Then display the result in a web browser program, mostly the known
+.IR "html viewers" .
+.
+.
 .P
 The following modes do not use the
 .I \%groffer
@@ -1066,6 +1089,7 @@ arguments are mapped to the corresponding
 option:
 .BR \%dvi ,
 .BR \%html ,
+.BR \%xhtml ,
 and
 .BR \%ps .
 All
@@ -2055,7 +2079,8 @@ in a PDF viewer
 .IP \*(BU 2m
 in a web browser
 .nh
-.RI ( html
+.RI ( html ,
+.RI ( xhtml
 or
 .IR \%www\~mode )
 .hy
@@ -3477,6 +3502,8 @@ for the
 .B ls
 program, decompress it, format it to
 .I \%html
+or
+.I \%xhtml
 format
 .nh
 .RI ( \%www\~mode )
@@ -3829,7 +3856,8 @@ Viewers for
 .BR \%lynx (1)
 Web-browsers for
 .BR \%groffer 's
-.I \%html
+.IR \%html ,
+.IR \%xhtml
 or
 .IR \%www\~mode .
 .
diff --git a/contrib/groffer/groffer.pl b/contrib/groffer/groffer.pl
index 4e2e575..63ccc96 100755
--- a/contrib/groffer/groffer.pl
+++ b/contrib/groffer/groffer.pl
@@ -5,11 +5,13 @@
 # Source file position: <groff-source>/contrib/groffer/groffer.pl
 # Installed position: <prefix>/bin/groffer
 
-# Copyright (C) 2006-2014
+# Copyright (C) 2006-2015
 #   Free Software Foundation, Inc.
 
 # Written by Bernd Warken <groff-bernd.warken-72@web.de>.
 
+# Last update: 27 Aug 2015
+
 # This file is part of `groffer', which is part of `groff'.
 
 # `groff' is free software; you can redistribute it and/or modify it
@@ -163,7 +165,8 @@ our @Conf_Files = (File::Spec->catfile(File::Spec->rootdir(),
 				      'groffer.conf')
 		 );
 
-our @Default_Modes = ('pdf', 'pdf2', 'html', 'ps', 'x', 'dvi', 'tty');
+our @Default_Modes = ('pdf', 'pdf2', 'html', 'xhtml', 'ps', 'x', 'dvi',
+		      'tty');
 our $Default_Resolution = 100;
 our $Default_tty_Device = 'utf8';
 
@@ -181,6 +184,9 @@ our %Viewer_X = ('DVI' => ['kdvi', 'xdvi', 'dvilx'],
 		'HTML' => ['konqueror', 'epiphany'. 'mozilla-firefox',
 			   'firefox', 'mozilla', 'netscape', 'galeon',
 			   'opera', 'amaya','arena', 'mosaic'],
+		'XHTML' => ['konqueror', 'epiphany'. 'mozilla-firefox',
+			   'firefox', 'mozilla', 'netscape', 'galeon',
+			   'opera', 'amaya','arena', 'mosaic'],
 		'PDF' => ['okular', 'kpdf', 'acroread', 'evince',
 			  'xpdf -z 150', 'gpdf', 'xpdf', 'zathura'.
 			  'epdfview', 'qpdfview', 'apvlv', 'qpdfview',
diff --git a/contrib/groffer/main_subs.pl b/contrib/groffer/main_subs.pl
index 90627cc..67d2cc8 100644
--- a/contrib/groffer/main_subs.pl
+++ b/contrib/groffer/main_subs.pl
@@ -5,9 +5,11 @@
 # Source file position: <groff-source>/contrib/groffer/subs.pl
 # Installed position: <prefix>/lib/groff/groffer/subs.pl
 
-# Copyright (C) 2006-2014  Free Software Foundation, Inc.
+# Copyright (C) 2006-2015  Free Software Foundation, Inc.
 # Written by Bernd Warken <groff-bernd.warken-72@web.de>.
 
+# LAst update: 27 Aug 2015
+
 # This file is part of `groffer', which is part of `groff'.
 
 # `groff' is free software; you can redistribute it and/or modify it
@@ -66,7 +68,7 @@ sub main_set_options {
   'groff', 'help', 'intermediate-output', 'html', 'latin1', 'man',
   'no-location', 'no-man', 'no-special', 'pdf', 'pdf2', 'ps', 'rv',
   'source', 'text', 'to-stdout', 'text-device', 'tty', 'tty-device',
-  'utf8', 'version', 'whatis', 'where', 'www', 'x', 'X');
+  'utf8', 'version', 'whatis', 'where', 'www', 'x', 'X', 'xhtml');
 
 ### main_set_options()
   my @opts_groffer_long_arg =
@@ -75,10 +77,10 @@ sub main_set_options {
      # tty viewers are ignored
      'dvi-viewer-tty', 'html-viewer-tty', 'pdf-viewer-tty',
      'ps-viewer-tty', 'tty-viewer-tty', 'www-viewer-tty',
-     'X-viewer-tty', 'x-viewer-tty',
+     'X-viewer-tty', 'x-viewer-tty', 'xhtml-viewer-tty',,
      # viewers for modes are ignored
      'dvi-viewer', 'html-viewer', 'pdf-viewer', 'ps-viewer', 'tty-viewer',
-     'www-viewer', 'X-viewer', 'x-viewer',
+     'www-viewer', 'X-viewer', 'x-viewer', 'xhtml-viewer',
     );
 
   ##### groffer options inhereted from groff
@@ -190,9 +192,11 @@ sub main_set_options {
 			  '--where' => '--location',
 			  '--www' => '--html',
 			  '--X' => '--x',
+			  '--xhtml' => '--html',
 			  # '--dvi-viewer' => '--viewer',
 			  '--dvi-viewer-tty' => '--viewer',
 			  '--html-viewer-tty' => '--viewer',
+			  '--xhtml-viewer-tty' => '--pager',
 			  '--pdf-viewer-tty' => '--viewer',
 			  '--ps-viewer-tty' => '--viewer',
 			  '--tty-viewer' => '--pager',
@@ -657,6 +661,7 @@ sub main_parse_params {
 			'cp1047' => 'tty',
 			'dvi'=> 'dvi',
 			'html' => 'html',
+			'xhtml' => 'html',
 			'latin1' => 'tty',
 			'lbp' => 'groff',
 			'lj4' => 'groff',
@@ -1016,7 +1021,7 @@ sub main_set_mode {
       $Display{'MODE'} = $Opt{'MODE'};
       return 1;
     }
-    $Display{'MODE'} = $Opt{'MODE'} if $Opt{'MODE'} =~ /^html$/;
+    $Display{'MODE'} = $Opt{'MODE'} if $Opt{'MODE'} =~ /^x?html$/;
     @modes = ($Opt{'MODE'});
   } else {			# empty mode
     if ($Opt{'DEVICE'}) {
@@ -1876,6 +1881,21 @@ sub main_display {
       next SWITCH;
     };
 
+    /^xhtml$/ and do {
+      if ($Opt{'DEVICE'} && $Opt{'DEVICE'} ne 'xhtml') {
+	warn "main_display(): " .
+	  "wrong device for $Display{'MODE'} mode: $Opt{'DEVICE'};"
+      }
+      $modefile .= '.xhtml';
+      $groggy = `cat $tmp_cat | grog -Txhtml`;
+      die "main_display(): grog error;" if $?;
+      chomp $groggy;
+      print STDERR "grog output: $groggy\n" if $Debug{'GROG'};
+      &_do_display();
+      next SWITCH;
+    };
+
+
     /^pdf$/ and do {
       $modefile .= '.pdf';
       $groggy = `cat $tmp_cat | grog -Tpdf --ligatures`;
@@ -1946,7 +1966,7 @@ sub main_display {
 	die "main_display(): grog error;" if $?;
 	chomp $groggy;
 	print STDERR "grog output: $groggy\n" if $Debug{'GROG'};
-      } elsif ($Opt{'DEVICE'} =~ /^(X.*|dvi|html|lbp|lj4|ps)$/) {
+      } elsif ($Opt{'DEVICE'} =~ /^(X.*|dvi|html|xhtml|lbp|lj4|ps)$/) {
 	# these devices work with
 	$groggy = `cat $tmp_cat | grog -T$Opt{'DEVICE'} -X`;
 	die "main_display(): grog error;" if $?;
diff --git a/contrib/groffer/subs.pl b/contrib/groffer/subs.pl
index 7f5a1dc..a9ab753 100644
--- a/contrib/groffer/subs.pl
+++ b/contrib/groffer/subs.pl
@@ -5,9 +5,11 @@
 # Source file position: <groff-source>/contrib/groffer/subs.pl
 # Installed position: <prefix>/lib/groff/groffer/subs.pl
 
-# Copyright (C) 2006-2014  Free Software Foundation, Inc.
+# Copyright (C) 2006-2015  Free Software Foundation, Inc.
 # Written by Bernd Warken <groff-bernd.warken-72@web.de>.
 
+# Last update: 27 Aug 2015
+
 # This file is part of `groffer', which is part of `groff'.
 
 # `groff' is free software; you can redistribute it and/or modify it
@@ -556,7 +558,7 @@ The most important groffer long options are
 --help		display this helping output.
 --html		display in a web browser.
 --man		check file parameters first whether they are man pages.
---mode=auto|dvi|groff|html|pdf|ps|source|text|tty|utf8|www|x|X
+--mode=auto|dvi|groff|html|pdf|ps|source|text|tty|utf8|www|x|X|xhtml
 		choose display mode.
 --no-man	disable man-page facility.
 --no-special	disable --all, --apropos*, and --whatis
@@ -572,6 +574,7 @@ The most important groffer long options are
 --whatis	display the file name and description of man pages
 --www		same as --html.
 --x --X		display with "gxditview" using an X* device.
+--xhtml		display html in XML mode using a web browser.
 
 The usual X Windows toolkit options transformed into GNU long options:
 --background=color, --bd=size, --bg=color, --bordercolor=color,
@@ -594,7 +597,7 @@ EOF
 # option.  The old options are only ignored:
 # --dvi-viewer=prog choose the viewer program for dvi mode.
 # --html-viewer=program
-#                  choose the web browser for html mode.
+#                  choose the web browser for html or xhtml mode.
 # --pdf-viewer=prog choose the viewer program for pdf mode.
 # --ps-viewer=prog  choose the viewer program for ps mode.
 # --tty-viewer=prog select a pager for tty mode; same as --pager.


