diff --git a/language/predefined/errorexception/getseverity.xml b/language/predefined/errorexception/getseverity.xml
index ea7454001e..44a1e45b76 100644
--- a/language/predefined/errorexception/getseverity.xml
+++ b/language/predefined/errorexception/getseverity.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 
 <refentry xml:id="errorexception.getseverity" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -34,7 +34,7 @@
   &reftitle.examples;
   <para>
    <example>
-    <title><function>ErrorException</function> example</title>
+    <title><function>ErrorException::getSeverity</function> example</title>
     <programlisting role="php">
 <![CDATA[
 <?php
diff --git a/language/predefined/iterator.xml b/language/predefined/iterator.xml
index 334d8f0da5..c816e51a9c 100644
--- a/language/predefined/iterator.xml
+++ b/language/predefined/iterator.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 
 <phpdoc:classref xml:id="class.iterator" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
 
@@ -49,7 +49,7 @@
     <title>Basic usage</title>
     <para>
      This example demonstrates in which order methods are called when
-     <function>foreach</function>ing over an iterator.
+     <link linkend="control-structures.foreach">foreach</link>ing over an iterator.
     </para>
     <programlisting role="php">
 <![CDATA[
diff --git a/language/predefined/iterator/next.xml b/language/predefined/iterator/next.xml
index c6da37dbbc..aa29df6f09 100644
--- a/language/predefined/iterator/next.xml
+++ b/language/predefined/iterator/next.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 
 <refentry xml:id="iterator.next" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -19,7 +19,7 @@
   <note>
    <para>
     This method is called <emphasis>after</emphasis> each
-    <function>foreach</function> loop.
+    <link linkend="control-structures.foreach">foreach</link> loop.
    </para>
   </note>
  </refsect1>
diff --git a/language/predefined/iterator/rewind.xml b/language/predefined/iterator/rewind.xml
index 8547e2f1cf..1fe455bc3d 100644
--- a/language/predefined/iterator/rewind.xml
+++ b/language/predefined/iterator/rewind.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 
 <refentry xml:id="iterator.rewind" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -19,8 +19,8 @@
   <note>
    <para>
     This is the <emphasis>first</emphasis> method called when starting a
-    <function>foreach</function> loop. It will <emphasis>not</emphasis> be
-    executed <emphasis>after</emphasis> <function>foreach</function> loops.
+    <link linkend="control-structures.foreach">foreach</link> loop. It will <emphasis>not</emphasis> be
+    executed <emphasis>after</emphasis> <link linkend="control-structures.foreach">foreach</link> loops.
    </para>
   </note>
  </refsect1>
diff --git a/language/predefined/traversable.xml b/language/predefined/traversable.xml
index ab5f0c12dc..ee03c49aa4 100644
--- a/language/predefined/traversable.xml
+++ b/language/predefined/traversable.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 
 <phpdoc:classref xml:id="class.traversable" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
 
@@ -13,7 +13,7 @@
    &reftitle.intro;
    <para>
     Interface to detect if a class is traversable using
-    <function>foreach</function>.
+    <link linkend="control-structures.foreach">foreach</link>.
    </para>
    <para>
     Abstract base interface that cannot be implemented alone. Instead it must
@@ -23,7 +23,7 @@
    <note>
     <para>
      Internal (built-in) classes that implement this interface can be used in
-     a <function>foreach</function> construct and do not need to implement
+     a <link linkend="control-structures.foreach">foreach</link> construct and do not need to implement
      <classname>IteratorAggregate</classname> or
      <classname>Iterator</classname>.
     </para>