Many files:

  Changed header to GPL version 2 only

88 files changed, 113 insertions, 176 deletions

diff --git a/strings/Makefile.am b/strings/Makefile.am
index 255bc4e1518..c53b3a728d7 100644
--- a/strings/Makefile.am
+++ b/strings/Makefile.am
@@ -2,8 +2,7 @@
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; version 2 of the License.
 # 
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/bchange.c b/strings/bchange.c
index 034dd3382e1..f17fb9bea27 100644
--- a/strings/bchange.c
+++ b/strings/bchange.c
@@ -2,8 +2,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/bcmp.c b/strings/bcmp.c
index 64a6b72c443..fd9ee5c1b96 100644
--- a/strings/bcmp.c
+++ b/strings/bcmp.c
@@ -2,8 +2,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/bcopy-duff.c b/strings/bcopy-duff.c
index 5ac6a716dab..215857715fd 100644
--- a/strings/bcopy-duff.c
+++ b/strings/bcopy-duff.c
@@ -2,8 +2,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/bfill.c b/strings/bfill.c
index 85d21483b41..2750553f48a 100644
--- a/strings/bfill.c
+++ b/strings/bfill.c
@@ -2,8 +2,8 @@
    
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
+   License as published by the Free Software Foundation; version 2
+   of the License.
    
    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/bmove.c b/strings/bmove.c
index 09fe067adcd..ae9641a5d58 100644
--- a/strings/bmove.c
+++ b/strings/bmove.c
@@ -2,8 +2,8 @@
    
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
+   License as published by the Free Software Foundation; version 2
+   of the License.
    
    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/bmove512.c b/strings/bmove512.c
index d4c748fe0ff..c3a4b7dfe4e 100644
--- a/strings/bmove512.c
+++ b/strings/bmove512.c
@@ -2,8 +2,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/bmove_upp-sparc.s b/strings/bmove_upp-sparc.s
index f38c391f8ab..e6608131058 100644
--- a/strings/bmove_upp-sparc.s
+++ b/strings/bmove_upp-sparc.s
@@ -2,8 +2,8 @@
 ! 
 ! This library is free software; you can redistribute it and/or
 ! modify it under the terms of the GNU Library General Public
-! License as published by the Free Software Foundation; either
-! version 2 of the License, or (at your option) any later version.
+! License as published by the Free Software Foundation; version 2
+! of the License.
 ! 
 ! This library is distributed in the hope that it will be useful,
 ! but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/bmove_upp.c b/strings/bmove_upp.c
index 5319cd9611a..02b59bdb703 100644
--- a/strings/bmove_upp.c
+++ b/strings/bmove_upp.c
@@ -2,8 +2,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/bzero.c b/strings/bzero.c
index a2b780cb396..b720de65eed 100644
--- a/strings/bzero.c
+++ b/strings/bzero.c
@@ -2,8 +2,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/conf_to_src.c b/strings/conf_to_src.c
index 8f7e40966b9..1ec7b360f03 100644
--- a/strings/conf_to_src.c
+++ b/strings/conf_to_src.c
@@ -2,8 +2,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/ctype-big5.c b/strings/ctype-big5.c
index 479fb789816..be04d19a756 100644
--- a/strings/ctype-big5.c
+++ b/strings/ctype-big5.c
@@ -2,8 +2,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/ctype-bin.c b/strings/ctype-bin.c
index 3e8b05580f6..fa586694fd2 100644
--- a/strings/ctype-bin.c
+++ b/strings/ctype-bin.c
@@ -2,8 +2,8 @@
    
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
+   License as published by the Free Software Foundation; version 2
+   of the License.
    
    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/ctype-cp932.c b/strings/ctype-cp932.c
