Update documentation to align with GNU Hello.

5 files changed, 55 insertions, 64 deletions

diff --git a/ChangeLog b/ChangeLog
index bab3d72..ae00b05 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
-Tue Jan 3 10:15:00 2011 Adam M. Dutko (adutko@member.fsf.org)
+Thu Jan 12 11:35:00 2012 Adam M. Dutko (adutko@member.fsf.org)
+        * Include fdl.texi.
+	* Revise documentation to align better with GNU Hello.
+	* Adjust date of last commit. It's 2012, not 2011. :-)
+
+Tue Jan 3 10:15:00 2012 Adam M. Dutko (adutko@member.fsf.org)
         * Removed @include copying.texi from fontu.texi
         * Verified pdf of document builds with texi2pdf -c -p fontu.texi
 
diff --git a/doc/bugs.texi b/doc/bugs.texi
index a6e4af0..3546f36 100644
--- a/doc/bugs.texi
+++ b/doc/bugs.texi
@@ -2,8 +2,8 @@
 @c This is part of the GNU font utilities manual.
 @c For copying conditions, see the file fontutil.texi.
 
-@node Bugs
-@chapter Bugs
+@node Reporting bugs
+@chapter Reporting bugs
 
 (This chapter is adapted from the analogous one in the GCC manual,
 written by Richard Stallman.)
@@ -20,7 +20,7 @@ making the next release work better.
 
 @cindex improvements, suggesting
 Send bug reports for the GNU font utilities, or for their documentation,
-to the address @code{bug-gnu-utils@@prep.ai.mit.edu}.  We also welcome
+to the address @code{fontutils-bugs@@gnu.org}.  We also welcome
 suggestions for improvements, no matter how small.
 
 In order for a bug report to serve its purpose, you must include the
diff --git a/doc/fontu.texi b/doc/fontu.texi
index e4e5bad..2d587bf 100644
--- a/doc/fontu.texi
+++ b/doc/fontu.texi
@@ -1,19 +1,14 @@
-@Copyright (C) 2011 Free Software Foundation, Inc.
-@c This is part of the GNU font utilities manual.
-@c For copying conditions, see the file fontutil.texi.
-
-\input texinfo
+\input texinfo @c -*-texinfo-*-
 @c %**start of header
 @setfilename fontu.info
-@settitle GNU font utilities
-@c %**end of header
+@include version.texi
+@settitle GNU Font Utilities @value{VERSION}
 
-@c Define new indices for commands in auxiliary files, filenames, and options.
-@defcodeindex cm
-@defcodeindex fl
+@c Define a new index for options.
 @defcodeindex op
-
-@c Put everything in one index (arbitrarily chosen to be the concept index).
+@c Combine everything into one index (arbitrarily chosen to be the 
+@c concept index).
+@syncodeindex op cp
 @syncodeindex cm cp
 @syncodeindex fl cp
 @syncodeindex fn cp
@@ -21,66 +16,51 @@
 @syncodeindex op cp
 @syncodeindex pg cp
 @syncodeindex vr cp
+@c %**end of header
+
+@copying
+This manual is for GNU Font Utilities (version @value{VERSION}, @value{UPDATED}), which provides porgrams for font manipulation.
+
+Copyright (C) 1992, 1993, 2004, 2011, 2012 Free Software Foundation, Inc.
+
+@quotation
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License, Version 1.3 or
+any later version published by the Free Software Foundation; with no
+Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
+Texts.  A copy of the license is included in the section entitled
+``GNU Free Documentation License''.
+@end quotation
+@end copying
 
 @dircategory Typesetting
 @direntry
 * Font utilities: (fontu).      Programs for font manipulation.
 @end direntry
 
-@copying
-This file documents the GNU font utilities.
-
-Copyright (C) 1992, 1993, 2004 Free Software Foundation, Inc.
-
-Permission is granted to make and distribute verbatim copies of this
-manual provided the copyright notice and this permission notice are
-preserved on all copies.
-
+@titlepage
+@title GNU Font Utilities
+@subtitle for version @value{VERSION}, @value{UPDATED} 
 @ignore
