Merge "Explain API action=parse&disablepp option more clearly"

diff --combined includes/api/i18n/en.json
index efbf605,2d1dadd..f972a42
--- 1/includes/api/i18n/en.json
--- 2/includes/api/i18n/en.json
+++ b/includes/api/i18n/en.json
@@@ -310,12 -310,12 +310,12 @@@
        "apihelp-parse-param-effectivelanglinks": "Includes language links supplied by extensions (for use with <kbd>$1prop=langlinks</kbd>).",
        "apihelp-parse-param-section": "Only retrieve the content of this section number or when <kbd>new</kbd> generate a new section.\n\n<kbd>new</kbd> section is only honored when specifying <var>text</var>.",
        "apihelp-parse-param-sectiontitle": "New section title when <var>section</var> is <kbd>new</kbd>.\n\nUnlike page editing, this does not fall back to <var>summary</var> when omitted or empty.",
-       "apihelp-parse-param-disablepp": "Disable the PP Report from the parser output.",
-       "apihelp-parse-param-disableeditsection": "Disable edit section links from the parser output.",
+       "apihelp-parse-param-disablepp": "Omit the preprocessor report (\"NewPP limit report\") from the parser output.",
+       "apihelp-parse-param-disableeditsection": "Omit edit section links from the parser output.",
        "apihelp-parse-param-generatexml": "Generate XML parse tree (requires content model <code>$1</code>; replaced by <kbd>$2prop=parsetree</kbd>).",
        "apihelp-parse-param-preview": "Parse in preview mode.",
        "apihelp-parse-param-sectionpreview": "Parse in section preview mode (enables preview mode too).",
-       "apihelp-parse-param-disabletoc": "Disable table of contents in output.",
+       "apihelp-parse-param-disabletoc": "Omit table of contents in output.",
        "apihelp-parse-param-contentformat": "Content serialization format used for the input text. Only valid when used with $1text.",
        "apihelp-parse-param-contentmodel": "Content model of the input text. If omitted, $1title must be specified, and default will be the model of the specified title. Only valid when used with $1text.",
        "apihelp-parse-example-page": "Parse a page.",
@@@ -998,20 -998,7 +998,20 @@@
        "apihelp-query+watchlist-param-user": "Only list changes by this user.",
        "apihelp-query+watchlist-param-excludeuser": "Don't list changes by this user.",
        "apihelp-query+watchlist-param-limit": "How many total results to return per request.",
 -      "apihelp-query+watchlist-param-prop": "Which additional items to get:\n;ids:Adds revision IDs and page IDs.\n;title:Adds title of the page.\n;flags:Adds flags for the edit.\n;user:Adds the user who made the edit.\n;userid:Adds user ID of whom made the edit.\n;comment:Adds comment of the edit.\n;parsedcomment:Adds parsed comment of the edit.\n;timestamp:Adds timestamp of the edit.\n;patrol:Tags edits that are patrolled.\n;sizes:Adds the old and new lengths of the page.\n;notificationtimestamp:Adds timestamp of when the user was last notified about the edit.\n;loginfo:Adds log information where appropriate.",
 +      "apihelp-query+watchlist-param-prop": "Which additional properties to get:",
 +      "apihelp-query+watchlist-paramvalue-prop-ids": "Adds revision IDs and page IDs.",
 +      "apihelp-query+watchlist-paramvalue-prop-title": "Adds title of the page.",
 +      "apihelp-query+watchlist-paramvalue-prop-flags": "Adds flags for the edit.",
 +      "apihelp-query+watchlist-paramvalue-prop-user": "Adds the user who made the edit.",
 +      "apihelp-query+watchlist-paramvalue-prop-userid": "Adds user ID of whoever made the edit.",
 +      "apihelp-query+watchlist-paramvalue-prop-comment": "Adds comment of the edit.",
 +      "apihelp-query+watchlist-paramvalue-prop-parsedcomment": "Adds parsed comment of the edit.",
 +      "apihelp-query+watchlist-paramvalue-prop-timestamp": "Adds timestamp of the edit.",
 +      "apihelp-query+watchlist-paramvalue-prop-patrol": "Tags edits that are patrolled.",
 +      "apihelp-query+watchlist-paramvalue-prop-sizes": "Adds the old and new lengths of the page.",
 +      "apihelp-query+watchlist-paramvalue-prop-notificationtimestamp": "Adds timestamp of when the user was last notified about the edit.",
 +      "apihelp-query+watchlist-paramvalue-prop-loginfo": "Adds log information where appropriate.",
 +
        "apihelp-query+watchlist-param-show": "Show only items that meet these criteria. For example, to see only minor edits done by logged-in users, set $1show=minor|!anon.",
        "apihelp-query+watchlist-param-type": "Which types of changes to show:\n;edit:Regular page edits.\n;external:External changes.\n;new:Page creations.\n;log:Log entries.",
        "apihelp-query+watchlist-param-owner": "Used along with $1token to access a different user's watchlist.",