diff --git a/reference/parle/parle.lexer.xml b/reference/parle/parle.lexer.xml
index 3783083a7a..a4e150bdf0 100644
--- a/reference/parle/parle.lexer.xml
+++ b/reference/parle/parle.lexer.xml
@@ -63,6 +63,26 @@
      <initializer>16</initializer>
     </fieldsynopsis>
     
+    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
+    <fieldsynopsis>
+     <modifier>public</modifier>
+     <type>boolean</type>
+     <varname linkend="parle-lexer.props.bol">bol</varname>
+     <initializer>false</initializer>
+    </fieldsynopsis>
+    <fieldsynopsis>
+     <modifier>public</modifier>
+     <type>integer</type>
+     <varname linkend="parle-lexer.props.flags">flags</varname>
+     <initializer>0</initializer>
+    </fieldsynopsis>
+    <fieldsynopsis>
+     <modifier>public</modifier>
+     <type>integer</type>
+     <varname linkend="parle-lexer.props.state">state</varname>
+     <initializer>0</initializer>
+    </fieldsynopsis>
+
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.parle-lexer')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
    </classsynopsis>
@@ -114,6 +134,31 @@
   </section>
 <!-- }}} -->
 
+<!-- {{{ Parle\Lexer properties -->
+  <section xml:id="parle-lexer.props">
+   &reftitle.properties;
+   <variablelist>
+    <varlistentry xml:id="parle-lexer.props.bol">
+     <term><varname>bol</varname></term>
+     <listitem>
+      <para>Start of input flag.</para>
+     </listitem>
+    </varlistentry>
+    <varlistentry xml:id="parle-lexer.props.flags">
+     <term><varname>flags</varname></term>
+     <listitem>
+      <para>Lexer flags.</para>
+     </listitem>
+    </varlistentry>
+    <varlistentry xml:id="parle-lexer.props.state">
+     <term><varname>state</varname></term>
+     <listitem>
+      <para>Current lexer state.</para>
+     </listitem>
+    </varlistentry>
+   </variablelist>
+  </section>
+<!-- }}} -->
 
  </partintro>
 
diff --git a/reference/parle/parle.parser.xml b/reference/parle/parle.parser.xml
index fba5b8edee..eaa605e994 100644
--- a/reference/parle/parle.parser.xml
+++ b/reference/parle/parle.parser.xml
@@ -81,6 +81,20 @@
      <initializer>2</initializer>
     </fieldsynopsis>
     
+    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
+    <fieldsynopsis>
+     <modifier>public</modifier>
+     <type>integer</type>
+     <varname linkend="parle-parser.props.action">action</varname>
+     <initializer>0</initializer>
+    </fieldsynopsis>
+    <fieldsynopsis>
+     <modifier>public</modifier>
+     <type>integer</type>
+     <varname linkend="parle-parser.props.reduceId">reduceId</varname>
+     <initializer>0</initializer>
+    </fieldsynopsis>
+
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.parle-parser')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
    </classsynopsis>
@@ -153,6 +167,25 @@
   </section>
 <!-- }}} -->
 
+<!-- {{{ Parle\Parser properties -->
+  <section xml:id="parle-parser.props">
+   &reftitle.properties;
+   <variablelist>
+    <varlistentry xml:id="parle-parser.props.action">
+     <term><varname>action</varname></term>
+     <listitem>
+      <para>Current parser action that matches one of the action class constants, readonly.</para>
+     </listitem>
+    </varlistentry>
+    <varlistentry xml:id="parle-parser.props.reduceId">
+     <term><varname>reduceId</varname></term>
+     <listitem>
+      <para>Grammar rule id just processed in the reduce action. The value corresponds either to a token or to a production id. Readonly.</para>
+     </listitem>
+    </varlistentry>
+   </variablelist>
+  </section>
+<!-- }}} -->
 
  </partintro>
 
diff --git a/reference/parle/parle.rlexer.xml b/reference/parle/parle.rlexer.xml
index 52990aac75..3ea6c29466 100644
--- a/reference/parle/parle.rlexer.xml
+++ b/reference/parle/parle.rlexer.xml
@@ -68,11 +68,31 @@
      <initializer>16</initializer>
     </fieldsynopsis>
     
+    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
+    <fieldsynopsis>
+     <modifier>public</modifier>
+     <type>boolean</type>
+     <varname linkend="parle-rlexer.props.bol">bol</varname>
+     <initializer>false</initializer>
+    </fieldsynopsis>
+    <fieldsynopsis>
+     <modifier>public</modifier>
+     <type>integer</type>
+     <varname linkend="parle-rlexer.props.flags">flags</varname>
+     <initializer>0</initializer>
+    </fieldsynopsis>
+    <fieldsynopsis>
+     <modifier>public</modifier>
+     <type>integer</type>
+     <varname linkend="parle-rlexer.props.state">state</varname>
+     <initializer>0</initializer>
+    </fieldsynopsis>
+
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.parle-rlexer')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
     
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.parle-lexer')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.parle-rlexer')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
 
    </classsynopsis>
 <!-- }}} -->
@@ -123,6 +143,31 @@
   </section>
 <!-- }}} -->
 
