Merge from emacs--rel--22

[bpt/emacs.git] / man / eudc.texi

diff --git a/man/eudc.texi b/man/eudc.texi
index 23df55b..7a8dbbe 100644 (file)
--- a/man/eudc.texi
+++ b/man/eudc.texi
@@ -12,12 +12,12 @@ EUDC is the Emacs Unified Directory Client, a common interface to
 directory servers using various protocols such as LDAP or the CCSO white
 pages directory system (PH/QI)
 
-Copyright (C) 1998, 2000, 2001, 2002, 2003, 2004,
-  2005 Free Software Foundation, Inc.
+Copyright @copyright{} 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+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.1 or
+under the terms of the GNU Free Documentation License, Version 1.2 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
@@ -70,6 +70,7 @@ LDAP or the CCSO white pages directory system (PH/QI)
 * Installation::                How to install EUDC
 * Usage::                       The various usage possibilities explained
 * Credits::                     Who's done what
+* GNU Free Documentation License:: The license for this documentation.
 * Command and Function Index::
 * Variables Index::
 @end menu
@@ -94,7 +95,7 @@ LDAP, Lightweight Directory Access Protocol
 @item
 CCSO PH/QI
 @item
-BBDB, Big Brother's Insiduous Database
+BBDB, Big Brother's Insidious Database
 @end itemize
 
 The main features of the EUDC interface are:
@@ -179,7 +180,7 @@ EUDC.
 @comment  node-name,  next,  previous,  up
 @section BBDB
 
-BBDB is the @dfn{Big Brother's Insiduous Database}, a package for Emacs
+BBDB is the @dfn{Big Brother's Insidious Database}, a package for Emacs
 originally written by Jamie Zawinski which provides rolodex-like
 database functionality featuring tight integration with the Emacs mail
 and news readers.
@@ -949,7 +950,7 @@ Update all EUDC variables according to their local settings.
 
 
 
-@node Credits, Command and Function Index, Usage, Top
+@node Credits, GNU Free Documentation License, Usage, Top
 @comment  node-name,  next,  previous,  up
 @chapter Credits
 
@@ -959,7 +960,11 @@ same author.
 Thanks to Soren Dayton for his suggestions, his enthusiasm and his help
 in testing and proofreading the code and docs of @file{ph.el}.
 
-@node Command and Function Index, Variables Index, Credits, Top
+@node GNU Free Documentation License, Command and Function Index, Credits, Top
+@appendix GNU Free Documentation License
+@include doclicense.texi
+
+@node Command and Function Index, Variables Index, GNU Free Documentation License, Top
 @comment  node-name,  next,  previous,  up
 @unnumbered Command and Function Index