diff --git a/Doc/Sd1/Statements/statements.xml b/Doc/Sd1/Statements/statements.xml
index 83fb9ec81e2d09916565153188ab61467de1b4f0..48ab1334aee57225fc506c44fb98a034bd62c922 100644
--- a/Doc/Sd1/Statements/statements.xml
+++ b/Doc/Sd1/Statements/statements.xml
@@ -1906,61 +1906,37 @@ switch (number) {
       <title>Allowed types for <code language="java">switch</code>
       statements</title>
 
-      <glosslist>
-        <glossentry>
-          <glossterm>Integer types:</glossterm>
-
-          <glossdef>
-            <itemizedlist>
-              <listitem>
-                <para>byte and Byte</para>
-              </listitem>
-
-              <listitem>
-                <para>short and Short</para>
-              </listitem>
-
-              <listitem>
-                <para>int and Integer</para>
-              </listitem>
-
-              <listitem>
-                <para>char and Character</para>
-              </listitem>
-            </itemizedlist>
-          </glossdef>
-        </glossentry>
-
-        <glossentry>
-          <glossterm/>
-
-          <glossdef>
-            <para/>
-          </glossdef>
-        </glossentry>
-      </glosslist>
-
       <itemizedlist>
         <listitem>
           <para><emphasis>Integer types:</emphasis></para>
 
-          <itemizedlist>
-            <listitem>
-              <para>byte and Byte</para>
-            </listitem>
+          <informaltable border="0">
+            <tr>
+              <td valign="top"><itemizedlist>
+                  <listitem>
+                    <para>byte and <classname
+                    xlink:href="javaapi://java.lang.Byte">Byte</classname></para>
+                  </listitem>
 
-            <listitem>
-              <para>short and Short</para>
-            </listitem>
+                  <listitem>
+                    <para>short and <classname
+                    xlink:href="javaapi://java.lang.Short">Short</classname></para>
+                  </listitem>
+                </itemizedlist></td>
 
-            <listitem>
-              <para>int and Integer</para>
-            </listitem>
+              <td valign="top"><itemizedlist>
+                  <listitem>
+                    <para>int and <classname
+                    xlink:href="javaapi://java.lang.Integer">Integer</classname></para>
+                  </listitem>
 
-            <listitem>
-              <para>char and Character</para>
-            </listitem>
-          </itemizedlist>
+                  <listitem>
+                    <para>char and <classname
+                    xlink:href="javaapi://java.lang.Character">Character</classname></para>
+                  </listitem>
+                </itemizedlist></td>
+            </tr>
+          </informaltable>
         </listitem>
 
         <listitem>