summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2011-05-19 15:40:42 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2011-05-19 15:40:42 +0000
commitdb56ac797295c658dc26e6c04fbe80e2b878f33e (patch)
tree5b69315ff35690359fd83cf09946a5c7353734bf /doc
parent2011-05-19 Sebastian Huber <sebastian.huber@embedded-brains.de> (diff)
downloadrtems-db56ac797295c658dc26e6c04fbe80e2b878f33e.tar.bz2
2011-05-19 Gedare Bloom <giddyup44@yahoo.com>
* user/conf.t: Fix typos.
Diffstat (limited to 'doc')
-rw-r--r--doc/ChangeLog4
-rw-r--r--doc/user/conf.t4
2 files changed, 6 insertions, 2 deletions
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 5da1b7175b..606ec8ecce 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2011-05-19 Gedare Bloom <giddyup44@yahoo.com>
+
+ * user/conf.t: Fix typos.
+
2011-05-18 Joel Sherrill <joel.sherrill@oarcorp.com>
* user/conf.t: Add SMP Configuration parameters.
diff --git a/doc/user/conf.t b/doc/user/conf.t
index 0f7cfe36d7..a8d5d45722 100644
--- a/doc/user/conf.t
+++ b/doc/user/conf.t
@@ -425,7 +425,7 @@ Simple Priority Scheduler but is capable of scheduling threads across
multiple cores. It is designed to provide the same task scheduling
behaviour as the Deterministic Priority Scheduler while distributing
threads across multiple cores. Being based upon the Simple Priority
-Scheduler, it is also maintains a single sorted list of all ready threads.
+Scheduler, it also maintains a single sorted list of all ready threads.
Thus blocking or unblocking a thread is not a constant time operation
with this scheduler. In addition, when allocating threads to cores,
the algorithm is not constant time. This algorithm was not designed
@@ -899,7 +899,7 @@ It is recommended that applications be configured using
@code{rtems/confdefs.h} as it is simpler and insulates applications from
changes in the underlying data structures. However, it is sometimes
important to understand the data structures that are automatically filled
-in by the configuration parametes. This section describes the primary
+in by the configuration parameters. This section describes the primary
configuration data structures.
@subsection Configuration Table