Recommit for updates in build 11

doc/puppet_classes/confdroid_apache_3A_3Aserver_3A_3Adirs.html

@@ -292,7 +292,8 @@ httpd service.
 194
 195
 196
-197</pre>
+197
+198</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/server/dirs.pp', line 7</span>
@@ -300,6 +301,7 @@ httpd service.
 class confdroid_apache::server::dirs (
 
 ) inherits confdroid_apache::params {
+  require confdroid_apache::server::install
 
   if $ae_manage_dirs == true {
     # create main dir

doc/puppet_classes/confdroid_apache_3A_3Aserver_3A_3Ainstall.html

@@ -108,8 +108,7 @@
 10
 11
 12
-13
-14</pre>
+13</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/server/install.pp', line 6</span>
@@ -117,7 +116,6 @@
 class confdroid_apache::server::install (
 
 ) inherits confdroid_apache::params {
-  require cd_resources
 
   package { $reqpackages:
     ensure =&gt; $pkg_ensure,