cookbooks 0.10 changes, use md for environments

infochimps-labs · May 6, 2011 · 6524c23 · 6524c23
1 parent cbbeee2
commit 6524c23
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/cookbooks/README.md b/cookbooks/README.md
@@ -17,7 +17,7 @@ Configure knife to use your preferred copyright holder, email contact and licens
     cookbook_email     "cookbooks@example.com"
     cookbook_license   "apachev2"
 
-Supported values for `cookbook_license` are "apachev2" or "none". These settings are used to prefill comments in the default recipe, and the corresponding values in the metadata.rb. You are free to change these in those files.
+Supported values for `cookbook_license` are "apachev2", "mit","gplv2","gplv3",  or "none". These settings are used to prefill comments in the default recipe, and the corresponding values in the metadata.rb. You are free to change the the comments in those files.
 
 Create new cookbooks in this directory with Knife.
 
@@ -29,7 +29,7 @@ You can also download cookbooks directly from the Opscode Cookbook Site. There a
 
 The first and recommended method is to use a vendor branch if you're using Git. This is automatically handled with Knife.
 
-    knife cookbook site vendor COOKBOOK
+    knife cookbook site install COOKBOOK
 
 This will:
 
@@ -43,6 +43,7 @@ This will:
 * Creates a tag for the version downloaded.
 * Checks out the master branch again.
 * Merges the cookbook into master.
+* Repeats the above for all the cookbooks dependencies, downloading them from the community site
 
 The last step will ensure that any local changes or modifications you have made to the cookbook are preserved, so you can keep your changes through upstream updates.
 

diff --git a/data_bags/README.md b/data_bags/README.md
@@ -1,5 +1,6 @@
 Data Bags
 ---------
+
 This directory contains directories of the various data bags you create for your infrastructure. Each subdirectory corresponds to a data bag on the Chef Server, and contains JSON files of the items that go in the bag.
 
 First, create a directory for the data bag.
@@ -27,6 +28,7 @@ Then upload the items in the data bag's directory to the Chef Server.
 
 Encrypted Data Bags
 -------------------
+
 Added in Chef 0.10, encrypted data bags allow you to encrypt the contents of your data bags. The content of attributes will no longer be searchable. To use encrypted data bags, first you must have or create a secret key.
 
     openssl rand -base64 512 > secret_key

diff --git a/environments/README → environments/README.md b/environments/README → environments/README.md
@@ -1,4 +1,4 @@
-Requires Chef 0.10.0.
+Requires Chef 0.10.0+.
 
 This directory is for Ruby DSL and JSON files for environments. For more information see the Chef wiki page: