Merge branch 'master' of ssh://sources.redhat.com/git/glibc

Conflicts: ChangeLog
git-mirror · Jun 14, 2010 · 46658a1 · 46658a1
2 parents b2ef2c0 + fbd643b
commit 46658a1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -9,6 +9,10 @@
 	* sysdeps/unix/sysv/linux/sh/bits/fcntl.h: Likewise.
 	* sysdeps/unix/sysv/linux/ia64/bits/fcntl.h: Likewise
 
+2010-06-14  Roland McGrath  <roland@redhat.com>
+
+	* manual/libc.texinfo (@copying): Change to GFDL v1.3.
+
 2010-06-07  Jakub Jelinek  <jakub@redhat.com>
 
 	* libio/stdio.h (sscanf, vsscanf): Use __REDIRECT_NTH instead of

diff --git a/manual/libc.texinfo b/manual/libc.texinfo
@@ -30,10 +30,10 @@ This is Edition @value{EDITION}, last updated @value{UPDATED},
 of @cite{The GNU C Library Reference Manual}, for version @value{VERSION}.
 
 Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002,
-2003, 2007, 2008 Free Software Foundation, Inc.
+2003, 2007, 2008, 2010 Free Software Foundation, Inc.
 
 Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.2 or
+under the terms of the GNU Free Documentation License, Version 1.3 or
 any later version published by the Free Software Foundation; with the
 Invariant Sections being ``Free Software Needs Free Documentation''
 and ``GNU Lesser General Public License'', the Front-Cover texts being