diff --git a/chapters/install.caudium.xml b/chapters/install.caudium.xml
index 4f50906f3d..ff0192ff17 100644
--- a/chapters/install.caudium.xml
+++ b/chapters/install.caudium.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
   <sect1 id="install.caudium">
    <title>Servers-Caudium</title>
    <para>
@@ -46,7 +46,7 @@
      the normal MySQL client code is used. Otherwise there might be
      conflicts if your Pike already has MySQL support. You do this by
      specifying a MySQL install directory the 
-     <option role="configure"> --with-mysql</option> option.
+     <option role="configure">--with-mysql</option> option.
     </para>
    </note>
   </sect1>
diff --git a/chapters/install.configure.graphics.xml b/chapters/install.configure.graphics.xml
index 1ed8e514b6..67fb395df9 100644
--- a/chapters/install.configure.graphics.xml
+++ b/chapters/install.configure.graphics.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.7 $ -->
+<!-- $Revision: 1.8 $ -->
  <sect3 id="install.configure.options.graphics">
   <title>Graphics options</title>
   <variablelist>
    <varlistentry id="install.configure.with-imagick">
     <term>
-     <parameter>--with-imagick</parameter>
+     <option role="configure">--with-imagick</option>
     </term>
     <listitem>
      <para>
@@ -14,8 +14,9 @@
       for PHP 4 can be found on the PEAR site.
      </para>
      <para>
-      Simply doing <literal>--with-imagick</literal> is only supported
-      in PHP 3 unless you follow the instructions found on the PEAR site.
+      Simply doing <option role="configure">--with-imagick</option> is only
+      supported in PHP 3 unless you follow the instructions found on the PEAR
+      site.
      </para>
     </listitem>
    </varlistentry>
diff --git a/chapters/install.configure.misc.xml b/chapters/install.configure.misc.xml
index c7779c4fd7..d30145f645 100644
--- a/chapters/install.configure.misc.xml
+++ b/chapters/install.configure.misc.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.12 $ -->
+<!-- $Revision: 1.13 $ -->
  <sect3 id="install.configure.options.misc">
   <title>Misc options</title>
   <variablelist>
    <varlistentry id="install.configure.enable-debug">
     <term>
-     <parameter>--enable-debug</parameter>
+     <option role="configure">--enable-debug</option>
     </term>
     <listitem>
      <para>
@@ -15,7 +15,7 @@
    </varlistentry>
    <varlistentry id="install.configure.with-layout">
     <term>
-     <parameter>--with-layout=TYPE</parameter>
+     <option role="configure">--with-layout=TYPE</option>
     </term>
     <listitem>
      <para>
@@ -26,7 +26,7 @@ or GNU.
    </varlistentry>
    <varlistentry id="install.configure.with-pear">
     <term>
-     <parameter>--with-pear=DIR</parameter>
+     <option role="configure">--with-pear=DIR</option>
     </term>
     <listitem>
      <para>
@@ -36,7 +36,7 @@ or GNU.
    </varlistentry>
    <varlistentry id="install.configure.without-pear">
     <term>
-     <parameter>--without-pear</parameter>
+     <option role="configure">--without-pear</option>
     </term>
     <listitem>
      <para>
@@ -47,7 +47,7 @@ or GNU.
 
    <varlistentry id="install.configure.enable-sigchild">
     <term>
-     <parameter>--enable-sigchild</parameter>
+     <option role="configure">--enable-sigchild</option>
     </term>
     <listitem>
      <para>
@@ -57,7 +57,7 @@ or GNU.
    </varlistentry>
    <varlistentry id="install.configure.disable-rpath">
     <term>
-     <parameter>--disable-rpath</parameter>
+     <option role="configure">--disable-rpath</option>
     </term>
     <listitem>
      <para>
@@ -67,7 +67,7 @@ or GNU.
    </varlistentry>
    <varlistentry id="install.configure.enable-libgcc">
     <term>
