Merge pull request #32 from skilldrick/spellings.

Spellings

diff --git a/MIT-LICENSE b/MIT-LICENSE
deleted file mode 100644 (file)
index b243e8c..0000000
--- a/MIT-LICENSE
+++ /dev/null
@@ -1,20 +0,0 @@
-Copyright (c) 2009 EdgeCase
- 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
- 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
- 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file

diff --git a/README.rdoc b/README.rdoc
index f1e0f8e..b3eef11 100644 (file)
--- a/README.rdoc
+++ b/README.rdoc
@@ -130,7 +130,15 @@ Brian Marick's fantastic guide for beginners Everyday Scripting with Ruby    ::
 
 = Other stuff
 
-Author         ::   Jim Weirich <jim@weirichhouse.org>
-Author         ::   Joe O'Brien <joe@edgecase.com>
+Author         :: Jim Weirich <jim@weirichhouse.org>
+Author         :: Joe O'Brien <joe@edgecase.com>
 Issue Tracker  :: http://www.pivotaltracker.com/projects/48111
 Requires       :: Ruby 1.8.x or later and Rake (any recent version)
+
+= License
+
+http://i.creativecommons.org/l/by-nc-sa/3.0/88x31.png
+
+RubyKoans is released under a Creative Commons,
+Attribution-NonCommercial-ShareAlike, Version 3.0
+(http://creativecommons.org/licenses/by-nc-sa/3.0/) License.

diff --git a/koans/about_scoring_project.rb b/koans/about_scoring_project.rb
index 3c8e027..bc61785 100644 (file)
--- a/koans/about_scoring_project.rb
+++ b/koans/about_scoring_project.rb
@@ -1,7 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/edgecase')
 
 # Greed is a dice game where you roll up to five dice to accumulate
-# points.  The following "score" function will be used calculate the
+# points.  The following "score" function will be used to calculate the
 # score of a single roll of the dice.
 #
 # A greed roll is scored as follows:

diff --git a/koans/about_symbols.rb b/koans/about_symbols.rb
index 6133faa..f4a4319 100644 (file)
--- a/koans/about_symbols.rb
+++ b/koans/about_symbols.rb
@@ -84,7 +84,7 @@ class AboutSymbols < EdgeCase::Koan
   # interesting string operations are available on symbols.
 
   def test_symbols_cannot_be_concatenated
-    # Exceptions will be pondered further father down the path
+    # Exceptions will be pondered further farther down the path
     assert_raise(___) do
       :cats + :dogs
     end

diff --git a/src/about_proxy_object_project.rb b/src/about_proxy_object_project.rb
index 1d64f0f..483a7d7 100644 (file)
--- a/src/about_proxy_object_project.rb
+++ b/src/about_proxy_object_project.rb
@@ -6,7 +6,7 @@ require File.expand_path(File.dirname(__FILE__) + '/edgecase')
 # below).  You should be able to initialize the proxy object with any
 # object.  Any messages sent to the proxy object should be forwarded
 # to the target object.  As each message is sent, the proxy should
-# record the name of the method send.
+# record the name of the method sent.
 #
 # The proxy class is started for you.  You will need to add a method
 # missing handler and any other supporting methods.  The specification

diff --git a/src/about_scoring_project.rb b/src/about_scoring_project.rb
index 124c387..60b4682 100644 (file)
--- a/src/about_scoring_project.rb
+++ b/src/about_scoring_project.rb
@@ -1,7 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/edgecase')
 
 # Greed is a dice game where you roll up to five dice to accumulate
-# points.  The following "score" function will be used calculate the
+# points.  The following "score" function will be used to calculate the
 # score of a single roll of the dice.
 #
 # A greed roll is scored as follows: