diff options
| -rw-r--r-- | chef/distro/common/html/knife-cookbook.1.html | 8 | ||||
| -rw-r--r-- | chef/distro/common/man/man1/knife-cookbook.1 | 6 | ||||
| -rw-r--r-- | chef/distro/common/markdown/man1/knife-cookbook.mkd | 3 | ||||
| -rw-r--r-- | chef/lib/chef/knife/cookbook_upload.rb | 2 |
4 files changed, 14 insertions, 5 deletions
diff --git a/chef/distro/common/html/knife-cookbook.1.html b/chef/distro/common/html/knife-cookbook.1.html index f062742922..c6ad49e1ac 100644 --- a/chef/distro/common/html/knife-cookbook.1.html +++ b/chef/distro/common/html/knife-cookbook.1.html @@ -143,6 +143,8 @@ <dl> <dt><code>-a</code>, <code>--all</code></dt><dd>upload all cookbooks, rather than just a single cookbook</dd> <dt><code>-o</code>, <code>--cookbook-path path:path</code></dt><dd>a colon-separated path to look for cookbooks in</dd> +<dt><code>-d</code>, <code>--upload-dependencies</code></dt><dd>Uploads additional cookbooks that this cookbook lists in as +dependencies in its metadata.</dd> <dt><code>-E</code>, <code>--environment ENVIRONMENT</code></dt><dd>An <em>ENVIRONMENT</em> to apply the uploaded cookbooks to. Specifying this option will cause knife to edit the <em>ENVIRONMENT</em> to place a strict version constraint on the cookbook version(s) uploaded.</dd> @@ -350,11 +352,11 @@ cookbook.</p> <h2 id="AUTHOR">AUTHOR</h2> -<p> Chef was written by Adam Jacob <a href="mailto:adam@opscode.com" data-bare-link="true">adam@opscode.com</a> with many contributions from the community.</p> +<p> Chef was written by Adam Jacob <a href="mailto:adam@opscode.com" data-bare-link="true">adam@opscode.com</a> with many contributions from the community.</p> <h2 id="DOCUMENTATION">DOCUMENTATION</h2> -<p> This manual page was written by Joshua Timberman <a href="mailto:joshua@opscode.com" data-bare-link="true">joshua@opscode.com</a>. +<p> This manual page was written by Joshua Timberman <a href="mailto:joshua@opscode.com" data-bare-link="true">joshua@opscode.com</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> @@ -364,7 +366,7 @@ cookbook.</p> <ol class='man-decor man-foot man foot'> <li class='tl'>Chef 0.10.0</li> - <li class='tc'>April 2011</li> + <li class='tc'>May 2011</li> <li class='tr'>knife-cookbook(1)</li> </ol> diff --git a/chef/distro/common/man/man1/knife-cookbook.1 b/chef/distro/common/man/man1/knife-cookbook.1 index 3571f5d7d8..624bc4fca3 100644 --- a/chef/distro/common/man/man1/knife-cookbook.1 +++ b/chef/distro/common/man/man1/knife-cookbook.1 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "KNIFE\-COOKBOOK" "1" "April 2011" "Chef 0.10.0" "Chef Manual" +.TH "KNIFE\-COOKBOOK" "1" "May 2011" "Chef 0.10.0" "Chef Manual" . .SH "NAME" \fBknife\-cookbook\fR \- upload and manage chef cookbooks @@ -82,6 +82,10 @@ upload all cookbooks, rather than just a single cookbook a colon\-separated path to look for cookbooks in . .TP +\fB\-d\fR, \fB\-\-upload\-dependencies\fR +Uploads additional cookbooks that this cookbook lists in as dependencies in its metadata\. +. +.TP \fB\-E\fR, \fB\-\-environment ENVIRONMENT\fR An \fIENVIRONMENT\fR to apply the uploaded cookbooks to\. Specifying this option will cause knife to edit the \fIENVIRONMENT\fR to place a strict version constraint on the cookbook version(s) uploaded\. . diff --git a/chef/distro/common/markdown/man1/knife-cookbook.mkd b/chef/distro/common/markdown/man1/knife-cookbook.mkd index 32bdcfdbc5..81dd3af0b1 100644 --- a/chef/distro/common/markdown/man1/knife-cookbook.mkd +++ b/chef/distro/common/markdown/man1/knife-cookbook.mkd @@ -46,6 +46,9 @@ __knife cookbook upload [cookbooks...]__ _(options)_ upload all cookbooks, rather than just a single cookbook * `-o`, `--cookbook-path path:path`: a colon-separated path to look for cookbooks in + * `-d`, `--upload-dependencies`: + Uploads additional cookbooks that this cookbook lists in as + dependencies in its metadata. * `-E`, `--environment ENVIRONMENT`: An _ENVIRONMENT_ to apply the uploaded cookbooks to. Specifying this option will cause knife to edit the _ENVIRONMENT_ to place a strict diff --git a/chef/lib/chef/knife/cookbook_upload.rb b/chef/lib/chef/knife/cookbook_upload.rb index 6bc229a675..2945a9fef9 100644 --- a/chef/lib/chef/knife/cookbook_upload.rb +++ b/chef/lib/chef/knife/cookbook_upload.rb @@ -64,7 +64,7 @@ class Chef option :depends, :short => "-d", :long => "--include-dependencies", - :description => "Upload dependencies also" + :description => "Also upload cookbook dependencies" def run config[:cookbook_path] ||= Chef::Config[:cookbook_path] |