index b4e9ba16d92..3c71b7fbac7 100644
--- a/strings/ctype-cp932.c
+++ b/strings/ctype-cp932.c
@@ -2,8 +2,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/ctype-czech.c b/strings/ctype-czech.c
index d9f95868d6d..d0104a50f4a 100644
--- a/strings/ctype-czech.c
+++ b/strings/ctype-czech.c
@@ -2,8 +2,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/ctype-euc_kr.c b/strings/ctype-euc_kr.c
index 40e0f4e3d2d..abaa8f1a516 100644
--- a/strings/ctype-euc_kr.c
+++ b/strings/ctype-euc_kr.c
@@ -2,8 +2,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/ctype-eucjpms.c b/strings/ctype-eucjpms.c
index 65fef2dfc4c..75000340c16 100644
--- a/strings/ctype-eucjpms.c
+++ b/strings/ctype-eucjpms.c
@@ -2,8 +2,8 @@
    
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
+   License as published by the Free Software Foundation; version 2
+   of the License.
    
    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/ctype-gb2312.c b/strings/ctype-gb2312.c
index c2fc1e2c190..811394878d6 100644
--- a/strings/ctype-gb2312.c
+++ b/strings/ctype-gb2312.c
@@ -2,8 +2,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/ctype-gbk.c b/strings/ctype-gbk.c
index c4d06d67eb9..c7160e923a9 100644
--- a/strings/ctype-gbk.c
+++ b/strings/ctype-gbk.c
@@ -2,8 +2,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/ctype-latin1.c b/strings/ctype-latin1.c
index 1298b66bb7e..906595e60bf 100644
--- a/strings/ctype-latin1.c
+++ b/strings/ctype-latin1.c
@@ -2,8 +2,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/ctype-mb.c b/strings/ctype-mb.c
index 3ef245015d7..c861c1c1525 100644
--- a/strings/ctype-mb.c
+++ b/strings/ctype-mb.c
@@ -2,8 +2,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/ctype-simple.c b/strings/ctype-simple.c
index fc9cbfc9d21..56f18132d6f 100644
--- a/strings/ctype-simple.c
+++ b/strings/ctype-simple.c
@@ -2,8 +2,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/ctype-sjis.c b/strings/ctype-sjis.c
index 3854837e09a..7f423362815 100644
--- a/strings/ctype-sjis.c
+++ b/strings/ctype-sjis.c
@@ -2,8 +2,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/ctype-tis620.c b/strings/ctype-tis620.c
index 85ebbe82731..b933f72533c 100644
--- a/strings/ctype-tis620.c
+++ b/strings/ctype-tis620.c
@@ -2,8 +2,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/ctype-uca.c b/strings/ctype-uca.c
index b18e5ee59d2..d1de758c797 100644
--- a/strings/ctype-uca.c
+++ b/strings/ctype-uca.c
@@ -2,8 +2,8 @@
    
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
+   License as published by the Free Software Foundation; version 2
+   of the License.
    
    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/ctype-ucs2.c b/strings/ctype-ucs2.c
index 3c69a314b45..baee37c103b 100644
--- a/strings/ctype-ucs2.c
+++ b/strings/ctype-ucs2.c
@@ -2,8 +2,8 @@
    
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
+   License as published by the Free Software Foundation; version 2
+   of the License.
    
    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/ctype-ujis.c b/strings/ctype-ujis.c
index 675ac918e2c..efd793eb01c 100644
--- a/strings/ctype-ujis.c
+++ b/strings/ctype-ujis.c
@@ -2,8 +2,8 @@
    
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
+   License as published by the Free Software Foundation; version 2
+   of the License.
    
    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/ctype-utf8.c b/strings/ctype-utf8.c
index a21fe4961ec..104afddb253 100644
--- a/strings/ctype-utf8.c
+++ b/strings/ctype-utf8.c
@@ -2,8 +2,8 @@
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
+   License as published by the Free Software Foundation; version 2
+   of the License.
 
    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/ctype-win1250ch.c b/strings/ctype-win1250ch.c
