From 52d7e2f384be0730847ccae21a7607c7149a63d9 Mon Sep 17 00:00:00 2001
From: Adam Spiers <stow@adamspiers.org>
Date: Sat, 18 Feb 2012 15:47:19 +0000
Subject: [PATCH] Update structure of manual to match recommended texinfo
 structure.

TOC now appears after title page.
Copying information is no longer duplicated.
---
 doc/stow.texi | 64 ++++++++++++++++++++-------------------------------
 1 file changed, 25 insertions(+), 39 deletions(-)

diff --git a/doc/stow.texi b/doc/stow.texi
index f595212..291bd59 100644
--- a/doc/stow.texi
+++ b/doc/stow.texi
@@ -7,16 +7,16 @@
 @c @setchapternewpage odd
 @c @footnotestyle separate
 @c %**end of header
-@dircategory System administration
-@direntry
-* Stow: (stow).           GNU Stow.
-@end direntry
 
 @include version.texi
 
 @ifinfo
-This file describes GNU Stow version @value{VERSION}, a program for
-managing the installation of software packages.
+@end ifinfo
+
+@copying
+This manual describes GNU Stow version @value{VERSION}
+(@value{UPDATED}), a program for managing the installation of software
+packages.
 
 Software and documentation is copyrighted by the following:
 
@@ -28,6 +28,7 @@ Software and documentation is copyrighted by the following:
 @*
 @copyright{} 2011 Adam Spiers <stow@@adamspiers.org>
 
+@quotation
 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.
@@ -50,8 +51,15 @@ Permission is granted to copy and distribute translations of this manual
 into another language, under the above conditions for modified versions,
 except that this permission notice may be stated in a translation
 approved by the Free Software Foundation.
-@end ifinfo
+@end quotation
+@end copying
 
+@dircategory System administration
+@direntry
+* Stow: (stow).           GNU Stow.
+@end direntry
+
+@c ===========================================================================
 @titlepage
 @title Stow @value{VERSION}
 @subtitle Managing the installation of software packages
@@ -59,45 +67,24 @@ approved by the Free Software Foundation.
 @author Kahlil Hodgson, RMIT Univerity, Australia.
 @page
 @vskip 0pt plus 1filll
-This manual describes GNU Stow version @value{VERSION}, a program for
-managing the installation of software packages.
-
-Software and documentation is copyrighted by the following:
-
-@copyright{} 1993, 1994, 1995, 1996 Bob Glickstein <bobg+stow@@zanshin.com>
-@*
-@copyright{} 2000, 2001 Guillaume Morin <gmorin@@gnu.org>
-@*
-@copyright{} 2007 Kahlil (Kal) Hodgson <kahlil@@internode.on.net>
-@*
-@copyright{} 2011 Adam Spiers <stow@@adamspiers.org>
-
-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
-section entitled ``GNU General Public License'' is included with the
-modified manual, 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 this permission notice may be stated in a translation
-approved by the Free Software Foundation.
+@insertcopying
 @end titlepage
 
+@c FIXME: How to include the TOC in the TOC?
+@c @node Table of Contents, Top, (dir), (dir)
+@c @unnumbered Table of Contents
+@contents
 
 @c ==========================================================================
-@node Top, Introduction, (dir), (dir)
+@ifnottex
+@node Top
 @top
 
 @ifinfo
-This manual describes GNU Stow @value{VERSION}, a program for managing
-the installation of software packages.
+This manual describes GNU Stow @value{VERSION} (@value{UPDATED}), a
+program for managing the installation of software packages.
 @end ifinfo
+@end ifnottex
 
 @menu
 * Introduction::                Description of Stow.
@@ -1638,5 +1625,4 @@ General Public License instead of this License.
 
 @printindex cp
 
-@contents
 @bye