2001-01-02 Joel Sherrill <joel@OARcorp.com>

	* CHANGELOG: Removed.
	* README: Merged CHANGELOG contents as initial changes.

5 files changed, 118 insertions, 54 deletions

diff --git a/c/src/exec/libnetworking/ChangeLog b/c/src/exec/libnetworking/ChangeLog
index 0ec04c0ab8..85f24f3503 100644
--- a/c/src/exec/libnetworking/ChangeLog
+++ b/c/src/exec/libnetworking/ChangeLog
@@ -1,3 +1,8 @@
+2001-01-02	Joel Sherrill <joel@OARcorp.com>
+
+	* CHANGELOG: Removed.
+	* README: Merged CHANGELOG contents as initial changes.
+
 2000-12-14	Eric Norum <eric.norum@usask.ca>
 
 	* lib/tftpDriver.c: Added write capability.
diff --git a/c/src/exec/libnetworking/README b/c/src/exec/libnetworking/README
index d0c22ec688..ed76f94183 100644
--- a/c/src/exec/libnetworking/README
+++ b/c/src/exec/libnetworking/README
@@ -16,3 +16,57 @@ Things that need to be done:
 	4) Have a look at all the FIXME comments.
 	5) Go through and make sure that all the source files are
 	   free of undesired copyright restrictions.
+
+Initial Changes
+===============
+
+19-AUG-1998 snapshot
+	- Pulled BOOTP initialization out of rtems_glue.  Applications which
+	  don't used BOOTP are now about 5k smaller.
+	- Loopback interface is not installed by default, rather it is
+	  attached like any other interface.  Saves about 0.5 kbytes.
+	- Add rtems_bsdnet_show_if_stats();
+	- Moved test programs from below freebsd directory.
+
+18-AUG-1998 snapshot
+	- Removed some include files that were already part of RTEMS.
+	- Cleaned up machine/types.h to prepare for inclusion in RTEMS source.
+	- Added syslog library routines -- much simpler than KA9Q version.
+	  Sockets can be shared among tasks (as long as the send is
+	  protected by a mutex) so there's no need for a Syslog Daemon.
+
+16-AUG-1998 snapshot
+	- Table-driven configuration (networkconfig.h).
+	- Cleaned up rtems_bsdnet.h.
+	- BOOTP now retries properly -- Note to Joel:
+		The dichotomy between RTEMS and UNIX error codes is
+		a real pain!
+
+14-AUG-1998 snapshot
+	- Added dummy getprotobyname() and getprotobynum() functions.
+	- Added socket ioctl.
+	- Added application-level entry to manipulate routing tables.
+	- Added non-BOOTP network initialization.
+
+13-AUG-1998 snapshot
+	- Changed some BOOTP addresses from sockaddr_in to inaddr;
+	- Get DNS information from BOOTP reply.
+	- Got DNS lookups working.
+	  Bloatware comes to RTEMS -- invoking gethostbyname() drags in
+	  and extra 40 kbytes of code!
+	- Added hostname lookup program.
+
+12-AUG-1998 snapshot
+	- Added startup delay to network initialization.
+	- More statistic-printing routines.
+	- Added TFTP driver and test program
+	- Modified TFTP test program to use networkconfig.h.
+	- Removed unused include files.
+	- Added from ftp://ftp.ca.FreeBSD.ORG/pub/FreeBSD/FreeBSD-current/src/lib/libc/net.
+
+11-AUG-1998 snapshot.
+	- Added getpeername()
+	- Added M68k versions of IP checksum code
+	- Added TCP timing program to snapshot.
+
+02-AUG-1998 snapshot.
diff --git a/c/src/libnetworking/CHANGELOG b/c/src/libnetworking/CHANGELOG
deleted file mode 100644
index dd504eb885..0000000000
--- a/c/src/libnetworking/CHANGELOG
+++ /dev/null
@@ -1,54 +0,0 @@
-#
-#  $Id$
-#
-
-19-AUG-1998 snapshot
-	- Pulled BOOTP initialization out of rtems_glue.  Applications which
-	  don't used BOOTP are now about 5k smaller.
-	- Loopback interface is not installed by default, rather it is
-	  attached like any other interface.  Saves about 0.5 kbytes.
-	- Add rtems_bsdnet_show_if_stats();
-	- Moved test programs from below freebsd directory.
-
-18-AUG-1998 snapshot
-	- Removed some include files that were already part of RTEMS.
-	- Cleaned up machine/types.h to prepare for inclusion in RTEMS source.
-	- Added syslog library routines -- much simpler than KA9Q version.
-	  Sockets can be shared among tasks (as long as the send is
-	  protected by a mutex) so there's no need for a Syslog Daemon.
-
-16-AUG-1998 snapshot
-	- Table-driven configuration (networkconfig.h).
-	- Cleaned up rtems_bsdnet.h.
-	- BOOTP now retries properly -- Note to Joel:
-		The dichotomy between RTEMS and UNIX error codes is
-		a real pain!
-
-14-AUG-1998 snapshot
-	- Added dummy getprotobyname() and getprotobynum() functions.
-	- Added socket ioctl.
-	- Added application-level entry to manipulate routing tables.
-	- Added non-BOOTP network initialization.
-
-13-AUG-1998 snapshot
-	- Changed some BOOTP addresses from sockaddr_in to inaddr;
-	- Get DNS information from BOOTP reply.
-	- Got DNS lookups working.
-	  Bloatware comes to RTEMS -- invoking gethostbyname() drags in
-	  and extra 40 kbytes of code!
-	- Added hostname lookup program.
-
-12-AUG-1998 snapshot
-	- Added startup delay to network initialization.
-	- More statistic-printing routines.
-	- Added TFTP driver and test program
-	- Modified TFTP test program to use networkconfig.h.
-	- Removed unused include files.
-	- Added from ftp://ftp.ca.FreeBSD.ORG/pub/FreeBSD/FreeBSD-current/src/lib/libc/net.
-
-11-AUG-1998 snapshot.
-	- Added getpeername()
-	- Added M68k versions of IP checksum code
-	- Added TCP timing program to snapshot.
-
-02-AUG-1998 snapshot.
diff --git a/c/src/libnetworking/ChangeLog b/c/src/libnetworking/ChangeLog
index 0ec04c0ab8..85f24f3503 100644
--- a/c/src/libnetworking/ChangeLog
+++ b/c/src/libnetworking/ChangeLog
@@ -1,3 +1,8 @@
+2001-01-02	Joel Sherrill <joel@OARcorp.com>
+
+	* CHANGELOG: Removed.
+	* README: Merged CHANGELOG contents as initial changes.
+
 2000-12-14	Eric Norum <eric.norum@usask.ca>
 
 	* lib/tftpDriver.c: Added write capability.
