consistently use @insertcopying, @direntry, @contents

[gnu-emacs] / doc / misc / widget.texi

diff --git a/doc/misc/widget.texi b/doc/misc/widget.texi
index 35f0722406ee0faf46fe1bee2c624a078db76a66..905ead0ec8ae71d47ec568ec4b71c9428299d43c 100644 (file)
--- a/doc/misc/widget.texi
+++ b/doc/misc/widget.texi
@@ -1,36 +1,27 @@
 \input texinfo.tex
-
 @c %**start of header
 @setfilename ../../info/widget
 @settitle The Emacs Widget Library
 @syncodeindex fn cp
 @syncodeindex vr cp
 @syncodeindex ky cp
-@afourpaper
 @c %**end of header
 
 @copying
 Copyright @copyright{} 2000, 2001, 2002, 2003, 2004, 2005,
-2006, 2007  Free Software Foundation, Inc.
+2006, 2007, 2008, 2009  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.2 or
-any later version published by the Free Software Foundation; with the
-Invariant Sections being ``The GNU Manifesto'', ``Distribution'' and
-``GNU GENERAL PUBLIC LICENSE'', with the Front-Cover texts being ``A GNU
-Manual'', and with the Back-Cover Texts as in (a) below.  A copy of the
-license is included in the section entitled ``GNU Free Documentation
-License'' in the Emacs manual.
-
-This document is part of a collection distributed under the GNU Free
-Documentation License.  If you want to distribute this document
-separately from the collection, you can do so by adding a copy of the
-license to the document, as described in section 6 of the license.
-
-(a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify
-this GNU Manual, like GNU software.  Copies published by the Free
-Software Foundation raise funds for GNU development.''
+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 the Front-Cover texts being ``A GNU Manual'',
+and with the Back-Cover Texts as in (a) below.  A copy of the license
+is included in the section entitled ``GNU Free Documentation License''.
+
+(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
+modify this GNU manual.  Buying copies from the FSF supports it in
+developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
@@ -40,10 +31,14 @@ Software Foundation raise funds for GNU development.''
                            facility.
 @end direntry
 
+@contents
+
 @node Top, Introduction, (dir), (dir)
 @comment  node-name,  next,  previous,  up
 @top The Emacs Widget Library
 
+@insertcopying
+
 @menu
 * Introduction::
 * User Interface::
@@ -142,19 +137,6 @@ extended to use the GUI features.  This means that your code using the
 widget library will also use the new graphic features automatically.
 @end enumerate
 
-In order to minimize the code that is loaded by users who do not
-create any widgets, the code has been split in two files:
-
-@cindex widget library, files
-@table @file
-@item widget.el
-This will declare the user variables, define the function
-@code{define-widget}, and autoload the function @code{widget-create}.
-@item wid-edit.el
-Everything else is here, there is no reason to load it explicitly, as
-it will be autoloaded when needed.
-@end table
-
 @node User Interface, Programming Example, Introduction, Top
 @comment  node-name,  next,  previous,  up
 @section User Interface
@@ -1846,8 +1828,6 @@ This is an alphabetical listing of all concepts, functions, commands,
 variables, and widgets described in this manual.
 @printindex cp
 
-@setchapternewpage odd
-@contents
 @bye
 
 @ignore