-     <parameter>--enable-libgcc</parameter>
+     <option role="configure">--enable-libgcc</option>
     </term>
     <listitem>
      <para>
@@ -77,7 +77,7 @@ or GNU.
    </varlistentry>
    <varlistentry id="install.configure.enable-php-streams">
     <term>
-     <parameter>--enable-php-streams</parameter>
+     <option role="configure">--enable-php-streams</option>
     </term>
     <listitem>
      <para>
@@ -88,7 +88,7 @@ code!
    </varlistentry>
    <varlistentry id="install.configure.with-zlib-dir">
     <term>
-     <parameter>--with-zlib-dir=&lt;DIR&gt;</parameter>
+     <option role="configure">--with-zlib-dir[=DIR]</option>
     </term>
     <listitem>
      <para>
@@ -99,7 +99,7 @@ code!
 
    <varlistentry id="install.configure.enable-trans-sid">
     <term>
-     <parameter>--enable-trans-sid</parameter>
+     <option role="configure">--enable-trans-sid</option>
     </term>
     <listitem>
      <para>
@@ -111,7 +111,7 @@ code!
 
    <varlistentry id="install.configure.with-tsrm-pthreads">
     <term>
-     <parameter>--with-tsrm-pthreads</parameter>
+     <option role="configure">--with-tsrm-pthreads</option>
     </term>
     <listitem>
      <para>
@@ -121,7 +121,7 @@ code!
    </varlistentry>
    <varlistentry id="install.configure.enable-shared">
     <term>
-     <parameter>--enable-shared[=PKGS]</parameter>
+     <option role="configure">--enable-shared[=PKGS]</option>
     </term>
     <listitem>
      <para>
@@ -131,7 +131,7 @@ code!
    </varlistentry>
    <varlistentry id="install.configure.enable-static">
     <term>
-     <parameter>--enable-static[=PKGS]</parameter>
+     <option role="configure">--enable-static[=PKGS]</option>
     </term>
     <listitem>
      <para>
@@ -141,7 +141,7 @@ code!
    </varlistentry>
    <varlistentry id="install.configure.enable-fast-install">
     <term>
-     <parameter>--enable-fast-install[=PKGS]</parameter>
+     <option role="configure">--enable-fast-install[=PKGS]</option>
     </term>
     <listitem>
      <para>
@@ -151,7 +151,7 @@ code!
    </varlistentry>
    <varlistentry id="install.configure.with-gnu-ld">
     <term>
-     <parameter>--with-gnu-ld</parameter>
+     <option role="configure">--with-gnu-ld</option>
     </term>
     <listitem>
      <para>
@@ -161,7 +161,7 @@ code!
    </varlistentry>
    <varlistentry id="install.configure.disable-libtool-lock">
     <term>
-     <parameter>--disable-libtool-lock</parameter>
+     <option role="configure">--disable-libtool-lock</option>
     </term>
     <listitem>
      <para>
@@ -171,7 +171,7 @@ code!
    </varlistentry>
    <varlistentry id="install.configure.with-pic">
     <term>
-     <parameter>--with-pic</parameter>
+     <option role="configure">--with-pic</option>
     </term>
     <listitem>
      <para>
@@ -182,7 +182,7 @@ code!
 
    <varlistentry id="install.configure.enable-memory-limit">
     <term>
-     <parameter>--enable-memory-limit</parameter>
+     <option role="configure">--enable-memory-limit</option>
     </term>
     <listitem>
      <para>
@@ -192,7 +192,7 @@ code!
    </varlistentry>
    <varlistentry id="install.configure.disable-url-fopen-wrapper">
     <term>
-     <parameter>--disable-url-fopen-wrapper</parameter>
+     <option role="configure">--disable-url-fopen-wrapper</option>
     </term>
     <listitem>
      <para>
@@ -203,7 +203,7 @@ code!
    </varlistentry>
    <varlistentry id="install.configure.enable-versioning.php4">
     <term>
