diff --git a/language-snippets.ent b/language-snippets.ent
index 3e9c304043..ed37e29a19 100644
--- a/language-snippets.ent
+++ b/language-snippets.ent
@@ -1,8 +1,5 @@
-<!-- PHPDoc snippets $Id$ -->
+<!-- $Id$ -->
 
-<!ENTITY true '<constant>TRUE</constant>'>
-<!ENTITY false '<constant>FALSE</constant>'>
-<!ENTITY null '<constant>NULL</constant>'>
 
 
 <!ENTITY warn.experimental '<warning><simpara>This module is <emphasis>EXPERIMENTAL</emphasis>. That means, that the behaviour of these functions, these function names, in concreto ANYTHING documented here can change in a future release of PHP WITHOUT NOTICE. Be warned, and use this module at your own risk.</simpara></warning>'>
@@ -10,7 +7,7 @@
 
 <!ENTITY tip.ob-capture '<tip><simpara>As with anything that outputs its result directly to the browser, you can use the <link linkend="ref.outcontrol">output-control functions</link> to capture the output of this function, and save it - for example - in a <type>string</type>.</simpara></tip>'>
 
-<!ENTITY return.success 'Returns <constant>TRUE</constant> on succes, <constant>FALSE</constant> on failure.'>
+<!ENTITY return.success 'Returns &true; on succes, &false; on failure.'>
 
 <!ENTITY note.not-bin-safe '<warning><simpara>This function is not (yet) binary safe!</simpara></warning>'>
 
@@ -19,3 +16,4 @@
 <!ENTITY note.no-windows '<note><simpara>This function is not implemented on Windows-platforms</simpara></note>'>
 
 <!ENTITY note.no-safemode '<note><simpara>This function is disabled when safe-mode is enabled.</simpara></note>'>
+<!ENTITY note.limited-safemode '<note><simpara>The behaviour of this function is limited when safe-mode is enabled.</simpara></note>'>