Replace FSF snail mail address with URLs.

64 files changed, 98 insertions, 126 deletions

diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 658b8e0ed3..ba58e99c5a 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,7 @@
+2012-02-07  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Replace FSF snail mail address with URLs, as per GNU coding standards.
+
 2012-01-07  Ulrich Drepper  <drepper@gmail.com>
 
 	[BZ #13547]
diff --git a/localedata/Makefile b/localedata/Makefile
index 4c4acd34f9..6b48c874f1 100644
--- a/localedata/Makefile
+++ b/localedata/Makefile
@@ -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/>.
 
 # Makefile for installing locale data source files.
 
diff --git a/localedata/collate-test.c b/localedata/collate-test.c
index e8f43218fd..a84974cef3 100644
--- a/localedata/collate-test.c
+++ b/localedata/collate-test.c
@@ -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/>.  */
 
 #include <ctype.h>
 #include <error.h>
diff --git a/localedata/dump-ctype.c b/localedata/dump-ctype.c
index a1f24c6560..6cf96d81df 100644
--- a/localedata/dump-ctype.c
+++ b/localedata/dump-ctype.c
@@ -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/>.  */
 
 /* Usage example:
      $ dump-ctype de_DE.UTF-8
diff --git a/localedata/gen-locale.sh b/localedata/gen-locale.sh
index 9e411c1cd8..89a9e06ee7 100644
--- a/localedata/gen-locale.sh
+++ b/localedata/gen-locale.sh
@@ -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/>.
 
 common_objpfx="$1"; shift
 localedef="$1"; shift
diff --git a/localedata/gen-unicode-ctype.c b/localedata/gen-unicode-ctype.c
index 849f272ed5..0c74e6a7ed 100644
--- a/localedata/gen-unicode-ctype.c
+++ b/localedata/gen-unicode-ctype.c
@@ -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/>.  */
 
 /* Usage example:
      $ gen-unicode /usr/local/share/Unidata/UnicodeData.txt 3.1
diff --git a/localedata/locales/br_FR@euro b/localedata/locales/br_FR@euro
index 62b1da934f..2296694ccf 100644
--- a/localedata/locales/br_FR@euro
+++ b/localedata/locales/br_FR@euro
@@ -14,7 +14,7 @@ escape_char  /
 LC_IDENTIFICATION
 title      "Breton locale for France with Euro"
 source     "Free Software Foundation, Inc."
-address    "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA"
+address    "http://www.gnu.org/software/libc/"
 email      "bug-glibc-locales@gnu.org"
 tel        ""
 fax        ""
diff --git a/localedata/locales/ca_ES@euro b/localedata/locales/ca_ES@euro
index 50609df06e..96f89316e1 100644
--- a/localedata/locales/ca_ES@euro
+++ b/localedata/locales/ca_ES@euro
@@ -16,7 +16,7 @@ escape_char  /
 LC_IDENTIFICATION
 title      "Catalan locale for Catalonia with Euro"
 source     "Free Software Foundation, Inc."
-address    "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA"
+address    "http://www.gnu.org/software/libc/"
 contact    ""
 email      "bug-glibc-locales@gnu.org"
 tel        ""
diff --git a/localedata/locales/cs_CZ b/localedata/locales/cs_CZ
index 2f25e9a8f6..92b458750c 100644
--- a/localedata/locales/cs_CZ
+++ b/localedata/locales/cs_CZ
@@ -107,7 +107,7 @@ comment_char %
 LC_IDENTIFICATION
 title      "Czech locale for the Czech Republic"
 source     "Free Software Foundation, Inc."
-address    "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA"
+address    "http://www.gnu.org/software/libc/"
 contact    ""
 email      "bug-glibc-locales@gnu.org"
 tel        ""
diff --git a/localedata/locales/de_BE@euro b/localedata/locales/de_BE@euro
index e5f02dcfc0..dc6bfa3d70 100644
--- a/localedata/locales/de_BE@euro
+++ b/localedata/locales/de_BE@euro
@@ -14,7 +14,7 @@ escape_char  /
 LC_IDENTIFICATION
 title      "German locale for Belgium with Euro"
 source     "Free Software Foundation, Inc."
-address    "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA"
+address    "http://www.gnu.org/software/libc/"
 contact    ""
 email      "bug-glibc-locales@gnu.org"
 tel        ""
diff --git a/localedata/locales/de_DE b/localedata/locales/de_DE
index eac517a578..74bf8d7124 100644
--- a/localedata/locales/de_DE
+++ b/localedata/locales/de_DE
@@ -6,7 +6,7 @@ comment_char %
 LC_IDENTIFICATION
 title      "German locale for Germany"
 source     "Free Software Foundation, Inc."
-address    "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA"
+address    "http://www.gnu.org/software/libc/"
 contact    ""
 email      "bug-glibc-locales@gnu.org"
 tel        ""
diff --git a/localedata/locales/de_DE@euro b/localedata/locales/de_DE@euro
index d639e3fa4d..a5c65d5878 100644
--- a/localedata/locales/de_DE@euro
+++ b/localedata/locales/de_DE@euro
@@ -6,7 +6,7 @@ comment_char %
 LC_IDENTIFICATION
 title      "German locale for Germany with Euro"
 source     "Free Software Foundation, Inc."
-address    "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA"
+address    "http://www.gnu.org/software/libc/"
 contact    ""
 email      "bug-glibc-locales@gnu.org"
 tel        ""
diff --git a/localedata/locales/de_LU@euro b/localedata/locales/de_LU@euro
index 3c41ffb761..049d01e863 100644
--- a/localedata/locales/de_LU@euro
+++ b/localedata/locales/de_LU@euro
@@ -14,7 +14,7 @@ escape_char  /
 LC_IDENTIFICATION
 title      "German locale for Luxemburg with Euro"
 source     "Free Software Foundation, Inc."
-address    "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA"
+address    "http://www.gnu.org/software/libc/"
 contact    ""
 email      "bug-glibc-locales@gnu.org"
 tel        ""
diff --git a/localedata/locales/el_GR@euro b/localedata/locales/el_GR@euro
index bd1f6be068..350f36b31e 100644
--- a/localedata/locales/el_GR@euro
+++ b/localedata/locales/el_GR@euro
@@ -4,7 +4,7 @@ comment_char %
 LC_IDENTIFICATION
 title      "Greek locale for Greece with Euro"
 source     "Free Software Foundation, Inc."
-address    "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA"
+address    "http://www.gnu.org/software/libc/"
 contact    ""
 email      "bug-glibc-locales@gnu.org"
 tel        ""
diff --git a/localedata/locales/en_AG b/localedata/locales/en_AG
index f39c410acb..8c79e8dec1 100644
--- a/localedata/locales/en_AG
+++ b/localedata/locales/en_AG
@@ -6,7 +6,7 @@ comment_char %
 LC_IDENTIFICATION
 title      "English language locale for Antigua and Barbuda"
 source     "Free Software Foundation, Inc."
-address    "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA"
+address    "http://www.gnu.org/software/libc/"
 contact    ""
 email      "bug-glibc-locales@gnu.org"
 tel        ""
diff --git a/localedata/locales/en_IE@euro b/localedata/locales/en_IE@euro
index dc429d7710..264facc523 100644
--- a/localedata/locales/en_IE@euro
+++ b/localedata/locales/en_IE@euro
@@ -14,7 +14,7 @@ comment_char  %
 LC_IDENTIFICATION
 title      "English locale for Ireland with Euro"
 source     "Free Software Foundation, Inc."
-address    "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA"
+address    "http://www.gnu.org/software/libc/"
 contact    ""
 email      "bug-glibc-locales@gnu.org"
 tel        ""
diff --git a/localedata/locales/en_US b/localedata/locales/en_US
index a41f5bc310..eec6366c27 100644
--- a/localedata/locales/en_US
+++ b/localedata/locales/en_US
@@ -6,7 +6,7 @@ comment_char %
 LC_IDENTIFICATION
 title      "English locale for the USA"
 source     "Free Software Foundation, Inc."
-address    "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA"
+address    "http://www.gnu.org/software/libc/"
 contact    ""
 email      "bug-glibc-locales@gnu.org"
 tel        ""
diff --git a/localedata/locales/es_CR b/localedata/locales/es_CR
index f998c86246..9ee08d502a 100644
--- a/localedata/locales/es_CR
+++ b/localedata/locales/es_CR
@@ -14,7 +14,7 @@ escape_char  /
 LC_IDENTIFICATION
 title      "Spanish locale for Costa Rica"
 source     "Free Software Foundation, Inc."
-address    "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA"
+address    "http://www.gnu.org/software/libc/"
 contact    ""
 email      "bug-glibc-locales@gnu.org"
 tel        ""
diff --git a/localedata/locales/es_ES@euro b/localedata/locales/es_ES@euro
index 1d81e83652..7e90c6a788 100644
--- a/localedata/locales/es_ES@euro
+++ b/localedata/locales/es_ES@euro
@@ -15,7 +15,7 @@ escape_char  /
 LC_IDENTIFICATION
 title      "Spanish locale for Spain with Euro"
 source     "Free Software Foundation, Inc."
-address    "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA"
+address    "http://www.gnu.org/software/libc/"
 contact    ""
 email      "bug-glibc-locales@gnu.org"
 tel        ""
diff --git a/localedata/locales/es_NI b/localedata/locales/es_NI
index 207f2dabf8..f685db096b 100644
--- a/localedata/locales/es_NI
+++ b/localedata/locales/es_NI
@@ -14,7 +14,7 @@ escape_char  /
 LC_IDENTIFICATION
 title      "Spanish locale for Nicaragua"
 source     "Free Software Foundation, Inc."
-address    "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA"
+address    "http://www.gnu.org/software/libc/"
 contact    ""
 email      "bug-glibc-locales@gnu.org"
 tel        ""
diff --git a/localedata/locales/es_PR b/localedata/locales/es_PR
index 53496d48c0..d6c818cd0b 100644
--- a/localedata/locales/es_PR
+++ b/localedata/locales/es_PR
@@ -14,7 +14,7 @@ escape_char  /
 LC_IDENTIFICATION
 title      "Spanish locale for Puerto Rico"
 source     "Free Software Foundation, Inc."
-address    "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA"
+address    "http://www.gnu.org/software/libc/"
 contact    ""
 email      "bug-glibc-locales@gnu.org"
 tel        ""
diff --git a/localedata/locales/eu_ES@euro b/localedata/locales/eu_ES@euro
index f88fce4c7f..0930dd8900 100644
--- a/localedata/locales/eu_ES@euro
+++ b/localedata/locales/eu_ES@euro
@@ -15,7 +15,7 @@ escape_char  /
 LC_IDENTIFICATION
 title      "Basque language locale for Spain with Euro"
 source     "Free Software Foundation, Inc."
-address    "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA"
+address    "http://www.gnu.org/software/libc/"
 contact    ""
 email      "bug-glibc-locales@gnu.org"
 tel        ""
diff --git a/localedata/locales/fi_FI@euro b/localedata/locales/fi_FI@euro
index 836322b21f..0f874be55a 100644
--- a/localedata/locales/fi_FI@euro
+++ b/localedata/locales/fi_FI@euro
@@ -15,7 +15,7 @@ comment_char    %
 LC_IDENTIFICATION
 title      "Finnish locale for Finland with Euro"
 source     "Free Software Foundation, Inc."
-address    "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA"
+address    "http://www.gnu.org/software/libc/"
 contact    ""
 email      "bug-glibc-locales@gnu.org"
 tel        ""
diff --git a/localedata/locales/fr_BE@euro b/localedata/locales/fr_BE@euro
index 51968f8304..02114aa48a 100644
--- a/localedata/locales/fr_BE@euro
+++ b/localedata/locales/fr_BE@euro
@@ -14,7 +14,7 @@ escape_char  /
 LC_IDENTIFICATION
 title      "French locale for Belgium with Euro"
 source     "Free Software Foundation, Inc."
-address    "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA"
+address    "http://www.gnu.org/software/libc/"
 contact    ""
 email      "bug-glibc-locales@gnu.org"
 tel        ""
diff --git a/localedata/locales/fr_FR@euro b/localedata/locales/fr_FR@euro
index 63f805adc9..18c919c9a5 100644
--- a/localedata/locales/fr_FR@euro
+++ b/localedata/locales/fr_FR@euro
@@ -14,7 +14,7 @@ escape_char  /
 LC_IDENTIFICATION
 title      "French locale for France with Euro"
 source     "Free Software Foundation, Inc."
-address    "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA"
+address    "http://www.gnu.org/software/libc/"
 email      "bug-glibc-locales@gnu.org"
 tel        ""
 fax        ""
diff --git a/localedata/locales/fr_LU@euro b/localedata/locales/fr_LU@euro
index 3466e4081a..9bc863a95f 100644
--- a/localedata/locales/fr_LU@euro
+++ b/localedata/locales/fr_LU@euro
@@ -14,7 +14,7 @@ escape_char  /
 LC_IDENTIFICATION
 title      "French locale for Luxemburg with Euro"
 source     "Free Software Foundation, Inc."
-address    "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA"
+address    "http://www.gnu.org/software/libc/"
 contact    ""
 email      "bug-glibc-locales@gnu.org"
 tel        ""
diff --git a/localedata/locales/fy_NL b/localedata/locales/fy_NL
index a787e78f7a..f745951576 100644
--- a/localedata/locales/fy_NL
+++ b/localedata/locales/fy_NL
@@ -13,7 +13,7 @@ escape_char  /
 LC_IDENTIFICATION
 title      "Frisian locale for the Netherlands"
 source     "Free Software Foundation, Inc."
-address    "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA"
+address    "http://www.gnu.org/software/libc/"
 contact    ""
 email      "bug-glibc-locales@gnu.org"
 tel        ""
diff --git a/localedata/locales/ga_IE@euro b/localedata/locales/ga_IE@euro
index c7a929976e..3f639acad3 100644
--- a/localedata/locales/ga_IE@euro
+++ b/localedata/locales/ga_IE@euro
@@ -13,7 +13,7 @@ comment_char  %
 LC_IDENTIFICATION
 title      "Irish locale for Ireland with Euro"
 source     "Free Software Foundation, Inc."
-address    "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA"
+address    "http://www.gnu.org/software/libc/"
 contact    ""
 email      "bug-glibc-locales@gnu.org"
 tel        ""
diff --git a/localedata/locales/gl_ES@euro b/localedata/locales/gl_ES@euro
index b5214516c9..dad7e566d1 100644
--- a/localedata/locales/gl_ES@euro
+++ b/localedata/locales/gl_ES@euro
@@ -15,7 +15,7 @@ escape_char  /
 LC_IDENTIFICATION
 title      "Galician locale for Spain with Euro"
 source     "Free Software Foundation, Inc."
-address    "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA"
+address    "http://www.gnu.org/software/libc/"
 contact    ""
 email      "bug-glibc-locales@gnu.org"
 tel        ""
diff --git a/localedata/locales/it_IT@euro b/localedata/locales/it_IT@euro
index e995eb385f..6ea87dbe4e 100644
--- a/localedata/locales/it_IT@euro
+++ b/localedata/locales/it_IT@euro
@@ -14,7 +14,7 @@ escape_char  /
 LC_IDENTIFICATION
 title      "Italian locale for Italy with Euro"
 source     "Free Software Foundation, Inc."
-address    "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA"
+address    "http://www.gnu.org/software/libc/"
 contact    ""
 email      "bug-glibc-locales@gnu.org"
 tel        ""
diff --git a/localedata/locales/nl_AW b/localedata/locales/nl_AW
index 9161977f0d..769843ba42 100644
--- a/localedata/locales/nl_AW
+++ b/localedata/locales/nl_AW
@@ -6,7 +6,7 @@ comment_char %
 LC_IDENTIFICATION
 title      "Dutch language locale for Aruba"
 source     "Free Software Foundation, Inc."
-address    "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA"
+address    "http://www.gnu.org/software/libc/"
 contact    ""
 email      "bug-glibc-locales@gnu.org"
 tel        ""
diff --git a/localedata/locales/nl_BE@euro b/localedata/locales/nl_BE@euro
index 333305cf67..a5dab45982 100644
--- a/localedata/locales/nl_BE@euro
+++ b/localedata/locales/nl_BE@euro
@@ -14,7 +14,7 @@ escape_char  /
 LC_IDENTIFICATION
 title      "Dutch locale for Belgium with Euro"
 source     "Free Software Foundation, Inc."
-address    "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA"
+address    "http://www.gnu.org/software/libc/"
 contact    ""
 email      "bug-glibc-locales@gnu.org"
 tel        ""
diff --git a/localedata/locales/nl_NL@euro b/localedata/locales/nl_NL@euro
index 98ee41c573..633593a431 100644
--- a/localedata/locales/nl_NL@euro
+++ b/localedata/locales/nl_NL@euro
@@ -14,7 +14,7 @@ escape_char  /
 LC_IDENTIFICATION
 title      "Dutch locale for the Netherlands with Euro"
 source     "Free Software Foundation, Inc."
-address    "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA"
+address    "http://www.gnu.org/software/libc/"
 contact    ""
 email      "bug-glibc-locales@gnu.org"
 tel        ""
diff --git a/localedata/locales/pt_PT@euro b/localedata/locales/pt_PT@euro
index 658976a657..12f943484e 100644
--- a/localedata/locales/pt_PT@euro
+++ b/localedata/locales/pt_PT@euro
@@ -14,7 +14,7 @@ escape_char  /
 LC_IDENTIFICATION
 title      "Portuguese locale for Portugal with Euro"
 source     "Free Software Foundation, Inc."
-address    "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA"
+address    "http://www.gnu.org/software/libc/"
 contact    ""
 email      "bug-glibc-locales@gnu.org"
 tel        ""
diff --git a/localedata/locales/sv_FI@euro b/localedata/locales/sv_FI@euro
index 095ef677ed..f636ef9f3c 100644
--- a/localedata/locales/sv_FI@euro
+++ b/localedata/locales/sv_FI@euro
@@ -14,7 +14,7 @@ escape_char  /
 LC_IDENTIFICATION
 title      "Swedish locale for Finland with Euro"
 source     "Free Software Foundation, Inc."
-address    "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA"
+address    "http://www.gnu.org/software/libc/"
 contact    ""
 email      "bug-glibc-locales@gnu.org"
 tel        ""
diff --git a/localedata/locales/tr_CY b/localedata/locales/tr_CY
index bc63829a4a..4ab3b2db6d 100644
--- a/localedata/locales/tr_CY
+++ b/localedata/locales/tr_CY
@@ -16,7 +16,7 @@ escape_char  /
 LC_IDENTIFICATION
 title      "Turkish language locale for Cyprus"
 source     "Free Software Foundation, Inc."
-address    "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA"
+address    "http://www.gnu.org/software/libc/"
 contact    ""
 email      "bug-glibc-locales@gnu.org"
 tel        ""
diff --git a/localedata/locales/wa_BE@euro b/localedata/locales/wa_BE@euro
index a88b906997..dc2a774f48 100644
--- a/localedata/locales/wa_BE@euro
+++ b/localedata/locales/wa_BE@euro
@@ -14,7 +14,7 @@ escape_char  /
 LC_IDENTIFICATION
 title      "Walloon locale for Belgium with Euro"
 source     "Free Software Foundation, Inc."
-address    "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA"
+address    "http://www.gnu.org/software/libc/"
 contact    ""
 email      "bug-glibc-locales@gnu.org"
 tel        ""
diff --git a/localedata/tests/test6.c b/localedata/tests/test6.c
index 6051496914..137bb63641 100644
--- a/localedata/tests/test6.c
+++ b/localedata/tests/test6.c
@@ -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/>.  */
 
 #include <ctype.h>
 #include <locale.h>
diff --git a/localedata/tst-ctype.c b/localedata/tst-ctype.c
index f4e01f0826..072a70cf2c 100644
--- a/localedata/tst-ctype.c
+++ b/localedata/tst-ctype.c
@@ -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/>.  */
 
 #include <ctype.h>
 #include <locale.h>
diff --git a/localedata/tst-ctype.sh b/localedata/tst-ctype.sh
index e6bf768733..61f8cae62b 100755
--- a/localedata/tst-ctype.sh
+++ b/localedata/tst-ctype.sh
@@ -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/>.
 
 common_objpfx=$1; shift
 tst_ctype=$1; shift
diff --git a/localedata/tst-digits.c b/localedata/tst-digits.c
index 8414a4b518..16cf2114e1 100644
--- a/localedata/tst-digits.c
+++ b/localedata/tst-digits.c
@@ -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/>.  */
 
 #include <ctype.h>
 #include <langinfo.h>
diff --git a/localedata/tst-fmon.c b/localedata/tst-fmon.c
index 11093ce6ce..bcdd2d03ec 100644
--- a/localedata/tst-fmon.c
+++ b/localedata/tst-fmon.c
@@ -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/>.  */
 
 #include <stdio.h>
 #include <locale.h>
diff --git a/localedata/tst-fmon.data b/localedata/tst-fmon.data
index bbcd821213..aaaaa3087a 100644
--- a/localedata/tst-fmon.data
+++ b/localedata/tst-fmon.data
@@ -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/>.
 
 # The format of this file is pretty simple: Each line contains a test
 # for strfmon.  Fields are separated by TABs.  Lines that start with a
diff --git a/localedata/tst-fmon.sh b/localedata/tst-fmon.sh
index d2bd608280..be6f128725 100755
--- a/localedata/tst-fmon.sh
+++ b/localedata/tst-fmon.sh
@@ -16,9 +16,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/>.
 
 common_objpfx=$1
 run_program_prefix=$2
diff --git a/localedata/tst-langinfo.c b/localedata/tst-langinfo.c
index e95f0da533..aca8239bf8 100644
--- a/localedata/tst-langinfo.c
+++ b/localedata/tst-langinfo.c
@@ -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/>.  */
 
 #include <langinfo.h>
 #include <locale.h>
diff --git a/localedata/tst-langinfo.sh b/localedata/tst-langinfo.sh
index b169adedb1..567361c233 100755
--- a/localedata/tst-langinfo.sh
+++ b/localedata/tst-langinfo.sh
@@ -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/>.
 
 common_objpfx=$1
 run_program_prefix=$2
diff --git a/localedata/tst-locale.sh b/localedata/tst-locale.sh
index c6c8a85fdd..96c26a750c 100755
--- a/localedata/tst-locale.sh
+++ b/localedata/tst-locale.sh
@@ -16,9 +16,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/>.
 
 common_objpfx=$1; shift
 localedef=$1; shift
diff --git a/localedata/tst-mbswcs.sh b/localedata/tst-mbswcs.sh
index cf148f433e..30667890cd 100755
--- a/localedata/tst-mbswcs.sh
+++ b/localedata/tst-mbswcs.sh
@@ -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/>.
 
 common_objpfx=$1; shift
 run_program_prefix=$1; shift
diff --git a/localedata/tst-mbswcs1.c b/localedata/tst-mbswcs1.c
index fb2ea84cdd..6681ccc9e8 100644
--- a/localedata/tst-mbswcs1.c
+++ b/localedata/tst-mbswcs1.c
@@ -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/>.  */
 
 #include <stdio.h>
 #include <string.h>
diff --git a/localedata/tst-mbswcs2.c b/localedata/tst-mbswcs2.c
index 49f13cc878..042069f82e 100644
--- a/localedata/tst-mbswcs2.c
+++ b/localedata/tst-mbswcs2.c
@@ -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/>.  */
 
 #include <stdio.h>
 #include <string.h>
diff --git a/localedata/tst-mbswcs3.c b/localedata/tst-mbswcs3.c
index 0c4af4c142..73bb59af07 100644
--- a/localedata/tst-mbswcs3.c
+++ b/localedata/tst-mbswcs3.c
@@ -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/>.  */
 
 #include <stdio.h>
 #include <string.h>
diff --git a/localedata/tst-mbswcs4.c b/localedata/tst-mbswcs4.c
index e02b67569a..8720401388 100644
--- a/localedata/tst-mbswcs4.c
+++ b/localedata/tst-mbswcs4.c
@@ -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/>.  */
 
 #include <stdio.h>
 #include <string.h>
diff --git a/localedata/tst-mbswcs5.c b/localedata/tst-mbswcs5.c
index 7cab97e722..efb6dda894 100644
--- a/localedata/tst-mbswcs5.c
+++ b/localedata/tst-mbswcs5.c
@@ -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/>.  */
 
 #include <stdio.h>
 #include <string.h>
diff --git a/localedata/tst-mbswcs6.c b/localedata/tst-mbswcs6.c
index a4ba7fe45e..a687eea2e3 100644
--- a/localedata/tst-mbswcs6.c
+++ b/localedata/tst-mbswcs6.c
@@ -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/>.  */
 
 #include <errno.h>
 #include <locale.h>
diff --git a/localedata/tst-numeric.c b/localedata/tst-numeric.c
index 9d3c91d155..a7911f1b2a 100644
--- a/localedata/tst-numeric.c
+++ b/localedata/tst-numeric.c
@@ -16,9 +16,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/>.  */
 
 #include <stdio.h>
 #include <locale.h>
diff --git a/localedata/tst-numeric.data b/localedata/tst-numeric.data
index fc914a6763..efbee2fda0 100644
--- a/localedata/tst-numeric.data
+++ b/localedata/tst-numeric.data
@@ -16,9 +16,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/>.
 
 # The format of this file is pretty simple: Each line contains a test
 # for strfmon.  Fields are separated by TABs.  Lines that start with a
diff --git a/localedata/tst-numeric.sh b/localedata/tst-numeric.sh
index f27eacd078..b78fc94830 100644
--- a/localedata/tst-numeric.sh
+++ b/localedata/tst-numeric.sh
@@ -16,9 +16,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/>.
 
 common_objpfx=$1
 run_program_prefix=$2
diff --git a/localedata/tst-rpmatch.c b/localedata/tst-rpmatch.c
index d751a43bfb..91e23650b0 100644
--- a/localedata/tst-rpmatch.c
+++ b/localedata/tst-rpmatch.c
@@ -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/>.  */
 
 #include <locale.h>
 #include <stdio.h>
diff --git a/localedata/tst-rpmatch.sh b/localedata/tst-rpmatch.sh
index 5900c94544..d8c79f7b00 100755
--- a/localedata/tst-rpmatch.sh
+++ b/localedata/tst-rpmatch.sh
@@ -16,8 +16,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 common_objpfx=$1
 tst_rpmatch=$2
diff --git a/localedata/tst-trans.c b/localedata/tst-trans.c
index 034a362166..081a9aaaf7 100644
--- a/localedata/tst-trans.c
+++ b/localedata/tst-trans.c
@@ -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/>.  */
 
 #include <locale.h>
 #include <stdio.h>
diff --git a/localedata/tst-trans.sh b/localedata/tst-trans.sh
index c86a08cda7..5155a35852 100755
--- a/localedata/tst-trans.sh
+++ b/localedata/tst-trans.sh
@@ -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/>.
 
 common_objpfx=$1
 run_program_prefix=$2
diff --git a/localedata/tst-wctype.c b/localedata/tst-wctype.c
index 8fd8ce5186..21ebd9294d 100644
--- a/localedata/tst-wctype.c
+++ b/localedata/tst-wctype.c
@@ -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/>.  */
 
 #include <error.h>
 #include <locale.h>
diff --git a/localedata/tst-wctype.sh b/localedata/tst-wctype.sh
index 77312b68c4..3c657815d4 100755
--- a/localedata/tst-wctype.sh
+++ b/localedata/tst-wctype.sh
@@ -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/>.
 
 common_objpfx=$1
 run_program_prefix=$2
diff --git a/localedata/xfrm-test.c b/localedata/xfrm-test.c
index 199bb6b5a5..1ab087440e 100644
--- a/localedata/xfrm-test.c
+++ b/localedata/xfrm-test.c
@@ -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/>.  */
 
 #include <ctype.h>
 #include <error.h>