Index: c-user/configuring_a_system.rst
===================================================================
--- c-user/configuring_a_system.rst	(revision ba781f98dea48df86707680886850826254f154a)
+++ c-user/configuring_a_system.rst	(revision a0d2eeea9da0671faecb31c7f1e426f76e8bc506)
@@ -671,10 +671,9 @@
 DESCRIPTION:
     ``CONFIGURE_MAXIMUM_MRSP_SEMAPHORES`` is the maximum number of Classic API
-    Semaphores using the Multiprocessor Resource Sharing Protocol (MrsP) that
-    can be concurrently active.
-
-NOTES:
-    This configuration option is only used on SMP configurations.  On
-    uni-processor configurations the Priority Ceiling Protocol is used for MrsP
+    Semaphores using the :ref:`MrsP` that can be concurrently active.
+
+NOTES:
+    This configuration option is only used in SMP configurations.  In
+    uni-processor configurations, the :ref:`PriorityCeiling` is used for MrsP
     semaphores and thus no extra memory is necessary.
 
Index: c-user/fatal_error.rst
===================================================================
--- c-user/fatal_error.rst	(revision ba781f98dea48df86707680886850826254f154a)
+++ c-user/fatal_error.rst	(revision a0d2eeea9da0671faecb31c7f1e426f76e8bc506)
@@ -249,5 +249,5 @@
 
 INTERNAL_ERROR_THREAD_QUEUE_ENQUEUE_STICKY_FROM_BAD_STATE (29)
-    This fatal error can only happen on SMP configurations.  It is not allowed
+    This fatal error can only happen in SMP configurations.  It is not allowed
     to obtain MrsP semaphores in a context with thread dispatching disabled,
     for example interrupt context.
@@ -332,5 +332,5 @@
 
 INTERNAL_ERROR_BAD_THREAD_DISPATCH_ENVIRONMENT (31)
-    On SMP configurations, it is a fatal error to call blocking operating
+    In SMP configurations, it is a fatal error to call blocking operating
     system with interrupts disabled, since this prevents delivery of
     inter-processor interrupts.  This could lead to executing threads which are
@@ -410,5 +410,5 @@
 
 For the initial extensions the read-write data (including .bss segment) is not
-required on single processor configurations.  On SMP configurations, however,
+required on single processor configurations.  In SMP configurations, however,
 the read-write data must be initialized since this function must determine the
 state of the other processors and request them to shut-down if necessary.
Index: c-user/glossary.rst
===================================================================
--- c-user/glossary.rst	(revision ba781f98dea48df86707680886850826254f154a)
+++ c-user/glossary.rst	(revision a0d2eeea9da0671faecb31c7f1e426f76e8bc506)
@@ -172,5 +172,5 @@
 :dfn:`executing task`
     The task state entered by a task after it has been given control of the
-    processor.  On SMP configurations a task may be registered as executing on
+    processor.  In SMP configurations, a task may be registered as executing on
     more than one processor for short time frames during task migration.
     Blocked tasks can be executing until they issue a thread dispatch.
Index: c-user/interrupt_manager.rst
===================================================================
--- c-user/interrupt_manager.rst	(revision ba781f98dea48df86707680886850826254f154a)
+++ c-user/interrupt_manager.rst	(revision a0d2eeea9da0671faecb31c7f1e426f76e8bc506)
@@ -447,5 +447,5 @@
     This directive will not cause the calling task to be preempted.
 
-    On SMP configurations this will not ensure system wide mutual exclusion.
+    In SMP configurations, this will not ensure system wide mutual exclusion.
     Use interrupt locks instead.
 
@@ -529,6 +529,6 @@
 
 DESCRIPTION:
-    Interrupts will be disabled.  On SMP configurations this directive acquires
-    a SMP lock.
+    Interrupts will be disabled.  In SMP configurations, this directive
+    acquires an SMP lock.
 
 NOTES:
@@ -558,6 +558,6 @@
 
 DESCRIPTION:
-    The interrupt status will be restored.  On SMP configurations this
-    directive releases a SMP lock.
+    The interrupt status will be restored.  In SMP configurations, this
+    directive releases an SMP lock.
 
 NOTES:
@@ -587,6 +587,6 @@
 
 DESCRIPTION:
