2011-09-19 Joel Sherrill <joel.sherrill@oarcorp.com>

	* user/Makefile.am, user/c_user.texi: Reorder chapters to put
	scheduling earlier. Also put Barrier and Rate Monotonic Manager where
	they logically belong. They appear to have just be added toward the
	end.

3 files changed, 34 insertions, 28 deletions

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 2d47bb2c3f..59948ed2f3 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,10 @@
+2011-09-19	Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	* user/Makefile.am, user/c_user.texi: Reorder chapters to put
+	scheduling earlier. Also put Barrier and Rate Monotonic Manager where
+	they logically belong. They appear to have just be added toward the
+	end.
+
 2011-07-29	Joel Sherrill <joel.sherrilL@OARcorp.com>
 
 	PR 1864/doc
diff --git a/doc/user/Makefile.am b/doc/user/Makefile.am
index 47c29b003b..847767dbab 100644
--- a/doc/user/Makefile.am
+++ b/doc/user/Makefile.am
@@ -1,5 +1,5 @@
 #
-#  COPYRIGHT (c) 1988-2007
+#  COPYRIGHT (c) 1988-2011
 #  On-Line Applications Research Corporation (OAR).
 #  All rights reserved.
 #
@@ -54,10 +54,15 @@ concepts.texi: concepts.t
 datatypes.texi: datatypes.t
 	$(BMENU2) -p "Key Concepts Memory Management" \
 	    -u "Top" \
+	    -n "Scheduling Concepts" < $< > $@
+
+schedule.texi: schedule.t
+	$(BMENU2) -p "RTEMS Data Types List of Data Types" \
+	    -u "Top" \
 	    -n "Initialization Manager" < $< > $@
 
 init.texi: init.t
-	$(BMENU2) -p "RTEMS Data Types List of Data Types" \
+	$(BMENU2) -p "Scheduling Concepts Task State Transitions" \
 	    -u "Top" \
 	    -n "Task Manager" < $< > $@
 
@@ -80,15 +85,25 @@ clock.texi: clock.t
 timer.texi: timer.t
 	$(BMENU2) -p "Clock Manager CLOCK_TICK - Announce a clock tick" \
 	    -u "Top" \
+	    -n "Rate Monotonic Manager" < $< > $@
+
+rtmon.texi: rtmon.t
+	$(BMENU2) -p "Timer Manager TIMER_RESET - Reset an interval timer" \
+	    -u "Top" \
 	    -n "Semaphore Manager" < $< > $@
 
 sem.texi: sem.t
-	$(BMENU2) -p "Timer Manager TIMER_RESET - Reset an interval timer" \
+	$(BMENU2) -p "Rate Monotonic Manager RATE_MONOTONIC_REPORT_STATISTICS - Print period statistics report" \
+	    -u "Top" \
+	    -n "Barrier Manager" < $< > $@
+
+barrier.texi: barrier.t
+	$(BMENU2) -p "Semaphore Manager SEMAPHORE_FLUSH - Unblock all tasks waiting on a semaphore" \
 	    -u "Top" \
 	    -n "Message Manager" < $< > $@
 
 msg.texi: msg.t
-	$(BMENU2) -p "Semaphore Manager SEMAPHORE_FLUSH - Unblock all tasks waiting on a semaphore" \
+	$(BMENU2) -p "Barrier Manager BARRIER_RELEASE - Release a barrier" \
 	    -u "Top" \
 	    -n "Event Manager" < $< > $@
 
@@ -128,26 +143,10 @@ io.texi: io.t
 fatal.texi: fatal.t
 	$(BMENU2) -p "I/O Manager IO_CONTROL - Special device services" \
 	    -u "Top" \
-	    -n "Scheduling Concepts" < $< > $@
-
-schedule.texi: schedule.t
-	$(BMENU2) \
--p "Fatal Error Manager FATAL_ERROR_OCCURRED - Invoke the fatal error handler" \
-	    -u "Top" \
-	    -n "Rate Monotonic Manager" < $< > $@
-
-rtmon.texi: rtmon.t
-	$(BMENU2) -p "Scheduling Concepts Task State Transitions" \
-	    -u "Top" \
-	    -n "Barrier Manager" < $< > $@
-
-barrier.texi: barrier.t
-	$(BMENU2) -p "Rate Monotonic Manager RATE_MONOTONIC_REPORT_STATISTICS - Print period statistics report" \
-	    -u "Top" \
 	    -n "Board Support Packages" < $< > $@
 
 bsp.texi: bsp.t
-	$(BMENU2) -p "Barrier Manager BARRIER_RELEASE - Release a barrier" \
+	$(BMENU2) -p "Fatal Error Manager FATAL_ERROR_OCCURRED - Invoke the fatal error handler" \
 	    -u "Top" \
 	    -n "User Extensions Manager" < $< > $@
 
diff --git a/doc/user/c_user.texi b/doc/user/c_user.texi
index eaaa419567..87d5ea6017 100644
--- a/doc/user/c_user.texi
+++ b/doc/user/c_user.texi
@@ -7,7 +7,7 @@
 @c %**end of header
 
 @c
-@c  COPYRIGHT (c) 1988-2008.
+@c  COPYRIGHT (c) 1988-2011.
 @c  On-Line Applications Research Corporation (OAR).
 @c  All rights reserved.
 @c
@@ -86,12 +86,15 @@
 @include overview.texi
 @include concepts.texi
 @include datatypes.texi
+@include schedule.texi
 @include init.texi
 @include task.texi
 @include intr.texi
 @include clock.texi
 @include timer.texi
+@include rtmon.texi
 @include sem.texi
+@include barrier.texi
 @include msg.texi
 @include event.texi
 @include signal.texi
@@ -100,9 +103,6 @@
 @include dpmem.texi
 @include io.texi
 @include fatal.texi
-@include schedule.texi
-@include rtmon.texi
-@include barrier.texi
 @include bsp.texi
 @include userext.texi
 @include conf.texi
@@ -126,12 +126,15 @@ This is the online version of the RTEMS C User's Guide.
 * Overview::
 * Key Concepts::
 * RTEMS Data Types::
+* Scheduling Concepts::
 * Initialization Manager::
 * Task Manager::
 * Interrupt Manager::
 * Clock Manager::
 * Timer Manager::
+* Rate Monotonic Manager::
 * Semaphore Manager::
+* Barrier Manager::
 * Message Manager::
 * Event Manager::
 * Signal Manager::
@@ -140,9 +143,6 @@ This is the online version of the RTEMS C User's Guide.
 * Dual-Ported Memory Manager::
 * I/O Manager::
 * Fatal Error Manager::
-* Scheduling Concepts::
-* Rate Monotonic Manager::
-* Barrier Manager::
 * Board Support Packages::
 * User Extensions Manager::
 * Configuring a System::