diff --git a/features/safe-mode.xml b/features/safe-mode.xml
index d05f9798d8..8e0c102d73 100644
--- a/features/safe-mode.xml
+++ b/features/safe-mode.xml
@@ -1,5 +1,5 @@
 <?xml encoding="iso-8859-1"?>
-<!-- $Revision: 1.11 $ -->
+<!-- $Revision: 1.12 $ -->
  <chapter id="features.safe-mode">
   <title>Safe Mode</title>
 
@@ -21,9 +21,9 @@ disable_functions =
    </programlisting>
   </para>
   <para>
-   When safe_mode is on, PHP checks to see if the owner of the current script 
-   matches the owner of the file to be operated on by a file function. For 
-   example: 
+   When <link linkend="ini.safe-mode">safe_mode</link> is on, PHP checks to see 
+   if the owner of the current script matches the owner of the file to be 
+   operated on by a file function. For example: 
    <programlisting role="ls">
 -rw-rw-r--    1 rasmus   rasmus       33 Jul  1 19:20 script.php 
 -rw-r--r--    1 root     root       1116 May 26 18:01 /etc/passwd 
@@ -41,9 +41,9 @@ allowed to access /etc/passwd owned by uid 0 in /docroot/script.php on line 2
    </programlisting>
   </para>
   <para>
-   If instead of safe_mode, you set an open_basedir directory then all file 
-   operations will be limited to files under the specified directory. For 
-   example (Apache httpd.conf example): 
+   If instead of <link linkend="ini.safe-mode">safe_mode</link>, you set an 
+   open_basedir directory then all file operations will be limited to files 
+   under the specified directory. For example (Apache httpd.conf example): 
    <programlisting role="ini">
 &lt;Directory /docroot&gt; 
 php_admin_value open_basedir /docroot