Merge "JSON formatversion=2 is no longer experimental"

diff --git a/RELEASE-NOTES-1.33 b/RELEASE-NOTES-1.33
index 4e0f112..640bb1d 100644 (file)
--- a/RELEASE-NOTES-1.33
+++ b/RELEASE-NOTES-1.33
@@ -45,6 +45,7 @@ production.
 
 === Action API changes in 1.33 ===
 * (T198913) Added 'ApiOptions' hook.
+* The JSON formatversion=2 is no longer experimental.
 * …
 
 === Action API internal changes in 1.33 ===

diff --git a/includes/api/i18n/en.json b/includes/api/i18n/en.json
index 83bb6e6..a9f92aa 100644 (file)
--- a/includes/api/i18n/en.json
+++ b/includes/api/i18n/en.json
@@ -1570,11 +1570,11 @@
        "apihelp-json-param-callback": "If specified, wraps the output into a given function call. For safety, all user-specific data will be restricted.",
        "apihelp-json-param-utf8": "If specified, encodes most (but not all) non-ASCII characters as UTF-8 instead of replacing them with hexadecimal escape sequences. Default when <var>formatversion</var> is not <kbd>1</kbd>.",
        "apihelp-json-param-ascii": "If specified, encodes all non-ASCII using hexadecimal escape sequences. Default when <var>formatversion</var> is <kbd>1</kbd>.",
-       "apihelp-json-param-formatversion": "Output formatting:\n;1:Backwards-compatible format (XML-style booleans, <samp>*</samp> keys for content nodes, etc.).\n;2:Experimental modern format. Details may change!\n;latest:Use the latest format (currently <kbd>2</kbd>), may change without warning.",
+       "apihelp-json-param-formatversion": "Output formatting:\n;1:Backwards-compatible format (XML-style booleans, <samp>*</samp> keys for content nodes, etc.).\n;2:Modern format.\n;latest:Use the latest format (currently <kbd>2</kbd>), may change without warning.",
        "apihelp-jsonfm-summary": "Output data in JSON format (pretty-print in HTML).",
        "apihelp-none-summary": "Output nothing.",
        "apihelp-php-summary": "Output data in serialized PHP format.",
-       "apihelp-php-param-formatversion": "Output formatting:\n;1:Backwards-compatible format (XML-style booleans, <samp>*</samp> keys for content nodes, etc.).\n;2:Experimental modern format. Details may change!\n;latest:Use the latest format (currently <kbd>2</kbd>), may change without warning.",
+       "apihelp-php-param-formatversion": "Output formatting:\n;1:Backwards-compatible format (XML-style booleans, <samp>*</samp> keys for content nodes, etc.).\n;2:Modern format.\n;latest:Use the latest format (currently <kbd>2</kbd>), may change without warning.",
        "apihelp-phpfm-summary": "Output data in serialized PHP format (pretty-print in HTML).",
        "apihelp-rawfm-summary": "Output data, including debugging elements, in JSON format (pretty-print in HTML).",
        "apihelp-xml-summary": "Output data in XML format.",