summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2003-09-19 18:04:26 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2003-09-19 18:04:26 +0000
commit41bb0e60c6627e1147d2eab107d18ea78311da17 (patch)
treeb4b8a66963c2f05d48e54a90f2292d743fc60d58 /doc
parent397bff45f08a99a3900fcea6fa2fc66d801c9d66 (diff)
downloadrtems-41bb0e60c6627e1147d2eab107d18ea78311da17.tar.bz2
2003-09-19 Joel Sherrill <joel@OARcorp.com>
* networking.texi: Merge from branch.
Diffstat (limited to 'doc')
-rw-r--r--doc/networking/ChangeLog4
-rw-r--r--doc/networking/networking.texi1
2 files changed, 5 insertions, 0 deletions
diff --git a/doc/networking/ChangeLog b/doc/networking/ChangeLog
index 4ac95a9be7..11477a322d 100644
--- a/doc/networking/ChangeLog
+++ b/doc/networking/ChangeLog
@@ -1,3 +1,7 @@
+2003-09-19 Joel Sherrill <joel@OARcorp.com>
+
+ * networking.texi: Merge from branch.
+
2003-02-11 Jay Monkman <jtm@smoothsmoothie.com>
* networkapp.t: Add an example code snippet for adding a default route.
diff --git a/doc/networking/networking.texi b/doc/networking/networking.texi
index 528d1152c4..bedf69fe0c 100644
--- a/doc/networking/networking.texi
+++ b/doc/networking/networking.texi
@@ -21,6 +21,7 @@
@include version.texi
@include common/setup.texi
+@include common/rtems.texi
@ifset use-ascii
@dircategory RTEMS On-Line Manual