index 39948964a42..d5be20f7b1b 100644
--- a/strings/ctype-win1250ch.c
+++ b/strings/ctype-win1250ch.c
@@ -2,8 +2,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/ctype.c b/strings/ctype.c
index 91fa1413259..f02b5542e78 100644
--- a/strings/ctype.c
+++ b/strings/ctype.c
@@ -2,8 +2,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/decimal.c b/strings/decimal.c
index f6ac4717a32..502bf380af9 100644
--- a/strings/decimal.c
+++ b/strings/decimal.c
@@ -2,8 +2,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/do_ctype.c b/strings/do_ctype.c
index f51770e3633..b8eca68debf 100644
--- a/strings/do_ctype.c
+++ b/strings/do_ctype.c
@@ -2,8 +2,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/int2str.c b/strings/int2str.c
index be86e9735ab..9fc53032819 100644
--- a/strings/int2str.c
+++ b/strings/int2str.c
@@ -2,8 +2,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/is_prefix.c b/strings/is_prefix.c
index 37d8002703b..451cd468b7e 100644
--- a/strings/is_prefix.c
+++ b/strings/is_prefix.c
@@ -2,8 +2,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/llstr.c b/strings/llstr.c
index ac034cbe2e2..12aea63e014 100644
--- a/strings/llstr.c
+++ b/strings/llstr.c
@@ -2,8 +2,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/longlong2str-x86.s b/strings/longlong2str-x86.s
index 168dab38a85..3de43a96e78 100644
--- a/strings/longlong2str-x86.s
+++ b/strings/longlong2str-x86.s
@@ -1,8 +1,7 @@
 # Copyright (C) 2000 MySQL AB
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; version 2 of the License.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/longlong2str.c b/strings/longlong2str.c
index 096531095db..c464abcfccd 100644
--- a/strings/longlong2str.c
+++ b/strings/longlong2str.c
@@ -2,8 +2,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/longlong2str_asm.c b/strings/longlong2str_asm.c
index e38a8328b91..637815e52c5 100644
--- a/strings/longlong2str_asm.c
+++ b/strings/longlong2str_asm.c
@@ -2,8 +2,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/macros.asm b/strings/macros.asm
index 4cd5397fbaa..0697f38d777 100644
--- a/strings/macros.asm
+++ b/strings/macros.asm
@@ -2,8 +2,8 @@
 ; 
 ; This library is free software; you can redistribute it and/or
 ; modify it under the terms of the GNU Library General Public
-; License as published by the Free Software Foundation; either
-; version 2 of the License, or (at your option) any later version.
+; License as published by the Free Software Foundation; version 2
+; of the License.
 ; 
 ; This library is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/memcmp.c b/strings/memcmp.c
index 2f1e4e2ea1f..9471353f751 100644
--- a/strings/memcmp.c
+++ b/strings/memcmp.c
@@ -2,8 +2,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/memcpy.c b/strings/memcpy.c
index de79e43ae72..f32d346e3ec 100644
--- a/strings/memcpy.c
+++ b/strings/memcpy.c
@@ -2,8 +2,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/memset.c b/strings/memset.c
index 53383beb170..e07dc4ead85 100644
--- a/strings/memset.c
+++ b/strings/memset.c
@@ -2,8 +2,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/my_strtoll10-x86.s b/strings/my_strtoll10-x86.s
index 1d8b8f2bbce..4499116625b 100644
--- a/strings/my_strtoll10-x86.s
+++ b/strings/my_strtoll10-x86.s
@@ -1,8 +1,7 @@
 # Copyright (C) 2003 MySQL AB
 # This program is free software; you can resistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; version 2 of the License.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/my_strtoll10.c b/strings/my_strtoll10.c
index b9b09810c51..165d3e38095 100644
--- a/strings/my_strtoll10.c
+++ b/strings/my_strtoll10.c
@@ -2,8 +2,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/my_vsnprintf.c b/strings/my_vsnprintf.c
index e4302f50c58..22410f552d1 100644
--- a/strings/my_vsnprintf.c
+++ b/strings/my_vsnprintf.c
@@ -2,8 +2,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/ptr_cmp.asm b/strings/ptr_cmp.asm
index 6106016ee32..76f9aa71778 100644
--- a/strings/ptr_cmp.asm
+++ b/strings/ptr_cmp.asm
@@ -2,8 +2,8 @@
 ; 
 ; This library is free software; you can redistribute it and/or
 ; modify it under the terms of the GNU Library General Public
-; License as published by the Free Software Foundation; either
-; version 2 of the License, or (at your option) any later version.
+; License as published by the Free Software Foundation; version 2
+; of the License.
 ; 
 ; This library is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/r_strinstr.c b/strings/r_strinstr.c
