Merge pull request #2024 from jdaudier/update/controller.yaml

Fix typos on Controller yaml file
marionettejs · Oct 26, 2014 · d6a394c · d6a394c
2 parents 1f76932 + 08befc9
commit d6a394c
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/api/controller.jsdoc b/api/controller.jsdoc
@@ -4,7 +4,6 @@ class: Marionette.Controller
 
 extends: 
   - Backbone.Events
-  - Backbone.extend
 
 description: |
   A Controller is a white-label Marionette Object. Its name can be a cause for
@@ -67,7 +66,7 @@ functions:
 
   initialize: 
     description: |
-      Initialize is called after a controller has been instanciated.
+      Initialize is called after a controller has been instantiated.
 
       The `options` parameter can take any key/value pair and set it on the Controller instance.