diff --git a/language/control-structures/switch.xml b/language/control-structures/switch.xml
index b692bd4702..bed8699827 100644
--- a/language/control-structures/switch.xml
+++ b/language/control-structures/switch.xml
@@ -16,8 +16,8 @@
   <simpara>
    Note that unlike some other languages, the
    <link linkend="control-structures.continue">continue</link> statement
-   applies to switch and acts similar to <literal>break</literal>.  If you
-   have a switch inside a loop and wish to continue to the next iteration of
+   applies to <literal>switch</literal> and acts similar to <literal>break</literal>.  If you
+   have a <literal>switch</literal> inside a loop and wish to continue to the next iteration of
    the outer loop, use <literal>continue 2</literal>.
   </simpara>
  </note>
@@ -41,13 +41,13 @@
      <row>
       <entry>7.0.0</entry>
       <entry>
-       Multiple default cases will raise a <constant>E_COMPILE_ERROR</constant> error. 
+       Multiple default cases will raise a <constant>E_COMPILE_ERROR</constant> error.
       </entry>
      </row>
     </tbody>
    </tgroup>
   </table>
- </para> 
+ </para>
  <para>
   The following two examples are two different ways to write the
   same thing, one using a series of <literal>if</literal> and
@@ -82,7 +82,7 @@ switch ($i) {
    </programlisting>
   </example>
   <example>
-   <title><literal>switch</literal> structure allows usage of strings</title>
+   <title><literal>switch</literal> structure allows usage of <type>string</type>s</title>
    <programlisting role="php">
 <![CDATA[
 <?php
@@ -198,8 +198,8 @@ switch ($i) {
  </para>
  <para>
   The <literal>case</literal> expression may be any expression that
-  evaluates to a simple type, that is, integer or floating-point
-  numbers and strings.  Arrays or objects cannot be used here unless
+  evaluates to a simple type, that is, <type>integer</type> or floating-point
+  numbers and <type>string</type>s.  <type>Array</type>s or <type>object</type>s cannot be used here unless
   they are dereferenced to a simple type.
  </para>
  <para>