diff --git a/chapters/config.xml b/chapters/config.xml
index 4140dabb44..1fef27c793 100644
--- a/chapters/config.xml
+++ b/chapters/config.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.94 $ -->
+<!-- $Revision: 1.95 $ -->
  <chapter id="configuration">
   <title>Configuration</title>
 
@@ -70,8 +70,8 @@ include_path = ".;c:\php\lib"
     <simpara>
      When using PHP as an Apache module, you can also change the
      configuration settings using directives in Apache configuration
-     files (e.g. <filename>httpd.conf</filename>) and
-     <filename>.htaccess</filename> files (You will need
+     files (e.g. &httpd.conf;) and
+     &htaccess; files (You will need
      "AllowOverride Options" or "AllowOverride All" privileges)
     </simpara>
 
@@ -137,9 +137,9 @@ php_value auto_prepend_file none
        <listitem>
         <para>
          Sets the value of the specified directive.
-         This can NOT be used in <filename>.htaccess</filename> files.
+         This can NOT be used in &htaccess; files.
          Any directive type set with <systemitem role="directive">php_admin_value</systemitem>
-         can not be overridden by <filename>.htaccess</filename> or virtualhost directives.
+         can not be overridden by &htaccess; or virtualhost directives.
          To clear a previously set value use <literal>none</literal> as the value.
          <informalexample>
           <programlisting role="ini">
@@ -160,9 +160,9 @@ php_admin_value open_basedir none
        <listitem>
         <para>
          Used to set a Boolean configuration directive.
-         This can NOT be used in <filename>.htaccess</filename> files.
+         This can NOT be used in &htaccess; files.
          Any directive type set with <systemitem role="directive">php_admin_flag</systemitem>
-         can not be overridden by <filename>.htaccess</filename> or virtualhost directives.
+         can not be overridden by &htaccess; or virtualhost directives.
         </para>
        </listitem>
       </varlistentry>
@@ -188,7 +188,7 @@ php_admin_value open_basedir none
      <note>
       <para>
        PHP constants do not exist outside of PHP. For example, in 
-       <filename>httpd.conf</filename> you can not use PHP constants 
+       &httpd.conf; you can not use PHP constants 
        such as <constant>E_ALL</constant> or <constant>E_NOTICE</constant> 
        to set the <link linkend="ini.error-reporting">error_reporting</link> 
        directive as they will have no meaning and will evaluate to
@@ -228,15 +228,15 @@ php_admin_value open_basedir none
         <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>
@@ -692,8 +692,8 @@ php_admin_value open_basedir none
         <para>
          Please note that <systemitem role="directive">register_globals</systemitem>
          cannot be set at runtime (<function>ini_set</function>). Although, you can
-         use <filename>.htaccess</filename> if your host allows it as described
-         above. An example <filename>.htaccess</filename> entry:
+         use &htaccess; if your host allows it as described
+         above. An example &htaccess; entry:
          <userinput>php_flag register_globals on</userinput>.
         </para>
         <note>
diff --git a/chapters/install.apache2.xml b/chapters/install.apache2.xml
index d4a84d224c..781d92f506 100644
--- a/chapters/install.apache2.xml
+++ b/chapters/install.apache2.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.9 $ -->
+<!-- $Revision: 1.10 $ -->
   <sect1 id="install.apache2">
    <title>Servers-Apache 2.0</title>
    <para>
@@ -186,7 +186,7 @@
      There are two ways to set up <literal>PHP</literal> to work with
      Apache 2.0 on Windows. One is to use the CGI binary the other is to
      use the Apache module DLL. In either case you need to stop the Apache
-     server, and edit your <filename>httpd.conf</filename> to configure Apache
+     server, and edit your &httpd.conf; to configure Apache
      to work with <literal>PHP</literal>.
     </para>
     <para>