--- a/packages/kernel/current/cdl/counters.cdl
+++ b/packages/kernel/current/cdl/counters.cdl
@@ -248,3 +248,4 @@ cdl_option CYGNUM_KERNEL_COUNTERS_RTC_PE
 	(CYGPKG_KERNEL_COUNTERS_CLOCK_OVERRIDE) and associated options."
 }
 
+# EOF counters.cdl

--- a/packages/kernel/current/cdl/kernel.cdl
+++ b/packages/kernel/current/cdl/kernel.cdl
@@ -51,7 +51,7 @@
 
 cdl_package CYGPKG_KERNEL {
     display       "eCos kernel"
-    doc           redirect/ecos-kernel-overview.html
+    doc           ref/kernel.html
     include_dir   cyg/kernel
     description   "
         This package contains the core functionality of the eCos
@@ -77,7 +77,7 @@ cdl_package CYGPKG_KERNEL {
     cdl_component CYGPKG_KERNEL_INTERRUPTS {
         display       "Kernel interrupt handling"
         flavor        none
-        doc           redirect/interrupts.html
+        doc           ref/kernel-interrupts.html
         description   "
             The majority of configuration options related to interrupt
             handling are in the HAL packages, since usually the code has
@@ -98,7 +98,7 @@ cdl_package CYGPKG_KERNEL {
         display       "Exception handling"
         requires      CYGPKG_HAL_EXCEPTIONS
         default_value 1
-        doc           redirect/exceptions.html
+        doc           ref/kernel-exceptions.html
         description   "
             In the context of the eCos kernel exceptions are unexpected
             events detected by the hardware, for example an attempt to
@@ -141,7 +141,7 @@ cdl_package CYGPKG_KERNEL {
     cdl_component CYGPKG_KERNEL_SCHED {
         display       "Kernel schedulers"
         flavor        none
-        doc           redirect/the-scheduler.html
+        doc           ref/kernel-overview.html#KERNEL-OVERVIEW-SCHEDULERS
         description   "
             The eCos kernel provides a choice of schedulers. In addition
             there are a number of configuration options to control the
@@ -164,7 +164,7 @@ cdl_package CYGPKG_KERNEL {
     cdl_component CYGPKG_KERNEL_COUNTERS {
         display       "Counters and clocks"
         flavor        none
-        doc           redirect/counters-clocks-and-alarms.html
+        doc           ref/kernel-counters.html
         description   "
             The counter objects provided by the kernel provide an
             abstraction of the clock facility that is generally provided.
@@ -180,7 +180,6 @@ cdl_package CYGPKG_KERNEL {
     cdl_component CYGPKG_KERNEL_THREADS {
         display       "Thread-related options"
         flavor        none
-        doc           redirect/thread-operations.html
         description   "
             There are a number of configuration options related to the
             implementation of threads, for example whether or not the
@@ -193,7 +192,6 @@ cdl_package CYGPKG_KERNEL {
     cdl_component CYGPKG_KERNEL_SYNCH {
         display       "Synchronization primitives"
         flavor        none
-        doc           redirect/thread-synchronization.html
         description   "
             The eCos kernel supports a number of different
             synchronization primitives such as mutexes, semaphores,
@@ -249,7 +247,6 @@ cdl_package CYGPKG_KERNEL {
     cdl_component CYGPKG_KERNEL_API {
         display       "Kernel APIs"
         flavor        none
-        doc           redirect/kernel-apis.html
         description   "
             The eCos kernel is implemented in C++, so a C++ interface
             to the kernel is always available. There is also an optional
@@ -336,3 +333,5 @@ cdl_package CYGPKG_KERNEL {
         }
     }
 }
+
+# EOF kernel.cdl

--- a/packages/kernel/current/cdl/scheduler.cdl
+++ b/packages/kernel/current/cdl/scheduler.cdl
@@ -253,3 +253,4 @@ cdl_component CYGSEM_KERNEL_SCHED_ASR_SU
     }
 }
 
+# EOF scheduler.cdl

--- a/packages/kernel/current/cdl/synch.cdl
+++ b/packages/kernel/current/cdl/synch.cdl
@@ -53,6 +53,7 @@
 cdl_component CYGSEM_KERNEL_SYNCH_MUTEX_PRIORITY_INVERSION_PROTOCOL {
     display      "Priority inversion protection protocols"
     flavor       booldata
+    doc          ref/kernel-mutexes.html
     legal_values { "SIMPLE" }
     default_value { "SIMPLE" }
     active_if    { CYGSEM_KERNEL_SCHED_MLQUEUE }
@@ -142,6 +143,7 @@ cdl_component CYGSEM_KERNEL_SYNCH_MUTEX_
 
 cdl_option CYGMFN_KERNEL_SYNCH_MBOXT_PUT_CAN_WAIT {
     display       "Message box blocking put support"
+    doc           ref/kernel-mail-boxes.html
     default_value 1
     description   "
         Message boxes can support three different versions of the
@@ -161,6 +163,7 @@ cdl_option CYGMFN_KERNEL_SYNCH_MBOXT_PUT
 
 cdl_option CYGNUM_KERNEL_SYNCH_MBOX_QUEUE_SIZE {
     display       "Message box queue size"
+    doc           ref/kernel-mail-boxes.html
     flavor        data
     legal_values  1 to 65535
     default_value 10
@@ -174,6 +177,7 @@ cdl_option CYGNUM_KERNEL_SYNCH_MBOX_QUEU
 
 cdl_option CYGMFN_KERNEL_SYNCH_CONDVAR_TIMED_WAIT {
     display       "Condition variable timed-wait support"
+    doc           ref/kernel-condition-variables.html
     requires      CYGFUN_KERNEL_THREADS_TIMER
     default_value 1
     description   "
@@ -183,6 +187,7 @@ cdl_option CYGMFN_KERNEL_SYNCH_CONDVAR_T
 
 cdl_option CYGMFN_KERNEL_SYNCH_CONDVAR_WAIT_MUTEX {
     display       "Condition variable explicit mutex wait support"
+    doc           ref/kernel-condition-variables.html
     default_value 1
     description   "
         This option enables the condition variable explicit mutex wait
@@ -204,3 +209,5 @@ cdl_option CYGIMP_KERNEL_SYNCH_MQUEUE_NO
         non-inline versions to be used instead."
     compile       sync/mqueue.cxx
 }
+
+# EOF synch.cdl

--- a/packages/kernel/current/cdl/thread.cdl
+++ b/packages/kernel/current/cdl/thread.cdl
@@ -154,6 +154,7 @@ cdl_component CYGFUN_KERNEL_THREADS_STAC
 cdl_component CYGVAR_KERNEL_THREADS_DATA {
     display            "Support for per-thread data"
     requires           CYGFUN_KERNEL_THREADS_STACK_LIMIT
+    doc                ref/kernel-thread-data.html
     default_value      1
     description "
         It is possible for the kernel to support per-thread data, in
@@ -233,6 +234,7 @@ cdl_component CYGVAR_KERNEL_THREADS_DATA
 
 cdl_component CYGPKG_KERNEL_THREADS_DESTRUCTORS {
     display       "Thread destructors"
+    doc           ref/kernel-thread-destructors.html
     default_value 0
     description   "
         This option enables support for registered destructor functions to
@@ -291,7 +293,7 @@ cdl_option CYGNUM_KERNEL_MAX_SUSPEND_COU
     description   "
         This option provides for an assertion that the count value for
         counted thread suspends do not exceed set limits.  This is to help
-        with debugging, to allow a runaaway loop, for example, to be
+        with debugging, to allow a runaway loop, for example, to be
         detected more easily.
     
         If the option is not defined, no assert is included.  Whether asserts
@@ -327,3 +329,4 @@ cdl_option CYGIMP_IDLE_THREAD_YIELD {
         level, then the idle thread must yield each time around its loop."
 }
 
+# EOF thread.cdl