diff --git a/reference/yar/book.xml b/reference/yar/book.xml
index a5a848d4b..8136bba09 100644
--- a/reference/yar/book.xml
+++ b/reference/yar/book.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 68c2c871505aadf983f16113c5b077b335ce8d76 Maintainer: seros Status: ready -->
+<!-- EN-Revision: 28975cb447c4d3e13fdfd2f9c1eb3e8b7c231e3f Maintainer: seros Status: ready -->
 <!-- Reviewed: no -->
 
 <book xml:id="book.yar" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
@@ -24,7 +24,15 @@
  &reference.yar.yar-client;
  &reference.yar.yar-concurrent-client;
  &reference.yar.yar-server-exception;
+ &reference.yar.yar-server-output-exception;
+ &reference.yar.yar-server-packager-exception;
+ &reference.yar.yar-server-protocol-exception;
+ &reference.yar.yar-server-request-exception;
+
  &reference.yar.yar-client-exception;
+ &reference.yar.yar-client-packager-exception;
+ &reference.yar.yar-client-protocol-exception;
+ &reference.yar.yar-client-transport-exception;
 
 </book>
 
diff --git a/reference/yar/reference.xml b/reference/yar/reference.xml
deleted file mode 100644
index 066f035fc..000000000
--- a/reference/yar/reference.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- EN-Revision: 914b97130aed191518791045b93b6f858ef5a139 Maintainer: seros Status: ready -->
-<!-- Reviewed: no -->
-
-<reference xml:id="ref.yar" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>&Functions; de Yar</title>
-
- &reference.yar.entities.functions;
-
-</reference>
-
-<!-- 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/yar/yar-client-packager-exception.xml b/reference/yar/yar-client-packager-exception.xml
index fc8765051..b9eaa45ec 100644
--- a/reference/yar/yar-client-packager-exception.xml
+++ b/reference/yar/yar-client-packager-exception.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 4d17b7b4947e7819ff5036715dd706be87ae4def Maintainer: seros Status: ready -->
+<!-- EN-Revision: 28975cb447c4d3e13fdfd2f9c1eb3e8b7c231e3f Maintainer: seros Status: ready -->
 <!-- Reviewed: no -->
 
 <reference xml:id="class.yar-client-packager-exception" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -41,11 +41,9 @@
     <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
 
 
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yar-client-packager-exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yar-client-exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
 
    </classsynopsis>
 <!-- }}} -->
@@ -88,8 +86,6 @@
 
  </partintro>
 
- &reference.yar.entities.yar-client-packager-exception;
-
 </reference>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/yar/yar-client-protocol-exception.xml b/reference/yar/yar-client-protocol-exception.xml
index 941d44762..23d78d60a 100644
--- a/reference/yar/yar-client-protocol-exception.xml
+++ b/reference/yar/yar-client-protocol-exception.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 4d17b7b4947e7819ff5036715dd706be87ae4def Maintainer: seros Status: ready -->
+<!-- EN-Revision: 28975cb447c4d3e13fdfd2f9c1eb3e8b7c231e3f Maintainer: seros Status: ready -->
 <!-- Reviewed: no -->
 
 <reference xml:id="class.yar-client-protocol-exception" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -41,11 +41,9 @@
     <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
 
 
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yar-client-protocol-exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yar-client-exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
 
    </classsynopsis>
 <!-- }}} -->
@@ -88,8 +86,6 @@
 
  </partintro>
 
- &reference.yar.entities.yar-client-protocol-exception;
-
 </reference>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/yar/yar-client-transport-exception.xml b/reference/yar/yar-client-transport-exception.xml
index 09df014a2..9251225db 100644
--- a/reference/yar/yar-client-transport-exception.xml
+++ b/reference/yar/yar-client-transport-exception.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 4d17b7b4947e7819ff5036715dd706be87ae4def Maintainer: seros Status: ready -->
+<!-- EN-Revision: 28975cb447c4d3e13fdfd2f9c1eb3e8b7c231e3f Maintainer: seros Status: ready -->
 <!-- Reviewed: no -->
 
 <reference xml:id="class.yar-client-transport-exception" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -41,11 +41,9 @@
     <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
 
 
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yar-client-transport-exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yar-client-exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
 
    </classsynopsis>
 <!-- }}} -->
