diff --git a/reference/yaf/book.xml b/reference/yaf/book.xml
index 60d7bb90ee..114dfac736 100644
--- a/reference/yaf/book.xml
+++ b/reference/yaf/book.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- EN-Revision: 68c2c871505aadf983f16113c5b077b335ce8d76 Maintainer: yannick Status: ready -->
-<!-- Reviewed: no -->
+<!-- EN-Revision: bd23019549a09eb15f5c772987c76781ab5f5f09 Maintainer: yannick Status: ready -->
 
 <book xml:id="book.yaf" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <?phpdoc extension-membership="pecl" ?>
@@ -45,6 +43,8 @@
  &reference.yaf.yaf-request-http;
  &reference.yaf.yaf-request-simple;
  &reference.yaf.yaf-response-abstract;
+ &reference.yaf.yaf-response-cli;
+ &reference.yaf.yaf-response-http;
  &reference.yaf.yaf-route-interface;
  &reference.yaf.yaf-route-map;
  &reference.yaf.yaf-route-regex;
diff --git a/reference/yaf/reference.xml b/reference/yaf/reference.xml
deleted file mode 100644
index 909a9909f2..0000000000
--- a/reference/yaf/reference.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- EN-Revision: 1f71c647dd6e32a7e4f03c33bac449c69ed2135b Maintainer: yannick Status: ready -->
-<!-- Reviewed: yes -->
-
-<reference xml:id="ref.yaf" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>&Functions; Yaf</title>
-
- &reference.yaf.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/yaf/yaf-response-cli.xml b/reference/yaf/yaf-response-cli.xml
index aa47f45242..354fada1ae 100644
--- a/reference/yaf/yaf-response-cli.xml
+++ b/reference/yaf/yaf-response-cli.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- EN-Revision: 4d17b7b4947e7819ff5036715dd706be87ae4def Maintainer: yannick Status: ready -->
-<!-- Reviewed: yes -->
+<!-- EN-Revision: bd23019549a09eb15f5c772987c76781ab5f5f09 Maintainer: yannick Status: ready -->
 
 <reference xml:id="class.yaf-response-cli" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
 
@@ -31,7 +29,7 @@
      <ooclass>
       <classname>Yaf_Response_Cli</classname>
      </ooclass>
-     
+
      <ooclass>
       <modifier>extends</modifier>
       <classname>Yaf_Response_Abstract</classname>
@@ -41,8 +39,6 @@
     <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
 
     
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaf-response-cli')/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.yaf-response-abstract')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
@@ -82,7 +78,6 @@
 
  </partintro>
 
- &reference.yaf.entities.yaf-response-cli;
 
 </reference>
 
diff --git a/reference/yaf/yaf-response-http.xml b/reference/yaf/yaf-response-http.xml
index a0b64133bf..3293016e15 100644
--- a/reference/yaf/yaf-response-http.xml
+++ b/reference/yaf/yaf-response-http.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- EN-Revision: 4d17b7b4947e7819ff5036715dd706be87ae4def Maintainer: yannick Status: ready -->
-<!-- Reviewed: yes -->
+<!-- EN-Revision: bd23019549a09eb15f5c772987c76781ab5f5f09 Maintainer: yannick Status: ready -->
 
 <reference xml:id="class.yaf-response-http" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
 
@@ -31,7 +29,7 @@
      <ooclass>
       <classname>Yaf_Response_Http</classname>
      </ooclass>
-     
+
      <ooclass>
       <modifier>extends</modifier>
       <classname>Yaf_Response_Abstract</classname>
@@ -49,8 +47,6 @@
     </fieldsynopsis>
 
     
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaf-response-http')/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.yaf-response-abstract')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
@@ -96,7 +92,6 @@
 
  </partintro>
 
- &reference.yaf.entities.yaf-response-http;
 
 </reference>