index fdd6e010a22..98118015456 100644
--- a/strings/r_strinstr.c
+++ b/strings/r_strinstr.c
@@ -2,8 +2,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/str2int.c b/strings/str2int.c
index d328d64d899..c4a4c07eeff 100644
--- a/strings/str2int.c
+++ b/strings/str2int.c
@@ -2,8 +2,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/str_alloc.c b/strings/str_alloc.c
index 158fa7e75bb..615ad1ba1e2 100644
--- a/strings/str_alloc.c
+++ b/strings/str_alloc.c
@@ -2,8 +2,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/str_test.c b/strings/str_test.c
index 369fa7251d8..7863dce8688 100644
--- a/strings/str_test.c
+++ b/strings/str_test.c
@@ -2,8 +2,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/strappend-sparc.s b/strings/strappend-sparc.s
index 30b621c3fce..ac716ce340c 100644
--- a/strings/strappend-sparc.s
+++ b/strings/strappend-sparc.s
@@ -2,8 +2,8 @@
 ! 
 ! This library is free software; you can redistribute it and/or
 ! modify it under the terms of the GNU Library General Public
-! License as published by the Free Software Foundation; either
-! version 2 of the License, or (at your option) any later version.
+! License as published by the Free Software Foundation; version 2
+! of the License.
 ! 
 ! This library is distributed in the hope that it will be useful,
 ! but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/strappend.c b/strings/strappend.c
index 9912bd5197d..3a5da658709 100644
--- a/strings/strappend.c
+++ b/strings/strappend.c
@@ -2,8 +2,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/strcat.c b/strings/strcat.c
index 3c571514701..e69369c357f 100644
--- a/strings/strcat.c
+++ b/strings/strcat.c
@@ -2,8 +2,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/strcend.c b/strings/strcend.c
index a3f00a1057b..56e31d5f994 100644
--- a/strings/strcend.c
+++ b/strings/strcend.c
@@ -2,8 +2,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/strchr.c b/strings/strchr.c
index 3f1a569c296..5ffe386c718 100644
--- a/strings/strchr.c
+++ b/strings/strchr.c
@@ -2,8 +2,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/strcmp.c b/strings/strcmp.c
index d673c035dbc..54bbe92279b 100644
--- a/strings/strcmp.c
+++ b/strings/strcmp.c
@@ -2,8 +2,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/strcont.c b/strings/strcont.c
index 1d89be89517..d57af77804d 100644
--- a/strings/strcont.c
+++ b/strings/strcont.c
@@ -2,8 +2,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/strend-sparc.s b/strings/strend-sparc.s
index 0f19f6a435a..a5ff9a4faf6 100644
--- a/strings/strend-sparc.s
+++ b/strings/strend-sparc.s
@@ -2,8 +2,8 @@
 ! 
 ! This library is free software; you can redistribute it and/or
 ! modify it under the terms of the GNU Library General Public
-! License as published by the Free Software Foundation; either
-! version 2 of the License, or (at your option) any later version.
+! License as published by the Free Software Foundation; version 2
+! of the License.
 ! 
 ! This library is distributed in the hope that it will be useful,
 ! but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/strend.c b/strings/strend.c
index 0e9c0333fc8..4dadf0675dc 100644
--- a/strings/strend.c
+++ b/strings/strend.c
@@ -2,8 +2,8 @@
    
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
+   License as published by the Free Software Foundation; version 2
+   of the License.
    
    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/strfill.c b/strings/strfill.c
index 0ef56a67706..7d3f25e3ff4 100644
--- a/strings/strfill.c
+++ b/strings/strfill.c
@@ -2,8 +2,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/strings-not-used.h b/strings/strings-not-used.h
index e0dc1eac3a5..3efaa8ab6eb 100644
--- a/strings/strings-not-used.h
+++ b/strings/strings-not-used.h
@@ -2,8 +2,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/strings-x86.s b/strings/strings-x86.s
index 30a7517a372..db7bb0c1274 100644
--- a/strings/strings-x86.s
+++ b/strings/strings-x86.s
@@ -1,8 +1,7 @@
 # Copyright (C) 2000 MySQL AB
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; version 2 of the License.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/strings.asm b/strings/strings.asm
index fe39c8bb3e6..c6481b065fc 100644
--- a/strings/strings.asm
+++ b/strings/strings.asm
@@ -2,8 +2,8 @@
 ; 
 ; This library is free software; you can redistribute it and/or
 ; modify it under the terms of the GNU Library General Public
