hholzgra                Thu Nov 22 17:07:16 2001 EDT

  Added files:                 
    /phpdoc     LICENSE 

  Modified files:              
    /phpdoc     genfuncindex.in genfuncindex.php 
  Log:
  be more clear about the current manual license
  
  
Index: phpdoc/genfuncindex.in
diff -u phpdoc/genfuncindex.in:1.1 phpdoc/genfuncindex.in:1.2
--- phpdoc/genfuncindex.in:1.1  Thu Nov 22 16:38:18 2001
+++ phpdoc/genfuncindex.in      Thu Nov 22 17:07:16 2001
@@ -1,32 +1,27 @@
 #!/bin/sh
 # 
 # +----------------------------------------------------------------------+
-# | PHP HTML Embedded Scripting Language Version 3.0                     |
+# | PHP Manual                                                           |
 # +----------------------------------------------------------------------+
-# | Copyright (c) 1997,1998 PHP Development Team (See Credits file)      |
+# | Copyright (c) 2001 PHP Documentation Team                            |
 # +----------------------------------------------------------------------+
 # | This program is free software; you can redistribute it and/or modify |
-# | it under the terms of one of the following licenses:                 |
-# |                                                                      |
-# |  A) 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.                                               |
-# |                                                                      |
-# |  B) the PHP License as published by the PHP Development Team and     |
-# |     included in the distribution in the file: LICENSE                |
+# | 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 or FITNESS FOR A PARTICULAR PURPOSE.  See the        |
 # | GNU General Public License for more details.                         |
 # |                                                                      |
-# | You should have received a copy of both licenses referred to here.   |
-# | If you did not, or have any questions about PHP licensing, please    |
-# | contact [EMAIL PROTECTED]                                                |
+# | You should have received a copy of the license refered to here in a  |
+# | file called LICENSE. If you did not, or have any questions about PHP |
+# | licensing, please contact [EMAIL PROTECTED]                            |
 # +----------------------------------------------------------------------+
 # | Authors:    Hartmut Holzgraefe <[EMAIL PROTECTED]>                      |
 # +----------------------------------------------------------------------+
-# 
-# $Id: genfuncindex.in,v 1.1 2001/11/22 21:38:18 hholzgra Exp $
+#  
+# $Id: genfuncindex.in,v 1.2 2001/11/22 22:07:16 hholzgra Exp $
 
 php -q -d short_tags=off genfuncindex.php quickref.txt @ENCODING@ > funcindex.xml
Index: phpdoc/genfuncindex.php
diff -u phpdoc/genfuncindex.php:1.1 phpdoc/genfuncindex.php:1.2
--- phpdoc/genfuncindex.php:1.1 Thu Nov 22 16:38:18 2001
+++ phpdoc/genfuncindex.php     Thu Nov 22 17:07:16 2001
@@ -2,33 +2,28 @@
 /*
 # 
 # +----------------------------------------------------------------------+
-# | PHP HTML Embedded Scripting Language Version 3.0                     |
+# | PHP Manual                                                           |
 # +----------------------------------------------------------------------+
-# | Copyright (c) 1997,1998 PHP Development Team (See Credits file)      |
+# | Copyright (c) 2001 PHP Documentation Team                            |
 # +----------------------------------------------------------------------+
 # | This program is free software; you can redistribute it and/or modify |
-# | it under the terms of one of the following licenses:                 |
-# |                                                                      |
-# |  A) 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.                                               |
-# |                                                                      |
-# |  B) the PHP License as published by the PHP Development Team and     |
-# |     included in the distribution in the file: LICENSE                |
+# | 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 or FITNESS FOR A PARTICULAR PURPOSE.  See the        |
 # | GNU General Public License for more details.                         |
 # |                                                                      |
-# | You should have received a copy of both licenses referred to here.   |
-# | If you did not, or have any questions about PHP licensing, please    |
-# | contact [EMAIL PROTECTED]                                                |
+# | You should have received a copy of the license refered to here in a  |
+# | file called LICENSE. If you did not, or have any questions about PHP |
+# | licensing, please contact [EMAIL PROTECTED]                            |
 # +----------------------------------------------------------------------+
 # | Authors:    Hartmut Holzgraefe <[EMAIL PROTECTED]>                      |
 # +----------------------------------------------------------------------+
 # 
-# $Id: genfuncindex.php,v 1.1 2001/11/22 21:38:18 hholzgra Exp $
+# $Id: genfuncindex.php,v 1.2 2001/11/22 22:07:16 hholzgra Exp $
 */
 echo "<?xml version=\"1.0\" encoding=\"$argv[2]\" ?>\n";
 echo "<!-- do not edit this file, it was auto genereated $argv[0] -->\n";


Reply via email to