Merge branch '11-stable'

This merge doesn't bring in the version number change which should be different on master.

Conflicts:
	distro/common/man/man8/chef-expander.8
	distro/common/man/man8/chef-expanderctl.8
	distro/common/man/man8/chef-server-webui.8
	distro/common/man/man8/chef-server.8
	distro/common/man/man8/chef-solr.8

32 files changed, 77 insertions, 671 deletions

diff --git a/Rakefile b/Rakefile
index eb48b8e389..7e4d5bc14f 100644
--- a/Rakefile
+++ b/Rakefile
@@ -71,14 +71,11 @@ end
 RONN_OPTS = "--manual='Chef Manual' --organization='Chef #{Chef::VERSION}' --date='#{Time.new.strftime('%Y-%m-%d')}'"
 
 namespace :docs do
-  desc "Regenerate manpages from markdown"
-  task :man
-
   desc "Regenerate HTML manual from markdown"
   task :html
 
   desc "Regenerate help topics from man pages"
-  task :list => :man do
+  task :list do
     topics = Array.new
 
     Dir['distro/common/man/man1/*.1'].each do |man|
@@ -106,30 +103,22 @@ namespace :docs do
       Dir[dir].each do |mkd|
         basename = File.basename(mkd, '.mkd')
         if dir =~ /man1/
-          manfile = "distro/common/man/man1/#{basename}.1"
           htmlfile = "distro/common/html/#{basename}.1.html"
         elsif dir =~ /man8/
-          manfile = "distro/common/man/man8/#{basename}.8"
           htmlfile = "distro/common/html/#{basename}.8.html"
         end
 
-        file(manfile => [mkd, 'lib/chef/version.rb']) do
-           sh "ronn -r #{RONN_OPTS} #{mkd} --pipe > #{manfile}"
-         end
-         task :man => manfile
-
          file(htmlfile => [mkd, 'lib/chef/version.rb']) do
            sh "ronn -5 #{RONN_OPTS} --style=toc #{mkd} --pipe > #{htmlfile}"
          end
          task :html => htmlfile
-
       end
     end
   else
     puts "get with the program and install ronn"
   end
 
-  task :all => [:man, :html]
+  task :all => [:list, :html]
 end
 
 task :docs => "docs:all"
