summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2003-09-19 18:04:39 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2003-09-19 18:04:39 +0000
commit878867d01dfcef75bbc356a001ef3048c9fb4e63 (patch)
tree37a20b64048ef39c070bb6b16f62f0f38382b50a /doc
parent3fd575084c5371b0054f33e3b55fa3cfad2668de (diff)
downloadrtems-878867d01dfcef75bbc356a001ef3048c9fb4e63.tar.bz2
2003-09-19 Joel Sherrill <joel@OARcorp.com>
* filesystem.texi: Merge from branch.
Diffstat (limited to 'doc')
-rw-r--r--doc/filesystem/ChangeLog4
-rw-r--r--doc/filesystem/filesystem.texi1
2 files changed, 5 insertions, 0 deletions
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