-     <parameter>--enable-versioning</parameter>
+     <option role="configure">--enable-versioning</option>
     </term>
     <listitem>
      <para>
@@ -215,7 +215,7 @@ code!
 
    <varlistentry id="install.configure.with-ismp">
     <term>
-     <parameter>--with-imsp[=DIR]</parameter>
+     <option role="configure">--with-imsp[=DIR]</option>
     </term>
     <listitem>
      <para>
@@ -227,7 +227,7 @@ code!
 
    <varlistentry id="install.configure.with-mck">
     <term>
-     <parameter>--with-mck[=DIR]</parameter>
+     <option role="configure">--with-mck[=DIR]</option>
     </term>
     <listitem>
      <para>
@@ -241,7 +241,7 @@ code!
 
    <varlistentry id="install.configure.with-mod-dav">
     <term>
-     <parameter>--with-mod-dav=DIR</parameter>
+     <option role="configure">--with-mod-dav=DIR</option>
     </term>
     <listitem>
      <para>
@@ -253,7 +253,7 @@ code!
    </varlistentry>
    <varlistentry id="install.configure.enable-debugger">
     <term>
-     <parameter>--enable-debugger</parameter>
+     <option role="configure">--enable-debugger</option>
     </term>
     <listitem>
      <para>
@@ -263,7 +263,7 @@ code!
    </varlistentry>
    <varlistentry id="install.configure.enable-versioning.php3">
     <term>
-     <parameter>--enable-versioning</parameter>
+     <option role="configure">--enable-versioning</option>
     </term>
     <listitem>
      <para>
diff --git a/chapters/install.configure.php.xml b/chapters/install.configure.php.xml
index c031dbcddb..dee9583216 100644
--- a/chapters/install.configure.php.xml
+++ b/chapters/install.configure.php.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
  <sect3 id="install.configure.options.php">
   <title>PHP options</title>
   <variablelist>
    <varlistentry id="install.configure.enable-maintainer-mode">
     <term>
-     <parameter>--enable-maintainer-mode</parameter>
+     <option role="configure">--enable-maintainer-mode</option>
     </term>
     <listitem>
      <para>
@@ -16,7 +16,7 @@
    </varlistentry>
    <varlistentry id="install.configure.with-config-file-path">
     <term>
-     <parameter>--with-config-file-path=PATH</parameter>
+     <option role="configure">--with-config-file-path=PATH</option>
     </term>
     <listitem>
      <para>
@@ -26,7 +26,7 @@
    </varlistentry>
    <varlistentry id="install.configure.enable-safe-mode">
     <term>
-     <parameter>--enable-safe-mode</parameter>
+     <option role="configure">--enable-safe-mode</option>
     </term>
     <listitem>
      <para>
@@ -36,7 +36,7 @@
    </varlistentry>
    <varlistentry id="install.configure.with-exec-dir">
     <term>
-     <parameter>--with-exec-dir[=DIR]</parameter>
+     <option role="configure">--with-exec-dir[=DIR]</option>
     </term>
     <listitem>
      <para>
@@ -46,7 +46,7 @@
    </varlistentry>
    <varlistentry id="install.configure.enable-magic-quotes">
     <term>
-     <parameter>--enable-magic-quotes</parameter>
+     <option role="configure">--enable-magic-quotes</option>
     </term>
     <listitem>
      <para>
@@ -56,7 +56,7 @@
    </varlistentry>
    <varlistentry id="install.configure.disable-short-tags">
     <term>
-     <parameter>--disable-short-tags</parameter>
+     <option role="configure">--disable-short-tags</option>
     </term>
     <listitem>
      <para>
@@ -86,4 +86,4 @@ End:
 vim600: syn=xml fen fdm=syntax fdl=2 si
 vim: et tw=78 syn=sgml
 vi: ts=1 sw=1
