From 878867d01dfcef75bbc356a001ef3048c9fb4e63 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Fri, 19 Sep 2003 18:04:39 +0000
Subject: 2003-09-19	Joel Sherrill <joel@OARcorp.com>

	* filesystem.texi: Merge from branch.
---
 doc/filesystem/ChangeLog       | 4 ++++
 doc/filesystem/filesystem.texi | 1 +
 2 files changed, 5 insertions(+)

(limited to 'doc')

diff --git a/doc/filesystem/ChangeLog b/doc/filesystem/ChangeLog
index fdbd22d770..802346752a 100644
--- a/doc/filesystem/ChangeLog
+++ b/doc/filesystem/ChangeLog
@@ -1,3 +1,7 @@
+2003-09-19	Joel Sherrill <joel@OARcorp.com>
+
+	* filesystem.texi: Merge from branch.
+
 2003-01-25	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* filesystem.texi: Set @setfilename filesystem.info.
diff --git a/doc/filesystem/filesystem.texi b/doc/filesystem/filesystem.texi
index 7579a32447..6565eeb5e4 100644
--- a/doc/filesystem/filesystem.texi
+++ b/doc/filesystem/filesystem.texi
@@ -21,6 +21,7 @@
 
 @include version.texi
 @include common/setup.texi
+@include common/rtems.texi
 
 @ifset use-ascii
 @dircategory RTEMS On-Line Manual
-- 
cgit v1.2.3