diff --git a/reference/yaf/ini.xml b/reference/yaf/ini.xml
index 33e497a45f..df055d90d8 100644
--- a/reference/yaf/ini.xml
+++ b/reference/yaf/ini.xml
@@ -62,7 +62,7 @@
      <row>
       <entry>yaf.cache_config</entry>
       <entry>0</entry>
-      <entry>its PHP_INI_ALL value</entry>
+      <entry>its PHP_INI_SYS value</entry>
       <entry><!-- leave empty, this will be filled by an automatic script --></entry>
      </row>
      <row>
diff --git a/reference/yaf/setup.xml b/reference/yaf/setup.xml
index be43f7f911..0bcf856481 100644
--- a/reference/yaf/setup.xml
+++ b/reference/yaf/setup.xml
@@ -4,13 +4,14 @@
 <chapter xml:id="yaf.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  &reftitle.setup;
 
+ <!-- {{{ Requirements -->
  <section xml:id="yaf.requirements">
+  &reftitle.required;
   &no.requirement;
-  <para>
-
-  </para>
  </section>
+ <!-- }}} -->
 
+ <!-- {{{ Installation -->
  <section xml:id="yaf.installation">
   &reftitle.install;
   <para>
@@ -24,18 +25,18 @@
    &pecl.windows.download;
   </para>
  </section>
+ <!-- }}} -->
 
- <section xml:id="yaf.configuration">
-  &reftitle.runtime;
-  &no.config;
- </section>
+ <!-- {{{ Configuration -->
+ &reference.yaf.ini;
+ <!-- }}} -->
 
+ <!-- {{{ Resources -->
  <section xml:id="yaf.resources">
+  &reftitle.resources;
   &no.resource;
-  <para>
-
-  </para>
  </section>
+ <!-- }}} -->
 
 </chapter>
 
diff --git a/reference/yaf/yaf-dispatcher.xml b/reference/yaf/yaf-dispatcher.xml
index 3b2f719c17..c017341a59 100644
--- a/reference/yaf/yaf-dispatcher.xml
+++ b/reference/yaf/yaf-dispatcher.xml
@@ -49,6 +49,7 @@
      <varname linkend="yaf-dispatcher.props.plugins">_plugins</varname>
     </fieldsynopsis>
     <fieldsynopsis>
+     <modifier>protected</modifier>
      <modifier>static</modifier>
      <varname linkend="yaf-dispatcher.props.instance">_instance</varname>
     </fieldsynopsis>
diff --git a/reference/yaf/yaf_controller_abstract/clone.xml b/reference/yaf/yaf_controller_abstract/clone.xml
index 5d9808bbb4..852944ccc2 100644
--- a/reference/yaf/yaf_controller_abstract/clone.xml
+++ b/reference/yaf/yaf_controller_abstract/clone.xml
@@ -4,7 +4,7 @@
 <refentry xml:id="yaf-controller-abstract.clone" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>Yaf_Controller_Abstract::__clone</refname>
-  <refpurpose>The __clone purpose</refpurpose>
+  <refpurpose>Yaf_Controller_Abstract can not be cloned</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
diff --git a/reference/yaf/yaf_controller_abstract/construct.xml b/reference/yaf/yaf_controller_abstract/construct.xml
index d6be21870f..15d02a6dfc 100644
--- a/reference/yaf/yaf_controller_abstract/construct.xml
+++ b/reference/yaf/yaf_controller_abstract/construct.xml
@@ -4,13 +4,13 @@
 <refentry xml:id="yaf-controller-abstract.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>Yaf_Controller_Abstract::__construct</refname>
-  <refpurpose>The __construct purpose</refpurpose>
+  <refpurpose>Yaf_Controller_Abstract constructor</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <methodname>Yaf_Controller_Abstract::__construct</methodname>
+   <modifier>final</modifier> <modifier>private</modifier> <methodname>Yaf_Controller_Abstract::__construct</methodname>
    <void />
   </methodsynopsis>
   <para>
diff --git a/reference/yaf/yaf_dispatcher/sleep.xml b/reference/yaf/yaf_dispatcher/sleep.xml
index fdb9b51a90..6b4c170310 100644
--- a/reference/yaf/yaf_dispatcher/sleep.xml
+++ b/reference/yaf/yaf_dispatcher/sleep.xml
@@ -4,7 +4,7 @@
 <refentry xml:id="yaf-dispatcher.sleep" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>Yaf_Dispatcher::__sleep</refname>
-  <refpurpose>The __sleep purpose</refpurpose>
+  <refpurpose>Yaf_Dispatcher can not be serialized</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
diff --git a/reference/yaf/yaf_dispatcher/wakeup.xml b/reference/yaf/yaf_dispatcher/wakeup.xml
index 2fe7b50101..e14af61d54 100644
--- a/reference/yaf/yaf_dispatcher/wakeup.xml
+++ b/reference/yaf/yaf_dispatcher/wakeup.xml
@@ -4,7 +4,7 @@
 <refentry xml:id="yaf-dispatcher.wakeup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>Yaf_Dispatcher::__wakeup</refname>
-  <refpurpose>The __wakeup purpose</refpurpose>
+  <refpurpose>Yaf_Dispatcher can not be unserialized</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">