--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-03  Karl Berry  <karl@gnu.org>
+
+	* doc/error.texi: new file, explaining interaction with progname.
+	* doc/gnulib.texi: include it.  Update copyright.
+
 2007-01-03  Simon Josefsson  <simon@josefsson.org>
 
 	* gnulib-tool (func_create_testdir): Run AC_CANONICAL_BUILD and

new file mode 100644
--- /dev/null
+++ b/doc/error.texi
@@ -0,0 +1,22 @@
+@node error and progname
+@section error and progname
+@findex error
+@findex progname
+@vindex program_name
+
+@c Copyright (C) 2007 Free Software Foundation, Inc.
+
+@c Permission is granted to copy, distribute and/or modify this document
+@c under the terms of the GNU Free Documentation License, Version 1.2 or
+@c any later version published by the Free Software Foundation; with no
+@c Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
+@c Texts.  A copy of the license is included in the ``GNU Free
+@c Documentation License'' file as part of this distribution.
+
+The @code{error} function uses the @code{program_name} variable, but
+does not depend on the @code{progname} module.  Why?  Because
+@code{error} is released under the LGPL, whereas @code{progname} is
+GPL.  RMS does not want additional baggage accompanying the
+@code{error} module, so an LGPL user must provide their own
+replacement @code{program_name}, and a GPL user should manually 
+specify using the @code{progname} module.

--- a/doc/gnulib.texi
+++ b/doc/gnulib.texi
@@ -1,5 +1,5 @@
 \input texinfo   @c -*-texinfo-*-
-@comment $Id: gnulib.texi,v 1.30 2006-11-07 19:51:40 rwild Exp $
+@comment $Id: gnulib.texi,v 1.31 2007-01-03 18:51:20 karl Exp $
 @comment %**start of header
 @setfilename gnulib.info
 @settitle GNU Gnulib
@@ -7,28 +7,21 @@
 @syncodeindex pg cp
 @comment %**end of header
 
-@set UPDATED $Date: 2006-11-07 19:51:40 $
+@set UPDATED $Date: 2007-01-03 18:51:20 $
 
 @copying
 This manual is for GNU Gnulib (updated @value{UPDATED}),
 which is a library of common routines intended to be shared at the
 source level.
 
-Copyright @copyright{} 2004, 2005, 2006 Free Software Foundation, Inc.
+Copyright @copyright{} 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
 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 freedom to copy and modify
-this GNU Manual, like GNU software.  Copies published by the Free
-Software Foundation raise funds for GNU development.''
-@end quotation
+Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
+Texts.  A copy of the license is included in the section entitled
+``GNU Free Documentation License.''
 @end copying
 
 @dircategory Software development
@@ -63,7 +56,6 @@
 * Index::
 @end menu
 
-
 @node Introduction
 @chapter Introduction
 
@@ -369,17 +361,16 @@
 @menu
 * Quoting::
 * ctime::
+* error and progname::
 * gcd::
 * inet_ntoa::
 * Regular expressions::
 @end menu
 
 @include quote.texi
-
+@include error.texi
 @include ctime.texi
-
 @include gcd.texi
-
 @include inet_ntoa.texi
 
 @node Regular expressions