summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/ChangeLog4
-rw-r--r--doc/user/conf.t2
2 files changed, 5 insertions, 1 deletions
diff --git a/doc/ChangeLog b/doc/ChangeLog
index c5c9930237..ff53a59f0d 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2008-09-17 Joel Sherrill <joel.sherrill@OARcorp.com>
+
+ * user/conf.t: Fix typo.
+
2008-09-17 Joel Sherrill <joel.sherrill@oarcorp.com>
* user/conf.t: Add support for optionally having a unified work area.
diff --git a/doc/user/conf.t b/doc/user/conf.t
index ad5cc20e60..81ef4ae9cc 100644
--- a/doc/user/conf.t
+++ b/doc/user/conf.t
@@ -214,7 +214,7 @@ of the RTEMS RAM Workspace.
@item @code{CONFIGURE_UNIFIED_WORK_AREAS} configures RTEMS to use a
single memory pool for the RTEMS Workspace and C Program Heap. If not
defined, there will be separate memory pools for the RTEMS Workspace and
-C Program Heap. Having separate pools does haved some advantages in the
+C Program Heap. Having separate pools does have some advantages in the
event a task blows a stack or writes outside its memory area. However,
in low memory systems the overhead of the two pools plus the potential
for unused memory in either pool is very undesirable.