+<!-- {{{ Parle\RLexer properties -->
+  <section xml:id="parle-rlexer.props">
+   &reftitle.properties;
+   <variablelist>
+    <varlistentry xml:id="parle-rlexer.props.bol">
+     <term><varname>bol</varname></term>
+     <listitem>
+      <para>Start of input flag.</para>
+     </listitem>
+    </varlistentry>
+    <varlistentry xml:id="parle-rlexer.props.flags">
+     <term><varname>flags</varname></term>
+     <listitem>
+      <para>Lexer flags.</para>
+     </listitem>
+    </varlistentry>
+    <varlistentry xml:id="parle-rlexer.props.state">
+     <term><varname>state</varname></term>
+     <listitem>
+      <para>Current lexer state.</para>
+     </listitem>
+    </varlistentry>
+   </variablelist>
+  </section>
+<!-- }}} -->
 
  </partintro>
 
diff --git a/reference/parle/parle.stack.xml b/reference/parle/parle.stack.xml
index 3c79e46aef..8c55944f33 100644
--- a/reference/parle/parle.stack.xml
+++ b/reference/parle/parle.stack.xml
@@ -32,6 +32,20 @@
     </classsynopsisinfo>
 <!-- }}} -->
     
+    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
+    <fieldsynopsis>
+     <modifier>public</modifier>
+     <type>boolean</type>
+     <varname linkend="parle-stack.props.empty">empty</varname>
+     <initializer>true</initializer>
+    </fieldsynopsis>
+    <fieldsynopsis>
+     <modifier>public</modifier>
+     <type>integer</type>
+     <varname linkend="parle-stack.props.size">size</varname>
+     <initializer>0</initializer>
+    </fieldsynopsis>
+
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.parle-stack')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
    </classsynopsis>
@@ -39,6 +53,26 @@
 
   </section>
 
+<!-- {{{ Parle\Lexer properties -->
+  <section xml:id="parle-stack.props">
+   &reftitle.properties;
+   <variablelist>
+    <varlistentry xml:id="parle-stack.props.empty">
+     <term><varname>empty</varname></term>
+     <listitem>
+      <para>Whether the stack is empty, readonly.</para>
+     </listitem>
+    </varlistentry>
+    <varlistentry xml:id="parle-stack.props.size">
+     <term><varname>size</varname></term>
+     <listitem>
+      <para>Stack size, readonly.</para>
+     </listitem>
+    </varlistentry>
+   </variablelist>
+  </section>
+<!-- }}} -->
+
  </partintro>
 
  <!--&reference.parle.entities.parle-stack;-->
diff --git a/reference/parle/parle/lexer/bol.xml b/reference/parle/parle/lexer/bol.xml
deleted file mode 100644
index 76886e56d3..0000000000
--- a/reference/parle/parle/lexer/bol.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="parle-lexer.bol" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Parle\Lexer::bol</refname>
-  <refpurpose>Retrieve or set the flag indicating start of input</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>Parle\Lexer::bol</methodname>
-   <methodparam choice="opt"><type>boolean</type><parameter>bol</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-  This methods sets or retrieves the flag value indicating the start of input or the the last character read being <literal>\n</literal>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>bol</parameter></term>
-    <listitem>
-     <para>
-      Flag value to be set.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  <para>
-   If a new value is passed, &null; is returned. Otherwise &boolean; is returned.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/parle/parle/lexer/flags.xml b/reference/parle/parle/lexer/flags.xml
deleted file mode 100644
index 428d9494e9..0000000000
--- a/reference/parle/parle/lexer/flags.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="parle-lexer.flags" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Parle\Lexer::flags</refname>
-  <refpurpose>Set or get the lexer flags</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>Parle\Lexer::flags</methodname>
-   <methodparam choice="opt"><type>integer</type><parameter>state</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>flags</parameter></term>
-    <listitem>
-     <para>
-      New flags to be set.      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   If the new flags value is passed, &null; is returned. Otherwise returns &integer;.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/parle/parle/parser/action.xml b/reference/parle/parle/parser/action.xml
deleted file mode 100644
index a320567359..0000000000
--- a/reference/parle/parle/parser/action.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="parle-parser.action" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Parle\Parser::action</refname>
-  <refpurpose>Get the current action</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Parle\Parser::action</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Get the current parser action that matches one of the action class constants.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &integer; representing the action.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/parle/parle/parser/reduceid.xml b/reference/parle/parle/parser/reduceid.xml
deleted file mode 100644
index 0e1d611a55..0000000000
--- a/reference/parle/parle/parser/reduceid.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="parle-parser.reduceid" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Parle\Parser::reduceId</refname>
-  <refpurpose>Get reduce id</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Parle\Parser::reduceId</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Get the grammar rule id just processed in the reduce action. The returned value corresponds either to a token or to a parser rule. 
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &integer; represeting the rule id.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/parle/parle/rlexer/state.xml b/reference/parle/parle/rlexer/state.xml
deleted file mode 100644
index 4cac1a030b..0000000000
--- a/reference/parle/parle/rlexer/state.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="parle-rlexer.state" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Parle\RLexer::state</refname>
-  <refpurpose>Get current lexer state</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Parle\RLexer::state</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Return &integer;.  
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/parle/parle/stack/empty.xml b/reference/parle/parle/stack/empty.xml
deleted file mode 100644
index 45cf4fe9be..0000000000
--- a/reference/parle/parle/stack/empty.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="parle-stack.empty" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Parle\Stack::empty</refname>
-  <refpurpose>Check whether the stack is empty</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Parle\Stack::empty</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &boolean;.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/parle/parle/stack/size.xml b/reference/parle/parle/stack/size.xml
deleted file mode 100644
index 463f9b2306..0000000000
--- a/reference/parle/parle/stack/size.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="parle-stack.size" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Parle\Stack::size</refname>
-  <refpurpose>Retrieve the stack size</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Parle\Stack::size</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &integer; representing the item number in the stack. 
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->