-Permission is granted to process this file through TeX and print the
-results, provided the printed document carries a copying permission
-notice identical to this one except for the removal of this paragraph
-(this paragraph not being relevant to the printed manual).
+@author Karl Berry and Kathryn A. Hargreaves
 @end ignore
-
-Permission is granted to copy and distribute modified versions of this
-manual under the conditions for verbatim copying, provided also that the
-sections entitled ``Freedom'' and ``GNU General Public License'' are
-included exactly as in the original, and provided that the entire
-resulting derived work is distributed under the terms of a permission
-notice identical to this one.
-
-Permission is granted to copy and distribute translations of this manual
-into another language, under the above conditions for modified versions,
-except that the sections entitled ``Freedom'' and ``GNU General Public
-License'' may be included in a translation approved by the Free Software
-Foundation instead of in the original English.
-@end copying
-
-@titlepage
-@title GNU font utilities
-@subtitle for version REPLACE-WITH-VERSION
-@subtitle REPLACE-WITH-MONTH-YEAR
-@author Karl Berry
-@author with Kathryn A. Hargreaves
+@author GNU Font Utilities Developers (@email{fontutils-bugs@@gnu.org}) 
 @page
 @vskip 0pt plus 1filll
-@insertcopying{}
+@insertcopying
 @end titlepage
 
-@summarycontents
 @contents
 
 @ifnottex
 @node Top
-@top GNU font utilities
+@top GNU Font Utilities
 
-This manual documents how to install and run the GNU font utilities.  It
-corresponds to version REPLACE-WITH-VERSION (released in
-REPLACE-WITH-MONTH-YEAR).
+This manual documents how to install and run the GNU Font Utilities.  It
+corresponds to version @value{VERSION} (released in @value{UPDATED}).
 
 The introduction briefly describes the purpose and philosophy of the
-font utilities.  The overview gives details on their general usage,
+Font Utilities.  The overview gives details on their general usage,
 especially how they interact, and describes various things which are
 common to all or most of the programs.
 
@@ -90,11 +70,11 @@ lower level nodes in the document.
 
 @menu
 * Introduction::                A brief introduction.
-* Installation::                How to compile and install the font utilities.
+* Installation::                How to compile and install the Font Utilities.
 * Overview::                    Commonalities to the programs,
 				  a roadmap to how they fit together,
                                   and examples of usage.
-* Bugs::                        How, why, and where to report bugs.
+* Reporting bugs::              How, why, and where to report bugs.
 * File formats::                These programs read and write many files.
 * Imageto::                     Extracting a font from a scanned image.
 * IMGrotate::                   Rotating an image.
@@ -107,8 +87,8 @@ lower level nodes in the document.
 * BZRedit::                     Hand editor for outline fonts under Emacs.
 * GSrenderfont::                Rasterize PostScript fonts.
 * Enhancements::                Future projects.
-* Copying::                     Conditions for copying and sharing.
-* Index::                       General index.
+* GNU Free Documentation License:: Copying and sharing this documentation.
+* Concept index::               Index of concepts.
 
 @detailmenu
  --- The Detailed Node Listing ---
@@ -365,6 +345,12 @@ Enhancements
 @include bzredit.texi
 @include gsrenderf.texi
 @include enhance.texi
+
+@node GNU Free Documentation License
+@appendix GNU Free Documentation License
+
+@include fdl.texi
+
 @include index.texi
 
 @bye
diff --git a/doc/index.texi b/doc/index.texi
index c4d36c1..d5a7fc5 100644
--- a/doc/index.texi
+++ b/doc/index.texi
@@ -2,7 +2,7 @@
 @c This is part of the GNU font utilities manual.
 @c For copying conditions, see the file fontutil.texi.
 
-@node Index
-@unnumbered Index
+@node Concept index
+@unnumbered Concept index
 
 @printindex cp
diff --git a/doc/intro.texi b/doc/intro.texi
index d659993..081ada9 100644
--- a/doc/intro.texi
+++ b/doc/intro.texi
@@ -7,7 +7,7 @@
 
 @cindex introduction
 
-This manual corresponds to version REPLACE-WITH-VERSION of the GNU font
+This manual corresponds to version @value{VERSION} of the GNU font
 utilities.
 
 You can manipulate fonts in various ways using the utilities: conversion