Merge branch 'master' of github.com:wycats/handlebars.js

README.markdown

@@ -138,8 +138,8 @@ Handlebars.js also adds the ability to define block helpers. Block helpers are f
 
 ```js
 var source = "<ul>{{#people}}<li>{{#link}}{{name}}{{/link}}</li>{{/people}}</ul>";
-Handlebars.registerHelper('link', function(context, options) {
-  return '<a href="/people/' + this.id + '">' + context.fn(this) + '</a>';
+Handlebars.registerHelper('link', function(options) {
+  return '<a href="/people/' + this.id + '">' + options.fn(this) + '</a>';
 });
 var template = Handlebars.compile(source);
 

lib/handlebars/compiler/compiler.js

@@ -805,7 +805,7 @@ Handlebars.JavaScriptCompiler = function() {};
       }
 
       this.context.aliases.self = "this";
-      this.pushStack("self.invokePartial(" + params.join(", ") + ");");
+      this.pushStack("self.invokePartial(" + params.join(", ") + ")");
     },
 
     // [assignToHash]