--->
\ No newline at end of file
+-->
diff --git a/chapters/install.configure.servers.xml b/chapters/install.configure.servers.xml
index b227530f09..c892589649 100644
--- a/chapters/install.configure.servers.xml
+++ b/chapters/install.configure.servers.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.8 $ -->
+<!-- $Revision: 1.9 $ -->
  <sect3 id="install.configure.options.servers">
   <title>SAPI options</title>
   <para>
@@ -9,7 +9,7 @@
   <variablelist>
    <varlistentry id="install.configure.with-aolserver">
     <term>
-     <parameter>--with-aolserver=DIR</parameter>
+     <option role="configure">--with-aolserver=DIR</option>
     </term>
     <listitem>
      <para>
@@ -19,7 +19,7 @@
    </varlistentry>
    <varlistentry id="install.configure.with-apxs">
     <term>
-     <parameter>--with-apxs[=FILE]</parameter>
+     <option role="configure">--with-apxs[=FILE]</option>
     </term>
     <listitem>
      <para>
@@ -32,7 +32,7 @@
    </varlistentry>
    <varlistentry id="install.configure.with-apache">
     <term>
-     <parameter>--with-apache[=DIR]</parameter>
+     <option role="configure">--with-apache[=DIR]</option>
     </term>
     <listitem>
      <para>
@@ -43,7 +43,7 @@
    </varlistentry>
    <varlistentry id="install.configure.with-mod_charset">
     <term>
-     <parameter>--with-mod_charset</parameter>
+     <option role="configure">--with-mod_charset</option>
     </term>
     <listitem>
      <para>
@@ -53,7 +53,7 @@
    </varlistentry>
    <varlistentry id="install.configure.with-apxs2">
     <term>
-     <parameter>--with-apxs2[=FILE]</parameter>
+     <option role="configure">--with-apxs2[=FILE]</option>
     </term>
     <listitem>
      <para>
@@ -65,7 +65,7 @@
 
    <varlistentry id="install.configure.with-caudium">
     <term>
-     <parameter>--with-caudium=DIR</parameter>
+     <option role="configure">--with-caudium=DIR</option>
     </term>
     <listitem>
      <para>
@@ -77,7 +77,7 @@
 
    <varlistentry id="install.configure.disable-cli">
     <term>
-     <parameter>--disable-cli</parameter>
+     <option role="configure">--disable-cli</option>
     </term>
     <listitem>
      <para>
@@ -91,7 +91,7 @@
 
    <varlistentry id="install.configure.enable-embed">
     <term>
-     <parameter> --enable-embed[=TYPE]</parameter>
+     <option role="configure">--enable-embed[=TYPE]</option>
     </term>
     <listitem>
      <para>
@@ -104,7 +104,7 @@
 
    <varlistentry id="install.configure.with-fhttpd">
     <term>
-     <parameter>--with-fhttpd[=DIR]</parameter>
+     <option role="configure">--with-fhttpd[=DIR]</option>
     </term>
     <listitem>
      <para>
@@ -116,7 +116,7 @@
    </varlistentry>
    <varlistentry id="install.configure.with-isapi">
     <term>
-     <parameter>--with-isapi=DIR</parameter>
+     <option role="configure">--with-isapi=DIR</option>
     </term>
     <listitem>
      <para>
@@ -126,7 +126,7 @@
    </varlistentry>
    <varlistentry id="install.configure.with-nsapi">
     <term>
-     <parameter>--with-nsapi=DIR</parameter>
+     <option role="configure">--with-nsapi=DIR</option>
     </term>
     <listitem>
      <para>
@@ -136,7 +136,7 @@
    </varlistentry>
    <varlistentry id="install.configure.with-phttpd">
     <term>
-     <parameter>--with-phttpd=DIR</parameter>
+     <option role="configure">--with-phttpd=DIR</option>
     </term>
     <listitem>
      <para>
