diff --git a/NEWS b/NEWS
index b46f829d..754c62a2 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@
     - made Smarty catch unimplemented modifiers and custom functions and output
       error messages during compilation instead of failing during run time.
       (Andrei)
+    - removed short-tags at the top of the smarty scripts (Monte)
     - added register_custom_function() and register_modifier() API calls
       to make registering stuff easier. (Andrei)
     - added template results caching capability. (Monte, Andrei)
diff --git a/Smarty.addons.php b/Smarty.addons.php
index c208de87..90156e43 100644
--- a/Smarty.addons.php
+++ b/Smarty.addons.php
@@ -273,16 +273,6 @@ function smarty_func_html_select_date()
     print $html_result;
 }
 
-/*======================================================================*\
-    Function: smarty_func_header
-    Purpose:  Pass a header. Must be used before any content is sent.
-\*======================================================================*/
-function smarty_func_header($params)
-{
-    extract($params);
-    header($contents);
-}
-
 /* vim: set expandtab: */
 
 ?>
diff --git a/docs.sgml b/docs.sgml
index 58002c26..bd77a91b 100644
--- a/docs.sgml
+++ b/docs.sgml
@@ -371,6 +371,28 @@ chmod 700 cache
 				is "false".
 			</para>
 		</sect2>
+		<sect2 id="setting.php.handling">
+			<title>$php_handling</title>
+			<para>
+                This tells Smarty how to handle PHP code embedded in the
+                tempalates. There are four possible settings, default being
+                SMARTY_PHP_PASSTHRU.
+            </para>    
+		    <itemizedlist>
+		    <listitem><para>SMARTY_PHP_PASSTHRU - Smarty echos tags as-is.</para></listitem>
+		    <listitem><para>SMARTY_PHP_QUOTE - Smarty quotes the tags as
+                html entities.</para></listitem>
+		    <listitem><para>SMARTY_PHP_REMOVE - Smarty removes the tags from
+                the templates.</para></listitem>
+		    <listitem><para>SMARTY_PHP_ALLOW - Smarty will execute the tags
+                as PHP code.</para></listitem>
+            </itemizedlist>
+            <para>
+                NOTE: Embedding PHP code into templates is highly discouraged.
+                Use <link linkend="custom.functions">custom functions</link> or
+                <link linkend="variable.modifiers">modifiers</link> instead.
+			</para>
+		</sect2>
 		<sect2 id="setting.left.delimiter">
 			<title>$left_delimiter</title>
 			<para>