-; License as published by the Free Software Foundation; either
-; version 2 of the License, or (at your option) any later version.
+; License as published by the Free Software Foundation; version 2
+; of the License.
 ; 
 ; This library is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/strinstr-sparc.s b/strings/strinstr-sparc.s
index b9881743683..ca821a5671e 100644
--- a/strings/strinstr-sparc.s
+++ b/strings/strinstr-sparc.s
@@ -2,8 +2,8 @@
 ! 
 ! This library is free software; you can redistribute it and/or
 ! modify it under the terms of the GNU Library General Public
-! License as published by the Free Software Foundation; either
-! version 2 of the License, or (at your option) any later version.
+! License as published by the Free Software Foundation; version 2
+! of the License.
 ! 
 ! This library is distributed in the hope that it will be useful,
 ! but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/strinstr.c b/strings/strinstr.c
index 457581af950..10f83a54c29 100644
--- a/strings/strinstr.c
+++ b/strings/strinstr.c
@@ -2,8 +2,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/strlen.c b/strings/strlen.c
index b9be374fa6e..b3c901739b1 100644
--- a/strings/strlen.c
+++ b/strings/strlen.c
@@ -2,8 +2,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/strmake-sparc.s b/strings/strmake-sparc.s
index 4effe95774e..e4f2a3b9a97 100644
--- a/strings/strmake-sparc.s
+++ b/strings/strmake-sparc.s
@@ -2,8 +2,8 @@
 ! 
 ! This library is free software; you can redistribute it and/or
 ! modify it under the terms of the GNU Library General Public
-! License as published by the Free Software Foundation; either
-! version 2 of the License, or (at your option) any later version.
+! License as published by the Free Software Foundation; version 2
+! of the License.
 ! 
 ! This library is distributed in the hope that it will be useful,
 ! but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/strmake.c b/strings/strmake.c
index d2252f648f6..5ca4688de46 100644
--- a/strings/strmake.c
+++ b/strings/strmake.c
@@ -2,8 +2,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/strmov-sparc.s b/strings/strmov-sparc.s
index 3536685b47b..f5639cb867d 100644
--- a/strings/strmov-sparc.s
+++ b/strings/strmov-sparc.s
@@ -2,8 +2,8 @@
 ! 
 ! This library is free software; you can redistribute it and/or
 ! modify it under the terms of the GNU Library General Public
-! License as published by the Free Software Foundation; either
-! version 2 of the License, or (at your option) any later version.
+! License as published by the Free Software Foundation; version 2
+! of the License.
 ! 
 ! This library is distributed in the hope that it will be useful,
 ! but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/strmov.c b/strings/strmov.c
index 507c2b6d997..1393411dd8f 100644
--- a/strings/strmov.c
+++ b/strings/strmov.c
@@ -2,8 +2,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/strnlen.c b/strings/strnlen.c
index fc8879b3a41..11ecf718746 100644
--- a/strings/strnlen.c
+++ b/strings/strnlen.c
@@ -2,8 +2,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/strnmov-sparc.s b/strings/strnmov-sparc.s
index f681318f410..59c7e618247 100644
--- a/strings/strnmov-sparc.s
+++ b/strings/strnmov-sparc.s
@@ -2,8 +2,8 @@
 ! 
 ! This library is free software; you can redistribute it and/or
 ! modify it under the terms of the GNU Library General Public
-! License as published by the Free Software Foundation; either
-! version 2 of the License, or (at your option) any later version.
+! License as published by the Free Software Foundation; version 2
+! of the License.
 ! 
 ! This library is distributed in the hope that it will be useful,
 ! but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/strnmov.c b/strings/strnmov.c
index 362f3d6c4a8..b2099452d98 100644
--- a/strings/strnmov.c
+++ b/strings/strnmov.c
@@ -2,8 +2,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/strrchr.c b/strings/strrchr.c
index fb588c015f2..cdb0479ef90 100644
--- a/strings/strrchr.c
+++ b/strings/strrchr.c
@@ -2,8 +2,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/strstr-sparc.s b/strings/strstr-sparc.s
index eb658e9f7f0..7023cc5a16c 100644
--- a/strings/strstr-sparc.s
+++ b/strings/strstr-sparc.s
@@ -2,8 +2,8 @@
 ! 
 ! This library is free software; you can redistribute it and/or
 ! modify it under the terms of the GNU Library General Public
