Merge "Remove unused 'XMPGetInfo' and 'XMPGetResults' hooks"

diff --combined docs/hooks.txt
index a14199f,4fa92a8..e15520c
--- 1/docs/hooks.txt
--- 2/docs/hooks.txt
+++ b/docs/hooks.txt
@@@ -420,8 -420,6 +420,8 @@@ $module: ApiBase Module objec
  $module: ApiBase Module object
  &$help: Array of HTML strings to be joined for the output.
  $options: Array Options passed to ApiHelp::getHelp
 +&$tocData: Array If a TOC is being generated, this array has keys as anchors in
 +the page and values as for Linker::generateTOC().
  
  'ApiMain::moduleManager': Called when ApiMain has finished initializing its
  module manager. Can be used to conditionally register API modules.
@@@ -2127,12 -2125,6 +2127,12 @@@ the key
  &$confstr: reference to a hash key string which can be modified
  $user: User (object) requesting the page
  
 +'PageViewUpdate': Allow database (or other) changes to be made after a
 +page view is seen by MediaWiki.  Note this does not capture views made
 +via external caches such as Squid.
 +$wikipage: WikiPage (object) for the page being viewed.
 +$user: User (object) for the user who is viewing.
 +
  'ParserAfterParse': Called from Parser::parse() just after the call to
  Parser::internalParse() returns.
  $parser: parser object
@@@ -2149,10 -2141,6 +2149,10 @@@ $stripState: stripState used (object
  $parser: Parser object being used
  $text: text that will be returned
  
 +'ParserAfterUnstrip': Called after the first unstripGeneral() in Parser::internalParseHalfParsed()
 +$parser: Parser object being used
 +$text: text that will be returned
 +
  'ParserBeforeInternalParse': Called at the beginning of Parser::internalParse().
  $parser: Parser object
  $text: text to parse
@@@ -3297,16 -3285,5 +3297,5 @@@ $obj: The XmlDumpWriter object
  $row: The database row for the revision.
  $text: The revision text.
  
- 'XMPGetInfo': Called when obtaining the list of XMP tags to extract. Can be used
- to add additional tags to extract.
- &$items: Array containing information on which items to extract. See XMPInfo for
-   details on the format.
- 
- 'XMPGetResults': Called just before returning the results array of parsing xmp
- data. Can be used to post-process the results.
- &$data: Array of metadata sections (such as $data['xmp-general']) each section
-   is an array of metadata tags returned (each tag is either a value, or an array
-   of values).
- 
  More hooks might be available but undocumented, you can execute
  "php maintenance/findHooks.php" to find hidden ones.