@@ -146,7 +146,7 @@
    </varlistentry>
    <varlistentry id="install.configure.with-pi3web">
     <term>
-     <parameter>--with-pi3web=DIR</parameter>
+     <option role="configure">--with-pi3web=DIR</option>
     </term>
     <listitem>
      <para>
@@ -156,7 +156,7 @@
    </varlistentry>
    <varlistentry id="install.configure.with-roxen">
     <term>
-     <parameter>--with-roxen=DIR</parameter>
+     <option role="configure">--with-roxen=DIR</option>
     </term>
     <listitem>
      <para>
@@ -167,7 +167,7 @@
    </varlistentry>
    <varlistentry id="install.configure.enable-roxen-zts">
     <term>
-     <parameter>--enable-roxen-zts</parameter>
+     <option role="configure">--enable-roxen-zts</option>
     </term>
     <listitem>
      <para>
@@ -177,7 +177,7 @@
    </varlistentry>
    <varlistentry id="install.configure.with-servlet">
     <term>
-     <parameter>--with-servlet[=DIR]</parameter>
+     <option role="configure">--with-servlet[=DIR]</option>
     </term>
     <listitem>
      <para>
@@ -188,7 +188,7 @@
    </varlistentry>
    <varlistentry id="install.configure.with-thttpd">
     <term>
-     <parameter>--with-thttpd=SRCDIR</parameter>
+     <option role="configure">--with-thttpd=SRCDIR</option>
     </term>
     <listitem>
      <para>
@@ -199,7 +199,7 @@
 
    <varlistentry id="install.configure.with-tux">
     <term>
-     <parameter>--with-tux=MODULEDIR</parameter>
+     <option role="configure">--with-tux=MODULEDIR</option>
     </term>
     <listitem>
      <para>
@@ -210,7 +210,7 @@
 
    <varlistentry id="install.configure.with-webjames">
     <term>
-     <parameter>--with-webjames=SRCDIR</parameter>
+     <option role="configure">--with-webjames=SRCDIR</option>
     </term>
     <listitem>
      <para>
@@ -221,7 +221,7 @@
 
    <varlistentry id="install.configure.disable-cgi">
     <term>
-     <parameter> --disable-cgi</parameter>
+     <option role="configure">--disable-cgi</option>
     </term>
     <listitem>
      <para>
@@ -232,7 +232,7 @@
 
    <varlistentry id="install.configure.enable-force-cgi-redirect">
     <term>
-     <parameter>--enable-force-cgi-redirect</parameter>
+     <option role="configure">--enable-force-cgi-redirect</option>
     </term>
     <listitem>
      <para>
@@ -244,7 +244,7 @@
 
    <varlistentry id="install.configure.enable-discard-path">
     <term>
-     <parameter>--enable-discard-path</parameter>
+     <option role="configure">--enable-discard-path</option>
     </term>
     <listitem>
      <para>
@@ -257,19 +257,19 @@
 
    <varlistentry id="install.configure.with-fastcgi">
     <term>
-     <parameter>--with-fastcgi</parameter>
+     <option role="configure">--with-fastcgi</option>
     </term>
     <listitem>
      <para>
       Build PHP as FastCGI application. No longer available as of PHP 4.3.0,
-      instead you should use <parameter>--enable-fastcgi</parameter>.
+      instead you should use <option role="configure">--enable-fastcgi</option>.
      </para>
     </listitem>
    </varlistentry>
 
    <varlistentry id="install.configure.enable-fastcgi">
     <term>
-     <parameter>--enable-fastcgi</parameter>
+     <option role="configure">--enable-fastcgi</option>
     </term>
     <listitem>
      <para>
@@ -281,7 +281,7 @@
 
    <varlistentry id="install.configure.disable-path-info-check">
     <term>
-     <parameter>--disable-path-info-check</parameter>
+     <option role="configure">--disable-path-info-check</option>
     </term>
     <listitem>
      <para>