Merge mysql.com:/home/kent/bk/main/mysql-5.0

into  mysql.com:/home/kent/bk/main/mysql-5.1

2 files changed, 16 insertions, 1 deletions

diff --git a/Docs/Makefile.am b/Docs/Makefile.am
index 87a3ea81270..05757618a8b 100644
--- a/Docs/Makefile.am
+++ b/Docs/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+# Copyright (C) 2000-2006 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
diff --git a/Docs/generate-text-files.pl b/Docs/generate-text-files.pl
index 0829525f679..69e0478eb8a 100755
--- a/Docs/generate-text-files.pl
+++ b/Docs/generate-text-files.pl
@@ -1,4 +1,19 @@
 #!/usr/bin/perl -w -*- perl -*-
+# Copyright (C) 2000, 2003, 2005 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; 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
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# 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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 # Generate text files from top directory from the manual.
 
 $from = shift(@ARGV);