-    The interrupt status will remain unchanged.  On SMP configurations this
-    directive acquires a SMP lock.
+    The interrupt status will remain unchanged.  In SMP configurations, this
+    directive acquires an SMP lock.
 
     In case the corresponding interrupt service routine can be interrupted by
@@ -621,6 +621,6 @@
 DESCRIPTION:
 
-    The interrupt status will remain unchanged.  On SMP configurations this
-    directive releases a SMP lock.
+    The interrupt status will remain unchanged.  In SMP configurations, this
+    directive releases an SMP lock.
 
 NOTES:
Index: c-user/semaphore_manager.rst
===================================================================
--- c-user/semaphore_manager.rst	(revision ba781f98dea48df86707680886850826254f154a)
+++ c-user/semaphore_manager.rst	(revision a0d2eeea9da0671faecb31c7f1e426f76e8bc506)
@@ -429,5 +429,5 @@
 
     It is not allowed to create an initially locked MrsP semaphore and the
-    ``RTEMS_INVALID_NUMBER`` status code will be returned on SMP configurations
+    ``RTEMS_INVALID_NUMBER`` status code will be returned in SMP configurations
     in this case.  This prevents lock order reversal problems with the
     allocator mutex.
@@ -613,5 +613,5 @@
 
     Deadlock situations are detected for MrsP semaphores and the
-    ``RTEMS_UNSATISFIED`` status code will be returned on SMP configurations in
+    ``RTEMS_UNSATISFIED`` status code will be returned in SMP configurations in
     this case.
 
@@ -639,5 +639,5 @@
     It is not allowed to obtain a MrsP semaphore more than once by one task at
     a time (nested access) and the ``RTEMS_UNSATISFIED`` status code will be
-    returned on SMP configurations in this case.
+    returned in SMP configurations in this case.
 
 .. raw:: latex
@@ -699,5 +699,5 @@
 
     The MrsP semaphores must be released in the reversed obtain order,
-    otherwise the ``RTEMS_INCORRECT_STATE`` status code will be returned on SMP
+    otherwise the ``RTEMS_INCORRECT_STATE`` status code will be returned in SMP
     configurations in this case.
 
@@ -756,5 +756,5 @@
 
     It is not allowed to flush a MrsP semaphore and the ``RTEMS_NOT_DEFINED``
-    status code will be returned on SMP configurations in this case.
+    status code will be returned in SMP configurations in this case.
 
 .. raw:: latex
Index: c-user/symmetric_multiprocessing_services.rst
===================================================================
--- c-user/symmetric_multiprocessing_services.rst	(revision ba781f98dea48df86707680886850826254f154a)
+++ c-user/symmetric_multiprocessing_services.rst	(revision a0d2eeea9da0671faecb31c7f1e426f76e8bc506)
@@ -266,5 +266,5 @@
 A low overhead means to ensure mutual exclusion in uni-processor configurations
 is to disable interrupts around a critical section.  This is commonly used in
-device driver code and throughout the operating system core.  On SMP
+device driver code and throughout the operating system core.  In SMP
 configurations, however, disabling the interrupts on one processor has no
 effect on other processors.  So, this is insufficient to ensure system wide
@@ -277,5 +277,5 @@
 - ``rtems_interrupt_flush()``
 
-are disabled on SMP configurations and its use will lead to compiler warnings
+are disabled in SMP configurations and its use will lead to compiler warnings
 and linker errors.  In the unlikely case that interrupts must be disabled on
 the current processor, then the
@@ -523,7 +523,7 @@
 
 DESCRIPTION:
-    On uni-processor configurations a value of one will be returned.
-
-    On SMP configurations this returns the value of a global variable set
+    In uni-processor configurations, a value of one will be returned.
+
+    In SMP configurations, this returns the value of a global variable set
     during system initialization to indicate the count of utilized processors.
     The processor count depends on the physically or virtually available
@@ -552,7 +552,7 @@
 
 DESCRIPTION:
-    On uni-processor configurations a value of zero will be returned.
-
-    On SMP configurations an architecture specific method is used to obtain the
+    In uni-processor configurations, a value of zero will be returned.
+
+    In SMP configurations, an architecture specific method is used to obtain the
     index of the current processor in the system.  The set of processor indices
     is the range of integers starting with zero up to the processor count minus
