Merging upstream changes and updating to require 2.1.1

jwhitley · Nov 2, 2012 · 757be3b · 757be3b
2 parents e441279 + a185040
commit 757be3b
Show file tree

Hide file tree

Showing 6 changed files with 1,188 additions and 1,085 deletions.
diff --git a/README.md b/README.md
@@ -237,7 +237,7 @@ discussed below.
 
 ### jQuery
 
-jQuery users must use jQuery 1.7 or later (`jquery-rails >= 1.0.17`) to use it as an [AMD module](http://wiki.commonjs.org/wiki/Modules/AsynchronousDefinition) with RequireJS.  To use jQuery in a module:
+jQuery users must use jQuery 1.7 or later (`jquery-rails >= 1.0.17`) to use it as an [AMD module](https://github.com/amdjs/amdjs-api/wiki/AMD) with RequireJS.  To use jQuery in a module:
 
 ```coffeescript
 # app/assets/javascripts/hello.js