Merge branch 'master' into 11-stable

1 files changed, 8 insertions, 8 deletions

diff --git a/distro/common/html/knife-cookbook.1.html b/distro/common/html/knife-cookbook.1.html
index 1b4d53a5f9..e044adfa1c 100644
--- a/distro/common/html/knife-cookbook.1.html
+++ b/distro/common/html/knife-cookbook.1.html
@@ -217,9 +217,9 @@ regular expression (<em>regex</em>) should be in quotes, not in //'s.</p>
 <dl>
 <dt><code>-o</code>, <code>--cookbook-path path</code></dt><dd>the directory where the cookbook will be created</dd>
 <dt><code>-r</code>, <code>--readme-format format</code></dt><dd>format of the readme file md, mkd, txt, rdoc</dd>
-<dt><code>-c</code>, <code>--copyright copyright</code></dt><dd>name of copyright holder</dd>
+<dt><code>-C</code>, <code>--copyright copyright</code></dt><dd>name of copyright holder</dd>
 <dt><code>-i</code>, <code>--license license</code></dt><dd>license for cookbook, apachev2 or none</dd>
-<dt><code>-e</code>, <code>--email email</code></dt><dd>email address of cookbook maintainer</dd>
+<dt><code>-m</code>, <code>--email email</code></dt><dd>email address of cookbook maintainer</dd>
 </dl>
 
 
@@ -245,7 +245,7 @@ named cookbook.</p>
 readme file will be written with the specified extension and a set of
 helpful starting headers.</p>
 
-<p>specify <code>-c</code> or <code>--copyright</code> with the name of the copyright holder as
+<p>specify <code>-C</code> or <code>--copyright</code> with the name of the copyright holder as
 your name or your company/organization name in a quoted string. if this
 value is not specified an all-caps string <code>your_company_name</code> is used
 which can be easily changed with find/replace.</p>
@@ -258,7 +258,7 @@ the cookbook and follow any restrictions they describe. when using
 are pre-filled. the <code>none</code> license will be treated as
 non-redistributable.</p>
 
-<p>specify <code>-e</code> or <code>--email</code> with the email address of the cookbook's
+<p>specify <code>-m</code> or <code>--email</code> with the email address of the cookbook's
 maintainer. if this value is not specified, an all-caps string
 <code>your_email</code> is used which can easily be changed with find/replace.</p>
 
@@ -358,11 +358,11 @@ cookbook.</p>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>   Chef was written by Adam Jacob <a href="&#x6d;&#x61;&#x69;&#x6c;&#116;&#111;&#58;&#97;&#100;&#x61;&#109;&#x40;&#x6f;&#112;&#x73;&#x63;&#x6f;&#x64;&#x65;&#x2e;&#99;&#111;&#x6d;" data-bare-link="true">&#97;&#x64;&#97;&#x6d;&#64;&#x6f;&#112;&#x73;&#x63;&#x6f;&#100;&#101;&#x2e;&#99;&#111;&#x6d;</a> with many contributions from the community.</p>
+<p>   Chef was written by Adam Jacob <a href="&#x6d;&#97;&#105;&#x6c;&#116;&#111;&#x3a;&#x61;&#x64;&#x61;&#x6d;&#x40;&#111;&#x70;&#x73;&#99;&#111;&#100;&#101;&#46;&#99;&#111;&#x6d;" data-bare-link="true">&#x61;&#100;&#x61;&#x6d;&#64;&#111;&#112;&#115;&#x63;&#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;&#x61;&#105;&#108;&#x74;&#111;&#x3a;&#106;&#x6f;&#115;&#x68;&#x75;&#x61;&#64;&#111;&#x70;&#x73;&#99;&#111;&#x64;&#101;&#46;&#99;&#x6f;&#x6d;" data-bare-link="true">&#x6a;&#x6f;&#x73;&#x68;&#117;&#97;&#64;&#x6f;&#112;&#115;&#99;&#x6f;&#x64;&#101;&#46;&#99;&#111;&#x6d;</a>.
+<p>   This manual page was written by Joshua Timberman <a href="&#x6d;&#97;&#105;&#108;&#116;&#x6f;&#x3a;&#x6a;&#x6f;&#x73;&#x68;&#117;&#97;&#x40;&#x6f;&#x70;&#x73;&#99;&#x6f;&#100;&#101;&#x2e;&#99;&#x6f;&#109;" data-bare-link="true">&#x6a;&#x6f;&#115;&#x68;&#117;&#x61;&#64;&#111;&#x70;&#115;&#x63;&#111;&#100;&#101;&#46;&#x63;&#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>
@@ -371,8 +371,8 @@ cookbook.</p>
 
 
   <ol class='man-decor man-foot man foot'>
-    <li class='tl'>Chef 11.6.0.hotfix.1</li>
-    <li class='tc'>August 2013</li>
+    <li class='tl'>Chef 11.8.0.alpha.0</li>
+    <li class='tc'>July 2013</li>
     <li class='tr'>knife-cookbook(1)</li>
   </ol>