Permalink
Browse files

Update license information

* Extend year to 2012
* Use United States version of Creative Commons license
  • Loading branch information...
1 parent f6f0475 commit da84a9141a3095c4fc8fd6edd5da42d51e2c792f @jtimberman jtimberman committed Jan 20, 2012
View
@@ -1,6 +1,6 @@
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.
+2.0. See the LICENSE 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
View
@@ -6,7 +6,7 @@ Unless otherwise indicated, these materials are Copyright © 2010-2011
Opscode, Inc. All rights reserved.
Slides, guides and notes are placed under Creative Commons
-Attribution-ShareAlike license (CC BY-SA). You are free:
+Attribution-ShareAlike United States license (CC BY-SA). You are free:
to Share — to copy, distribute and transmit the work
to Remix — to adapt the work
View
@@ -65,7 +65,7 @@ these materials.
# License and Authors
-See LICENSE.txt for licensing of these materials and how you may use
+See LICENSE for licensing of these materials and how you may use
them.
## Authors:
View
@@ -29,8 +29,8 @@ def section_header(section = "welcome")
end
def copyright_header
- "\n.notes These course materials are Copyright © 2010-2011 Opscode, Inc. All rights reserved.
-This work is licensed under a Creative Commons Attribution Share Alike 3.0 License. To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/3.0/; or send a letter to Creative Commons, 171 2nd Street, Suite 300, San Francisco, California, 94105, USA.\n\n"
+ "\n.notes These course materials are Copyright © 2010-2012 Opscode, Inc. All rights reserved.
+This work is licensed under a Creative Commons Attribution Share Alike 3.0 United States License. To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/3.0/us; or send a letter to Creative Commons, 171 2nd Street, Suite 300, San Francisco, California, 94105, USA.\n\n"
end
def section_objectives
@@ -1,7 +1,7 @@
# Adding a New Node
-.notes These course materials are Copyright © 2010-2011 Opscode, Inc. All rights reserved.
-This work is licensed under a Creative Commons Attribution Share Alike 3.0 License. To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/3.0/; or send a letter to Creative Commons, 171 2nd Street, Suite 300, San Francisco, California, 94105, USA.
+.notes These course materials are Copyright © 2010-2012 Opscode, Inc. All rights reserved.
+This work is licensed under a Creative Commons Attribute Share Alike 3.0 United States License. To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/3.0/us; or send a letter to Creative Commons, 171 2nd Street, Suite 300, San Francisco, California, 94105, USA.
# Objectives
@@ -1,11 +1,7 @@
# Adding Cookbooks
-.notes These course materials are Copyright © 2010-2011 Opscode,
-Inc. All rights reserved. This work is licensed under a Creative
-Commons Attribution Share Alike 3.0 License. To view a copy of this
-license, visit http://creativecommons.org/licenses/by-sa/3.0/; or send
-a letter to Creative Commons, 171 2nd Street, Suite 300, San
-Francisco, California, 94105, USA.
+.notes These course materials are Copyright © 2010-2012 Opscode, Inc. All rights reserved.
+This work is licensed under a Creative Commons Attribution Share Alike 3.0 United States License. To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/3.0/us; or send a letter to Creative Commons, 171 2nd Street, Suite 300, San Francisco, California, 94105, USA.
# Objectives
@@ -1,7 +1,7 @@
# Anatomy of a Chef Run
-.notes These course materials are Copyright © 2010-2011 Opscode, Inc. All rights reserved.
-This work is licensed under a Creative Commons Attribution Share Alike 3.0 License. To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/3.0/; or send a letter to Creative Commons, 171 2nd Street, Suite 300, San Francisco, California, 94105, USA.
+.notes These course materials are Copyright © 2010-2012 Opscode, Inc. All rights reserved.
+This work is licensed under a Creative Commons Attribute Share Alike 3.0 United States License. To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/3.0/us; or send a letter to Creative Commons, 171 2nd Street, Suite 300, San Francisco, California, 94105, USA.
# Objectives
@@ -2,8 +2,8 @@
And Further Resources
-.notes These course materials are Copyright © 2010-2011 Opscode, Inc. All rights reserved.
-This work is licensed under a Creative Commons Attribution Share Alike 3.0 License. To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/3.0/; or send a letter to Creative Commons, 171 2nd Street, Suite 300, San Francisco, California, 94105, USA.
+.notes These course materials are Copyright © 2010-2012 Opscode, Inc. All rights reserved.
+This work is licensed under a Creative Commons Attribute Share Alike 3.0 United States License. To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/3.0/us; or send a letter to Creative Commons, 171 2nd Street, Suite 300, San Francisco, California, 94105, USA.
# Chef is Open Source
@@ -1,7 +1,7 @@
# Data Bags
-.notes These course materials are Copyright © 2010-2011 Opscode, Inc. All rights reserved.
-This work is licensed under a Creative Commons Attribution Share Alike 3.0 License. To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/3.0/; or send a letter to Creative Commons, 171 2nd Street, Suite 300, San Francisco, California, 94105, USA.
+.notes These course materials are Copyright © 2010-2012 Opscode, Inc. All rights reserved.
+This work is licensed under a Creative Commons Attribute Share Alike 3.0 United States License. To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/3.0/us; or send a letter to Creative Commons, 171 2nd Street, Suite 300, San Francisco, California, 94105, USA.
# Objectives
@@ -1,7 +1,7 @@
# Example Cookbook
-.notes These course materials are Copyright © 2010-2011 Opscode, Inc. All rights reserved.
-This work is licensed under a Creative Commons Attribution Share Alike 3.0 License. To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/3.0/; or send a letter to Creative Commons, 171 2nd Street, Suite 300, San Francisco, California, 94105, USA.
+.notes These course materials are Copyright © 2010-2012 Opscode, Inc. All rights reserved.
+This work is licensed under a Creative Commons Attribute Share Alike 3.0 United States License. To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/3.0/us; or send a letter to Creative Commons, 171 2nd Street, Suite 300, San Francisco, California, 94105, USA.
# Objectives
@@ -1,7 +1,7 @@
# Getting Started
-.notes These course materials are Copyright © 2010-2011 Opscode, Inc. All rights reserved.
-This work is licensed under a Creative Commons Attribution Share Alike 3.0 License. To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/3.0/; or send a letter to Creative Commons, 171 2nd Street, Suite 300, San Francisco, California, 94105, USA.
+.notes These course materials are Copyright © 2010-2012 Opscode, Inc. All rights reserved.
+This work is licensed under a Creative Commons Attribute Share Alike 3.0 United States License. To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/3.0/us; or send a letter to Creative Commons, 171 2nd Street, Suite 300, San Francisco, California, 94105, USA.
# Objectives
@@ -1,7 +1,7 @@
# Introduction To Search
-.notes These course materials are Copyright © 2010-2011 Opscode, Inc. All rights reserved.
-This work is licensed under a Creative Commons Attribution Share Alike 3.0 License. To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/3.0/; or send a letter to Creative Commons, 171 2nd Street, Suite 300, San Francisco, California, 94105, USA.
+.notes These course materials are Copyright © 2010-2012 Opscode, Inc. All rights reserved.
+This work is licensed under a Creative Commons Attribute Share Alike 3.0 United States License. To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/3.0/us; or send a letter to Creative Commons, 171 2nd Street, Suite 300, San Francisco, California, 94105, USA.
# Objectives
@@ -1,13 +1,15 @@
# Chef Fundamentals
-Opscode, Inc.
+Welcome to Chef Fundamentals!
+
+OPS150-04.01 - January, 2012
-OPS150-04.01
+Created and Sponsored by Opscode, Inc.
-December, 2011
+<center><font size="-2">Copyright © 2010-2012 Opscode, Inc.</font></center>
-.notes These course materials are Copyright © 2010-2011 Opscode, Inc. All rights reserved.
-This work is licensed under a Creative Commons Attribution Share Alike 3.0 License. To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/3.0/; or send a letter to Creative Commons, 171 2nd Street, Suite 300, San Francisco, California, 94105, USA.
+.notes These course materials are Copyright © 2010-2012 Opscode, Inc. All rights reserved.
+This work is licensed under a Creative Commons Attribution Share Alike 3.0 United States License. To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/3.0/us; or send a letter to Creative Commons, 171 2nd Street, Suite 300, San Francisco, California, 94105, USA.
# Introduction
@@ -1,7 +1,7 @@
# Just Enough Ruby For Chef
-.notes These course materials are Copyright © 2010-2011 Opscode, Inc. All rights reserved.
-This work is licensed under a Creative Commons Attribution Share Alike 3.0 License. To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/3.0/; or send a letter to Creative Commons, 171 2nd Street, Suite 300, San Francisco, California, 94105, USA.
+.notes These course materials are Copyright © 2010-2012 Opscode, Inc. All rights reserved.
+This work is licensed under a Creative Commons Attribute Share Alike 3.0 United States License. To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/3.0/us; or send a letter to Creative Commons, 171 2nd Street, Suite 300, San Francisco, California, 94105, USA.
# Objectives
@@ -1,7 +1,7 @@
# Node Attributes
-.notes These course materials are Copyright © 2010-2011 Opscode, Inc. All rights reserved.
-This work is licensed under a Creative Commons Attribution Share Alike 3.0 License. To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/3.0/; or send a letter to Creative Commons, 171 2nd Street, Suite 300, San Francisco, California, 94105, USA.
+.notes These course materials are Copyright © 2010-2012 Opscode, Inc. All rights reserved.
+This work is licensed under a Creative Commons Attribute Share Alike 3.0 United States License. To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/3.0/us; or send a letter to Creative Commons, 171 2nd Street, Suite 300, San Francisco, California, 94105, USA.
# Objectives
View
@@ -1,7 +1,7 @@
# Roles
-.notes These course materials are Copyright © 2010-2011 Opscode, Inc. All rights reserved.
-This work is licensed under a Creative Commons Attribution Share Alike 3.0 License. To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/3.0/; or send a letter to Creative Commons, 171 2nd Street, Suite 300, San Francisco, California, 94105, USA.
+.notes These course materials are Copyright © 2010-2012 Opscode, Inc. All rights reserved.
+This work is licensed under a Creative Commons Attribute Share Alike 3.0 United States License. To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/3.0/us; or send a letter to Creative Commons, 171 2nd Street, Suite 300, San Francisco, California, 94105, USA.
# Objectives
@@ -1,7 +1,7 @@
# Troubleshooting
-.notes These course materials are Copyright © 2010-2011 Opscode, Inc. All rights reserved.
-This work is licensed under a Creative Commons Attribution Share Alike 3.0 License. To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/3.0/; or send a letter to Creative Commons, 171 2nd Street, Suite 300, San Francisco, California, 94105, USA.
+.notes These course materials are Copyright © 2010-2012 Opscode, Inc. All rights reserved.
+This work is licensed under a Creative Commons Attribute Share Alike 3.0 United States License. To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/3.0/us; or send a letter to Creative Commons, 171 2nd Street, Suite 300, San Francisco, California, 94105, USA.
# Objectives

0 comments on commit da84a91

Please sign in to comment.