add cookbook upload dependencies option to more documentation

patcoll · May 20, 2011 · 83318ea · 83318ea
1 parent 04dca91
commit 83318ea
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/chef/distro/common/html/knife-cookbook.1.html b/chef/distro/common/html/knife-cookbook.1.html
diff --git 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
@@ -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
@@ -64,7 +64,7 @@ class CookbookUpload < Knife
       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]