@@ -88,8 +86,6 @@
 
  </partintro>
 
- &reference.yar.entities.yar-client-transport-exception;
-
 </reference>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/yar/yar-server-output-exception.xml b/reference/yar/yar-server-output-exception.xml
index a8905cdba..ba8868cb1 100644
--- a/reference/yar/yar-server-output-exception.xml
+++ b/reference/yar/yar-server-output-exception.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 4d17b7b4947e7819ff5036715dd706be87ae4def Maintainer: seros Status: ready -->
+<!-- EN-Revision: 28975cb447c4d3e13fdfd2f9c1eb3e8b7c231e3f Maintainer: seros Status: ready -->
 <!-- Reviewed: no -->
 
 <reference xml:id="class.yar-server-output-exception" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -41,11 +41,9 @@
     <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
 
 
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yar-server-output-exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yar-server-exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
 
    </classsynopsis>
 <!-- }}} -->
@@ -88,8 +86,6 @@
 
  </partintro>
 
- &reference.yar.entities.yar-server-output-exception;
-
 </reference>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/yar/yar-server-packager-exception.xml b/reference/yar/yar-server-packager-exception.xml
index d2dcc821e..bfdbd0226 100644
--- a/reference/yar/yar-server-packager-exception.xml
+++ b/reference/yar/yar-server-packager-exception.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 4d17b7b4947e7819ff5036715dd706be87ae4def Maintainer: seros Status: ready -->
+<!-- EN-Revision: 28975cb447c4d3e13fdfd2f9c1eb3e8b7c231e3f Maintainer: seros Status: ready -->
 <!-- Reviewed: no -->
 
 <reference xml:id="class.yar-server-packager-exception" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -41,11 +41,9 @@
     <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
 
 
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yar-server-packager-exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yar-server-exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
 
    </classsynopsis>
 <!-- }}} -->
@@ -88,8 +86,6 @@
 
  </partintro>
 
- &reference.yar.entities.yar-server-packager-exception;
-
 </reference>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/yar/yar-server-protocol-exception.xml b/reference/yar/yar-server-protocol-exception.xml
index f74f5f570..72535b66f 100644
--- a/reference/yar/yar-server-protocol-exception.xml
+++ b/reference/yar/yar-server-protocol-exception.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 4d17b7b4947e7819ff5036715dd706be87ae4def Maintainer: seros Status: ready -->
+<!-- EN-Revision: 28975cb447c4d3e13fdfd2f9c1eb3e8b7c231e3f Maintainer: seros Status: ready -->
 <!-- Reviewed: no -->
 
 <reference xml:id="class.yar-server-protocol-exception" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -41,11 +41,9 @@
     <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
 
 
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yar-server-protocol-exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yar-server-exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
 
    </classsynopsis>
 <!-- }}} -->
@@ -88,8 +86,6 @@
 
  </partintro>
 
- &reference.yar.entities.yar-server-protocol-exception;
-
 </reference>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/yar/yar-server-request-exception.xml b/reference/yar/yar-server-request-exception.xml
index 8b95123fb..25e6de130 100644
--- a/reference/yar/yar-server-request-exception.xml
+++ b/reference/yar/yar-server-request-exception.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 4d17b7b4947e7819ff5036715dd706be87ae4def Maintainer: seros Status: ready -->
+<!-- EN-Revision: 28975cb447c4d3e13fdfd2f9c1eb3e8b7c231e3f Maintainer: seros Status: ready -->
 <!-- Reviewed: no -->
 
 <reference xml:id="class.yar-server-request-exception" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -41,11 +41,9 @@
     <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
 
 
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yar-server-request-exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yar-server-exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
 
    </classsynopsis>
 <!-- }}} -->
@@ -88,8 +86,6 @@
 
  </partintro>
 
- &reference.yar.entities.yar-server-request-exception;
-
 </reference>
 
 <!-- Keep this comment at the end of the file