diff --git a/c/src/libnetworking/README b/c/src/libnetworking/README
index d0c22ec688..ed76f94183 100644
--- a/c/src/libnetworking/README
+++ b/c/src/libnetworking/README
@@ -16,3 +16,57 @@ Things that need to be done:
 	4) Have a look at all the FIXME comments.
 	5) Go through and make sure that all the source files are
 	   free of undesired copyright restrictions.
+
+Initial Changes
+===============
+
+19-AUG-1998 snapshot
+	- Pulled BOOTP initialization out of rtems_glue.  Applications which
+	  don't used BOOTP are now about 5k smaller.
+	- Loopback interface is not installed by default, rather it is
+	  attached like any other interface.  Saves about 0.5 kbytes.
+	- Add rtems_bsdnet_show_if_stats();
+	- Moved test programs from below freebsd directory.
+
+18-AUG-1998 snapshot
+	- Removed some include files that were already part of RTEMS.
+	- Cleaned up machine/types.h to prepare for inclusion in RTEMS source.
+	- Added syslog library routines -- much simpler than KA9Q version.
+	  Sockets can be shared among tasks (as long as the send is
+	  protected by a mutex) so there's no need for a Syslog Daemon.
+
+16-AUG-1998 snapshot
+	- Table-driven configuration (networkconfig.h).
+	- Cleaned up rtems_bsdnet.h.
+	- BOOTP now retries properly -- Note to Joel:
+		The dichotomy between RTEMS and UNIX error codes is
+		a real pain!
+
+14-AUG-1998 snapshot
+	- Added dummy getprotobyname() and getprotobynum() functions.
+	- Added socket ioctl.
+	- Added application-level entry to manipulate routing tables.
+	- Added non-BOOTP network initialization.
+
+13-AUG-1998 snapshot
+	- Changed some BOOTP addresses from sockaddr_in to inaddr;
+	- Get DNS information from BOOTP reply.
+	- Got DNS lookups working.
+	  Bloatware comes to RTEMS -- invoking gethostbyname() drags in
+	  and extra 40 kbytes of code!
+	- Added hostname lookup program.
+
+12-AUG-1998 snapshot
+	- Added startup delay to network initialization.
+	- More statistic-printing routines.
+	- Added TFTP driver and test program
+	- Modified TFTP test program to use networkconfig.h.
+	- Removed unused include files.
+	- Added from ftp://ftp.ca.FreeBSD.ORG/pub/FreeBSD/FreeBSD-current/src/lib/libc/net.
+
+11-AUG-1998 snapshot.
+	- Added getpeername()
+	- Added M68k versions of IP checksum code
+	- Added TCP timing program to snapshot.
+
+02-AUG-1998 snapshot.