diff --git a/chapters/tutorial.xml b/chapters/tutorial.xml
index 481b7bcd95..c60a518e80 100644
--- a/chapters/tutorial.xml
+++ b/chapters/tutorial.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.13 $ -->
+<!-- $Revision: 1.14 $ -->
  <chapter id="tutorial">
   <title>A simple tutorial</title>
 
@@ -78,7 +78,7 @@
       web servers configuration.  Although this is outside the scope of this
       tutorial, see also the <varname>DocumentRoot</varname> and
       <varname>ServerName</varname> directives in your web servers
-      configuration file. (on Apache this is <filename>httpd.conf</filename>).
+      configuration file. (on Apache this is &httpd.conf;).
       If everything is setup correctly, this file will be parsed by PHP and
       the following output will make it to your browser:
      </simpara>
diff --git a/reference/apache/ini.xml b/reference/apache/ini.xml
index 897a5d6d86..a687c1e02d 100644
--- a/reference/apache/ini.xml
+++ b/reference/apache/ini.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <section id="apache.configuration">
  &reftitle.runtime;
  <para>
   The behaviour of the Apache PHP module is affected by settings in &php.ini;.
   Configuration settings from &php.ini; may be overridden by php_flag settings
-  in the server configuration file or local <filename>.htaccess</filename> files.
+  in the server configuration file or local &htaccess; files.
  </para>
  <example>
-  <title>Turning off PHP parsing for a directory using <filename>.htaccess</filename></title>
+  <title>Turning off PHP parsing for a directory using &htaccess;</title>
   <programlisting>php_flag engine off</programlisting>
  </example>
  <para>
@@ -68,10 +68,9 @@
      This directive is really only useful in the Apache module
      version of PHP. It is used by sites that would like to turn
      PHP parsing on and off on a per-directory or per-virtual
-     server basis. By putting <userinput>engine
-     off</userinput> in the appropriate places in the
-     <filename>httpd.conf</filename> file, PHP can be enabled or
-     disabled.
+     server basis. By putting <userinput>engine off</userinput>
+     in the appropriate places in the &httpd.conf; file, PHP can
+     be enabled or disabled.
     </para>
    </listitem>
   </varlistentry>
diff --git a/reference/info/functions/ini-set.xml b/reference/info/functions/ini-set.xml
index fb6b182756..1fbc4e6a69 100644
--- a/reference/info/functions/ini-set.xml
+++ b/reference/info/functions/ini-set.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.25 $ -->
+<!-- $Revision: 1.26 $ -->
 <!-- splitted from ./en/functions/info.xml, last change in rev 1.23 -->
   <refentry id="function.ini-set">
    <refnamediv>
@@ -1212,15 +1212,14 @@
          <entry>PHP_INI_PERDIR</entry>
          <entry>2</entry>
          <entry>
-          Entry can be set in &php.ini;, <filename>.htaccess</filename> or
-          <filename>httpd.conf</filename>
+          Entry can be set in &php.ini;, &htaccess; or &httpd.conf;
          </entry>
         </row>
         <row>
          <entry>PHP_INI_SYSTEM</entry>
          <entry>4</entry>
          <entry>
-          Entry can be set in &php.ini; or <filename>httpd.conf</filename> 
+          Entry can be set in &php.ini; or &httpd.conf; 
          </entry>
         </row>
         <row>
diff --git a/reference/var/functions/unserialize.xml b/reference/var/functions/unserialize.xml
index 6b449e273e..354e887b08 100644
--- a/reference/var/functions/unserialize.xml
+++ b/reference/var/functions/unserialize.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.11 $ -->
+<!-- $Revision: 1.12 $ -->
 <!-- splitted from ./en/functions/var.xml, last change in rev 1.2 -->
   <refentry id="function.unserialize">
    <refnamediv>
@@ -29,7 +29,7 @@
       It's possible to set a callback-function which will be called,
       if an undefined class should be instantiated during unserializing.
       (to prevent getting an incomplete <type>object</type> "__PHP_Incomplete_Class".)
-      Use your &php.ini;, <function>ini_set</function> or <filename>.htaccess</filename> 
+      Use your &php.ini;, <function>ini_set</function> or &htaccess; 
       to define 'unserialize_callback_func'.  Everytime an undefined class
       should be instantiated, it'll be called.  To disable this feature just
       empty this setting.  Also note that the directive