Merge changes between r17050 and r17194 from /fsf/trunk.

git-svn-id: svn://svn.eglibc.org/trunk@17195 7b3dc134-2b1b-0410-93df-9e9f96275f8d

13 files changed, 26 insertions, 39 deletions

diff --git a/libc/include/atomic.h b/libc/include/atomic.h
index fc4023b76..3ccb46d9e 100644
--- a/libc/include/atomic.h
+++ b/libc/include/atomic.h
@@ -14,9 +14,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #ifndef _ATOMIC_H
 #define _ATOMIC_H	1
diff --git a/libc/include/bits/xopen_lim.h b/libc/include/bits/xopen_lim.h
index 7f3611860..0d56f8518 100644
--- a/libc/include/bits/xopen_lim.h
+++ b/libc/include/bits/xopen_lim.h
@@ -12,9 +12,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 /*
  * Never include this file directly; use <limits.h> instead.
diff --git a/libc/include/caller.h b/libc/include/caller.h
index 63759c865..1cbed1d5d 100644
--- a/libc/include/caller.h
+++ b/libc/include/caller.h
@@ -12,9 +12,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #ifndef _CALLER_H
 #define _CALLER_H 1
diff --git a/libc/include/features.h b/libc/include/features.h
index 64dda86a4..606979eec 100644
--- a/libc/include/features.h
+++ b/libc/include/features.h
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #ifndef	_FEATURES_H
 #define	_FEATURES_H	1
diff --git a/libc/include/gnu-versions.h b/libc/include/gnu-versions.h
index 59e617c4b..f67764c7b 100644
--- a/libc/include/gnu-versions.h
+++ b/libc/include/gnu-versions.h
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #ifndef _GNU_VERSIONS_H
 #define	_GNU_VERSIONS_H	1
diff --git a/libc/include/gnu/libc-version.h b/libc/include/gnu/libc-version.h
index 57071fd7d..a70f702fb 100644
--- a/libc/include/gnu/libc-version.h
+++ b/libc/include/gnu/libc-version.h
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #ifndef _GNU_LIBC_VERSION_H
 #define	_GNU_LIBC_VERSION_H	1
diff --git a/libc/include/inline-hashtab.h b/libc/include/inline-hashtab.h
index 0f6719b91..df26dedc9 100644
--- a/libc/include/inline-hashtab.h
+++ b/libc/include/inline-hashtab.h
@@ -19,9 +19,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #ifndef INLINE_HASHTAB_H
 # define INLINE_HASHTAB_H 1
diff --git a/libc/include/libc-symbols.h b/libc/include/libc-symbols.h
index 9203da296..255985927 100644
--- a/libc/include/libc-symbols.h
+++ b/libc/include/libc-symbols.h
@@ -15,9 +15,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #ifndef _LIBC_SYMBOLS_H
 #define _LIBC_SYMBOLS_H	1
diff --git a/libc/include/limits.h b/libc/include/limits.h
index 3e9a5df88..c274dd492 100644
--- a/libc/include/limits.h
+++ b/libc/include/limits.h
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 /*
  *	ISO C99 Standard: 7.10/5.2.4.2.1 Sizes of integer types	<limits.h>
diff --git a/libc/include/link.h b/libc/include/link.h
index e87710464..c5265ee16 100644
--- a/libc/include/link.h
+++ b/libc/include/link.h
@@ -14,9 +14,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #ifndef	_PRIVATE_LINK_H
 #define	_PRIVATE_LINK_H	1
diff --git a/libc/include/set-hooks.h b/libc/include/set-hooks.h
index 770b30530..74c03acb0 100644
--- a/libc/include/set-hooks.h
+++ b/libc/include/set-hooks.h
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #ifndef _SET_HOOKS_H
 #define _SET_HOOKS_H 1
diff --git a/libc/include/shlib-compat.h b/libc/include/shlib-compat.h
index 90700576f..7a84f299f 100644
--- a/libc/include/shlib-compat.h
+++ b/libc/include/shlib-compat.h
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #ifndef _SHLIB_COMPAT_H
 #define _SHLIB_COMPAT_H	1
diff --git a/libc/include/values.h b/libc/include/values.h
index c8b376f18..601bd34a2 100644
--- a/libc/include/values.h
+++ b/libc/include/values.h
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 /* This interface is obsolete.  New programs should use
    <limits.h> and/or <float.h> instead of <values.h>.  */