Merge "Add ParserOutputStashForEdit hook for extension cache warming"

diff --combined docs/hooks.txt
index b516122,a252438..bc03714
--- 1/docs/hooks.txt
--- 2/docs/hooks.txt
+++ b/docs/hooks.txt
@@@ -513,8 -513,7 +513,8 @@@ sites statistics information
  'ApiQueryTokensRegisterTypes': Use this hook to add additional token types to
  action=query&meta=tokens. Note that most modules will probably be able to use
  the 'csrf' token instead of creating their own token types.
 -&$salts: array( type => salt to pass to User::getEditToken() )
 +&$salts: array( type => salt to pass to User::getEditToken() or array of salt
 +  and key to pass to Session::getToken() )
  
  'APIQueryUsersTokens': DEPRECATED! Use ApiQueryTokensRegisterTypes instead.
  Use this hook to add custom token to list=users. Every token has an action,
@@@ -2347,6 -2346,11 +2347,11 @@@ run. Use when page save hooks require t
  that tests continue to run properly.
  &$tables: array of table names
  
+ 'ParserOutputStashForEdit': Called when an edit stash parse finishes, before the output is cached.
+ $page: the WikiPage of the candidate edit
+ $content: the Content object of the candidate edit
+ $output: the ParserOutput result of the candidate edit
+ 
  'PasswordPoliciesForUser': Alter the effective password policy for a user.
  $user: User object whose policy you are modifying
  &$effectivePolicy: Array of policy statements that apply to this user