diff --git a/docs/client/api.html b/docs/client/api.html
index d0842cd162..585ed89774 100644
--- a/docs/client/api.html
+++ b/docs/client/api.html
@@ -1276,22 +1276,22 @@ The following properties and methods are available on the event object
 passed to handlers:
 
 <dl class="objdesc">
-{{#dtdd "type" "String"}}
+{{#dtdd name="type" type="String"}}
 The event's type, such as "click", "blur" or "keypress".
 {{/dtdd}}
 
-{{#dtdd "target" "DOM Element"}}
+{{#dtdd name="target" type="DOM Element"}}
 The element that originated the event.
 {{/dtdd}}
 
-{{#dtdd "currentTarget" "DOM Element"}}
+{{#dtdd name="currentTarget" type="DOM Element"}}
 The element currently handling the event.  This is the element that
 matched the selector in the event map.  For events that bubble, it may
 be `target` or an ancestor of `target`, and its value changes as the
 event bubbles.
 {{/dtdd}}
 
-{{#dtdd "which" "Number"}}
+{{#dtdd name="which" type="Number"}}
 For mouse events, the number of the mouse button (1=left, 2=middle, 3=right).
 For key events, a character or key code.
 {{/dtdd}}
diff --git a/docs/client/docs.js b/docs/client/docs.js
index b084f37933..f033b4f644 100644
--- a/docs/client/docs.js
+++ b/docs/client/docs.js
@@ -277,16 +277,21 @@ Handlebars.registerHelper('note', function(fn) {
   return Template.note_helper(fn(this));
 });
 
-Handlebars.registerHelper('dtdd', function(name, optType, fn) {
-  var type = null;
-  // handle optional positional argument (messy)
-  if (! fn)
-    fn = optType; // two arguments
-  else
-    type = optType; // three arguments
+Handlebars.registerHelper('dtdd', function(nameOrOptions, maybeFn) {
+  var name, type, fn;
+  if (nameOrOptions.hash) {
+    // {{#dtdd name="foo" type="bar}}
+    name = nameOrOptions.hash.name;
+    type = nameOrOptions.hash.type;
+    fn = nameOrOptions.fn;
+  } else {
+    // {#dtdd name}}
+    name = nameOrOptions;
+    fn = maybeFn.fn;
+    // no type
+  }
 
-  return Template.dtdd_helper(
-    {descr: fn(this), name:name, type:type}, true);
+  return Template.dtdd_helper({descr: fn(this), name: name, type: type});
 });
 
 Handlebars.registerHelper('better_markdown', function(fn) {