summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2003-09-19 18:04:32 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2003-09-19 18:04:32 +0000
commit97a93c96347d111f6b7eb68fa472903fc561fccb (patch)
treeca98525b9e490daee4c16147eb5ddb5296b23f4a /doc
parent41bb0e60c6627e1147d2eab107d18ea78311da17 (diff)
downloadrtems-97a93c96347d111f6b7eb68fa472903fc561fccb.tar.bz2
2003-09-19 Joel Sherrill <joel@OARcorp.com>
* itron.texi: Merge from branch.
Diffstat (limited to 'doc')
-rw-r--r--doc/itron3.0/ChangeLog4
-rw-r--r--doc/itron3.0/itron.texi2
2 files changed, 6 insertions, 0 deletions
diff --git a/doc/itron3.0/ChangeLog b/doc/itron3.0/ChangeLog
index d45a4dba85..3e172ba7dc 100644
--- a/doc/itron3.0/ChangeLog
+++ b/doc/itron3.0/ChangeLog
@@ -1,3 +1,7 @@
+2003-09-19 Joel Sherrill <joel@OARcorp.com>
+
+ * itron.texi: Merge from branch.
+
2003-01-25 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* itron.texi: Set @setfilename itron.info.
diff --git a/doc/itron3.0/itron.texi b/doc/itron3.0/itron.texi
index fc78e9696d..9bc3517538 100644
--- a/doc/itron3.0/itron.texi
+++ b/doc/itron3.0/itron.texi
@@ -27,6 +27,7 @@
@include version.texi
@include common/setup.texi
+@include common/rtems.texi
@ifset use-ascii
@dircategory RTEMS On-Line Manual
@@ -71,6 +72,7 @@
@subtitle @value{UPDATED}
@author On-Line Applications Research Corporation
@page
+@include common/cpright.texi
@end titlepage
@c This prevents a black box from being printed on "overflow" lines.