Merge dc3868c into 9f54a07

ember-cli · Nov 21, 2016 · a16b073 · a16b073
2 parents 9f54a07 + dc3868c
commit a16b073
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/lib/broccoli/ember-app.js b/lib/broccoli/ember-app.js
@@ -504,7 +504,7 @@ EmberApp.prototype.addonTreesFor = function(type) {
 };
 
 /**
-  Runs addon postprocessing on a given tree and returns the processed tree.
+  Runs addon post-processing on a given tree and returns the processed tree.
 
   This enables addons to do process immediately **after** the preprocessor for a
   given type is run, but before concatenation occurs. If an addon wishes to
@@ -514,7 +514,7 @@ EmberApp.prototype.addonTreesFor = function(type) {
   To utilize this addons implement `postprocessTree` hook.
 
   An example, would be to apply some broccoli transform on all JS files, but
-  only after the existing pre-processors have fun.
+  only after the existing pre-processors have run.
 
   ```js
   module.exports = {
@@ -550,14 +550,13 @@ EmberApp.prototype.addonPostprocessTree = function(type, tree) {
 
 
 /**
-  Runs addon postprocessing on a given tree and returns the processed tree.
+  Runs addon pre-processing on a given tree and returns the processed tree.
 
   This enables addons to do process immediately **before** the preprocessor for a
-  given type is run, but before concatenation occurs.  If an addon wishes to
-  apply a transform  after the preprocessors run, they can instead implement the
-  postprocessTree hook.
+  given type is run.  If an addon wishes to apply a transform  after the
+  preprocessors run, they can instead implement the postprocessTree hook.
 
-  To utilize this addons implement `postprocessTree` hook.
+  To utilize this addons implement `preprocessTree` hook.
 
   An example, would be to remove some set of files before the preprocessors run.
 

diff --git a/lib/models/addon.js b/lib/models/addon.js
@@ -75,6 +75,7 @@ function deprecatedAddonFilters(addon, name, insteadUse, fn) {
   - {{#crossLink "Addon/included:method"}}{{/crossLink}}
   - {{#crossLink "Addon/shouldIncludeChildAddon:method"}}{{/crossLink}}
   - {{#crossLink "Addon/setupPreprocessorRegistry:method"}}{{/crossLink}}
+  - {{#crossLink "Addon/preprocessTree:method"}}{{/crossLink}}
   - {{#crossLink "Addon/postprocessTree:method"}}{{/crossLink}}
   - {{#crossLink "Addon/lintTree:method"}}{{/crossLink}}
   - {{#crossLink "Addon/contentFor:method"}}{{/crossLink}}