diff --git a/distro/common/html/chef-client.8.html b/distro/common/html/chef-client.8.html
index 3f402ddcd3..b2e21a6c56 100644
--- a/distro/common/html/chef-client.8.html
+++ b/distro/common/html/chef-client.8.html
@@ -124,9 +124,9 @@ wiki, http://wiki.opscode.com/display/chef/Home.</p>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>Chef was written by Adam Jacob <a href="&#109;&#x61;&#x69;&#x6c;&#x74;&#111;&#x3a;&#97;&#x64;&#97;&#x6d;&#x40;&#x6f;&#115;&#x70;&#99;&#111;&#100;&#101;&#x2e;&#x63;&#x6f;&#x6d;" data-bare-link="true">&#97;&#100;&#97;&#x6d;&#64;&#111;&#x73;&#112;&#99;&#111;&#x64;&#101;&#x2e;&#x63;&#x6f;&#109;</a> of Opscode
+<p>Chef was written by Adam Jacob <a href="&#109;&#x61;&#x69;&#108;&#116;&#x6f;&#x3a;&#x61;&#100;&#97;&#109;&#64;&#x6f;&#x73;&#x70;&#x63;&#x6f;&#x64;&#x65;&#x2e;&#x63;&#x6f;&#x6d;" data-bare-link="true">&#97;&#100;&#x61;&#x6d;&#x40;&#x6f;&#115;&#112;&#x63;&#x6f;&#x64;&#x65;&#46;&#x63;&#111;&#x6d;</a> of Opscode
 (http://www.opscode.com),  with contributions from the community.  This
-manual page was written by Joshua Timberman  <a href="&#109;&#x61;&#x69;&#108;&#116;&#111;&#x3a;&#x6a;&#111;&#x73;&#x68;&#117;&#x61;&#x40;&#x6f;&#x70;&#x73;&#99;&#x6f;&#100;&#101;&#46;&#99;&#111;&#109;" data-bare-link="true">&#x6a;&#111;&#115;&#x68;&#x75;&#97;&#x40;&#111;&#x70;&#x73;&#x63;&#x6f;&#x64;&#101;&#46;&#99;&#x6f;&#109;</a>  with
+manual page was written by Joshua Timberman  <a href="&#x6d;&#97;&#x69;&#108;&#116;&#x6f;&#x3a;&#x6a;&#111;&#115;&#x68;&#x75;&#x61;&#64;&#111;&#112;&#115;&#99;&#x6f;&#x64;&#x65;&#x2e;&#x63;&#111;&#109;" data-bare-link="true">&#x6a;&#x6f;&#115;&#104;&#x75;&#97;&#x40;&#x6f;&#x70;&#x73;&#x63;&#111;&#100;&#x65;&#x2e;&#99;&#111;&#109;</a>  with
 help2man.  Permission  is  granted  to copy, distribute and / or modify
 this document under the terms of the Apache 2.0 License.</p>
 
@@ -135,7 +135,7 @@ found in /usr/share/common-licenses/Apache-2.0.</p>
 
 
   <ol class='man-decor man-foot man foot'>
-    <li class='tl'>Chef 11.10.0.alpha.0</li>
+    <li class='tl'>Chef 11.8.0.rc.0</li>
     <li class='tc'>October 2013</li>
     <li class='tr'>chef-client(8)</li>
   </ol>
diff --git a/distro/common/html/chef-expander.8.html b/distro/common/html/chef-expander.8.html
index 523b1abedd..31b0b21407 100644
--- a/distro/common/html/chef-expander.8.html
+++ b/distro/common/html/chef-expander.8.html
@@ -143,9 +143,9 @@ wiki, http://wiki.opscode.com/display/chef/Home.</p>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>Chef was written by Adam Jacob <a href="&#x6d;&#x61;&#105;&#x6c;&#116;&#x6f;&#58;&#x61;&#x64;&#x61;&#x6d;&#64;&#111;&#115;&#x70;&#99;&#x6f;&#100;&#x65;&#x2e;&#99;&#111;&#x6d;" data-bare-link="true">&#97;&#x64;&#x61;&#x6d;&#x40;&#111;&#x73;&#112;&#x63;&#x6f;&#x64;&#x65;&#x2e;&#99;&#x6f;&#109;</a> of Opscode
+<p>Chef was written by Adam Jacob <a href="&#x6d;&#x61;&#105;&#x6c;&#x74;&#x6f;&#58;&#97;&#100;&#97;&#109;&#x40;&#111;&#x73;&#112;&#x63;&#x6f;&#100;&#101;&#46;&#x63;&#111;&#x6d;" data-bare-link="true">&#97;&#100;&#x61;&#x6d;&#x40;&#x6f;&#115;&#x70;&#x63;&#x6f;&#x64;&#101;&#46;&#99;&#111;&#109;</a> of Opscode
 (http://www.opscode.com),  with contributions from the community. This
-manual page was created by Nuo Yan <a href="&#x6d;&#97;&#x69;&#x6c;&#116;&#111;&#x3a;&#110;&#x75;&#x6f;&#64;&#111;&#x70;&#115;&#x63;&#x6f;&#x64;&#x65;&#46;&#99;&#x6f;&#109;" data-bare-link="true">&#x6e;&#117;&#x6f;&#64;&#x6f;&#112;&#115;&#99;&#x6f;&#x64;&#101;&#46;&#99;&#111;&#109;</a>. Permission is
+manual page was created by Nuo Yan <a href="&#x6d;&#x61;&#x69;&#108;&#x74;&#111;&#58;&#110;&#117;&#x6f;&#64;&#111;&#112;&#x73;&#99;&#111;&#x64;&#x65;&#x2e;&#99;&#111;&#x6d;" data-bare-link="true">&#x6e;&#x75;&#x6f;&#x40;&#111;&#x70;&#x73;&#99;&#111;&#100;&#x65;&#x2e;&#x63;&#x6f;&#x6d;</a>. Permission is
 granted to copy, distribute and / or modify this document under the
 terms of the Apache 2.0 License.</p>
 
@@ -154,7 +154,7 @@ found in /usr/share/common-licenses/Apache-2.0.</p>
 
 
   <ol class='man-decor man-foot man foot'>
-    <li class='tl'>Chef 11.10.0.alpha.0</li>
+    <li class='tl'>Chef 11.8.0.rc.0</li>
     <li class='tc'>October 2013</li>
     <li class='tr'>chef-expander(8)</li>
   </ol>
diff --git a/distro/common/html/chef-expanderctl.8.html b/distro/common/html/chef-expanderctl.8.html
index 36d3fdab45..8e4cc64c20 100644
--- a/distro/common/html/chef-expanderctl.8.html
+++ b/distro/common/html/chef-expanderctl.8.html
@@ -125,9 +125,9 @@ wiki, http://wiki.opscode.com/display/chef/Home.</p>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>Chef was written by Adam Jacob <a href="&#109;&#x61;&#x69;&#x6c;&#116;&#x6f;&#58;&#x61;&#x64;&#x61;&#109;&#64;&#x6f;&#x73;&#112;&#x63;&#x6f;&#x64;&#101;&#46;&#x63;&#111;&#109;" data-bare-link="true">&#97;&#100;&#97;&#x6d;&#x40;&#111;&#x73;&#x70;&#x63;&#111;&#x64;&#101;&#46;&#99;&#x6f;&#x6d;</a> of Opscode
+<p>Chef was written by Adam Jacob <a href="&#x6d;&#x61;&#105;&#x6c;&#x74;&#x6f;&#58;&#97;&#100;&#97;&#109;&#x40;&#111;&#x73;&#112;&#x63;&#x6f;&#100;&#101;&#46;&#x63;&#111;&#x6d;" data-bare-link="true">&#97;&#100;&#x61;&#x6d;&#x40;&#x6f;&#115;&#x70;&#x63;&#x6f;&#x64;&#101;&#46;&#99;&#111;&#109;</a> of Opscode
 (http://www.opscode.com),  with contributions from the community. This
-manual page was created by Nuo Yan <a href="&#x6d;&#97;&#105;&#x6c;&#x74;&#x6f;&#x3a;&#110;&#117;&#111;&#64;&#111;&#112;&#115;&#99;&#111;&#x64;&#101;&#46;&#99;&#x6f;&#x6d;" data-bare-link="true">&#110;&#117;&#111;&#x40;&#111;&#112;&#x73;&#x63;&#111;&#100;&#x65;&#46;&#99;&#111;&#x6d;</a>. Permission is
+manual page was created by Nuo Yan <a href="&#x6d;&#x61;&#x69;&#108;&#x74;&#111;&#58;&#110;&#117;&#x6f;&#64;&#111;&#112;&#x73;&#99;&#111;&#x64;&#x65;&#x2e;&#99;&#111;&#x6d;" data-bare-link="true">&#x6e;&#x75;&#x6f;&#x40;&#111;&#x70;&#x73;&#99;&#111;&#100;&#x65;&#x2e;&#x63;&#x6f;&#x6d;</a>. Permission is
 granted to copy, distribute and / or modify this document under the
 terms of the Apache 2.0 License.</p>
 
@@ -136,7 +136,7 @@ found in /usr/share/common-licenses/Apache-2.0.</p>
 
 
   <ol class='man-decor man-foot man foot'>
-    <li class='tl'>Chef 11.10.0.alpha.0</li>
+    <li class='tl'>Chef 11.8.0.rc.0</li>
     <li class='tc'>October 2013</li>
     <li class='tr'>chef-expanderctl(8)</li>
   </ol>
diff --git a/distro/common/html/chef-server-webui.8.html b/distro/common/html/chef-server-webui.8.html
index cbb284bc69..004a6536cb 100644
--- a/distro/common/html/chef-server-webui.8.html
+++ b/distro/common/html/chef-server-webui.8.html
@@ -163,9 +163,9 @@ is located on the Chef wiki, http://wiki.opscode.com/display/chef/Home.</p>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>Chef was written by Adam Jacob <a href="&#109;&#97;&#x69;&#108;&#x74;&#111;&#x3a;&#97;&#x64;&#x61;&#x6d;&#x40;&#111;&#115;&#112;&#x63;&#111;&#x64;&#101;&#46;&#99;&#111;&#x6d;" data-bare-link="true">&#x61;&#x64;&#x61;&#x6d;&#x40;&#111;&#x73;&#x70;&#99;&#x6f;&#100;&#x65;&#46;&#99;&#111;&#x6d;</a> of Opscode
+<p>Chef was written by Adam Jacob <a href="&#109;&#x61;&#x69;&#108;&#x74;&#111;&#58;&#x61;&#x64;&#x61;&#109;&#64;&#x6f;&#x73;&#x70;&#99;&#111;&#x64;&#x65;&#x2e;&#x63;&#x6f;&#x6d;" data-bare-link="true">&#x61;&#100;&#x61;&#x6d;&#x40;&#x6f;&#x73;&#x70;&#99;&#111;&#x64;&#101;&#x2e;&#x63;&#x6f;&#109;</a> of Opscode
 (http://www.opscode.com), with contributions from the  community. This
-manual page was written by Joshua Timberman <a href="&#x6d;&#97;&#105;&#x6c;&#116;&#111;&#x3a;&#x6a;&#x6f;&#x73;&#x68;&#x75;&#x61;&#x40;&#111;&#112;&#115;&#x63;&#x6f;&#x64;&#x65;&#46;&#99;&#111;&#x6d;" data-bare-link="true">&#106;&#x6f;&#115;&#x68;&#x75;&#x61;&#64;&#x6f;&#x70;&#x73;&#99;&#x6f;&#x64;&#x65;&#46;&#99;&#x6f;&#x6d;</a> with
+manual page was written by Joshua Timberman <a href="&#109;&#97;&#x69;&#108;&#x74;&#111;&#x3a;&#x6a;&#111;&#115;&#104;&#117;&#97;&#x40;&#x6f;&#x70;&#x73;&#99;&#111;&#x64;&#101;&#x2e;&#99;&#111;&#x6d;" data-bare-link="true">&#x6a;&#111;&#x73;&#104;&#x75;&#x61;&#x40;&#x6f;&#112;&#x73;&#99;&#x6f;&#x64;&#101;&#x2e;&#x63;&#111;&#x6d;</a> with
 help2man for the Debian project (but may be used by others). Permission
 is granted to copy, distribute and / or modify this document under the
 terms of the Apache 2.0 License.</p>
@@ -175,7 +175,7 @@ found in /usr/share/common-licenses/Apache-2.0.</p>
 
 
   <ol class='man-decor man-foot man foot'>
-    <li class='tl'>Chef 11.10.0.alpha.0</li>
+    <li class='tl'>Chef 11.8.0.rc.0</li>
     <li class='tc'>October 2013</li>
     <li class='tr'>chef-server-webui(8)</li>
   </ol>
diff --git a/distro/common/html/chef-server.8.html b/distro/common/html/chef-server.8.html
index cf5753cceb..e3741a9f9c 100644
--- a/distro/common/html/chef-server.8.html
+++ b/distro/common/html/chef-server.8.html
@@ -161,9 +161,9 @@ wiki, http://wiki.opscode.com/display/chef/Home.</p>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>Chef was written by Adam Jacob <a href="&#109;&#97;&#x69;&#108;&#x74;&#111;&#x3a;&#97;&#x64;&#x61;&#x6d;&#x40;&#111;&#115;&#112;&#x63;&#111;&#x64;&#101;&#46;&#99;&#111;&#x6d;" data-bare-link="true">&#x61;&#x64;&#x61;&#x6d;&#x40;&#111;&#x73;&#x70;&#99;&#x6f;&#100;&#x65;&#46;&#99;&#111;&#x6d;</a> of Opscode
+<p>Chef was written by Adam Jacob <a href="&#109;&#x61;&#105;&#x6c;&#x74;&#111;&#x3a;&#x61;&#100;&#x61;&#109;&#x40;&#111;&#x73;&#x70;&#99;&#x6f;&#x64;&#101;&#x2e;&#x63;&#x6f;&#x6d;" data-bare-link="true">&#97;&#x64;&#97;&#109;&#x40;&#111;&#115;&#x70;&#99;&#111;&#x64;&#x65;&#x2e;&#x63;&#111;&#109;</a> of Opscode
 (http://www.opscode.com),  with contributions from the community.  This
-manual page was written by Joshua Timberman  <a href="&#x6d;&#97;&#105;&#x6c;&#116;&#111;&#x3a;&#x6a;&#x6f;&#x73;&#x68;&#x75;&#x61;&#x40;&#111;&#112;&#115;&#x63;&#x6f;&#x64;&#x65;&#46;&#99;&#111;&#x6d;" data-bare-link="true">&#106;&#x6f;&#115;&#x68;&#x75;&#x61;&#64;&#x6f;&#x70;&#x73;&#99;&#x6f;&#x64;&#x65;&#46;&#99;&#x6f;&#x6d;</a>  with
+manual page was written by Joshua Timberman  <a href="&#x6d;&#x61;&#105;&#108;&#116;&#x6f;&#x3a;&#106;&#111;&#115;&#104;&#117;&#x61;&#x40;&#x6f;&#112;&#115;&#x63;&#111;&#x64;&#x65;&#x2e;&#99;&#111;&#x6d;" data-bare-link="true">&#x6a;&#x6f;&#115;&#104;&#117;&#97;&#64;&#x6f;&#112;&#115;&#x63;&#x6f;&#100;&#101;&#46;&#99;&#111;&#109;</a>  with
 help2man.  Permission  is  granted  to copy, distribute and / or modify
 this document under the terms of the Apache 2.0 License.</p>
 
@@ -172,7 +172,7 @@ found in /usr/share/common-licenses/Apache-2.0.</p>
 
 
   <ol class='man-decor man-foot man foot'>
-    <li class='tl'>Chef 11.10.0.alpha.0</li>
+    <li class='tl'>Chef 11.8.0.rc.0</li>
     <li class='tc'>October 2013</li>
     <li class='tr'>chef-server(8)</li>
   </ol>
diff --git a/distro/common/html/chef-shell.1.html b/distro/common/html/chef-shell.1.html
index 95b03fc812..3f2db2217c 100644
--- a/distro/common/html/chef-shell.1.html
+++ b/distro/common/html/chef-shell.1.html
@@ -260,13 +260,13 @@ libraries.</p>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>   Chef was written by Adam Jacob <a href="&#109;&#97;&#x69;&#x6c;&#116;&#x6f;&#58;&#97;&#x64;&#97;&#x6d;&#x40;&#111;&#x70;&#x73;&#99;&#x6f;&#100;&#101;&#x2e;&#x63;&#111;&#x6d;" data-bare-link="true">&#x61;&#x64;&#97;&#109;&#x40;&#111;&#x70;&#x73;&#99;&#111;&#100;&#x65;&#46;&#x63;&#111;&#x6d;</a> with many
+<p>   Chef was written by Adam Jacob <a href="&#109;&#x61;&#x69;&#x6c;&#x74;&#111;&#58;&#x61;&#100;&#x61;&#x6d;&#64;&#x6f;&#112;&#115;&#99;&#x6f;&#x64;&#101;&#46;&#99;&#x6f;&#x6d;" data-bare-link="true">&#x61;&#100;&#97;&#x6d;&#64;&#x6f;&#x70;&#x73;&#x63;&#111;&#100;&#101;&#x2e;&#99;&#x6f;&#x6d;</a> with many
    contributions from the community. chef-shell was written by Daniel
    DeLeo.</p>
 
 <h2 id="DOCUMENTATION">DOCUMENTATION</h2>
 
-<p>   This manual page was written by Daniel DeLeo <a href="&#109;&#97;&#105;&#108;&#x74;&#111;&#x3a;&#x64;&#x61;&#x6e;&#x40;&#111;&#112;&#x73;&#x63;&#111;&#100;&#101;&#46;&#x63;&#111;&#x6d;" data-bare-link="true">&#100;&#97;&#x6e;&#64;&#x6f;&#112;&#x73;&#x63;&#x6f;&#100;&#101;&#x2e;&#99;&#x6f;&#x6d;</a>.
+<p>   This manual page was written by Daniel DeLeo <a href="&#109;&#97;&#105;&#108;&#x74;&#111;&#x3a;&#100;&#97;&#110;&#64;&#111;&#112;&#x73;&#x63;&#111;&#100;&#x65;&#x2e;&#99;&#111;&#109;" data-bare-link="true">&#x64;&#97;&#110;&#x40;&#111;&#112;&#x73;&#x63;&#x6f;&#100;&#101;&#x2e;&#99;&#x6f;&#x6d;</a>.
    Permission is granted to copy, distribute and / or modify this
    document under the terms of the Apache 2.0 License.</p>
 
@@ -276,7 +276,7 @@ libraries.</p>
 
 
   <ol class='man-decor man-foot man foot'>
-    <li class='tl'>Chef 11.10.0.alpha.0</li>
+    <li class='tl'>Chef 11.8.0.rc.0</li>
     <li class='tc'>October 2013</li>
     <li class='tr'>chef-shell(1)</li>
   </ol>
diff --git a/distro/common/html/chef-solo.8.html b/distro/common/html/chef-solo.8.html
index 7d19d55666..bcbc00d043 100644
--- a/distro/common/html/chef-solo.8.html
+++ b/distro/common/html/chef-solo.8.html
@@ -164,9 +164,9 @@ http://wiki.opscode.com/display/chef/Home.</p>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>Chef was written by Adam Jacob <a href="&#109;&#97;&#105;&#108;&#116;&#x6f;&#x3a;&#97;&#100;&#97;&#x6d;&#x40;&#x6f;&#x73;&#112;&#99;&#x6f;&#x64;&#x65;&#x2e;&#x63;&#111;&#x6d;" data-bare-link="true">&#x61;&#100;&#97;&#x6d;&#x40;&#x6f;&#x73;&#112;&#99;&#x6f;&#100;&#101;&#x2e;&#99;&#111;&#109;</a> of Opscode
+<p>Chef was written by Adam Jacob <a href="&#109;&#x61;&#105;&#x6c;&#x74;&#111;&#x3a;&#x61;&#100;&#x61;&#109;&#x40;&#111;&#x73;&#x70;&#99;&#x6f;&#x64;&#101;&#x2e;&#x63;&#x6f;&#x6d;" data-bare-link="true">&#97;&#x64;&#97;&#109;&#x40;&#111;&#115;&#x70;&#99;&#111;&#x64;&#x65;&#x2e;&#x63;&#111;&#109;</a> of Opscode
 (http://www.opscode.com),  with contributions from the community.  This
-manual page was written by Joshua Timberman  <a href="&#109;&#97;&#x69;&#x6c;&#116;&#x6f;&#58;&#106;&#111;&#x73;&#x68;&#117;&#97;&#64;&#x6f;&#112;&#115;&#x63;&#x6f;&#100;&#x65;&#x2e;&#99;&#x6f;&#109;" data-bare-link="true">&#106;&#x6f;&#115;&#104;&#x75;&#97;&#64;&#111;&#x70;&#115;&#99;&#111;&#100;&#101;&#x2e;&#x63;&#x6f;&#x6d;</a>  with
+manual page was written by Joshua Timberman  <a href="&#x6d;&#x61;&#105;&#108;&#116;&#x6f;&#x3a;&#106;&#111;&#115;&#104;&#117;&#x61;&#x40;&#x6f;&#112;&#115;&#x63;&#111;&#x64;&#x65;&#x2e;&#99;&#111;&#x6d;" data-bare-link="true">&#x6a;&#x6f;&#115;&#104;&#117;&#97;&#64;&#x6f;&#112;&#115;&#x63;&#x6f;&#100;&#101;&#46;&#99;&#111;&#109;</a>  with
 help2man.  Permission  is  granted  to copy, distribute and / or modify
 this document under the terms of the Apache 2.0 License.</p>
 
@@ -175,7 +175,7 @@ found in /usr/share/common-licenses/Apache-2.0.</p>
 
 
   <ol class='man-decor man-foot man foot'>
-    <li class='tl'>Chef 11.10.0.alpha.0</li>
+    <li class='tl'>Chef 11.8.0.rc.0</li>
     <li class='tc'>October 2013</li>
     <li class='tr'>chef-solo(8)</li>
   </ol>
diff --git a/distro/common/html/chef-solr.8.html b/distro/common/html/chef-solr.8.html
index b2ac9e44ba..785b870904 100644
--- a/distro/common/html/chef-solr.8.html
+++ b/distro/common/html/chef-solr.8.html
@@ -144,9 +144,9 @@ wiki, http://wiki.opscode.com/display/chef/Home.</p>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>Chef was written by Adam Jacob <a href="&#x6d;&#x61;&#x69;&#108;&#116;&#x6f;&#x3a;&#97;&#x64;&#x61;&#x6d;&#64;&#111;&#115;&#112;&#99;&#111;&#100;&#101;&#46;&#x63;&#111;&#109;" data-bare-link="true">&#97;&#x64;&#97;&#x6d;&#x40;&#x6f;&#115;&#112;&#99;&#x6f;&#x64;&#x65;&#x2e;&#x63;&#111;&#x6d;</a> of Opscode
+<p>Chef was written by Adam Jacob <a href="&#x6d;&#x61;&#105;&#x6c;&#116;&#111;&#x3a;&#x61;&#100;&#97;&#x6d;&#64;&#x6f;&#115;&#x70;&#99;&#111;&#x64;&#x65;&#46;&#x63;&#x6f;&#x6d;" data-bare-link="true">&#97;&#x64;&#97;&#109;&#64;&#x6f;&#115;&#112;&#99;&#x6f;&#100;&#x65;&#46;&#99;&#x6f;&#x6d;</a> of Opscode
 (http://www.opscode.com),  with contributions from the community.  This
-manual page was written by Joshua Timberman  <a href="&#109;&#x61;&#105;&#108;&#116;&#111;&#58;&#106;&#x6f;&#115;&#x68;&#x75;&#97;&#x40;&#x6f;&#112;&#115;&#x63;&#x6f;&#x64;&#101;&#x2e;&#x63;&#111;&#x6d;" data-bare-link="true">&#106;&#x6f;&#115;&#x68;&#x75;&#97;&#x40;&#x6f;&#112;&#x73;&#x63;&#x6f;&#100;&#x65;&#46;&#99;&#111;&#x6d;</a>  with
+manual page was written by Joshua Timberman  <a href="&#109;&#x61;&#105;&#108;&#x74;&#111;&#58;&#x6a;&#x6f;&#x73;&#104;&#x75;&#97;&#64;&#111;&#112;&#x73;&#99;&#111;&#x64;&#x65;&#46;&#99;&#x6f;&#109;" data-bare-link="true">&#106;&#x6f;&#115;&#x68;&#117;&#x61;&#x40;&#x6f;&#x70;&#115;&#99;&#x6f;&#100;&#101;&#46;&#x63;&#111;&#x6d;</a>  with
 help2man.  Permission  is  granted  to copy, distribute and / or modify
 this document under the terms of the Apache 2.0 License.</p>
 
@@ -155,7 +155,7 @@ found in /usr/share/common-licenses/Apache-2.0.</p>
 
 
   <ol class='man-decor man-foot man foot'>
-    <li class='tl'>Chef 11.10.0.alpha.0</li>
+    <li class='tl'>Chef 11.8.0.rc.0</li>
     <li class='tc'>October 2013</li>
     <li class='tr'>chef-solr(8)</li>
   </ol>
diff --git a/distro/common/html/knife-bootstrap.1.html b/distro/common/html/knife-bootstrap.1.html
index 56b03b4bb3..f3b14b0095 100644
--- a/distro/common/html/knife-bootstrap.1.html
+++ b/distro/common/html/knife-bootstrap.1.html
@@ -218,11 +218,11 @@ to other users via the process list using tools such as <span class="man-ref">ps
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>   Chef was written by Adam Jacob <a href="&#109;&#x61;&#x69;&#108;&#116;&#x6f;&#58;&#x61;&#100;&#x61;&#x6d;&#x40;&#x6f;&#x70;&#x73;&#x63;&#x6f;&#100;&#x65;&#46;&#99;&#111;&#109;" data-bare-link="true">&#x61;&#x64;&#x61;&#109;&#x40;&#x6f;&#x70;&#x73;&#x63;&#111;&#x64;&#x65;&#46;&#99;&#111;&#109;</a> with many contributions from the community.</p>
+<p>   Chef was written by Adam Jacob <a href="&#109;&#x61;&#x69;&#x6c;&#116;&#111;&#58;&#97;&#x64;&#x61;&#109;&#64;&#111;&#112;&#x73;&#99;&#x6f;&#100;&#101;&#46;&#99;&#x6f;&#109;" data-bare-link="true">&#97;&#100;&#x61;&#x6d;&#x40;&#x6f;&#x70;&#115;&#99;&#111;&#100;&#x65;&#46;&#99;&#x6f;&#109;</a> with many contributions from the community.</p>
 
 <h2 id="DOCUMENTATION">DOCUMENTATION</h2>
 
-<p>   This manual page was written by Joshua Timberman <a href="&#109;&#x61;&#x69;&#108;&#116;&#x6f;&#x3a;&#x6a;&#111;&#x73;&#x68;&#x75;&#x61;&#x40;&#x6f;&#112;&#115;&#99;&#x6f;&#100;&#x65;&#46;&#x63;&#x6f;&#109;" data-bare-link="true">&#106;&#111;&#x73;&#x68;&#117;&#x61;&#x40;&#x6f;&#112;&#x73;&#99;&#x6f;&#100;&#x65;&#46;&#x63;&#111;&#x6d;</a>.
+<p>   This manual page was written by Joshua Timberman <a href="&#x6d;&#97;&#x69;&#x6c;&#116;&#x6f;&#x3a;&#x6a;&#111;&#x73;&#x68;&#117;&#x61;&#64;&#111;&#112;&#x73;&#x63;&#x6f;&#100;&#x65;&#46;&#99;&#x6f;&#109;" data-bare-link="true">&#106;&#111;&#115;&#x68;&#x75;&#x61;&#64;&#x6f;&#112;&#115;&#99;&#x6f;&#x64;&#x65;&#46;&#99;&#111;&#109;</a>.
    Permission is granted to copy, distribute and / or modify this document under the terms of the Apache 2.0 License.</p>
 
 <h2 id="CHEF">CHEF</h2>
@@ -231,7 +231,7 @@ to other users via the process list using tools such as <span class="man-ref">ps
 
 
   <ol class='man-decor man-foot man foot'>
-    <li class='tl'>Chef 11.10.0.alpha.0</li>
+    <li class='tl'>Chef 11.8.0.rc.0</li>
     <li class='tc'>October 2013</li>
     <li class='tr'>knife-bootstrap(1)</li>
   </ol>
diff --git a/distro/common/html/knife-client.1.html b/distro/common/html/knife-client.1.html
index c2e499db38..fb93214e1e 100644
--- a/distro/common/html/knife-client.1.html
+++ b/distro/common/html/knife-client.1.html
@@ -196,11 +196,11 @@ setting up a host for management with Chef.</p>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>   Chef was written by Adam Jacob <a href="&#109;&#97;&#105;&#x6c;&#116;&#x6f;&#58;&#97;&#x64;&#x61;&#109;&#x40;&#x6f;&#112;&#x73;&#99;&#111;&#x64;&#101;&#46;&#x63;&#x6f;&#109;" data-bare-link="true">&#x61;&#x64;&#97;&#109;&#64;&#111;&#x70;&#x73;&#99;&#111;&#x64;&#101;&#46;&#99;&#111;&#109;</a> with many contributions from the community.</p>
+<p>   Chef was written by Adam Jacob <a href="&#x6d;&#x61;&#x69;&#x6c;&#116;&#111;&#58;&#97;&#x64;&#x61;&#x6d;&#64;&#x6f;&#x70;&#115;&#99;&#x6f;&#x64;&#101;&#46;&#x63;&#111;&#x6d;" data-bare-link="true">&#x61;&#x64;&#97;&#x6d;&#64;&#111;&#x70;&#x73;&#x63;&#111;&#100;&#x65;&#x2e;&#99;&#x6f;&#x6d;</a> with many contributions from the community.</p>
 
 <h2 id="DOCUMENTATION">DOCUMENTATION</h2>
 
-<p>   This manual page was written by Joshua Timberman <a href="&#109;&#x61;&#105;&#x6c;&#116;&#x6f;&#58;&#106;&#x6f;&#x73;&#x68;&#x75;&#97;&#64;&#111;&#112;&#x73;&#99;&#111;&#x64;&#101;&#46;&#99;&#111;&#109;" data-bare-link="true">&#x6a;&#111;&#115;&#104;&#117;&#x61;&#64;&#x6f;&#x70;&#x73;&#x63;&#111;&#x64;&#101;&#46;&#99;&#x6f;&#x6d;</a>.
+<p>   This manual page was written by Joshua Timberman <a href="&#x6d;&#x61;&#105;&#108;&#116;&#111;&#58;&#x6a;&#x6f;&#x73;&#x68;&#x75;&#97;&#x40;&#111;&#x70;&#115;&#99;&#x6f;&#100;&#101;&#46;&#x63;&#111;&#x6d;" data-bare-link="true">&#106;&#x6f;&#115;&#104;&#117;&#x61;&#64;&#x6f;&#112;&#115;&#99;&#111;&#100;&#x65;&#x2e;&#x63;&#111;&#109;</a>.
    Permission is granted to copy, distribute and / or modify this document under the terms of the Apache 2.0 License.</p>
 
 <h2 id="CHEF">CHEF</h2>
@@ -209,7 +209,7 @@ setting up a host for management with Chef.</p>
 
 
   <ol class='man-decor man-foot man foot'>
-    <li class='tl'>Chef 11.10.0.alpha.0</li>
+    <li class='tl'>Chef 11.8.0.rc.0</li>
     <li class='tc'>October 2013</li>
     <li class='tr'>knife-client(1)</li>
   </ol>
diff --git a/distro/common/html/knife-configure.1.html b/distro/common/html/knife-configure.1.html
index 741d4e9e9f..cbb55f4e13 100644
--- a/distro/common/html/knife-configure.1.html
+++ b/distro/common/html/knife-configure.1.html
@@ -147,11 +147,11 @@ may need to modify that setting after copying to a remote host.</p></li>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>   Chef was written by Adam Jacob <a href="&#x6d;&#x61;&#x69;&#x6c;&#x74;&#111;&#58;&#97;&#100;&#97;&#x6d;&#64;&#111;&#x70;&#x73;&#99;&#111;&#x64;&#101;&#46;&#x63;&#x6f;&#x6d;" data-bare-link="true">&#97;&#100;&#x61;&#109;&#64;&#x6f;&#x70;&#115;&#99;&#111;&#x64;&#101;&#x2e;&#x63;&#111;&#109;</a> with many contributions from the community.</p>
+<p>   Chef was written by Adam Jacob <a href="&#x6d;&#x61;&#105;&#x6c;&#x74;&#x6f;&#x3a;&#97;&#100;&#x61;&#x6d;&#64;&#x6f;&#112;&#115;&#x63;&#x6f;&#x64;&#101;&#x2e;&#99;&#x6f;&#109;" data-bare-link="true">&#97;&#x64;&#x61;&#x6d;&#64;&#x6f;&#x70;&#115;&#99;&#111;&#100;&#x65;&#46;&#x63;&#111;&#109;</a> with many contributions from the community.</p>
 
 <h2 id="DOCUMENTATION">DOCUMENTATION</h2>
 
-<p>   This manual page was written by Joshua Timberman <a href="&#x6d;&#97;&#x69;&#108;&#116;&#111;&#x3a;&#106;&#111;&#115;&#x68;&#x75;&#x61;&#64;&#111;&#x70;&#115;&#x63;&#x6f;&#x64;&#101;&#x2e;&#x63;&#111;&#x6d;" data-bare-link="true">&#106;&#111;&#x73;&#x68;&#117;&#x61;&#x40;&#111;&#112;&#x73;&#x63;&#111;&#100;&#x65;&#46;&#99;&#111;&#x6d;</a>.
+<p>   This manual page was written by Joshua Timberman <a href="&#x6d;&#x61;&#x69;&#108;&#x74;&#111;&#58;&#106;&#x6f;&#115;&#104;&#117;&#97;&#64;&#x6f;&#112;&#x73;&#99;&#111;&#x64;&#101;&#x2e;&#99;&#111;&#x6d;" data-bare-link="true">&#106;&#111;&#x73;&#104;&#117;&#x61;&#x40;&#111;&#x70;&#x73;&#x63;&#x6f;&#100;&#x65;&#46;&#99;&#x6f;&#109;</a>.
    Permission is granted to copy, distribute and / or modify this document under the terms of the Apache 2.0 License.</p>
 
 <h2 id="CHEF">CHEF</h2>
@@ -160,7 +160,7 @@ may need to modify that setting after copying to a remote host.</p></li>
 
 
   <ol class='man-decor man-foot man foot'>
-    <li class='tl'>Chef 11.10.0.alpha.0</li>
+    <li class='tl'>Chef 11.8.0.rc.0</li>
     <li class='tc'>October 2013</li>
     <li class='tr'>knife-configure(1)</li>
   </ol>
diff --git a/distro/common/html/knife-cookbook-site.1.html b/distro/common/html/knife-cookbook-site.1.html
index 79f0cb22a5..334b875186 100644
--- a/distro/common/html/knife-cookbook-site.1.html
+++ b/distro/common/html/knife-cookbook-site.1.html
@@ -218,11 +218,11 @@ configuration file.</p>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>   Chef was written by Adam Jacob <a href="&#x6d;&#x61;&#x69;&#x6c;&#x74;&#111;&#58;&#97;&#100;&#97;&#x6d;&#64;&#111;&#x70;&#x73;&#99;&#111;&#x64;&#101;&#46;&#x63;&#x6f;&#x6d;" data-bare-link="true">&#97;&#100;&#x61;&#109;&#64;&#x6f;&#x70;&#115;&#99;&#111;&#x64;&#101;&#x2e;&#x63;&#111;&#109;</a> with many contributions from the community.</p>
+<p>   Chef was written by Adam Jacob <a href="&#x6d;&#x61;&#105;&#x6c;&#x74;&#x6f;&#x3a;&#97;&#100;&#x61;&#x6d;&#64;&#x6f;&#112;&#115;&#x63;&#x6f;&#x64;&#101;&#x2e;&#99;&#x6f;&#109;" data-bare-link="true">&#97;&#x64;&#x61;&#x6d;&#64;&#x6f;&#x70;&#115;&#99;&#111;&#100;&#x65;&#46;&#x63;&#111;&#109;</a> with many contributions from the community.</p>
 
 <h2 id="DOCUMENTATION">DOCUMENTATION</h2>
 
-<p>   This manual page was written by Joshua Timberman <a href="&#x6d;&#97;&#x69;&#108;&#116;&#111;&#x3a;&#106;&#111;&#115;&#x68;&#x75;&#x61;&#64;&#111;&#x70;&#115;&#x63;&#x6f;&#x64;&#101;&#x2e;&#x63;&#111;&#x6d;" data-bare-link="true">&#106;&#111;&#x73;&#x68;&#117;&#x61;&#x40;&#111;&#112;&#x73;&#x63;&#111;&#100;&#x65;&#46;&#99;&#111;&#x6d;</a>.
+<p>   This manual page was written by Joshua Timberman <a href="&#x6d;&#x61;&#x69;&#108;&#x74;&#111;&#58;&#106;&#x6f;&#115;&#104;&#117;&#97;&#64;&#x6f;&#112;&#x73;&#99;&#111;&#x64;&#101;&#x2e;&#99;&#111;&#x6d;" data-bare-link="true">&#106;&#111;&#x73;&#104;&#117;&#x61;&#x40;&#111;&#x70;&#x73;&#x63;&#x6f;&#100;&#x65;&#46;&#99;&#x6f;&#109;</a>.
    Permission is granted to copy, distribute and / or modify this document under the terms of the Apache 2.0 License.</p>
 
 <h2 id="CHEF">CHEF</h2>
@@ -231,7 +231,7 @@ configuration file.</p>
 
 
   <ol class='man-decor man-foot man foot'>
-    <li class='tl'>Chef 11.10.0.alpha.0</li>
+    <li class='tl'>Chef 11.8.0.rc.0</li>
     <li class='tc'>October 2013</li>
     <li class='tr'>knife-cookbook-site(1)</li>
   </ol>
diff --git a/distro/common/html/knife-cookbook.1.html b/distro/common/html/knife-cookbook.1.html
index 44ca081fb3..444ff96c94 100644
--- a/distro/common/html/knife-cookbook.1.html
+++ b/distro/common/html/knife-cookbook.1.html
@@ -358,11 +358,11 @@ cookbook.</p>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>   Chef was written by Adam Jacob <a href="&#109;&#97;&#x69;&#x6c;&#x74;&#x6f;&#x3a;&#x61;&#100;&#97;&#109;&#x40;&#111;&#x70;&#x73;&#99;&#111;&#100;&#101;&#46;&#x63;&#x6f;&#x6d;" data-bare-link="true">&#x61;&#100;&#x61;&#109;&#64;&#x6f;&#112;&#115;&#99;&#111;&#100;&#x65;&#46;&#x63;&#111;&#x6d;</a> with many contributions from the community.</p>
+<p>   Chef was written by Adam Jacob <a href="&#109;&#x61;&#x69;&#x6c;&#116;&#111;&#58;&#x61;&#x64;&#97;&#109;&#x40;&#111;&#x70;&#x73;&#99;&#111;&#x64;&#x65;&#46;&#99;&#111;&#109;" data-bare-link="true">&#x61;&#x64;&#97;&#x6d;&#64;&#x6f;&#x70;&#115;&#99;&#x6f;&#x64;&#x65;&#x2e;&#x63;&#111;&#x6d;</a> with many contributions from the community.</p>
 
 <h2 id="DOCUMENTATION">DOCUMENTATION</h2>
 
-<p>   This manual page was written by Joshua Timberman <a href="&#x6d;&#x61;&#x69;&#x6c;&#x74;&#111;&#58;&#x6a;&#x6f;&#115;&#104;&#x75;&#97;&#x40;&#x6f;&#x70;&#115;&#99;&#x6f;&#100;&#x65;&#x2e;&#x63;&#x6f;&#x6d;" data-bare-link="true">&#x6a;&#111;&#x73;&#104;&#x75;&#97;&#64;&#111;&#x70;&#x73;&#x63;&#111;&#x64;&#101;&#x2e;&#99;&#111;&#109;</a>.
+<p>   This manual page was written by Joshua Timberman <a href="&#109;&#97;&#x69;&#x6c;&#116;&#x6f;&#x3a;&#x6a;&#x6f;&#115;&#104;&#x75;&#x61;&#64;&#x6f;&#112;&#x73;&#x63;&#x6f;&#x64;&#x65;&#x2e;&#x63;&#x6f;&#109;" data-bare-link="true">&#106;&#111;&#x73;&#x68;&#117;&#97;&#x40;&#x6f;&#112;&#x73;&#x63;&#x6f;&#100;&#101;&#46;&#99;&#111;&#x6d;</a>.
    Permission is granted to copy, distribute and / or modify this document under the terms of the Apache 2.0 License.</p>
 
 <h2 id="CHEF">CHEF</h2>
@@ -371,7 +371,7 @@ cookbook.</p>
 
 
   <ol class='man-decor man-foot man foot'>
-    <li class='tl'>Chef 11.10.0.alpha.0</li>
+    <li class='tl'>Chef 11.8.0.rc.0</li>
     <li class='tc'>October 2013</li>
     <li class='tr'>knife-cookbook(1)</li>
   </ol>
diff --git a/distro/common/html/knife-data-bag.1.html b/distro/common/html/knife-data-bag.1.html
index 8237ce7096..18244f67f1 100644
--- a/distro/common/html/knife-data-bag.1.html
+++ b/distro/common/html/knife-data-bag.1.html
@@ -212,11 +212,11 @@ encryption keys.</p>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>   Chef was written by Adam Jacob <a href="&#x6d;&#97;&#105;&#x6c;&#116;&#111;&#58;&#x61;&#100;&#x61;&#109;&#64;&#x6f;&#x70;&#x73;&#99;&#111;&#100;&#101;&#x2e;&#99;&#111;&#x6d;" data-bare-link="true">&#x61;&#x64;&#97;&#109;&#x40;&#111;&#112;&#x73;&#99;&#111;&#x64;&#x65;&#x2e;&#x63;&#x6f;&#109;</a> with many contributions from the community.</p>
+<p>   Chef was written by Adam Jacob <a href="&#x6d;&#97;&#x69;&#108;&#116;&#x6f;&#58;&#x61;&#100;&#97;&#x6d;&#x40;&#111;&#x70;&#x73;&#99;&#111;&#100;&#x65;&#x2e;&#99;&#x6f;&#x6d;" data-bare-link="true">&#x61;&#x64;&#97;&#x6d;&#x40;&#x6f;&#x70;&#115;&#99;&#x6f;&#x64;&#101;&#46;&#99;&#x6f;&#x6d;</a> with many contributions from the community.</p>
 
 <h2 id="DOCUMENTATION">DOCUMENTATION</h2>
 
-<p>   This manual page was written by Joshua Timberman <a href="&#x6d;&#x61;&#105;&#108;&#116;&#x6f;&#x3a;&#106;&#x6f;&#115;&#x68;&#117;&#97;&#x40;&#x6f;&#x70;&#115;&#x63;&#111;&#x64;&#x65;&#46;&#99;&#x6f;&#x6d;" data-bare-link="true">&#106;&#111;&#115;&#x68;&#117;&#97;&#x40;&#x6f;&#112;&#x73;&#x63;&#x6f;&#100;&#x65;&#46;&#99;&#111;&#109;</a>.
+<p>   This manual page was written by Joshua Timberman <a href="&#x6d;&#x61;&#x69;&#108;&#x74;&#111;&#x3a;&#x6a;&#111;&#x73;&#104;&#x75;&#97;&#64;&#111;&#x70;&#x73;&#99;&#111;&#100;&#x65;&#46;&#99;&#x6f;&#x6d;" data-bare-link="true">&#106;&#111;&#x73;&#104;&#x75;&#x61;&#x40;&#111;&#112;&#115;&#x63;&#111;&#x64;&#x65;&#46;&#x63;&#x6f;&#x6d;</a>.
    Permission is granted to copy, distribute and / or modify this document under the terms of the Apache 2.0 License.</p>
 
 <h2 id="CHEF">CHEF</h2>
@@ -225,7 +225,7 @@ encryption keys.</p>
 
 
   <ol class='man-decor man-foot man foot'>
-    <li class='tl'>Chef 11.10.0.alpha.0</li>
+    <li class='tl'>Chef 11.8.0.rc.0</li>
     <li class='tc'>October 2013</li>
     <li class='tr'>knife-data-bag(1)</li>
   </ol>
diff --git a/distro/common/html/knife-environment.1.html b/distro/common/html/knife-environment.1.html
index bd014d3eb5..917604726e 100644
--- a/distro/common/html/knife-environment.1.html
+++ b/distro/common/html/knife-environment.1.html
@@ -242,11 +242,11 @@ override_attributes "aws_s3_bucket" =&gt; "production"
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>   Chef was written by Adam Jacob <a href="&#x6d;&#97;&#105;&#x6c;&#116;&#111;&#58;&#x61;&#100;&#x61;&#109;&#64;&#x6f;&#x70;&#x73;&#99;&#111;&#100;&#101;&#x2e;&#99;&#111;&#x6d;" data-bare-link="true">&#x61;&#x64;&#97;&#109;&#x40;&#111;&#112;&#x73;&#99;&#111;&#x64;&#x65;&#x2e;&#x63;&#x6f;&#109;</a> with many contributions from the community.</p>
+<p>   Chef was written by Adam Jacob <a href="&#109;&#x61;&#105;&#108;&#x74;&#x6f;&#58;&#x61;&#100;&#x61;&#109;&#x40;&#x6f;&#112;&#115;&#99;&#x6f;&#100;&#101;&#x2e;&#99;&#111;&#x6d;" data-bare-link="true">&#x61;&#100;&#97;&#109;&#x40;&#x6f;&#x70;&#x73;&#x63;&#111;&#x64;&#x65;&#x2e;&#x63;&#x6f;&#x6d;</a> with many contributions from the community.</p>
 
 <h2 id="DOCUMENTATION">DOCUMENTATION</h2>
 
-<p>   This manual page was written by Daniel DeLeo <a href="&#x6d;&#x61;&#105;&#108;&#116;&#x6f;&#x3a;&#100;&#x61;&#110;&#x40;&#111;&#112;&#x73;&#x63;&#x6f;&#100;&#x65;&#46;&#x63;&#x6f;&#109;" data-bare-link="true">&#100;&#x61;&#x6e;&#64;&#111;&#112;&#x73;&#99;&#111;&#x64;&#x65;&#46;&#x63;&#x6f;&#x6d;</a>.
+<p>   This manual page was written by Daniel DeLeo <a href="&#x6d;&#97;&#x69;&#108;&#x74;&#x6f;&#58;&#x64;&#x61;&#x6e;&#x40;&#111;&#x70;&#x73;&#x63;&#x6f;&#100;&#x65;&#x2e;&#x63;&#111;&#109;" data-bare-link="true">&#100;&#x61;&#110;&#64;&#111;&#x70;&#x73;&#x63;&#111;&#100;&#x65;&#x2e;&#x63;&#111;&#x6d;</a>.
    Permission is granted to copy, distribute and / or modify this document under the terms of the Apache 2.0 License.</p>
 
 <h2 id="CHEF">CHEF</h2>
@@ -255,7 +255,7 @@ override_attributes "aws_s3_bucket" =&gt; "production"
 
 
   <ol class='man-decor man-foot man foot'>
-    <li class='tl'>Chef 11.10.0.alpha.0</li>
+    <li class='tl'>Chef 11.8.0.rc.0</li>
     <li class='tc'>October 2013</li>
     <li class='tr'>knife-environment(1)</li>
   </ol>
diff --git a/distro/common/html/knife-exec.1.html b/distro/common/html/knife-exec.1.html
index eaee70eab7..0365ebd31e 100644
--- a/distro/common/html/knife-exec.1.html
+++ b/distro/common/html/knife-exec.1.html
@@ -111,11 +111,11 @@ description of the commands available.</p>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>   Chef was written by Adam Jacob <a href="&#x6d;&#x61;&#105;&#108;&#116;&#111;&#58;&#x61;&#100;&#x61;&#109;&#64;&#x6f;&#x70;&#x73;&#x63;&#111;&#100;&#x65;&#x2e;&#99;&#111;&#x6d;" data-bare-link="true">&#x61;&#x64;&#97;&#109;&#x40;&#x6f;&#112;&#x73;&#99;&#x6f;&#x64;&#101;&#46;&#x63;&#111;&#x6d;</a> with many contributions from the community.</p>
+<p>   Chef was written by Adam Jacob <a href="&#109;&#x61;&#105;&#108;&#x74;&#x6f;&#58;&#x61;&#100;&#x61;&#109;&#x40;&#x6f;&#112;&#115;&#99;&#x6f;&#100;&#101;&#x2e;&#99;&#111;&#x6d;" data-bare-link="true">&#x61;&#100;&#97;&#109;&#x40;&#x6f;&#x70;&#x73;&#x63;&#111;&#x64;&#x65;&#x2e;&#x63;&#x6f;&#x6d;</a> with many contributions from the community.</p>
 
 <h2 id="DOCUMENTATION">DOCUMENTATION</h2>
 
-<p>   This manual page was written by Joshua Timberman <a href="&#109;&#97;&#x69;&#108;&#x74;&#111;&#x3a;&#106;&#111;&#x73;&#x68;&#117;&#97;&#64;&#x6f;&#x70;&#x73;&#x63;&#x6f;&#100;&#x65;&#x2e;&#x63;&#x6f;&#x6d;" data-bare-link="true">&#106;&#111;&#x73;&#x68;&#117;&#97;&#x40;&#111;&#x70;&#115;&#99;&#x6f;&#x64;&#101;&#46;&#x63;&#111;&#109;</a>.
+<p>   This manual page was written by Joshua Timberman <a href="&#x6d;&#97;&#x69;&#108;&#x74;&#x6f;&#58;&#x6a;&#x6f;&#x73;&#x68;&#117;&#x61;&#x40;&#x6f;&#x70;&#115;&#x63;&#x6f;&#x64;&#101;&#46;&#99;&#x6f;&#109;" data-bare-link="true">&#106;&#111;&#x73;&#x68;&#x75;&#97;&#64;&#x6f;&#x70;&#x73;&#99;&#x6f;&#x64;&#101;&#46;&#99;&#x6f;&#109;</a>.
    Permission is granted to copy, distribute and / or modify this document under the terms of the Apache 2.0 License.</p>
 
 <h2 id="CHEF">CHEF</h2>
@@ -124,7 +124,7 @@ description of the commands available.</p>
 
 
   <ol class='man-decor man-foot man foot'>
-    <li class='tl'>Chef 11.10.0.alpha.0</li>
+    <li class='tl'>Chef 11.8.0.rc.0</li>
     <li class='tc'>October 2013</li>
     <li class='tr'>knife-exec(1)</li>
   </ol>
diff --git a/distro/common/html/knife-index.1.html b/distro/common/html/knife-index.1.html
index 2ed9d92688..d797dd7840 100644
--- a/distro/common/html/knife-index.1.html
+++ b/distro/common/html/knife-index.1.html
@@ -102,11 +102,11 @@ time for all objects to be indexed and available for search.</p>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>   Chef was written by Adam Jacob <a href="&#109;&#97;&#105;&#x6c;&#x74;&#x6f;&#58;&#97;&#x64;&#x61;&#109;&#x40;&#111;&#112;&#115;&#99;&#x6f;&#x64;&#101;&#x2e;&#99;&#111;&#x6d;" data-bare-link="true">&#97;&#100;&#97;&#109;&#64;&#x6f;&#112;&#115;&#x63;&#x6f;&#100;&#x65;&#46;&#99;&#x6f;&#109;</a> with many contributions from the community.</p>
+<p>   Chef was written by Adam Jacob <a href="&#x6d;&#x61;&#x69;&#108;&#x74;&#111;&#58;&#x61;&#x64;&#x61;&#109;&#64;&#x6f;&#x70;&#115;&#99;&#111;&#100;&#101;&#46;&#99;&#x6f;&#x6d;" data-bare-link="true">&#x61;&#100;&#x61;&#x6d;&#x40;&#x6f;&#112;&#115;&#x63;&#111;&#x64;&#x65;&#x2e;&#99;&#x6f;&#109;</a> with many contributions from the community.</p>
 
 <h2 id="DOCUMENTATION">DOCUMENTATION</h2>
 
-<p>   This manual page was written by Joshua Timberman <a href="&#x6d;&#97;&#x69;&#x6c;&#x74;&#x6f;&#x3a;&#x6a;&#x6f;&#115;&#104;&#117;&#97;&#64;&#111;&#x70;&#x73;&#99;&#x6f;&#x64;&#x65;&#46;&#x63;&#111;&#x6d;" data-bare-link="true">&#106;&#x6f;&#x73;&#104;&#x75;&#97;&#x40;&#x6f;&#x70;&#115;&#99;&#111;&#x64;&#101;&#x2e;&#99;&#111;&#109;</a>.
+<p>   This manual page was written by Joshua Timberman <a href="&#x6d;&#97;&#105;&#x6c;&#116;&#x6f;&#58;&#106;&#x6f;&#115;&#104;&#x75;&#97;&#64;&#111;&#112;&#115;&#99;&#x6f;&#x64;&#x65;&#46;&#99;&#111;&#109;" data-bare-link="true">&#x6a;&#x6f;&#x73;&#x68;&#x75;&#x61;&#64;&#x6f;&#x70;&#115;&#x63;&#111;&#100;&#x65;&#x2e;&#99;&#111;&#109;</a>.
    Permission is granted to copy, distribute and / or modify this document under the terms of the Apache 2.0 License.</p>
 
 <h2 id="CHEF">CHEF</h2>
@@ -115,7 +115,7 @@ time for all objects to be indexed and available for search.</p>
 
 
   <ol class='man-decor man-foot man foot'>
-    <li class='tl'>Chef 11.10.0.alpha.0</li>
+    <li class='tl'>Chef 11.8.0.rc.0</li>
     <li class='tc'>October 2013</li>
     <li class='tr'>knife-index(1)</li>
   </ol>
diff --git a/distro/common/html/knife-node.1.html b/distro/common/html/knife-node.1.html
index 2abad35c9b..b9a7f187a8 100644
--- a/distro/common/html/knife-node.1.html
+++ b/distro/common/html/knife-node.1.html
@@ -227,11 +227,11 @@ run list, the correct syntax is "role[ROLE_NAME]"</p>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>   Chef was written by Adam Jacob <a href="&#x6d;&#97;&#105;&#108;&#116;&#x6f;&#x3a;&#x61;&#100;&#97;&#x6d;&#x40;&#x6f;&#x70;&#x73;&#99;&#x6f;&#x64;&#x65;&#46;&#x63;&#111;&#109;" data-bare-link="true">&#x61;&#100;&#97;&#x6d;&#64;&#x6f;&#x70;&#115;&#99;&#111;&#100;&#101;&#46;&#x63;&#x6f;&#109;</a> with many contributions from the community.</p>
+<p>   Chef was written by Adam Jacob <a href="&#x6d;&#x61;&#x69;&#x6c;&#x74;&#111;&#x3a;&#97;&#100;&#97;&#x6d;&#x40;&#111;&#x70;&#x73;&#99;&#x6f;&#100;&#101;&#x2e;&#x63;&#111;&#109;" data-bare-link="true">&#97;&#100;&#x61;&#x6d;&#x40;&#111;&#112;&#x73;&#99;&#111;&#100;&#x65;&#x2e;&#99;&#x6f;&#x6d;</a> with many contributions from the community.</p>
 
 <h2 id="DOCUMENTATION">DOCUMENTATION</h2>
 
-<p>   This manual page was written by Joshua Timberman <a href="&#x6d;&#x61;&#x69;&#x6c;&#x74;&#111;&#58;&#x6a;&#x6f;&#115;&#104;&#x75;&#x61;&#64;&#x6f;&#112;&#x73;&#x63;&#x6f;&#x64;&#101;&#x2e;&#x63;&#111;&#x6d;" data-bare-link="true">&#x6a;&#111;&#x73;&#104;&#117;&#x61;&#x40;&#x6f;&#112;&#115;&#99;&#111;&#x64;&#x65;&#46;&#x63;&#x6f;&#x6d;</a>.
+<p>   This manual page was written by Joshua Timberman <a href="&#109;&#x61;&#105;&#108;&#x74;&#111;&#x3a;&#x6a;&#x6f;&#x73;&#104;&#117;&#97;&#64;&#x6f;&#112;&#115;&#99;&#x6f;&#x64;&#101;&#46;&#99;&#111;&#109;" data-bare-link="true">&#x6a;&#111;&#x73;&#x68;&#x75;&#97;&#64;&#111;&#112;&#115;&#x63;&#111;&#x64;&#101;&#x2e;&#99;&#111;&#109;</a>.
    Permission is granted to copy, distribute and / or modify this document under the terms of the Apache 2.0 License.</p>
 
 <h2 id="CHEF">CHEF</h2>
@@ -240,7 +240,7 @@ run list, the correct syntax is "role[ROLE_NAME]"</p>
 
 
   <ol class='man-decor man-foot man foot'>
-    <li class='tl'>Chef 11.10.0.alpha.0</li>
+    <li class='tl'>Chef 11.8.0.rc.0</li>
     <li class='tc'>October 2013</li>
     <li class='tr'>knife-node(1)</li>
   </ol>
diff --git a/distro/common/html/knife-role.1.html b/distro/common/html/knife-role.1.html
index ea04b10dac..4e0f9359de 100644
--- a/distro/common/html/knife-role.1.html
+++ b/distro/common/html/knife-role.1.html
@@ -177,11 +177,11 @@ run_list.</p>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>   Chef was written by Adam Jacob <a href="&#x6d;&#97;&#105;&#108;&#116;&#x6f;&#x3a;&#x61;&#100;&#97;&#x6d;&#x40;&#x6f;&#x70;&#x73;&#99;&#x6f;&#x64;&#x65;&#46;&#x63;&#111;&#109;" data-bare-link="true">&#x61;&#100;&#97;&#x6d;&#64;&#x6f;&#x70;&#115;&#99;&#111;&#100;&#101;&#46;&#x63;&#x6f;&#109;</a> with many contributions from the community.</p>
+<p>   Chef was written by Adam Jacob <a href="&#x6d;&#97;&#105;&#x6c;&#x74;&#x6f;&#58;&#97;&#100;&#x61;&#109;&#x40;&#x6f;&#112;&#115;&#99;&#111;&#100;&#x65;&#46;&#x63;&#111;&#109;" data-bare-link="true">&#x61;&#100;&#97;&#x6d;&#x40;&#x6f;&#x70;&#115;&#99;&#111;&#100;&#101;&#x2e;&#x63;&#111;&#109;</a> with many contributions from the community.</p>
 
 <h2 id="DOCUMENTATION">DOCUMENTATION</h2>
 
-<p>   This manual page was written by Joshua Timberman <a href="&#x6d;&#x61;&#x69;&#x6c;&#x74;&#111;&#58;&#x6a;&#x6f;&#115;&#104;&#x75;&#x61;&#64;&#x6f;&#112;&#x73;&#x63;&#x6f;&#x64;&#101;&#x2e;&#x63;&#111;&#x6d;" data-bare-link="true">&#x6a;&#111;&#x73;&#104;&#117;&#x61;&#x40;&#x6f;&#112;&#115;&#99;&#111;&#x64;&#x65;&#46;&#x63;&#x6f;&#x6d;</a>.
+<p>   This manual page was written by Joshua Timberman <a href="&#109;&#x61;&#105;&#x6c;&#116;&#111;&#58;&#x6a;&#111;&#115;&#104;&#117;&#x61;&#x40;&#x6f;&#112;&#x73;&#x63;&#111;&#100;&#x65;&#x2e;&#x63;&#x6f;&#x6d;" data-bare-link="true">&#x6a;&#x6f;&#x73;&#x68;&#x75;&#x61;&#x40;&#x6f;&#x70;&#115;&#x63;&#x6f;&#100;&#101;&#x2e;&#99;&#x6f;&#x6d;</a>.
    Permission is granted to copy, distribute and / or modify this document under the terms of the Apache 2.0 License.</p>
 
 <h2 id="CHEF">CHEF</h2>
@@ -190,7 +190,7 @@ run_list.</p>
 
 
   <ol class='man-decor man-foot man foot'>
-    <li class='tl'>Chef 11.10.0.alpha.0</li>
+    <li class='tl'>Chef 11.8.0.rc.0</li>
     <li class='tc'>October 2013</li>
     <li class='tr'>knife-role(1)</li>
   </ol>
diff --git a/distro/common/html/knife-search.1.html b/distro/common/html/knife-search.1.html
index b7b3a85751..e331128f4f 100644
--- a/distro/common/html/knife-search.1.html
+++ b/distro/common/html/knife-search.1.html
@@ -265,11 +265,11 @@ www.example.com:</p>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>   Chef was written by Adam Jacob <a href="&#x6d;&#97;&#105;&#108;&#x74;&#111;&#58;&#x61;&#100;&#97;&#x6d;&#64;&#111;&#x70;&#115;&#99;&#111;&#100;&#101;&#46;&#99;&#x6f;&#x6d;" data-bare-link="true">&#97;&#x64;&#x61;&#x6d;&#x40;&#x6f;&#112;&#x73;&#99;&#111;&#x64;&#x65;&#x2e;&#x63;&#x6f;&#109;</a> with many contributions from the community.</p>
+<p>   Chef was written by Adam Jacob <a href="&#x6d;&#97;&#105;&#x6c;&#x74;&#x6f;&#58;&#97;&#100;&#x61;&#109;&#x40;&#x6f;&#112;&#115;&#99;&#111;&#100;&#x65;&#46;&#x63;&#111;&#109;" data-bare-link="true">&#x61;&#100;&#97;&#x6d;&#x40;&#x6f;&#x70;&#115;&#99;&#111;&#100;&#101;&#x2e;&#x63;&#111;&#109;</a> with many contributions from the community.</p>
 
 <h2 id="DOCUMENTATION">DOCUMENTATION</h2>
 
-<p>   This manual page was written by Joshua Timberman <a href="&#x6d;&#x61;&#x69;&#x6c;&#x74;&#111;&#x3a;&#x6a;&#111;&#x73;&#x68;&#x75;&#x61;&#64;&#111;&#x70;&#x73;&#x63;&#x6f;&#100;&#101;&#x2e;&#x63;&#x6f;&#x6d;" data-bare-link="true">&#x6a;&#111;&#115;&#104;&#x75;&#97;&#64;&#111;&#x70;&#x73;&#x63;&#111;&#x64;&#101;&#46;&#99;&#111;&#x6d;</a>.
+<p>   This manual page was written by Joshua Timberman <a href="&#109;&#x61;&#105;&#x6c;&#116;&#111;&#58;&#x6a;&#111;&#115;&#104;&#117;&#x61;&#x40;&#x6f;&#112;&#x73;&#x63;&#111;&#100;&#x65;&#x2e;&#x63;&#x6f;&#x6d;" data-bare-link="true">&#x6a;&#x6f;&#x73;&#x68;&#x75;&#x61;&#x40;&#x6f;&#x70;&#115;&#x63;&#x6f;&#100;&#101;&#x2e;&#99;&#x6f;&#x6d;</a>.
    Permission is granted to copy, distribute and / or modify this document under the terms of the Apache 2.0 License.</p>
 
 <h2 id="CHEF">CHEF</h2>
@@ -278,7 +278,7 @@ www.example.com:</p>
 
 
   <ol class='man-decor man-foot man foot'>
-    <li class='tl'>Chef 11.10.0.alpha.0</li>
+    <li class='tl'>Chef 11.8.0.rc.0</li>
     <li class='tc'>October 2013</li>
     <li class='tr'>knife-search(1)</li>
   </ol>
diff --git a/distro/common/html/knife-ssh.1.html b/distro/common/html/knife-ssh.1.html
index b6bf41d078..5c4e1f449a 100644
--- a/distro/common/html/knife-ssh.1.html
+++ b/distro/common/html/knife-ssh.1.html
@@ -133,11 +133,11 @@ option.</dd>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>   Chef was written by Adam Jacob <a href="&#109;&#97;&#x69;&#x6c;&#x74;&#x6f;&#x3a;&#97;&#x64;&#x61;&#109;&#x40;&#x6f;&#x70;&#115;&#99;&#x6f;&#100;&#101;&#x2e;&#x63;&#111;&#x6d;" data-bare-link="true">&#97;&#100;&#97;&#x6d;&#x40;&#x6f;&#x70;&#x73;&#x63;&#x6f;&#100;&#101;&#46;&#x63;&#x6f;&#109;</a> with many contributions from the community.</p>
+<p>   Chef was written by Adam Jacob <a href="&#109;&#x61;&#x69;&#108;&#116;&#111;&#58;&#97;&#x64;&#97;&#109;&#64;&#x6f;&#x70;&#x73;&#x63;&#x6f;&#x64;&#x65;&#x2e;&#x63;&#x6f;&#109;" data-bare-link="true">&#x61;&#100;&#x61;&#109;&#64;&#111;&#112;&#115;&#99;&#x6f;&#x64;&#101;&#x2e;&#x63;&#x6f;&#x6d;</a> with many contributions from the community.</p>
 
 <h2 id="DOCUMENTATION">DOCUMENTATION</h2>
 
-<p>   This manual page was written by Joshua Timberman <a href="&#109;&#97;&#x69;&#108;&#116;&#111;&#58;&#106;&#x6f;&#115;&#x68;&#x75;&#x61;&#x40;&#111;&#112;&#x73;&#x63;&#x6f;&#x64;&#101;&#x2e;&#99;&#x6f;&#109;" data-bare-link="true">&#106;&#x6f;&#x73;&#x68;&#x75;&#x61;&#x40;&#x6f;&#112;&#x73;&#x63;&#111;&#x64;&#101;&#46;&#99;&#x6f;&#x6d;</a>.
+<p>   This manual page was written by Joshua Timberman <a href="&#x6d;&#x61;&#105;&#x6c;&#116;&#x6f;&#58;&#106;&#x6f;&#115;&#x68;&#117;&#x61;&#64;&#111;&#x70;&#115;&#99;&#x6f;&#x64;&#101;&#x2e;&#x63;&#x6f;&#109;" data-bare-link="true">&#106;&#x6f;&#x73;&#x68;&#117;&#x61;&#64;&#111;&#x70;&#x73;&#99;&#111;&#100;&#101;&#x2e;&#99;&#x6f;&#109;</a>.
    Permission is granted to copy, distribute and / or modify this document under the terms of the Apache 2.0 License.</p>
 
 <h2 id="CHEF">CHEF</h2>
@@ -146,7 +146,7 @@ option.</dd>
 
 
   <ol class='man-decor man-foot man foot'>
-    <li class='tl'>Chef 11.10.0.alpha.0</li>
+    <li class='tl'>Chef 11.8.0.rc.0</li>
     <li class='tc'>October 2013</li>
     <li class='tr'>knife-ssh(1)</li>
   </ol>
diff --git a/distro/common/html/knife-status.1.html b/distro/common/html/knife-status.1.html
index 379567bc8f..363b17724b 100644
--- a/distro/common/html/knife-status.1.html
+++ b/distro/common/html/knife-status.1.html
@@ -105,11 +105,11 @@ may not be publicly reachable.</p>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>   Chef was written by Adam Jacob <a href="&#109;&#97;&#x69;&#x6c;&#x74;&#x6f;&#x3a;&#97;&#x64;&#x61;&#109;&#x40;&#x6f;&#x70;&#115;&#99;&#x6f;&#100;&#101;&#x2e;&#x63;&#111;&#x6d;" data-bare-link="true">&#97;&#100;&#97;&#x6d;&#x40;&#x6f;&#x70;&#x73;&#x63;&#x6f;&#100;&#101;&#46;&#x63;&#x6f;&#109;</a> with many contributions from the community.</p>
+<p>   Chef was written by Adam Jacob <a href="&#109;&#x61;&#105;&#108;&#x74;&#111;&#58;&#97;&#100;&#97;&#109;&#64;&#x6f;&#x70;&#x73;&#99;&#x6f;&#100;&#101;&#46;&#x63;&#111;&#x6d;" data-bare-link="true">&#x61;&#x64;&#97;&#109;&#64;&#x6f;&#x70;&#x73;&#99;&#111;&#x64;&#101;&#46;&#x63;&#x6f;&#109;</a> with many contributions from the community.</p>
 
 <h2 id="DOCUMENTATION">DOCUMENTATION</h2>
 
-<p>   This manual page was written by Joshua Timberman <a href="&#109;&#97;&#x69;&#108;&#116;&#111;&#58;&#106;&#x6f;&#115;&#x68;&#x75;&#x61;&#x40;&#111;&#112;&#x73;&#x63;&#x6f;&#x64;&#101;&#x2e;&#99;&#x6f;&#109;" data-bare-link="true">&#106;&#x6f;&#x73;&#x68;&#x75;&#x61;&#x40;&#x6f;&#112;&#x73;&#x63;&#111;&#x64;&#101;&#46;&#99;&#x6f;&#x6d;</a>.
+<p>   This manual page was written by Joshua Timberman <a href="&#109;&#x61;&#105;&#108;&#116;&#111;&#x3a;&#106;&#x6f;&#x73;&#104;&#x75;&#97;&#64;&#111;&#x70;&#x73;&#99;&#x6f;&#100;&#101;&#46;&#x63;&#111;&#x6d;" data-bare-link="true">&#106;&#111;&#x73;&#x68;&#x75;&#x61;&#x40;&#111;&#112;&#x73;&#99;&#111;&#100;&#101;&#x2e;&#x63;&#111;&#109;</a>.
    Permission is granted to copy, distribute and / or modify this document under the terms of the Apache 2.0 License.</p>
 
 <h2 id="CHEF">CHEF</h2>
@@ -118,7 +118,7 @@ may not be publicly reachable.</p>
 
 
   <ol class='man-decor man-foot man foot'>
-    <li class='tl'>Chef 11.10.0.alpha.0</li>
+    <li class='tl'>Chef 11.8.0.rc.0</li>
     <li class='tc'>October 2013</li>
     <li class='tr'>knife-status(1)</li>
   </ol>
diff --git a/distro/common/html/knife-tag.1.html b/distro/common/html/knife-tag.1.html
index e4070a84e5..27205a5a20 100644
--- a/distro/common/html/knife-tag.1.html
+++ b/distro/common/html/knife-tag.1.html
@@ -114,11 +114,11 @@
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>   Chef was written by Adam Jacob <a href="&#109;&#x61;&#105;&#x6c;&#x74;&#111;&#x3a;&#97;&#x64;&#x61;&#109;&#x40;&#111;&#112;&#115;&#x63;&#x6f;&#100;&#x65;&#x2e;&#99;&#x6f;&#x6d;" data-bare-link="true">&#97;&#x64;&#x61;&#x6d;&#64;&#x6f;&#112;&#115;&#x63;&#x6f;&#100;&#x65;&#x2e;&#99;&#111;&#x6d;</a> with many contributions from the community.</p>
+<p>   Chef was written by Adam Jacob <a href="&#109;&#x61;&#105;&#108;&#x74;&#111;&#58;&#97;&#100;&#97;&#109;&#64;&#x6f;&#x70;&#x73;&#99;&#x6f;&#100;&#101;&#46;&#x63;&#111;&#x6d;" data-bare-link="true">&#x61;&#x64;&#97;&#109;&#64;&#x6f;&#x70;&#x73;&#99;&#111;&#x64;&#101;&#46;&#x63;&#x6f;&#109;</a> with many contributions from the community.</p>
 
 <h2 id="DOCUMENTATION">DOCUMENTATION</h2>
 
-<p>   This manual page was written by Daniel DeLeo <a href="&#x6d;&#x61;&#105;&#108;&#116;&#111;&#x3a;&#x64;&#97;&#x6e;&#64;&#x6f;&#x70;&#x73;&#x63;&#111;&#100;&#101;&#x2e;&#99;&#x6f;&#x6d;" data-bare-link="true">&#100;&#x61;&#x6e;&#64;&#111;&#112;&#115;&#99;&#x6f;&#x64;&#x65;&#x2e;&#99;&#x6f;&#109;</a>.
+<p>   This manual page was written by Daniel DeLeo <a href="&#109;&#x61;&#105;&#108;&#116;&#111;&#x3a;&#100;&#x61;&#x6e;&#64;&#x6f;&#112;&#115;&#99;&#x6f;&#x64;&#101;&#x2e;&#99;&#111;&#109;" data-bare-link="true">&#x64;&#97;&#x6e;&#64;&#111;&#x70;&#x73;&#x63;&#x6f;&#x64;&#101;&#46;&#x63;&#111;&#109;</a>.
    Permission is granted to copy, distribute and / or modify this document under the terms of the Apache 2.0 License.</p>
 
 <h2 id="CHEF">CHEF</h2>
@@ -127,7 +127,7 @@
 
 
   <ol class='man-decor man-foot man foot'>
-    <li class='tl'>Chef 11.10.0.alpha.0</li>
+    <li class='tl'>Chef 11.8.0.rc.0</li>
     <li class='tc'>October 2013</li>
     <li class='tr'>knife-tag(1)</li>
   </ol>
diff --git a/distro/common/html/knife.1.html b/distro/common/html/knife.1.html
index 1fc908b711..0f5376d019 100644
--- a/distro/common/html/knife.1.html
+++ b/distro/common/html/knife.1.html
@@ -286,12 +286,12 @@ data editing entirely.</dd>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>   Chef was written by Adam Jacob <a href="&#109;&#x61;&#x69;&#x6c;&#x74;&#111;&#x3a;&#97;&#x64;&#97;&#x6d;&#x40;&#x6f;&#112;&#x73;&#99;&#111;&#100;&#101;&#x2e;&#x63;&#x6f;&#x6d;" data-bare-link="true">&#97;&#100;&#97;&#x6d;&#64;&#111;&#x70;&#115;&#99;&#111;&#x64;&#101;&#x2e;&#x63;&#x6f;&#109;</a> of Opscode
+<p>   Chef was written by Adam Jacob <a href="&#x6d;&#x61;&#x69;&#108;&#116;&#x6f;&#58;&#97;&#x64;&#97;&#109;&#x40;&#111;&#x70;&#x73;&#99;&#x6f;&#100;&#x65;&#46;&#99;&#x6f;&#x6d;" data-bare-link="true">&#x61;&#100;&#x61;&#x6d;&#64;&#111;&#112;&#115;&#99;&#x6f;&#x64;&#101;&#x2e;&#99;&#x6f;&#x6d;</a> of Opscode
    (<a href="http://www.opscode.com" data-bare-link="true">http://www.opscode.com</a>), with contributions from the community.</p>
 
 <h2 id="DOCUMENTATION">DOCUMENTATION</h2>
 
-<p>   This manual page was written by Joshua Timberman <a href="&#109;&#x61;&#x69;&#108;&#116;&#111;&#x3a;&#x6a;&#111;&#x73;&#x68;&#117;&#x61;&#x40;&#x6f;&#x70;&#x73;&#99;&#x6f;&#100;&#101;&#46;&#99;&#111;&#109;" data-bare-link="true">&#x6a;&#111;&#115;&#x68;&#x75;&#97;&#x40;&#111;&#x70;&#x73;&#x63;&#x6f;&#x64;&#101;&#46;&#99;&#x6f;&#109;</a>.</p>
+<p>   This manual page was written by Joshua Timberman <a href="&#x6d;&#x61;&#x69;&#x6c;&#x74;&#111;&#58;&#x6a;&#x6f;&#115;&#104;&#117;&#x61;&#64;&#x6f;&#112;&#115;&#99;&#111;&#100;&#x65;&#46;&#99;&#x6f;&#x6d;" data-bare-link="true">&#106;&#x6f;&#115;&#104;&#117;&#97;&#64;&#111;&#x70;&#x73;&#x63;&#111;&#x64;&#x65;&#x2e;&#99;&#x6f;&#x6d;</a>.</p>
 
 <h2 id="LICENSE">LICENSE</h2>
 
@@ -305,7 +305,7 @@ data editing entirely.</dd>
 
 
   <ol class='man-decor man-foot man foot'>
-    <li class='tl'>Chef 11.10.0.alpha.0</li>
+    <li class='tl'>Chef 11.8.0.rc.0</li>
     <li class='tc'>October 2013</li>
     <li class='tr'>knife(1)</li>
   </ol>
diff --git a/distro/common/man/man8/chef-expander.8 b/distro/common/man/man8/chef-expander.8
deleted file mode 100644
index 37f3ec7de9..0000000000
--- a/distro/common/man/man8/chef-expander.8
+++ /dev/null
@@ -1,97 +0,0 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
-.
-.TH "CHEF\-EXPANDER" "8" "October 2013" "Chef 11.10.0.alpha.0" "Chef Manual"
-.
-.SH "NAME"
-\fBchef\-expander\fR \- fetches messages from RabbitMQ, processes, and loads into chef\-solr
-.
-.SH "SYNOPSIS"
-\fBchef\-expander\fR \fI(options)\fR
-.
-.TP
-\fB\-c\fR, \fB\-\-config CONFIG_FILE\fR
-a configuration file to use
-.
-.TP
-\fB\-i\fR, \fB\-\-index INDEX\fR
-the slot this node will occupy in the ring
-.
-.TP
-\fB\-n\fR, \fB\-\-node\-count NUMBER\fR
-the number of nodes in the ring
-.
-.TP
-\fB\-l\fR, \fB\-\-log\-level LOG_LEVEL\fR
-set the log level
-.
-.TP
-\fB\-L\fR, \fB\-\-logfile LOG_LOCATION\fR
-Logfile to use
-.
-.TP
-\fB\-d\fR, \fB\-\-daemonize\fR
-fork into the background
-.
-.TP
-\fB\-P\fR, \fB\-\-pid PIDFILE\fR
-PID file
-.
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-show help message
-.
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-show the version and exit
-.
-.SH "DESCRIPTION"
-Chef Expander fetches messages from RabbitMQ, processes them into the correct format to be loaded into Solr and loads them into Solr\.
-.
-.P
-\fBRunning Chef Expander\fR
-.
-.P
-Chef Expander is designed for clustered operation, though small installations will only need one worker process\. To run Chef Expander with one worker process, run chef\-expander \-n 1\. You will then have a master and worker process, which looks like this in ps:
-.
-.IP "" 4
-.
-.nf
-
-your\-shell> ps aux|grep expander
-you   52110   0\.1  0\.7  2515476  62748 s003  S+    3:49PM   0:00\.80 chef\-expander worker #1 (vnodes 0\-1023)
-you   52108   0\.1  0\.5  2492880  41696 s003  S+    3:49PM   0:00\.91 ruby bin/chef\-expander \-n 1
-.
-.fi
-.
-.IP "" 0
-.
-.P
-Workers are single threaded and therefore cannot use more than 100% of a single CPU\. If you find that your queues are getting backlogged, increase the number of workers
-.
-.P
-\fBDesign\fR
-.
-.P
-Chef Expander uses 1024 queues (called vnodes in some places) to allow you to scale the number of Chef Expander workers to meet the needs of your infrastructure\. When objects are saved in the API server, they are added to queues based on their database IDs\. These queues can be assigned to different Chef Expander workers to distribute the load of processing the index updates\.
-.
-.P
-\fBChef Expander Operation and Troubleshooting\fR
-.
-.P
-Chef Expander includes chef\-expanderctl, a management program that allows you to get status information or change the logging verbosity (without restarting)\.
-.
-.P
-See \fBchef\-expanderctl\fR(8) for details\.
-.
-.SH "SEE ALSO"
-\fBchef\-expanderctl\fR(8) \fBchef\-solr\fR(8)
-.
-.P
-Full documentation for Chef and chef\-server is located on the Chef wiki, http://wiki\.opscode\.com/display/chef/Home\.
-.
-.SH "AUTHOR"
-Chef was written by Adam Jacob \fIadam@ospcode\.com\fR of Opscode (http://www\.opscode\.com), with contributions from the community\. This manual page was created by Nuo Yan \fInuo@opscode\.com\fR\. Permission is granted to copy, distribute and / or modify this document under the terms of the Apache 2\.0 License\.
-.
-.P
-On Debian systems, the complete text of the Apache 2\.0 License can be found in /usr/share/common\-licenses/Apache\-2\.0\.
diff --git a/distro/common/man/man8/chef-expanderctl.8 b/distro/common/man/man8/chef-expanderctl.8
deleted file mode 100644
index 67caca0902..0000000000
--- a/distro/common/man/man8/chef-expanderctl.8
+++ /dev/null
@@ -1,62 +0,0 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
-.
-.TH "CHEF\-EXPANDERCTL" "8" "October 2013" "Chef 11.10.0.alpha.0" "Chef Manual"
-.
-.SH "NAME"
-\fBchef\-expanderctl\fR \- management program for chef\-expander
-.
-.SH "SYNOPSIS"
-\fBchef\-expanderctl\fR \fICOMMAND\fR
-.
-.P
-\fBCommands:\fR
-.
-.TP
-\fBhelp\fR
-Show help message
-.
-.TP
-\fBqueue\-depth\fR
-display the aggregate queue backlog
-.
-.TP
-\fBqueue\-status\fR
-show the backlog and consumer count for each vnode queue
-.
-.TP
-\fBnode\-status\fR
-show the status of the nodes in the cluster
-.
-.TP
-\fBlog\-level\fR
-sets the log level of all nodes in the cluster
-.
-.SH "DESCRIPTION"
-Chef\-expanderctl is a management program that allows you to get status information or change the logging verbosity (without restarting)\. chef\-expanderctl has the following commands:
-.
-.IP "\(bu" 4
-\fBchef\-expanderctl help\fR prints usage\.
-.
-.IP "\(bu" 4
-\fBchef\-expanderctl queue\-depth\fR Shows the total number of messages in the queues\.
-.
-.IP "\(bu" 4
-\fBchef\-expanderctl queue\-status\fR Show the number of messages in each queue\. This is mainly of use when debugging a Chef Expander cluster\.
-.
-.IP "\(bu" 4
-\fBchef\-expanderctl log\-level LEVEL\fR Sets the log level on a running Chef Expander or cluster\. If you suspect that a worker process is stuck, as long as you are using clustered operation, you can simply kill the worker process and it will be restarted by the master process\.
-.
-.IP "" 0
-.
-.SH "SEE ALSO"
-\fBchef\-expander\-cluster\fR(8) \fBchef\-solr\fR(8)
-.
-.P
-Full documentation for Chef and chef\-server is located on the Chef wiki, http://wiki\.opscode\.com/display/chef/Home\.
-.
-.SH "AUTHOR"
-Chef was written by Adam Jacob \fIadam@ospcode\.com\fR of Opscode (http://www\.opscode\.com), with contributions from the community\. This manual page was created by Nuo Yan \fInuo@opscode\.com\fR\. Permission is granted to copy, distribute and / or modify this document under the terms of the Apache 2\.0 License\.
-.
-.P
-On Debian systems, the complete text of the Apache 2\.0 License can be found in /usr/share/common\-licenses/Apache\-2\.0\.
diff --git a/distro/common/man/man8/chef-server-webui.8 b/distro/common/man/man8/chef-server-webui.8
deleted file mode 100644
index 76d2e59776..0000000000
--- a/distro/common/man/man8/chef-server-webui.8
+++ /dev/null
@@ -1,155 +0,0 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
-.
-.TH "CHEF\-SERVER\-WEBUI" "8" "October 2013" "Chef 11.10.0.alpha.0" "Chef Manual"
-.
-.SH "NAME"
-\fBchef\-server\-webui\fR \- Start the Chef Server merb application slice providing Web User Interface (Management Console)\.
-.
-.SH "SYNOPSIS"
-\fBchef\-server\-webui\fR \fI(options)\fR
-.
-.TP
-\fB\-u\fR, \fB\-\-user USER\fR
-This flag is for having chef\-server\-webui run as a user other than the one currently logged in\. Note: if you set this you must also provide a \-\-group option for it to take effect\.
-.
-.TP
-\fB\-G\fR, \fB\-\-group GROUP\fR
-This flag is for having chef\-server\-webui run as a group other than the one currently logged in\. Note: if you set this you must also provide a \-\-user option for it to take effect\.
-.
-.TP
-\fB\-d\fR, \fB\-\-daemonize\fR
-This will run a single chef\-server\-webui in the background\.
-.
-.TP
-\fB\-N\fR, \fB\-\-no\-daemonize\fR
-This will allow you to run a cluster in console mode\.
-.
-.TP
-\fB\-c\fR, \fB\-\-cluster\-nodes NUM_MERBS\fR
-Number of merb daemons to run for chef\-server\-webui\.
-.
-.TP
-\fB\-I\fR, \fB\-\-init\-file FILE\fR
-File to use for initialization on load, defaults to config/init\.rb\.
-.
-.TP
-\fB\-p\fR, \fB\-\-port PORTNUM\fR
-Port to run chef\-server\-webui on, defaults to 4040\. Additional nodes (\-c) listen on incrementing port numbers\.
-.
-.TP
-\fB\-o\fR, \fB\-\-socket\-file FILE\fR
-Socket file to run chef\-server\-webui on, defaults to [Merb\.root]/log/merb\.sock\. This is for web servers, like thin, that use sockets\. Specify this \fIonly\fR if you \fImust\fR\.
-.
-.TP
-\fB\-s\fR, \fB\-\-socket SOCKNUM\fR
-Socket number to run chef\-server\-webui on, defaults to 0\.
-.
-.TP
-\fB\-n\fR, \fB\-\-name NAME\fR
-Set the name of the application\. This is used in the process title and log file names\.
-.
-.TP
-\fB\-P\fR, \fB\-\-pid PIDFILE\fR
-PID file, defaults to [Merb\.root]/log/merb\.main\.pid for the master process and[Merb\.root]/log/merb\.[port number]\.pid for worker processes\. For clusters, use %s to specify where in the file chef\-server\-webui should place the port number\. For instance: \-P myapp\.%s\.pid\.
-.
-.TP
-\fB\-h\fR, \fB\-\-host HOSTNAME\fR
-Host to bind to (default is 0\.0\.0\.0)\.
-.
-.TP
-\fB\-m\fR, \fB\-\-merb\-root PATH_TO_APP_ROOT\fR
-The path to the Merb\.root for the app you want to run (default is current working directory)\.
-.
-.TP
-\fB\-a\fR, \fB\-\-adapter ADAPTER\fR
-The rack adapter to use to run chef\-server\-webui (default is mongrel) [mongrel, emongrel, thin, ebb, fastcgi, webrick]\.
-.
-.TP
-\fB\-R\fR, \fB\-\-rackup FILE\fR
-Load an alternate Rack config file (default is config/rack\.rb)\.
-.
-.TP
-\fB\-i\fR, \fB\-\-irb\-console\fR
-This flag will start chef\-server\-webui in irb console mode\. All your models and other classes will be available for you in an irb session\.
-.
-.TP
-\fB\-S\fR, \fB\-\-sandbox\fR
-This flag will enable a sandboxed irb console\. If your ORM supports transactions, all edits will be rolled back on exit\.
-.
-.TP
-\fB\-l\fR, \fB\-\-log\-level LEVEL\fR
-Log levels can be set to any of these options: debug < info < warn < error < fatal (default is info)\.
-.
-.TP
-\fB\-L\fR, \fB\-\-log LOGFILE\fR
-A string representing the logfile to use\. Defaults to [Merb\.root]/log/merb\.[main]\.log for the master process and [Merb\.root]/log/merb[port number]\.logfor worker processes\.
-.
-.TP
-\fB\-e\fR, \fB\-\-environment STRING\fR
-Environment to run Merb under [development, production, testing] (default is development)\.
-.
-.TP
-\fB\-r\fR, \fB\-\-script\-runner [\'RUBY CODE\'| FULL_SCRIPT_PATH]\fR
-Command\-line option to run scripts and/or code in the chef\-server\-webui app\.
-.
-.TP
-\fB\-K\fR, \fB\-graceful PORT or all\fR
-Gracefully kill chef\-server\-webui proceses by port number\. Use chef\-server \-K all to gracefully kill all merbs\.
-.
-.TP
-\fB\-k\fR, \fB\-\-kill PORT\fR
-Force kill one merb worker by port number\. This will cause the worker to be respawned\.
-.
-.TP
-\fB\-\-fast\-deploy\fR
-Reload the code, but not yourinit\.rb or gems\.
-.
-.TP
-\fB\-X\fR, \fB\-\-mutex on/off\fR
-This flag is for turning the mutex lock on and off\.
-.
-.TP
-\fB\-D\fR, \fB\-\-debugger\fR
-Run chef\-server\-webui using rDebug\.
-.
-.TP
-\fB\-V\fR, \fB\-\-verbose\fR
-Print extra information\.
-.
-.TP
-\fB\-C\fR, \fB\-\-console\-trap\fR
-Enter an irb console on ^C\.
-.
-.TP
-\fB\-?\fR, \fB\-H\fR, \fB\-\-help\fR
-Show this help message\.
-.
-.SH "DESCRIPTION"
-The Chef Server WebUI (Management Console) is a Merb application slice\. The default listen port is 4040\.
-.
-.P
-The Management Console is Chef Server\'s web interface\. Nodes, roles, cookbooks, data bags, and API clients can be managed through the Management Console\. Search can also be done on the console\.
-.
-.P
-In order to start using the Management Console, you need to first create a user or change the default password on the "admin" user\.
-.
-.P
-The default credentials are:
-.
-.IP "\(bu" 4
-\fBUsername\fR: admin
-.
-.IP "\(bu" 4
-\fBPassword\fR: p@ssw0rd1
-.
-.IP "" 0
-.
-.SH "SEE ALSO"
-Full documentation for Chef and chef\-server\-webui (Management Console) is located on the Chef wiki, http://wiki\.opscode\.com/display/chef/Home\.
-.
-.SH "AUTHOR"
-Chef was written by Adam Jacob \fIadam@ospcode\.com\fR of Opscode (http://www\.opscode\.com), with contributions from the community\. This manual page was written by Joshua Timberman \fIjoshua@opscode\.com\fR with help2man for the Debian project (but may be used by others)\. Permission is granted to copy, distribute and / or modify this document under the terms of the Apache 2\.0 License\.
-.
-.P
-On Debian systems, the complete text of the Apache 2\.0 License can be found in /usr/share/common\-licenses/Apache\-2\.0\.
diff --git a/distro/common/man/man8/chef-server.8 b/distro/common/man/man8/chef-server.8
deleted file mode 100644
index 3ac8939a2b..0000000000
--- a/distro/common/man/man8/chef-server.8
+++ /dev/null
@@ -1,147 +0,0 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
-.
-.TH "CHEF\-SERVER" "8" "October 2013" "Chef 11.10.0.alpha.0" "Chef Manual"
-.
-.SH "NAME"
-\fBchef\-server\fR \- Start the Chef Server merb application slice\.
-.
-.SH "SYNOPSIS"
-\fBchef\-server\fR \fI(options)\fR
-.
-.TP
-\fB\-u\fR, \fB\-\-user USER\fR
-This flag is for having chef\-server\-webui run as a user other than the one currently logged in\. Note: if you set this you must also provide a \-\-group option for it to take effect\.
-.
-.TP
-\fB\-G\fR, \fB\-\-group GROUP\fR
-This flag is for having chef\-server\-webui run as a group other than the one currently logged in\. Note: if you set this you must also provide a \-\-user option for it to take effect\.
-.
-.TP
-\fB\-d\fR, \fB\-\-daemonize\fR
-This will run a single chef\-server\-webui in the background\.
-.
-.TP
-\fB\-N\fR, \fB\-\-no\-daemonize\fR
-This will allow you to run a cluster in console mode\.
-.
-.TP
-\fB\-c\fR, \fB\-\-cluster\-nodes NUM_MERBS\fR
-Number of merb daemons to run for chef\-server\-webui\.
-.
-.TP
-\fB\-I\fR, \fB\-\-init\-file FILE\fR
-File to use for initialization on load, defaults to config/init\.rb\.
-.
-.TP
-\fB\-p\fR, \fB\-\-port PORTNUM\fR
-Port to run chef\-server\-webui on, defaults to 4040\. Additional nodes (\-c) listen on incrementing port numbers\.
-.
-.TP
-\fB\-o\fR, \fB\-\-socket\-file FILE\fR
-Socket file to run chef\-server\-webui on, defaults to [Merb\.root]/log/merb\.sock\. This is for web servers, like thin, that use sockets\. Specify this \fIonly\fR if you \fImust\fR\.
-.
-.TP
-\fB\-s\fR, \fB\-\-socket SOCKNUM\fR
-Socket number to run chef\-server\-webui on, defaults to 0\.
-.
-.TP
-\fB\-n\fR, \fB\-\-name NAME\fR
-Set the name of the application\. This is used in the process title and log file names\.
-.
-.TP
-\fB\-P\fR, \fB\-\-pid PIDFILE\fR
-PID file, defaults to [Merb\.root]/log/merb\.main\.pid for the master process and[Merb\.root]/log/merb\.[port number]\.pid for worker processes\. For clusters, use %s to specify where in the file chef\-server\-webui should place the port number\. For instance: \-P myapp\.%s\.pid\.
-.
-.TP
-\fB\-h\fR, \fB\-\-host HOSTNAME\fR
-Host to bind to (default is 0\.0\.0\.0)\.
-.
-.TP
-\fB\-m\fR, \fB\-\-merb\-root PATH_TO_APP_ROOT\fR
-The path to the Merb\.root for the app you want to run (default is current working directory)\.
-.
-.TP
-\fB\-a\fR, \fB\-\-adapter ADAPTER\fR
-The rack adapter to use to run chef\-server\-webui (default is mongrel) [mongrel, emongrel, thin, ebb, fastcgi, webrick]\.
-.
-.TP
-\fB\-R\fR, \fB\-\-rackup FILE\fR
-Load an alternate Rack config file (default is config/rack\.rb)\.
-.
-.TP
-\fB\-i\fR, \fB\-\-irb\-console\fR
-This flag will start chef\-server\-webui in irb console mode\. All your models and other classes will be available for you in an irb session\.
-.
-.TP
-\fB\-S\fR, \fB\-\-sandbox\fR
-This flag will enable a sandboxed irb console\. If your ORM supports transactions, all edits will be rolled back on exit\.
-.
-.TP
-\fB\-l\fR, \fB\-\-log\-level LEVEL\fR
-Log levels can be set to any of these options: debug < info < warn < error < fatal (default is info)\.
-.
-.TP
-\fB\-L\fR, \fB\-\-log LOGFILE\fR
-A string representing the logfile to use\. Defaults to [Merb\.root]/log/merb\.[main]\.log for the master process and [Merb\.root]/log/merb[port number]\.logfor worker processes\.
-.
-.TP
-\fB\-e\fR, \fB\-\-environment STRING\fR
-Environment to run Merb under [development, production, testing] (default is development)\.
-.
-.TP
-\fB\-r\fR, \fB\-\-script\-runner [\'RUBY CODE\'| FULL_SCRIPT_PATH]\fR
-Command\-line option to run scripts and/or code in the chef\-server\-webui app\.
-.
-.TP
-\fB\-K\fR, \fB\-graceful PORT or all\fR
-Gracefully kill chef\-server\-webui proceses by port number\. Use chef\-server \-K all to gracefully kill all merbs\.
-.
-.TP
-\fB\-k\fR, \fB\-\-kill PORT\fR
-Force kill one merb worker by port number\. This will cause the worker to be respawned\.
-.
-.TP
-\fB\-\-fast\-deploy\fR
-Reload the code, but not yourinit\.rb or gems\.
-.
-.TP
-\fB\-X\fR, \fB\-\-mutex on/off\fR
-This flag is for turning the mutex lock on and off\.
-.
-.TP
-\fB\-D\fR, \fB\-\-debugger\fR
-Run chef\-server\-webui using rDebug\.
-.
-.TP
-\fB\-V\fR, \fB\-\-verbose\fR
-Print extra information\.
-.
-.TP
-\fB\-C\fR, \fB\-\-console\-trap\fR
-Enter an irb console on ^C\.
-.
-.TP
-\fB\-?\fR, \fB\-H\fR, \fB\-\-help\fR
-Show this help message\.
-.
-.SH "DESCRIPTION"
-The Chef Server provides a central point for the distribution of Cookbooks, management and authentication of Nodes, and the use of Search\. It provides a REST API\.
-.
-.P
-The API service is what clients use to interact with the server to manage node configuration in Chef\. By default, the service is started on port 4000 as a Merb application slice running with the thin server adapter\.
-.
-.P
-The two methods of interaction with the API for humans are the command\-line tool Knife and the Management Console\. The Chef Client library is used for interacting with the API for client nodes\.
-.
-.SH "SEE ALSO"
-\fBchef\-client\fR(8) \fBchef\-server\-webui\fR(8) \fBknife\fR(1)
-.
-.P
-Full documentation for Chef and chef\-server is located on the Chef wiki, http://wiki\.opscode\.com/display/chef/Home\.
-.
-.SH "AUTHOR"
-Chef was written by Adam Jacob \fIadam@ospcode\.com\fR of Opscode (http://www\.opscode\.com), with contributions from the community\. This manual page was written by Joshua Timberman \fIjoshua@opscode\.com\fR with help2man\. Permission is granted to copy, distribute and / or modify this document under the terms of the Apache 2\.0 License\.
-.
-.P
-On Debian systems, the complete text of the Apache 2\.0 License can be found in /usr/share/common\-licenses/Apache\-2\.0\.
diff --git a/distro/common/man/man8/chef-solr.8 b/distro/common/man/man8/chef-solr.8
deleted file mode 100644
index 4002e744db..0000000000
--- a/distro/common/man/man8/chef-solr.8
+++ /dev/null
@@ -1,122 +0,0 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
-.
-.TH "CHEF\-SOLR" "8" "October 2013" "Chef 11.10.0.alpha.0" "Chef Manual"
-.
-.SH "NAME"
-\fBchef\-solr\fR \- Runs as Chef\'s search server
-.
-.SH "SYNOPSIS"
-\fBchef\-solr\fR \fI(options)\fR
-.
-.TP
-\fB\-c\fR, \fB\-\-config CONFIG\fR
-The configuration file to use
-.
-.TP
-\fB\-d\fR, \fB\-\-daemonize\fR
-Daemonize the process
-.
-.TP
-\fB\-g\fR, \fB\-\-group GROUP\fR
-Group to set privilege to
-.
-.TP
-\fB\-l\fR, \fB\-\-log_level LEVEL\fR
-Set the log level (debug, info, warn, error, fatal)
-.
-.TP
-\fB\-L\fR, \fB\-\-logfile LOGLOCATION\fR
-Set the log file location, defaults to STDOUT \- recommended for daemonizing
-.
-.TP
-\fB\-P\fR, \fB\-\-pid PIDFILE\fR
-Set the PID file location, defaults to /tmp/chef\-solr\.pid
-.
-.TP
-\fB\-D\fR, \fB\-\-solr\-data\-dir PATH\fR
-Where the Solr data lives
-.
-.TP
-\fB\-x\fR, \fB\-\-solor\-heap\-size SIZE\fR
-Set the size of the Java Heap
-.
-.TP
-\fB\-H\fR, \fB\-\-solr\-home\-dir PATH\fR
-Solr home directory
-.
-.TP
-\fB\-j\fR, \fB\-\-java\-opts OPTS\fR
-Raw options passed to Java
-.
-.TP
-\fB\-x\fR, \fB\-\-solor\-heap\-size\fR
-Set the size of the Java Heap
-.
-.TP
-\fB\-W\fR, \fB\-\-solr\-jetty\-dir PATH\fR
-Where to place the Solr Jetty instance
-.
-.TP
-\fB\-u\fR, \fB\-\-user USER\fR
-User to set privilege to
-.
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show chef\-solr version
-.
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-Show this message
-.
-.SH "DESCRIPTION"
-Chef\-solr provides search service for Chef\. You need to have both chef\-solr and chef\-expander\-cluster running in order for search to work\.
-.
-.P
-\fBInstallation\fR
-.
-.P
-Make sure you backed up your data if you are upgrading from a previous version\. Run chef\-solr\-installer to upgrade your Chef Solr installation\. Answer "yes" when prompted for confirmation\. The process should look like this:
-.
-.IP "" 4
-.
-.nf
-
-yourshell> chef\-solr\-installer
-Configuration setting solr_heap_size is unknown and will be ignored
-
-Chef Solr is already installed in /var/chef/solr
-Do you want to overwrite the current install? All existing Solr data will be lost\. [y/n] y
-Removing the existing Chef Solr installation
-  rm \-rf /var/chef/solr
-  rm \-rf /var/chef/solr\-jetty
-  rm \-rf /var/chef/solr/data
-Creating Solr Home Directory
-  mkdir \-p /var/chef/solr
-  entering /var/chef/solr
-  tar zxvf /Users/ddeleo/opscode/chef/chef\-solr/solr/solr\-home\.tar\.gz
-Creating Solr Data Directory
-  mkdir \-p /var/chef/solr/data
-Unpacking Solr Jetty
-  mkdir \-p /var/chef/solr\-jetty
-  entering /var/chef/solr\-jetty
-  tar zxvf /Users/ddeleo/opscode/chef/chef\-solr/solr/solr\-jetty\.tar\.gz
-
-Successfully installed Chef Solr\.
-You can restore your search index using `knife index rebuild`
-.
-.fi
-.
-.IP "" 0
-.
-.SH "SEE ALSO"
-\fBchef\-expander\-cluster\fR(8)
-.
-.P
-Full documentation for Chef and chef\-server is located on the Chef wiki, http://wiki\.opscode\.com/display/chef/Home\.
-.
-.SH "AUTHOR"
-Chef was written by Adam Jacob \fIadam@ospcode\.com\fR of Opscode (http://www\.opscode\.com), with contributions from the community\. This manual page was written by Joshua Timberman \fIjoshua@opscode\.com\fR with help2man\. Permission is granted to copy, distribute and / or modify this document under the terms of the Apache 2\.0 License\.
-.
-.P
-On Debian systems, the complete text of the Apache 2\.0 License can be found in /usr/share/common\-licenses/Apache\-2\.0\.
diff --git a/lib/chef/knife/help_topics.rb b/lib/chef/knife/help_topics.rb
index 8427204fd6..ca13381bbf 100644
--- a/lib/chef/knife/help_topics.rb
+++ b/lib/chef/knife/help_topics.rb
@@ -1,4 +1,4 @@
 # Do not edit this file by hand
 # This file is autogenerated by the docs:list rake task from the available manpages
 
-HELP_TOPICS = ["chef-shell", "knife-bootstrap", "knife-client", "knife-configure", "knife-cookbook-site", "knife-cookbook", "knife-data-bag", "knife-environment", "knife-exec", "knife-index", "knife-node", "knife-role", "knife-search", "knife-ssh", "knife-status", "knife-tag", "knife", "shef"]
+HELP_TOPICS = ["chef-shell", "knife-bootstrap", "knife-client", "knife-configure", "knife-cookbook-site", "knife-cookbook", "knife-data-bag", "knife-delete", "knife-deps", "knife-diff", "knife-download", "knife-edit", "knife-environment", "knife-exec", "knife-index-rebuild", "knife-index", "knife-list", "knife-node", "knife-raw", "knife-recipe-list", "knife-role", "knife-search", "knife-show", "knife-ssh", "knife-status", "knife-tag", "knife-upload", "knife-user", "knife-xargs", "knife"]
diff --git a/spec/integration/solo/solo_spec.rb b/spec/integration/solo/solo_spec.rb
index 9d2a391477..215c110d3e 100644
--- a/spec/integration/solo/solo_spec.rb
+++ b/spec/integration/solo/solo_spec.rb
@@ -31,7 +31,7 @@ EOM
     file 'cookbooks/x/recipes/default.rb', <<EOM
 ruby_block "sleeping" do
   block do
-    sleep 3
+    sleep 5
   end
 end
 EOM
@@ -52,7 +52,7 @@ EOM
 -l debug -L #{path_to('logs/runs.log')}", :chdir => chef_dir)
 
           # Give it some time to progress
-          sleep 3
+          sleep 1
 
           # Instantiate the second chef-solo run
           s2 = Process.spawn("chef-solo -c \"#{path_to('config/solo.rb')}\" -o 'x::default' \