-! License as published by the Free Software Foundation; either
-! version 2 of the License, or (at your option) any later version.
+! License as published by the Free Software Foundation; version 2
+! of the License.
 ! 
 ! This library is distributed in the hope that it will be useful,
 ! but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/strstr.c b/strings/strstr.c
index bd65ef654b1..a5b50d12043 100644
--- a/strings/strstr.c
+++ b/strings/strstr.c
@@ -2,8 +2,8 @@
    
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
+   License as published by the Free Software Foundation; version 2
+   of the License.
    
    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/strto.c b/strings/strto.c
index 9e10b935834..934b5d88e90 100644
--- a/strings/strto.c
+++ b/strings/strto.c
@@ -2,8 +2,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/strtol.c b/strings/strtol.c
index ed4ca86c846..42476b0226a 100644
--- a/strings/strtol.c
+++ b/strings/strtol.c
@@ -2,8 +2,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/strtoll.c b/strings/strtoll.c
index 45352ffd360..cfb6fbd75ee 100644
--- a/strings/strtoll.c
+++ b/strings/strtoll.c
@@ -2,8 +2,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/strtoul.c b/strings/strtoul.c
index 32a7bc62298..3e2b51bc982 100644
--- a/strings/strtoul.c
+++ b/strings/strtoul.c
@@ -2,8 +2,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/strtoull.c b/strings/strtoull.c
index 0c2788bc188..94bf6904f8d 100644
--- a/strings/strtoull.c
+++ b/strings/strtoull.c
@@ -2,8 +2,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/strxmov-sparc.s b/strings/strxmov-sparc.s
index b4ca531d2e4..317527fe74a 100644
--- a/strings/strxmov-sparc.s
+++ b/strings/strxmov-sparc.s
@@ -2,8 +2,8 @@
 ! 
 ! This library is free software; you can redistribute it and/or
 ! modify it under the terms of the GNU Library General Public
-! License as published by the Free Software Foundation; either
-! version 2 of the License, or (at your option) any later version.
+! License as published by the Free Software Foundation; version 2
+! of the License.
 ! 
 ! This library is distributed in the hope that it will be useful,
 ! but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/strxmov.asm b/strings/strxmov.asm
index 9b027ad4276..067e900e890 100644
--- a/strings/strxmov.asm
+++ b/strings/strxmov.asm
@@ -2,8 +2,8 @@
 ; 
 ; This library is free software; you can redistribute it and/or
 ; modify it under the terms of the GNU Library General Public
-; License as published by the Free Software Foundation; either
-; version 2 of the License, or (at your option) any later version.
+; License as published by the Free Software Foundation; version 2
+; of the License.
 ; 
 ; This library is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/strxmov.c b/strings/strxmov.c
index fe1e88c13d0..9dd2c936620 100644
--- a/strings/strxmov.c
+++ b/strings/strxmov.c
@@ -2,8 +2,8 @@
    
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
+   License as published by the Free Software Foundation; version 2
+   of the License.
    
    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/strxnmov.c b/strings/strxnmov.c
index 3ef0e57650c..dfa3ab858ab 100644
--- a/strings/strxnmov.c
+++ b/strings/strxnmov.c
@@ -2,8 +2,8 @@
    
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
+   License as published by the Free Software Foundation; version 2
+   of the License.
    
    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/t_ctype.h b/strings/t_ctype.h
index 4f6f78cd188..af4f3ebbaa1 100644
--- a/strings/t_ctype.h
+++ b/strings/t_ctype.h
@@ -2,8 +2,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/udiv.c b/strings/udiv.c
index 25f3f4685f0..81ac01ee9c3 100644
--- a/strings/udiv.c
+++ b/strings/udiv.c
@@ -2,8 +2,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/strings/xml.c b/strings/xml.c
index 767cb004d34..5f8283f2ea8 100644
--- a/strings/xml.c
+++ b/strings/xml.c
@@ -2,8 +2,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of