first cut at update

3 files changed, 18 insertions, 49 deletions

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 2acc2ce..89decb6 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,10 +1,10 @@
 # Makefile for the various bits of documentation.
 #
-# Copyright (C) 1992 Free Software Foundation, Inc.
+# Copyright (C) 1992, 2004 Free Software Foundation, Inc.
 #
 # This program 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 1, or (at your option)
+# the Free Software Foundation; either version 2, or (at your option)
 # any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -24,9 +24,7 @@ INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 
 MAKEINFO = makeinfo
-MAKEINFO_FLAGS = --paragraph-indent=2 -I$(HOME)/gnu/gnuorg
-# That -I is purely for my own benefit in doing `make dist'.  It won't
-# hurt anything for you (I hope).
+MAKEINFO_FLAGS =
 
 TEX = tex '\nonstopmode \input'
 TEXINDEX = texindex
diff --git a/doc/fontu.texi b/doc/fontu.texi
index a4deb01..21db7e7 100644
--- a/doc/fontu.texi
+++ b/doc/fontu.texi
@@ -18,14 +18,15 @@
 @syncodeindex pg cp
 @syncodeindex vr cp
 
-@c Here is what we use in the Info `dir' file:
-@c * Fontutils: (fontu).	Programs for font manipulation.
+@dircategory Typesetting
+@direntry
+* Font utilities: (fontu).      Programs for font manipulation.
+@end direntry
 
-
-@ifinfo
+@copying
 This file documents the GNU font utilities.
 
-Copyright (C) 1992, 93 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993 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
@@ -50,44 +51,24 @@ 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 ifinfo
-
+@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
-
 @page
-
 @vskip 0pt plus 1filll
-Copyright @copyright{} 1992 Free Software Foundation.
-
-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.
-
-Permission is granted to copy and distribute modified versions of this
-manual under the conditions for verbatim copying, provided also that the
-sections entitled ``Regain your programming 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 ``Regain your programming freedom''
-and ``GNU General Public License'' may be included in a translation
-approved by the Free Software Foundation instead of in the original English.
-
+@insertcopying{}
 @end titlepage
 
+@summarycontents
+@contents
 
-@ifinfo
-@node Top, Introduction, (dir), (dir)
+@ifnottex
+@node Top
 @top GNU font utilities
 
 This manual documents how to install and run the GNU font utilities.  It
@@ -123,7 +104,6 @@ lower level nodes in the document.
 * GSrenderfont::                Rasterize PostScript fonts.
 * Enhancements::                Future projects.
 * Copying::                     Conditions for copying and sharing.
-* Freedom::                     Regain your programming freedom.
 * Index::                       General index.
 
  --- The Detailed Node Listing ---
@@ -361,13 +341,8 @@ Enhancements
 * Portability::                 Assumptions about the programming environment.
 * Implementation::              Conventions we used in the sources.
 
-Regain your programming freedom
-
-* Software patents::            Algorithm monopolies.
-* User interface copyright::    Forbidding upward-compatibility.
-* What to do?::                 What to do?
 @end menu
-@end ifinfo
+@end ifnottex
 
 @include intro.texi
 @include install.texi
@@ -386,10 +361,6 @@ Regain your programming freedom
 @include gsrenderf.texi
 @include enhance.texi
 @include copying.texi
-@include freedom.texi
 @include index.texi
 
-@summarycontents
-@contents
-
 @bye
diff --git a/doc/index.texi b/doc/index.texi
index 62455ad..3a329a3 100644
--- a/doc/index.texi
+++ b/doc/index.texi
@@ -1,8 +1,8 @@
-@c Copyright (C) 1992 Free Software Foundation.
+@c Copyright (C) 1992, 2004 Free Software Foundation.
 @c This is part of the GNU font utilities manual.
 @c For copying conditions, see the file fontutil.texi.
 
-@node Index, , Freedom, Top
+@node Index
 @unnumbered Index
 
 @printindex cp