diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2010-06-14 14:48:37 -0700 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2010-06-14 14:48:37 -0700 |
| commit | 46658a1cbccb564942a147a747a7579099773764 (patch) | |
| tree | 2ebe1e567b66dcd9e126b89c236117d1f15eaa7c | |
| parent | b2ef2c014b9c66995a3eb4f310ae7c5c510279bf (diff) | |
| parent | fbd643b66230bafead971b8cd3b0cfe70f5d22ce (diff) | |
| download | glibc-46658a1cbccb564942a147a747a7579099773764.tar.gz glibc-46658a1cbccb564942a147a747a7579099773764.tar.xz glibc-46658a1cbccb564942a147a747a7579099773764.zip | |
Merge branch 'master' of ssh://sources.redhat.com/git/glibc
Conflicts: ChangeLog
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | manual/libc.texinfo | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 06a002eef4..7b25c3f292 100644 --- 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 index 872028849c..d4c37dbcc4 100644 --- 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 |