Browse files


  • Loading branch information...
1 parent 2157a83 commit b109c8140d81e7d5a3bf882523def4b340bcc81d @jtimberman jtimberman committed Dec 30, 2011
Showing with 36 additions and 2 deletions.
  1. +25 −0 CONTRIBUTING
  2. +3 −2 LICENSE.txt
  3. +8 −0
@@ -0,0 +1,25 @@
+These materials are an Opscode open source project. They are
+dual-licensed under Creative Commons and the Apache License, Version
+2.0. See the LICENSE.txt file for more information about your rights.
+In order to contribute changes to the supporting code and significant
+example code on slides, we require a contributor license
+agreement. Please see the following wiki document for more
+A contributor license agreement is not required to contribute changes
+to the slides, guides or notes that are placed under Creative Commons
+license. However, for tracking purposes we ask that a ticket in JIRA
+is created, and noted in the commit message for the change.
+For example:
+ git commit -m '[FND-##] - fixed typos in getting started'
+When making changes in the repository, please do not modify the
+"showoff.json" file. Also please do not replace images without new
+sources such as OmniGraffle.
@@ -5,7 +5,7 @@ Chef Fundamentals is created and sponsored by Opscode, Inc.
Unless otherwise indicated, these materials are Copyright © 2010-2011
Opscode, Inc. All rights reserved.
-Slides and notes are placed under Creative Commons
+Slides, guides and notes are placed under Creative Commons
Attribution-ShareAlike license (CC BY-SA). You are free:
to Share — to copy, distribute and transmit the work
@@ -25,7 +25,8 @@ Share Alike — If you alter, transform, or build upon this work, you
may distribute the resulting work only under the same or similar
license to this one.
-Supporting code and example code on slides, unless otherwise noted:
+Supporting code and significant example code on slides, unless
+otherwise noted:
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -42,3 +42,11 @@ This is spartan and will be embellished.
+# Contributing
+See LICENSE.txt for licensing of these materials and how you may use
+See CONTRIBUTING for information on how you can contribute changes to
+these materials.

0 comments on commit b109c81

Please sign in to comment.