Merge "API: Split description messages into summary + additional text"

diff --cc RELEASE-NOTES-1.30
index 122a21c,22c0bbc..77caadf
--- 1/RELEASE-NOTES-1.30
--- 2/RELEASE-NOTES-1.30
+++ b/RELEASE-NOTES-1.30
@@@ -70,15 -70,11 +70,17 @@@ production
    formatted as specified by the error formatter parameters.
  * action=compare can now handle arbitrary text, deleted revisions, and
    returning users and edit comments.
 +* (T164106) The 'rvdifftotext', 'rvdifftotextpst', 'rvdiffto',
 +  'rvexpandtemplates', 'rvgeneratexml', 'rvparse', and 'rvprop=parsetree'
 +  parameters to prop=revisions are deprecated, as are the similarly named
 +  parameters to prop=deletedrevisions, list=allrevisions, and
 +  list=alldeletedrevisions. Use action=compare, action=parse, or
 +  action=expandtemplates instead.
  
  === Action API internal changes in 1.30 ===
- * …
+ * ApiBase::getDescriptionMessage() and the "apihelp-*-description" messages are
+   deprecated. The existing message should be split between "apihelp-*-summary"
+   and "apihelp-*-extended-description".
  
  === Languages updated in 1.30 ===
  MediaWiki supports over 350 languages. Many localisations are updated

diff --cc includes/api/i18n/en.json
index 33a6072,ddc1936..06cf9af
--- 1/includes/api/i18n/en.json
--- 2/includes/api/i18n/en.json
+++ b/includes/api/i18n/en.json
@@@ -1105,18 -1121,18 +1121,18 @@@
        "apihelp-query+revisions+base-paramvalue-prop-parsedcomment": "Parsed comment by the user for the revision.",
        "apihelp-query+revisions+base-paramvalue-prop-content": "Text of the revision.",
        "apihelp-query+revisions+base-paramvalue-prop-tags": "Tags for the revision.",
 -      "apihelp-query+revisions+base-paramvalue-prop-parsetree": "The XML parse tree of revision content (requires content model <code>$1</code>).",
 +      "apihelp-query+revisions+base-paramvalue-prop-parsetree": "<span class=\"apihelp-deprecated\">Deprecated.</span> Use <kbd>[[Special:ApiHelp/expandtemplates|action=expandtemplates]]</kbd> or <kbd>[[Special:ApiHelp/parse|action=parse]]</kbd> instead. The XML parse tree of revision content (requires content model <code>$1</code>).",
        "apihelp-query+revisions+base-param-limit": "Limit how many revisions will be returned.",
 -      "apihelp-query+revisions+base-param-expandtemplates": "Expand templates in revision content (requires $1prop=content).",
 -      "apihelp-query+revisions+base-param-generatexml": "Generate XML parse tree for revision content (requires $1prop=content; replaced by <kbd>$1prop=parsetree</kbd>).",
 -      "apihelp-query+revisions+base-param-parse": "Parse revision content (requires $1prop=content). For performance reasons, if this option is used, $1limit is enforced to 1.",
 +      "apihelp-query+revisions+base-param-expandtemplates": "Use <kbd>[[Special:ApiHelp/expandtemplates|action=expandtemplates]]</kbd> instead. Expand templates in revision content (requires $1prop=content).",
 +      "apihelp-query+revisions+base-param-generatexml": "Use <kbd>[[Special:ApiHelp/expandtemplates|action=expandtemplates]]</kbd> or <kbd>[[Special:ApiHelp/parse|action=parse]]</kbd> instead. Generate XML parse tree for revision content (requires $1prop=content).",
 +      "apihelp-query+revisions+base-param-parse": "Use <kbd>[[Special:ApiHelp/parse|action=parse]]</kbd> instead. Parse revision content (requires $1prop=content). For performance reasons, if this option is used, $1limit is enforced to 1.",
        "apihelp-query+revisions+base-param-section": "Only retrieve the content of this section number.",
 -      "apihelp-query+revisions+base-param-diffto": "Revision ID to diff each revision to. Use <kbd>prev</kbd>, <kbd>next</kbd> and <kbd>cur</kbd> for the previous, next and current revision respectively.",
 -      "apihelp-query+revisions+base-param-difftotext": "Text to diff each revision to. Only diffs a limited number of revisions. Overrides <var>$1diffto</var>. If <var>$1section</var> is set, only that section will be diffed against this text.",
 -      "apihelp-query+revisions+base-param-difftotextpst": "Perform a pre-save transform on the text before diffing it. Only valid when used with <var>$1difftotext</var>.",
 +      "apihelp-query+revisions+base-param-diffto": "Use <kbd>[[Special:ApiHelp/compare|action=compare]]</kbd> instead. Revision ID to diff each revision to. Use <kbd>prev</kbd>, <kbd>next</kbd> and <kbd>cur</kbd> for the previous, next and current revision respectively.",
 +      "apihelp-query+revisions+base-param-difftotext": "Use <kbd>[[Special:ApiHelp/compare|action=compare]]</kbd> instead. Text to diff each revision to. Only diffs a limited number of revisions. Overrides <var>$1diffto</var>. If <var>$1section</var> is set, only that section will be diffed against this text.",
 +      "apihelp-query+revisions+base-param-difftotextpst": "Use <kbd>[[Special:ApiHelp/compare|action=compare]]</kbd> instead. Perform a pre-save transform on the text before diffing it. Only valid when used with <var>$1difftotext</var>.",
        "apihelp-query+revisions+base-param-contentformat": "Serialization format used for <var>$1difftotext</var> and expected for output of content.",
  
-       "apihelp-query+search-description": "Perform a full text search.",
+       "apihelp-query+search-summary": "Perform a full text search.",
        "apihelp-query+search-param-search": "Search for page titles or content matching this value. You can use the search string to invoke special search features, depending on what the wiki's search backend implements.",
        "apihelp-query+search-param-namespace": "Search only within these namespaces.",
        "apihelp-query+search-param-what": "Which type of search to perform.",