diff --git a/reference/session/reference.xml b/reference/session/reference.xml
index e76e6b8e77..4de9e9fcae 100644
--- a/reference/session/reference.xml
+++ b/reference/session/reference.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.35 $ -->
+<!-- $Revision: 1.36 $ -->
  <reference id="ref.session">
   <title>Session handling functions</title>
   <titleabbrev>Sessions</titleabbrev>
@@ -22,7 +22,7 @@
      The session support allows you to register arbitrary numbers of
      variables to be preserved across requests. When a visitor accesses
      your site, PHP will check automatically (if <link 
-     linkend="ini.session.auto-start"><literal>session.auto_start</literal></link>
+     linkend="ini.session.auto-start">session.auto_start</link>
      is set to 1) or on your request (explicitly through
      <function>session_start</function> or implicitly through
      <function>session_register</function>) whether a specific session
@@ -32,8 +32,8 @@
      <caution>
       <para>
        If you do turn on <link linkend="ini.session.auto-start">
-       <literal>session.auto_start</literal></link> then you cannot put
-       objects into your sessions since the class definition has to be
+       session.auto_start</link> then you cannot put  objects into
+       your sessions since the class definition has to be
        loaded before starting the session in order to recreate the
        objects in your session.
       </para>
@@ -151,7 +151,7 @@
 
     <para>
      If <link
-     linkend="ini.register-globals"><literal>register_globals</literal></link>
+     linkend="ini.register-globals">register_globals</link>
      is disabled, only members of the global associative array
      <varname>$_SESSION</varname> can be registered as session
      variables. The restored session variables will only be available
@@ -188,7 +188,7 @@ if (!isset($_SESSION['count'])) {
       <title>
        Unregistering a variable with <varname>$_SESSION</varname> and
        <link
-       linkend="ini.register-globals"><literal>register_globals</literal></link> disabled.
+       linkend="ini.register-globals">register_globals</link> disabled.
       </title>
       <programlisting role="php">
 <![CDATA[
@@ -203,7 +203,7 @@ unset($_SESSION['count']);
      <example>
       <title>
        Unregistering a variable with <link 
-       linkend="ini.register-globals"><literal>register_globals</literal></link>
+       linkend="ini.register-globals">register_globals</link>
        enabled, after registering it using
        <varname>$_SESSION</varname>.
       </title>
@@ -220,7 +220,7 @@ session_unregister('count');
     </para>
     <para>
      If <link
-     linkend="ini.register-globals"><literal>register_globals</literal></link>
+     linkend="ini.register-globals">register_globals</link>
      is enabled, then each global variable can be registered as session
      variable. Upon a restart of a session, these variables will be restored
      to corresponding global variables. Since PHP must know which global
@@ -231,7 +231,7 @@ session_unregister('count');
      <caution>
       <para>
        If you are using <varname>$_SESSION</varname> and disable <link
-       linkend="ini.register-globals"><literal>register_globals</literal></link>,
+       linkend="ini.register-globals">register_globals</link>,
        do not use <function>session_register</function>,
        <function>session_is_registered</function> and
        <function>session_unregister</function>, if your scripts shall work
@@ -239,18 +239,18 @@ session_unregister('count');
       </para>
       <para>
        If you enable <link
-        linkend="ini.register-globals"><literal>register_globals</literal></link>,
+        linkend="ini.register-globals">register_globals</link>,
         <function>session_unregister</function> should be used since
         session variables are registered as global variables when
         session data is deserialized. Disabling <link
-        linkend="ini.register-globals"><literal>register_globals</literal></link>
+        linkend="ini.register-globals">register_globals</link>
         is recommended for both security and performance reasons.
       </para>
      </caution>
      <example>
       <title>
        Registering a variable with <link
-       linkend="ini.register-globals"><literal>register_globals</literal></link>
+       linkend="ini.register-globals">register_globals</link>
        enabled
       </title>
       <programlisting role="php">
@@ -270,7 +270,7 @@ else {
     </para>
     <para>
      If <link
-     linkend="ini.register-globals"><literal>register_globals</literal></link>
+     linkend="ini.register-globals">register_globals</link>
      is enabled, then the global variables and the
      <varname>$_SESSION</varname> entries will automatically reference the
      same values which were registered in the prior session instance.
@@ -312,7 +312,7 @@ else {
      PHP is capable of transforming links transparently. Unless you are using
      PHP 4.2 or later, you need to enable it manually when building PHP.
      Under UNIX, pass <link linkend="install.configure.enable-trans-sid">
-     <literal>--enable-trans-sid</literal></link> to configure. If this build
+     --enable-trans-sid</link> to configure. If this build
      option and the run-time option
      <literal>session.use_trans_sid</literal> are enabled, relative
      URIs will be changed to contain the session id automatically.
@@ -362,7 +362,7 @@ To continue, <A HREF="nextpage.php?<?php echo strip_tags (SID)?>">click here</A>
     <para>
      Printing the SID, like shown above, is not necessary if
      <link linkend="install.configure.enable-trans-sid">
-     <literal>--enable-trans-sid</literal></link> was used to compile PHP.
+     --enable-trans-sid</link> was used to compile PHP.
     </para>
     <note>
      <para>