Merge pull request #14982 from Bestra/master

[DOC] Document setupController hook behavior when model is undefined
emberjs · Jul 6, 2017 · e32073b · e32073b
2 parents 6ccb095 + 4c8efd1
commit e32073b
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/packages/ember-routing/lib/system/route.js b/packages/ember-routing/lib/system/route.js
@@ -1680,7 +1680,7 @@ let Route = EmberObject.extend(ActionHandler, Evented, {
     model supplied by the `model` hook.
 
     By default, the `setupController` hook sets the `model` property of
-    the controller to the `model`.
+    the controller to the specified `model` when it is not `undefined`.
 
     If you implement the `setupController` hook in your Route, it will
     prevent this default behavior. If you want to preserve that behavior