summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2003-09-19 18:03:56 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2003-09-19 18:03:56 +0000
commitd8d93624938ee8e40e4c39c64df49cab1ee81e2c (patch)
treec1d40340fab3a6d013b194dfcc9304bcd5f5bf0a
parent2003-09-19 Joel Sherrill <joel@OARcorp.com> (diff)
downloadrtems-d8d93624938ee8e40e4c39c64df49cab1ee81e2c.tar.bz2
2003-09-19 Joel Sherrill <joel@OARcorp.com>
* posix_users.texi: Merge from branch.
-rw-r--r--doc/posix_users/ChangeLog4
-rw-r--r--doc/posix_users/posix_users.texi1
2 files changed, 5 insertions, 0 deletions
diff --git a/doc/posix_users/ChangeLog b/doc/posix_users/ChangeLog
index d1716a60af..9cace236f2 100644
--- a/doc/posix_users/ChangeLog
+++ b/doc/posix_users/ChangeLog
@@ -1,3 +1,7 @@
+2003-09-19 Joel Sherrill <joel@OARcorp.com>
+
+ * posix_users.texi: Merge from branch.
+
2003-09-04 Joel Sherrill <joel@OARcorp.com>
PR 466/doc
diff --git a/doc/posix_users/posix_users.texi b/doc/posix_users/posix_users.texi
index dddac0361b..b9f439be0b 100644
--- a/doc/posix_users/posix_users.texi
+++ b/doc/posix_users/posix_users.texi
@@ -27,6 +27,7 @@
@include version.texi
@include common/setup.texi
+@include common/rtems.texi
@ifset use-ascii
@dircategory RTEMS On-Line Manual