Merge from emacs-23; up to 2010-06-08T03:06:47Z!dann@ics.uci.edu.

[bpt/emacs.git] / doc / misc / autotype.texi

diff --git a/doc/misc/autotype.texi b/doc/misc/autotype.texi
index e173ed7..2e66c78 100644 (file)
--- a/doc/misc/autotype.texi
+++ b/doc/misc/autotype.texi
@@ -1,7 +1,5 @@
 \input texinfo
 @c This is an annex of the Emacs manual.
-@c Copyright (C) 1994, 1995, 2001, 2002, 2003, 2004,
-@c   2005, 2006, 2007  Free Software Foundation, Inc.
 @c Author: Daniel.Pfeiffer@Informatik.START.dbp.de, fax (+49 69) 7588-2389
 @setfilename ../../info/autotype
 @c @node Autotypist, Picture, Abbrevs, Top
@@ -12,34 +10,26 @@
 @c  @cindex autotypist
 
 @copying
-Copyright @copyright{} 1994, 1995, 1999, 2001, 2002, 2003, 2004,
-2005, 2006, 2007  Free Software Foundation, Inc.
+Copyright @copyright{} 1994-1995, 1999, 2001-2011  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.
-
-(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.''
-
-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.
+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
 
-@dircategory Emacs
+@dircategory Emacs misc features
 @direntry
-* Autotype: (autotype). Convenient features for text that you enter frequently
-                          in Emacs.
+* Autotype: (autotype).         Convenient features for text that you
+                                  enter frequently in Emacs.
 @end direntry
 
 @titlepage
@@ -58,6 +48,8 @@ frequently in Emacs}
 @insertcopying
 @end titlepage
 
+@contents
+
 @node Top
 @top Autotyping
 
@@ -86,6 +78,10 @@ be defined for inserting and navigating between text more generally.  A
 sort of meta-expansion facility can be used to try a set of alternative
 completions and expansions of text at point.
 
+@ifnottex
+@insertcopying
+@end ifnottex
+
 @menu
 * Using Skeletons::        How to insert a skeleton into your text.
 * Wrapping Skeletons::     Putting existing text within a skeleton.
@@ -95,7 +91,7 @@ completions and expansions of text at point.
                              after point.
 * Autoinserting::          Filling up empty files as soon as you visit them.
 * Copyrights::             Inserting and updating copyrights.
-* Executables::                   Turning interpreter scripts into executables.
+* Executables::            Turning interpreter scripts into executables.
 * Timestamps::             Updating dates and times in modified files.
 * QuickURL::               Inserting URLs based on text at point.
 * Tempo::                  Flexible template insertion.
@@ -108,7 +104,6 @@ completions and expansions of text at point.
 @end menu
 
 
-
 @node Using Skeletons
 @chapter Using Skeletons
 @cindex skeletons
@@ -205,7 +200,7 @@ the output from @kbd{M-x list-abbrevs} to make it look like this:
 
 @example
 (c-mode-abbrev-table)
-"if"          0    ""         c-if
+"if"           0    ""         c-if
 @end example
 
 @noindent
@@ -667,10 +662,4 @@ of the expansion possibilities.
 @unnumbered Variable Index
 @printindex vr
 
-@setchapternewpage odd
-@contents
 @bye
-
-@ignore
-   arch-tag: 54001b27-5ef8-4a9d-a199-905d650fafba
-@end ignore