merging latest master

[lhc/web/wiklou.git] / docs / hooks.txt

diff --git a/docs/hooks.txt b/docs/hooks.txt
index 950cb5f..1d45510 100644 (file)
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -266,7 +266,7 @@ $reason: the reason for the move (added in 1.13)
 
 'AbortNewAccount': Return false to cancel explicit account creation.
 $user: the User object about to be created (read-only, incomplete)
-&$msg: out parameter: name of error message to display on abort
+&$msg: out parameter: HTML to display on abort
 
 'ActionBeforeFormDisplay': before executing the HTMLForm object
 $name: name of the action
@@ -1133,9 +1133,9 @@ $result: User permissions error to add. If none, return true.
 &$title: Title object of the image
 &$file: File object, or false if it doesn't exist
 &$frameParams: Various parameters with special meanings; see documentation in
-       includes/Linker.php for Linker::makeImageLink2
+       includes/Linker.php for Linker::makeImageLink
 &$handlerParams: Various parameters with special meanings; see documentation in
-       includes/Linker.php for Linker::makeImageLink2
+       includes/Linker.php for Linker::makeImageLink
 &$time: Timestamp of file in 'YYYYMMDDHHIISS' string form, or false for current
 &$res: Final HTML output, used if you return false
 
@@ -1643,6 +1643,10 @@ $showEditLinks: boolean describing whether this section has an edit link
 maintenance/parserTests.inc
 $parser: Parser object created
 
+'ParserTestGlobals': Allows to define globals for parser tests.
+&$globals: Array with all the globals which should be set for parser tests.
+       The arrays keys serve as the globals names, its values are the globals values.
+
 'ParserTestTables': alter the list of tables to duplicate when parser tests
 are run. Use when page save hooks require the presence of custom tables
 to ensure that tests continue to run properly.
@@ -2407,8 +2411,9 @@ One, and only one hook should set this, and return false.
 'WikiPageDeletionUpdates': manipulate the list of DataUpdates to be applied when
        a page is deleted. Called in WikiPage::getDeletionUpdates().
        Note that updates specific to a content model should be provided by the
-       respective ContentHandler's getDeletionUpdates() method.
+       respective Content's getDeletionUpdates() method.
 $page: the WikiPage
+$content: the Content to generate updates for
 &$updates: the array of DataUpdate objects. Hook function may want to add to it.
 
 'wfShellWikiCmd': Called when generating a shell-escaped command line