4 files changed, 15 insertions, 10 deletions
diff --git a/doc/posix1003.1/ChangeLog b/doc/posix1003.1/ChangeLog
index 82b068e675..0580e9237b 100644
--- a/doc/posix1003.1/ChangeLog
+++ b/doc/posix1003.1/ChangeLog
@@ -1,3 +1,7 @@
+2003-09-19	Joel Sherrill <joel@OARcorp.com>
+
+	* ch07.t, posix1003_1.texi, preface.texi: Merge from branch.
+
 2003-01-25	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* posix1003_1.texi: Set @setfilename posix1003_1.info.
diff --git a/doc/posix1003.1/ch07.t b/doc/posix1003.1/ch07.t
index 3f45d7c4fc..96fa0077e7 100644
--- a/doc/posix1003.1/ch07.t
+++ b/doc/posix1003.1/ch07.t
@@ -26,17 +26,17 @@
 
 @subsubsection Noncanonical Mode Input Processing
 
-@lowersections
+@itemize
 
-@subsubsection Case A - MIN > 0 and TIME > 0
+@item Case A - MIN > 0 and TIME > 0
 
-@subsubsection Case B - MIN > 0 and TIME = 0
+@item Case B - MIN > 0 and TIME = 0
 
-@subsubsection Case C - MIN = 0 and TIME > 0
+@item Case C - MIN = 0 and TIME > 0
 
-@subsubsection Case D - MIN = 0 and TIME = 0
+@item Case D - MIN = 0 and TIME = 0
 
-@raisesections
+@end itemize
 
 @subsubsection Writing Data and Output Processing
 
diff --git a/doc/posix1003.1/posix1003_1.texi b/doc/posix1003.1/posix1003_1.texi
index 078637ab6a..7fd1345c84 100644
--- a/doc/posix1003.1/posix1003_1.texi
+++ b/doc/posix1003.1/posix1003_1.texi
@@ -21,6 +21,7 @@
 
 @include version.texi
 @include common/setup.texi
+@include common/rtems.texi
 
 @ifset use-ascii
 @dircategory RTEMS On-Line Manual
@@ -76,7 +77,7 @@
 @include ch18.texi
 @include ch19.texi
 
-@ifinfo
+@ifnottex
 @node Top, Preface, (dir), (dir)
 @top posix1003_1
 
@@ -107,7 +108,7 @@ This is the online version of the RTEMS POSIX 1003.1 Compliance Guide.
 * Concept Index::
 @end menu
 
-@end ifinfo
+@end ifnottex
 @c 
 @c 
 @c Need to copy the emacs stuff and "trailer stuff" (index, toc) into here
diff --git a/doc/posix1003.1/preface.texi b/doc/posix1003.1/preface.texi
index 4021260b43..33272e47f7 100644
--- a/doc/posix1003.1/preface.texi
+++ b/doc/posix1003.1/preface.texi
@@ -6,9 +6,9 @@
 @c  $Id$
 @c
 
-@ifinfo
+@ifnottex
 @node Preface, General, Top, Top
-@end ifinfo
+@end ifnottex
 
 @unnumbered Preface