Merge tag 'upstream/3.3.3'

[debian/amanda] / config / macro-archive / docbook-xslt.m4

diff --git a/config/macro-archive/docbook-xslt.m4 b/config/macro-archive/docbook-xslt.m4
index d163f982dda3e081e10e6a32b75f598ab413215c..49e228931f6a621778863aa7b29623840a18c218 100644 (file)
--- a/config/macro-archive/docbook-xslt.m4
+++ b/config/macro-archive/docbook-xslt.m4
@@ -32,11 +32,12 @@
 #
 # COPYRIGHT
 #
-#   Copyright (c) 2005-2008 Zmanda Inc.  All Rights Reserved.
+#   Copyright (c) 2007-2012 Zmanda, Inc.  All Rights Reserved.
 #  
-#   This program is free software; you can redistribute it and/or modify it
-#   under the terms of the GNU General Public License version 2 as published
-#   by the Free Software Foundation.
+#   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.
 #  
 #   This program is distributed in the hope that it will be useful, but
 #   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
@@ -53,7 +54,7 @@
 #   may extend this special exception to the GPL to apply to your
 #   modified version as well.
 #
-#   Contact information: Zmanda Inc., 465 S Mathlida Ave, Suite 300
+#   Contact information: Zmanda Inc., 465 S. Mathilda Ave., Suite 300
 #   Sunnyvale, CA 94086, USA, or: http://www.zmanda.com
 
 AC_DEFUN([AC_CHECK_DOCBOOK_XSLT],