Some rearranging.

diff --git a/NEWS b/NEWS
index 01a3eb8c650194cba6d12843ff814d050ca72702..b79701b932ff43b3f4d2efd679c4a348876d4b3e 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -3,8 +3,8 @@ PHP 4.0                                                                    NEWS
 
 ?? ?? ????, Version 4.0 Beta 4
 - Added socket_get_status() function. Renamed:
-  set_socket_timeout() -> socket_set_timeout()
-- set_socket_blocking() -> socket_set_blocking(). (Andrei)
+    set_socket_timeout() -> socket_set_timeout()
+    set_socket_blocking() -> socket_set_blocking(). (Andrei)
 - Added realpath() function. (Andrei)
 - mktime interprets years in the range 0-70 now as 2000-2070. You can
   continue to specify the complete year (i.e. 1920) (Sascha)

diff --git a/ext/standard/info.c b/ext/standard/info.c
index 62150924b2b9d02a366289f4823a33c4ddaa7f83..5dccf1be24e01e159305473c8b7c1fb94ea10ef9 100644 (file)
--- a/ext/standard/info.c
+++ b/ext/standard/info.c
@@ -307,6 +307,8 @@ void php_print_credits(int flag)
                PUTS("<table border=5 width=\"600\">\n");
                PUTS("<tr><th colspan=\"2\" bgcolor=\"" PHP_HEADER_COLOR "\">PHP 4.0 Authors</th></tr>\n");
                php_info_print_table_header(2, "Contribution", "Authors");
+               CREDIT_LINE("PHP Group", "Thies C. Arntzen, Stig Bakken, Andi Gutmans, Rasmus Lerdorf, \
+                                       Sascha Schumann, Zeev Suraski, Jim Winstead, Andrei Zmievski");
                CREDIT_LINE("Zend Scripting Language Engine", "Andi Gutmans, Zeev Suraski");
                CREDIT_LINE("Extension Module API", "Andi Gutmans, Zeev Suraski");
                CREDIT_LINE("UNIX Build and Modularization", "Stig Bakken, Sascha Schumann");
@@ -319,9 +321,6 @@ void php_print_credits(int flag)
                CREDIT_LINE("Servlet SAPI Module", "Sam Ruby");
                CREDIT_LINE("Roxen SAPI Module", "David Hedbor");
                CREDIT_LINE("thttpd SAPI Module", "Sascha Schumann");
-               CREDIT_LINE("Overall Work", "Thies C. Arntzen, Stig Bakken, Shane Caraveo, \
-                                       Rasmus Lerdorf, Sascha Schumann, Zeev Suraski, Andrei Zmievski, \
-                                       and others");
                PUTS("</table>\n");
        }