diff --git a/README.md b/README.md
index f059ec8..1beea25 100644
--- a/README.md
+++ b/README.md
@@ -51,7 +51,7 @@ let namespaces = mw.config.get("pageTriageNamespaces") as number[];
 
 ### MediaWiki API parameters
 
-This package also provides typings for API request parameters for the [MediaWiki Action API](https://www.mediawiki.org/wiki/API:Main_page). API endpoints defined in MediaWiki core and by a number of common extensions (the ones enabled on English Wikipedia) are covered. These aren't exported to the global scope, however. For usage, you need to import them. For example:
+This package also provides typings for API request parameters for the [MediaWiki Action API](https://www.mediawiki.org/wiki/Special:MyLanguage/API:Main_page). API endpoints defined in MediaWiki core and by a number of common extensions (the ones enabled on English Wikipedia) are covered. These aren't exported to the global scope, however. For usage, you need to import them. For example:
 
 ```ts
 import type { ApiEditPageParams, ApiParseParams } from "types-mediawiki/api_params";
diff --git a/jquery/client.d.ts b/jquery/client.d.ts
index 152e6e6..1f03fba 100644
--- a/jquery/client.d.ts
+++ b/jquery/client.d.ts
@@ -1,9 +1,9 @@
 declare global {
     interface JQueryStatic {
         /**
-         * User-agent detection
+         * User-agent detection.
          *
-         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/jQuery.client
+         * @see https://doc.wikimedia.org/jquery-client/master/jQuery.client.html
          */
         client: Client;
     }
@@ -27,19 +27,6 @@ interface Client {
      * }
      * ```
      *
-     * Example:
-     *
-     * ```js
-     * if ( $.client.profile().layout == 'gecko' ) {
-     *     // This will only run in Gecko browsers, such as Mozilla Firefox.
-     * }
-     *
-     * var profile = $.client.profile();
-     * if ( profile.layout == 'gecko' && profile.platform == 'linux' ) {
-     *     // This will only run in Gecko browsers on Linux.
-     * }
-     * ```
-     *
      * Recognised browser names:
      *
      * - `android` (legacy Android browser, prior to Chrome Mobile)
@@ -76,10 +63,21 @@ interface Client {
      * - `solaris` (untested)
      * - `win`
      *
+     * @example
+     * ```js
+     * if ( $.client.profile().layout == 'gecko' ) {
+     *     // This will only run in Gecko browsers, such as Mozilla Firefox.
+     * }
+     *
+     * var profile = $.client.profile();
+     * if ( profile.layout == 'gecko' && profile.platform == 'linux' ) {
+     *     // This will only run in Gecko browsers on Linux.
+     * }
+     * ```
      * @param {ClientNavigator} [nav] An object with a 'userAgent' and 'platform' property.
      *  Defaults to the global `navigator` object.
      * @returns {ClientProfile} The client object
-     * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/jQuery.client-method-profile
+     * @see https://doc.wikimedia.org/jquery-client/master/jQuery.client.html#.profile
      */
     profile(nav?: ClientNavigator): ClientProfile;
 
@@ -124,14 +122,14 @@ interface Client {
      * @param {boolean} [exactMatchOnly=false] Only return true if the browser is matched,
      *  otherwise returns true if the browser is not found.
      * @returns {boolean} The current browser is in the support map
-     * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/jQuery.client-method-test
+     * @see https://doc.wikimedia.org/jquery-client/master/jQuery.client.html#.test
      */
     test(map: ClientSupportMap, profile?: ClientProfile, exactMatchOnly?: boolean): boolean;
 }
 
 export interface ClientNavigator {
-    userAgent: string;
     platform: string;
+    userAgent: string;
 }
 
 type ClientProfileName =
@@ -159,9 +157,9 @@ type ClientSupportMap =
     | Record<"ltr" | "rtl", UndirectedClientSupportMap>;
 
 interface ClientProfile {
-    name: ClientProfileName;
     layout: "edge" | "gecko" | "khtml" | "presto" | "trident" | "webkit";
     layoutVersion: number;
+    name: ClientProfileName;
     platform: "ipad" | "iphone" | "linux" | "mac" | "solaris" | "win";
     version: string;
     versionBase: string;
diff --git a/jquery/collapsibleTabs.d.ts b/jquery/collapsibleTabs.d.ts
index b218fdf..4a2af39 100644
--- a/jquery/collapsibleTabs.d.ts
+++ b/jquery/collapsibleTabs.d.ts
@@ -1,26 +1,27 @@
-/**
- * CollapsibleTabsPlugin used in MediaWiki vector skin
- * Copied from https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/skins/Vector/+/master/resources/CollapsibleTabsPlugin.d.ts
- */
-
 declare global {
     interface JQueryStatic {
+        /**
+         * CollapsibleTabsPlugin used in MediaWiki vector skin
+         * Copied from {@link https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/skins/Vector/+/master/resources/CollapsibleTabsPlugin.d.ts}
+         */
         collapsibleTabs: CollapsibleTabsStatic;
     }
 
     interface JQuery {
+        /**
+         * CollapsibleTabsPlugin used in MediaWiki vector skin
+         * Copied from {@link https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/skins/Vector/+/master/resources/CollapsibleTabsPlugin.d.ts}
+         */
         collapsibleTabs(options: Partial<CollapsibleTabsOptions>): void;
     }
 }
 
 /**
  * A jQuery plugin that makes collapsible tabs for the Vector skin.
+ *
+ * @see https://doc.wikimedia.org/mediawiki-skins-Vector/master/js/js/CollapsibleTabsOptions.html
  */
 interface CollapsibleTabsOptions {
-    /**
-     * Optional tab selector. Defaults to `#p-views ul`.
-     */
-    expandedContainer: string;
     /**
      * Optional menu item selector. Defaults to `#p-cactions ul`.
      */
@@ -29,12 +30,16 @@ interface CollapsibleTabsOptions {
      * Optional selector for tabs that are collapsible. Defaults to `li.collapsible`.
      */
     collapsible: string;
-    shifting: boolean;
+    /**
+     * Optional tab selector. Defaults to `#p-views ul`.
+     */
+    expandedContainer: string;
     expandedWidth: number;
-
-    expandCondition(eleWidth: number): boolean;
+    shifting: boolean;
 
     collapseCondition(): boolean;
+
+    expandCondition(eleWidth: number): boolean;
 }
 
 interface CollapsibleTabsStatic {
@@ -43,6 +48,8 @@ interface CollapsibleTabsStatic {
 
     addData($collapsible: JQuery): void;
 
+    calculateTabDistance(): number;
+
     getSettings($collapsible: JQuery): CollapsibleTabsOptions;
 
     handleResize(): void;
@@ -50,8 +57,6 @@ interface CollapsibleTabsStatic {
     moveToCollapsed($moving: JQuery): void;
 
     moveToExpanded($moving: JQuery): void;
-
-    calculateTabDistance(): number;
 }
 
 interface CollapsibleTabs extends CollapsibleTabsStatic, CollapsibleTabsOptions {}
diff --git a/jquery/colorUtil.d.ts b/jquery/colorUtil.d.ts
index c71783a..84d1941 100644
--- a/jquery/colorUtil.d.ts
+++ b/jquery/colorUtil.d.ts
@@ -1,5 +1,9 @@
 declare global {
     interface JQueryStatic {
+        /**
+         * @deprecated Removed since 1.41.
+         * @see https://doc.wikimedia.org/mediawiki-core/REL1_40/js/#!/api/jQuery.colorUtil
+         */
         colorUtil: ColorUtil;
     }
 }
@@ -7,50 +11,57 @@ declare global {
 type Color = [number, number, number];
 
 interface ColorUtil {
-    /**
-     * Parse CSS color strings looking for color tuples
-     *
-     * Based on highlightFade by Blair Mitchelmore
-     * <http://jquery.offput.ca/highlightFade/>
-     *
-     * @param {Color|string} color
-     * @returns {Color}
-     */
-    getRGB<T extends Color>(color: string | T): T;
-
     /**
      * Named color map
      *
      * Based on Interface by Stefan Petre
-     * <http://interface.eyecon.ro/>
+     * {@link http://interface.eyecon.ro/}
+     *
+     * @see https://doc.wikimedia.org/mediawiki-core/REL1_40/js/#!/api/jQuery.colorUtil-property-colors
      */
     colors: Record<string, Color>;
 
     /**
-     * Convert an RGB color value to HSL.
+     * Get a brighter or darker rgb() value string.
      *
-     * Conversion formula based on
-     * <http://mjijackson.com/2008/02/rgb-to-hsl-and-rgb-to-hsv-color-model-conversion-algorithms-in-javascript>
+     * Usage:
      *
-     * Adapted from <https://en.wikipedia.org/wiki/HSL_color_space>.
+     * ```js
+     * $.colorUtil.getColorBrightness( 'red', +0.1 );
+     * // > "rgb(255,50,50)"
+     * $.colorUtil.getColorBrightness( 'rgb(200,50,50)', -0.2 );
+     * // > "rgb(118,29,29)"
+     * ```
      *
-     * Assumes `r`, `g`, and `b` are contained in the set `[0, 255]` and
-     * returns `h`, `s`, and `l` in the set `[0, 1]`.
+     * @param {Color|string} currentColor Current value in css
+     * @param {number} mod Wanted brightness modification between -1 and 1
+     * @returns {string} Like `'rgb(r,g,b)'`
+     * @see https://doc.wikimedia.org/mediawiki-core/REL1_40/js/#!/api/jQuery.colorUtil-method-getColorBrightness
+     */
+    getColorBrightness(
+        currentColor: string | Color,
+        mod: number
+    ): `rgb(${number},${number},${number})`;
+
+    /**
+     * Parse CSS color strings looking for color tuples
      *
-     * @param {number} r The red color value
-     * @param {number} g The green color value
-     * @param {number} b The blue color value
-     * @returns {Color} The HSL representation
+     * Based on highlightFade by Blair Mitchelmore
+     * {@link http://jquery.offput.ca/highlightFade/}
+     *
+     * @param {Color|string} color
+     * @returns {Color}
+     * @see https://doc.wikimedia.org/mediawiki-core/REL1_40/js/#!/api/jQuery.colorUtil-method-getRGB
      */
-    rgbToHsl(r: number, g: number, b: number): Color;
+    getRGB<T extends Color>(color: string | T): T;
 
     /**
      * Convert an HSL color value to RGB.
      *
      * Conversion formula based on
-     * <http://mjijackson.com/2008/02/rgb-to-hsl-and-rgb-to-hsv-color-model-conversion-algorithms-in-javascript>
+     * {@link http://mjijackson.com/2008/02/rgb-to-hsl-and-rgb-to-hsv-color-model-conversion-algorithms-in-javascript}
      *
-     * Adapted from <https://en.wikipedia.org/wiki/HSL_color_space>.
+     * Adapted from {@link https://en.wikipedia.org/wiki/HSL_color_space}.
      *
      * Assumes `h`, `s`, and `l` are contained in the set `[0, 1]` and
      * returns `r`, `g`, and `b` in the set `[0, 255]`.
@@ -59,29 +70,28 @@ interface ColorUtil {
      * @param {number} s The saturation
      * @param {number} l The lightness
      * @returns {Color} The RGB representation
+     * @see https://doc.wikimedia.org/mediawiki-core/REL1_40/js/#!/api/jQuery.colorUtil-method-hslToRgb
      */
     hslToRgb(h: number, s: number, l: number): Color;
 
     /**
-     * Get a brighter or darker rgb() value string.
+     * Convert an RGB color value to HSL.
      *
-     * Usage:
+     * Conversion formula based on
+     * {@link http://mjijackson.com/2008/02/rgb-to-hsl-and-rgb-to-hsv-color-model-conversion-algorithms-in-javascript}
      *
-     * ```js
-     * $.colorUtil.getColorBrightness( 'red', +0.1 );
-     * // > "rgb(255,50,50)"
-     * $.colorUtil.getColorBrightness( 'rgb(200,50,50)', -0.2 );
-     * // > "rgb(118,29,29)"
-     * ```
+     * Adapted from {@link https://en.wikipedia.org/wiki/HSL_color_space}.
      *
-     * @param {Color|string} currentColor Current value in css
-     * @param {number} mod Wanted brightness modification between -1 and 1
-     * @returns {string} Like `'rgb(r,g,b)'`
+     * Assumes `r`, `g`, and `b` are contained in the set `[0, 255]` and
+     * returns `h`, `s`, and `l` in the set `[0, 1]`.
+     *
+     * @param {number} r The red color value
+     * @param {number} g The green color value
+     * @param {number} b The blue color value
+     * @returns {Color} The HSL representation
+     * @see https://doc.wikimedia.org/mediawiki-core/REL1_40/js/#!/api/jQuery.colorUtil-method-rgbToHsl
      */
-    getColorBrightness(
-        currentColor: string | Color,
-        mod: number
-    ): `rgb(${number},${number},${number})`;
+    rgbToHsl(r: number, g: number, b: number): Color;
 }
 
 export {};
diff --git a/jquery/confirmable.d.ts b/jquery/confirmable.d.ts
index bc44d43..20843b9 100644
--- a/jquery/confirmable.d.ts
+++ b/jquery/confirmable.d.ts
@@ -1,101 +1,123 @@
 declare global {
     interface JQuery {
+        /**
+         * Enable inline confirmation for given clickable element (like `<a />` or `<button />`).
+         * Provided by the `jquery.confirmable` ResourceLoader module.
+         *
+         * An additional inline confirmation step being shown before the default action is carried out on
+         * click.
+         *
+         * Calling `.confirmable( { handler: function () { … } } )` will fire the handler only after the
+         * confirmation step.
+         *
+         * The element will have the `jquery-confirmable-element` class added to it when it's clicked for
+         * the first time, which has `white-space: nowrap;` and `display: inline-block;` defined in CSS.
+         * If the computed values for the element are different when you make it confirmable, you might
+         * encounter unexpected behavior.
+         *
+         * @example
+         * ```js
+         * mw.loader.using( 'jquery.confirmable' ).then( () => {
+         *     $( 'button' ).confirmable();
+         * } );
+         * ```
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/module-jquery.confirmable.html#.$.fn.confirmable
+         */
         confirmable: Confirmable;
     }
 }
 
+// make all properties required, replacing optional values with undefined,
+// whether "exactOptionalPropertyTypes" is enabled or not.
+type RequiredOrUndefined<T> = {
+    [P in keyof Required<T>]: T[P];
+};
+
 interface Confirmable {
     /**
-     * Enable inline confirmation for given clickable element (like `<a />` or `<button />`).
-     *
-     * An additional inline confirmation step being shown before the default action is carried out on
-     * click.
-     *
-     * Calling `.confirmable( { handler: function () { … } } )` will fire the handler only after the
-     * confirmation step.
-     *
-     * The element will have the `jquery-confirmable-element` class added to it when it's clicked for
-     * the first time, which has `white-space: nowrap;` and `display: inline-block;` defined in CSS.
-     * If the computed values for the element are different when you make it confirmable, you might
-     * encounter unexpected behavior.
-     *
      * @param {Options} [options]
      */
-    (options?: Partial<Options>): this;
+    (options?: Options): this;
 
     /**
      * Default options. Overridable primarily for internationalisation handling.
      */
-    defaultOptions: Options;
+    defaultOptions: RequiredOptions;
 
-    handler(event: JQuery.Event, options: Options): void;
+    handler(event: JQuery.Event, options: RequiredOptions): void;
 }
 
+type RequiredOptions = Required<Options> & { i18n: RequiredOrUndefined<I18N> };
+
 interface Options {
     /**
      * Optional selector used for jQuery event delegation.
      */
-    delegate: string | null;
+    delegate?: string | null;
 
     /**
      * Events to hook to.
      */
-    events: string;
+    events?: string;
 
     /**
      * Text to use for interface elements.
      */
-    i18n: I18N;
+    i18n?: I18N;
 
     /**
      * Callback to fire when preparing confirmable buttons. It is fired separately for the 'Yes' and 'No' button.
      * Receives the button jQuery object as the first parameter and 'yes' or 'no' as the second.
      */
-    buttonCallback($button: JQuery): JQuery;
+    buttonCallback?($button: JQuery): JQuery;
 
     /**
      * Callback to fire when the action is confirmed (user clicks the 'Yes' button).
      */
-    handler: ((event: JQuery.Event) => void) | null;
+    handler?: ((event: JQuery.Event) => void) | null;
 
     /**
      * Callback to fire when preparing confirmable interface.
      * Receives the interface jQuery object as the only parameter.
      */
-    wrapperCallback($interface: JQuery): JQuery;
+    wrapperCallback?($interface: JQuery): JQuery;
 }
 
 // tslint:disable-next-line:interface-name
 interface I18N {
     /**
      * Text to use for the confirmation question.
+     * Defaults to `Are you sure?`.
      */
     confirm: string;
 
     /**
      * Text to use for the 'No' button.
+     * Defaults to `No`.
      */
     no: string;
 
     /**
-     * Title text to use for the 'No' button.
+     * Optional title text to use for the 'No' button.
      */
-    noTitle: string | undefined;
+    noTitle?: string;
 
     /**
      * Word separator to place between the three text messages.
+     * Defaults to ` `.
      */
     space: string;
 
     /**
      * Text to use for the 'Yes' button.
+     * Defaults to `Yes`.
      */
     yes: string;
 
     /**
-     * Title text to use for the 'Yes' button.
+     * Optional title text to use for the 'Yes' button.
      */
-    yesTitle: string | undefined;
+    yesTitle?: string;
 }
 
 export {};
diff --git a/jquery/cookie.d.ts b/jquery/cookie.d.ts
new file mode 100644
index 0000000..6c0d3f9
--- /dev/null
+++ b/jquery/cookie.d.ts
@@ -0,0 +1,43 @@
+declare global {
+    interface JQueryStatic {
+        /**
+         * Set a cookie.
+         *
+         * @example
+         * ```js
+         * mw.loader.using( 'mediawiki.cookie' ).then( () => {
+         *     $.cookie( 'name', 'value', {} );
+         * } );
+         * ```
+         * @param {string} [key] Cookie name or (when getting) omit to return an object with all
+         *  current cookie keys and values.
+         * @param {string|null} [value] Cookie value to set. If `null`, this method will remove the cookie.
+         *  If omited, this method will get and return the current value.
+         * @param {mw.cookie.CookieOptions} [options]
+         * @returns {string|Object} The current value (if getting a cookie), or an internal `document.cookie`
+         *  expression (if setting or removing).
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/module-mediawiki.cookie.html#.$.cookie
+         */
+        cookie(key: string, value: string | null, options?: mw.cookie.CookieOptions): string;
+        cookie(key: string): unknown;
+        cookie(): Record<string, unknown>;
+
+        /**
+         * Remove a cookie by key.
+         *
+         * @example
+         * ```js
+         * mw.loader.using( 'mediawiki.cookie' ).then( () => {
+         *     $.removeCookie( 'name', {} );
+         * } );
+         * ```
+         * @param {string} key
+         * @param {mw.cookie.CookieOptions} options
+         * @returns {boolean} True if the cookie previously existed
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/module-mediawiki.cookie.html#.$.removeCookie
+         */
+        removeCookie(key: string, options: mw.cookie.CookieOptions): boolean;
+    }
+}
+
+export {};
diff --git a/jquery/footHovzer.d.ts b/jquery/footHovzer.d.ts
index 12874e8..6aa6118 100644
--- a/jquery/footHovzer.d.ts
+++ b/jquery/footHovzer.d.ts
@@ -3,14 +3,12 @@ declare global {
         /**
          * Utility to stack stuff in an overlay fixed on the bottom of the page.
          *
-         * Usage:
-         *
+         * @example
          * ```js
          * var hovzer = $.getFootHovzer();
          * hovzer.$.append( $myCollection );
          * hovzer.update();
          * ```
-         *
          * @private
          * @returns {FootHovzer}
          */
diff --git a/jquery/highlightText.d.ts b/jquery/highlightText.d.ts
index f0146fa..05df7cc 100644
--- a/jquery/highlightText.d.ts
+++ b/jquery/highlightText.d.ts
@@ -6,10 +6,20 @@ declare global {
     interface JQuery {
         /**
          * Highlight certain text in current nodes (by wrapping it in `<span class="highlight">...</span>`).
+         * Provided by the `jquery.highlightText` ResourceLoader module.
          *
+         * @example
+         * ```js
+         * mw.loader.using( 'jquery.highlightText' ).then( () => {
+         *     // no styling is provided by default.
+         *     mw.util.addCSS( `.highlight { background: yellow; }` )
+         *     $( '#bodyContent' ).highlightText( 'bear' );
+         * } );
+         * ```
          * @param {string} matchString String to match
          * @param {Options} [options]
          * @returns {JQuery}
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/module-jquery.highlightText.html#.$.fn.highlightText
          */
         highlightText(matchString: string, options?: Options): this;
     }
diff --git a/jquery/htmlform.d.ts b/jquery/htmlform.d.ts
index f591506..f7a088e 100644
--- a/jquery/htmlform.d.ts
+++ b/jquery/htmlform.d.ts
@@ -5,6 +5,7 @@ declare global {
          *
          * @param {boolean} [instantToggle=false]
          * @returns {JQuery}
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/jQueryPlugins.html#.goIn
          */
         goIn(instantToggle?: boolean): this;
 
@@ -13,6 +14,7 @@ declare global {
          *
          * @param {boolean} [instantToggle=false]
          * @returns {JQuery}
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/jQueryPlugins.html#.goOut
          */
         goOut(instantToggle?: boolean): this;
     }
diff --git a/jquery/lengthLimit.d.ts b/jquery/lengthLimit.d.ts
index b91cb1d..6154d2a 100644
--- a/jquery/lengthLimit.d.ts
+++ b/jquery/lengthLimit.d.ts
@@ -2,10 +2,11 @@ declare global {
     interface JQueryStatic {
         /**
          * Utility function to trim down a string, based on byteLimit
-         * and given a safe start position. It supports insertion anywhere
-         * in the string, so "foo" to "fobaro" if limit is 4 will result in
-         * "fobo", not "foba". Basically emulating the native maxlength by
-         * reconstructing where the insertion occurred.
+         * and given a safe start position.
+         *
+         * It supports insertion anywhere in the string, so "foo" to "fobaro" if
+         * limit is 4 will result in "fobo", not "foba". Basically emulating the
+         * native maxlength by reconstructing where the insertion occurred.
          *
          * @deprecated Use `require( 'mediawiki.String' ).trimByteLength` instead.
          * @param {string} safeVal Known value that was previously returned by this
@@ -14,6 +15,7 @@ declare global {
          * @param {number} byteLimit Number of bytes the value may be in size.
          * @param {FilterFunction} [filterFunction] Function to call on the string before assessing the length.
          * @returns {TrimResult}
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/module-jquery.lengthLimit.html#.'$.fn.trimByteLength'
          */
         trimByteLength(
             safeVal: string,
@@ -38,6 +40,7 @@ declare global {
          *  called with fetched value as argument.
          * @param {FilterFunction} [filterFunction] Function to call on the string before assessing the length.
          * @returns {JQuery}
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/module-jquery.lengthLimit.html#.$.fn.byteLimit
          */
         byteLimit(limit: number, filterFunction?: FilterFunction): this;
         byteLimit(filterFunction?: FilterFunction): this;
@@ -45,13 +48,12 @@ declare global {
         /**
          * Enforces a codepoint (character) limit on an input field.
          *
-         * For unfortunate historical reasons, browsers' native maxlength counts [the number of UTF-16
-         * code units rather than Unicode codepoints] [1], which means that codepoints outside the Basic
+         * For unfortunate historical reasons, browsers' native maxlength counts
+         * {@link https://www.w3.org/TR/html5/sec-forms.html#limiting-user-input-length-the-maxlength-attribute the number of UTF-16
+         * code units rather than Unicode codepoints}, which means that codepoints outside the Basic
          * Multilingual Plane (e.g. many emojis) count as 2 characters each. This plugin exists to
          * correct this.
          *
-         * [1]: https://www.w3.org/TR/html5/sec-forms.html#limiting-user-input-length-the-maxlength-attribute
-         *
          * Can be called with a custom limit (to use that limit instead of the maxlength attribute
          * value), a filter function (in case the limit should apply to something other than the
          * exact input value), or both. Order of parameters is important!
@@ -60,6 +62,7 @@ declare global {
          *  called with fetched value as argument.
          * @param {FilterFunction} [filterFunction] Function to call on the string before assessing the length.
          * @returns {JQuery}
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/module-jquery.lengthLimit.html#.$.fn.codePointLimit
          */
         codePointLimit(limit: number, filterFunction?: FilterFunction): this;
         codePointLimit(filterFunction?: FilterFunction): this;
diff --git a/jquery/makeCollapsible.d.ts b/jquery/makeCollapsible.d.ts
index e13b597..64e48ac 100644
--- a/jquery/makeCollapsible.d.ts
+++ b/jquery/makeCollapsible.d.ts
@@ -2,6 +2,7 @@ declare global {
     interface JQuery {
         /**
          * Enable collapsible-functionality on all elements in the collection.
+         * Provided by the `jquery.makeCollapsible` ResourceLoader module.
          *
          * - Will prevent binding twice to the same element.
          * - Initial state is expanded by default, this can be overridden by adding class
@@ -9,8 +10,15 @@ declare global {
          * - Elements made collapsible have jQuery data "mw-made-collapsible" set to true.
          * - The inner content is wrapped in a "div.mw-collapsible-content" (except for tables and lists).
          *
+         * @example
+         * ```js
+         * mw.loader.using( 'jquery.makeCollapsible' ).then( () => {
+         *     $( 'table' ).makeCollapsible();
+         * } );
+         * ```
          * @param {Options} [options]
          * @returns {JQuery}
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/module-jquery.makeCollapsible.html#.$.fn.makeCollapsible
          */
         makeCollapsible(options?: Options): this;
     }
diff --git a/jquery/spinner.d.ts b/jquery/spinner.d.ts
index c79dbda..29f48d7 100644
--- a/jquery/spinner.d.ts
+++ b/jquery/spinner.d.ts
@@ -6,7 +6,7 @@ declare global {
          * The argument is an object with options used to construct the spinner (see below).
          *
          * It is a good practice to keep a reference to the created spinner to be able to remove it
-         * later. Alternatively, one can use the 'id' option and #removeSpinner (but make sure to choose
+         * later. Alternatively, one can use the 'id' option and {@link removeSpinner} (but make sure to choose
          * an id that's unlikely to cause conflicts, e.g. with extensions, gadgets or user scripts).
          *
          * CSS classes used:
@@ -32,8 +32,9 @@ declare global {
          * $.createSpinner( { id: 'magic' } );
          * ```
          *
+         * @ignore
          * @param {string|Options} [opts] Options. If a string is given, it will be treated as the value
-         *   of the `id` option.
+         *  of the `id` option.
          * @returns {JQuery}
          */
         createSpinner(opts?: string | Options): JQuery;
@@ -41,6 +42,7 @@ declare global {
         /**
          * Remove a spinner element.
          *
+         * @ignore
          * @param {string} id Id of the spinner, as passed to {@link createSpinner}
          * @returns {JQuery} The (now detached) spinner element
          */
@@ -49,14 +51,16 @@ declare global {
 
     interface JQuery {
         /**
-         * Inject a spinner after each element in the collection
+         * Inject a spinner after each element in the collection.
+         * Provided by the `jquery.spinner` ResourceLoader module.
          *
          * Inserts spinner as siblings (not children) of the target elements.
          * Collection contents remain unchanged.
          *
-         * @param {string|Object} [opts] Options. If a string is given, it will be treated as the value
-         *   of the `id` option.
+         * @param {string|Options} [opts] Options. If a string is given, it will be treated as the value
+         *  of the `id` option.
          * @returns {JQuery}
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/jQueryPlugins.html#.injectSpinner
          */
         injectSpinner(opts?: string | Options): this;
     }
@@ -65,6 +69,11 @@ declare global {
 type Size = "large" | "small";
 type Type = "block" | "inline";
 
+/**
+ * Options for {@link JQuery.injectSpinner}.
+ *
+ * @see https://doc.wikimedia.org/mediawiki-core/master/js/jQueryPlugins.html#~SpinnerOpts
+ */
 interface Options {
     /**
      * If given, spinner will be given an id of "mw-spinner-{id}".
diff --git a/jquery/suggestions.d.ts b/jquery/suggestions.d.ts
index 99cefe0..beabc73 100644
--- a/jquery/suggestions.d.ts
+++ b/jquery/suggestions.d.ts
@@ -2,23 +2,25 @@ declare global {
     interface JQuery {
         /**
          * This plugin provides a generic way to add suggestions to a text box.
+         * Provided by the `jquery.suggestions` ResourceLoader module.
          *
-         * Set options:
-         *
+         * @example
          * ```js
-         * $( '#textbox' ).suggestions( { option1: value1, option2: value2 } );
-         * $( '#textbox' ).suggestions( option, value );
+         * // Initialize:
+         * mw.loader.using( 'jquery.suggestions' ).then(()=> {
+         *     $( '#textbox' ).suggestions();
+         * });
          * ```
-         *
-         * Initialize:
-         *
+         * @example
          * ```js
-         * $( '#textbox' ).suggestions();
+         * // Set options:
+         * $( '#textbox' ).suggestions( { option1: value1, option2: value2 } );
+         * $( '#textbox' ).suggestions( option, value );
          * ```
-         *
          * @param {string} property Name of property
          * @param {any} value Value to set property with
          * @returns {JQuery}
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/jQueryPlugins.html#.suggestions
          */
         suggestions<K extends keyof Options<T>, T = any>(property: K, value: Options<T>[K]): this;
         suggestions<T = any>(options?: Partial<Options<T>>): this;
diff --git a/jquery/tablesorter.d.ts b/jquery/tablesorter.d.ts
index c80139d..b87bbe0 100644
--- a/jquery/tablesorter.d.ts
+++ b/jquery/tablesorter.d.ts
@@ -5,7 +5,8 @@ declare global {
 
     interface JQuery {
         /**
-         * Create a sortable table with multi-column sorting capabilities
+         * Create a sortable table with multi-column sorting capabilities.
+         * Provided by `jquery.tablesorter` ResourceLoader module.
          *
          * ```js
          * // Create a simple tablesorter interface
@@ -14,8 +15,12 @@ declare global {
          * // Create a tablesorter interface, initially sorting on the first and second column
          * $( 'table' ).tablesorter( { sortList: [ { 0: 'desc' }, { 1: 'asc' } ] } );
          * ```
+         *
+         * @param {TableSorterOptions} settings
+         * @returns {JQuery}
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/jQueryPlugins.html#.tablesorter
          */
-        tablesorter(this: JQuery<HTMLTableElement>, settings?: Partial<Options>): this;
+        tablesorter(this: JQuery<HTMLTableElement>, settings?: TableSorterOptions): this;
     }
 }
 
@@ -28,9 +33,17 @@ export interface ParserMap {
     currency: "numeric";
     date: "numeric";
     IPAddress: "numeric";
+    /**
+     * @deprecated Removed since 1.40.
+     */
+    isoDate: "numeric";
     number: "numeric";
     text: "text";
     time: "numeric";
+    /**
+     * @deprecated Removed since 1.40.
+     */
+    url: "text";
     usLongDate: "numeric";
 }
 
@@ -52,14 +65,14 @@ interface Parser<T = unknown, K extends string = string> {
 
 interface TableSorter {
     dateRegex: [];
-    defaultOptions: Options;
+    defaultOptions: Required<TableSorterOptions>;
     monthNames: {};
 
     addParser<T = unknown>(parser: Parser<T>): void;
 
     clearTableBody(table: HTMLTableElement): void;
 
-    construct<T extends JQuery<HTMLTableElement>>($tables: T, settings?: Partial<Options>): T;
+    construct<T extends JQuery<HTMLTableElement>>($tables: T, settings?: TableSorterOptions): T;
 
     formatDigit(s: string): number;
 
@@ -73,64 +86,68 @@ interface TableSorter {
     getParsers(): Parser[];
 }
 
-interface Options {
+/**
+ * @see https://doc.wikimedia.org/mediawiki-core/master/js/jQueryPlugins.html#~TableSorterOptions
+ */
+interface TableSorterOptions {
     /**
      * Boolean flag indicating iftablesorter should cancel
      * selection of the table headers text.
      * Defaults to true.
      */
-    cancelSelection: boolean;
+    cancelSelection?: boolean;
 
-    columns: number;
+    columns?: number;
 
-    columnToHeader: number[];
+    columnToHeader?: number[];
     /**
      * A string of the class name to be appended to
      * sortable tr elements in the thead on a ascending sort.
      * Defaults to 'headerSortUp'.
      */
-    cssAsc: string;
+    cssAsc?: string;
 
-    cssChildRow: string;
+    cssChildRow?: string;
 
     /**
      * A string of the class name to be appended to
      * sortable tr elements in the thead on a descending sort.
      * Defaults to 'headerSortDown'.
      */
-    cssDesc: string;
+    cssDesc?: string;
 
     /**
      * A string of the class name to be appended to sortable
      * tr elements in the thead of the table.
      * Defaults to 'headerSort'.
      */
-    cssHeader: string;
+    cssHeader?: string;
 
-    cssInitial: string;
+    cssInitial?: string;
 
-    headerList: HTMLTableCellElement[];
+    headerList?: HTMLTableCellElement[];
 
-    headerToColumns: number[][];
+    headerToColumns?: number[][];
 
-    parsers: Parser[];
+    parsers?: Parser[];
 
     /**
      * An array containing objects specifying sorting. By passing more
      * than one object, multi-sorting will be applied. Object structure:
+     *
      * ```
      * { <Integer column index>: <String 'asc' or 'desc'> }
      * ```
      */
-    sortList: Array<[number, number]>;
+    sortList?: Array<[number, number]>;
 
     /**
      * A string of the multi-column sort key.
      * Defaults to 'shiftKey'.
      */
-    sortMultiSortKey: MultiSortKey;
+    sortMultiSortKey?: MultiSortKey;
 
-    unsortableClass: string;
+    unsortableClass?: string;
 }
 
 export {};
diff --git a/jquery/textSelection.d.ts b/jquery/textSelection.d.ts
index 8af079b..1614837 100644
--- a/jquery/textSelection.d.ts
+++ b/jquery/textSelection.d.ts
@@ -2,110 +2,120 @@ declare global {
     interface JQuery {
         /**
          * Get the contents of the textarea.
+         * Provided by the `jquery.textSelection` ResourceLoader module.
          *
          * @param {string} command Command to execute
          * @returns {string}
-         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/jQuery.plugin.textSelection-method-textSelection
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/jQueryPlugins.html#.textSelection
          */
         textSelection(command: "getContents"): string;
 
         /**
          * Set the contents of the textarea, replacing anything that was there before.
+         * Provided by the `jquery.textSelection` ResourceLoader module.
          *
          * @param {string} command Command to execute
          * @param {string} content
          * @returns {JQuery}
-         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/jQuery.plugin.textSelection-method-textSelection
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/jQueryPlugins.html#.textSelection
          */
         textSelection(command: "setContents", content: string): this;
 
         /**
          * Get the currently selected text in this textarea.
+         * Provided by the `jquery.textSelection` ResourceLoader module.
          *
          * @param {string} command Command to execute
          * @returns {string}
-         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/jQuery.plugin.textSelection-method-textSelection
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/jQueryPlugins.html#.textSelection
          */
         textSelection(command: "getSelection"): string;
 
         /**
          * Replace the selected text in the textarea with the given text, or insert it at the cursor.
+         * Provided by the `jquery.textSelection` ResourceLoader module.
          *
          * @param {string} command Command to execute
          * @param {string} value
          * @returns {JQuery}
-         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/jQuery.plugin.textSelection-method-textSelection
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/jQueryPlugins.html#.textSelection
          */
         textSelection(command: "replaceSelection", value: string): this;
 
         /**
          * Insert text at the beginning and end of a text selection, optionally
          * inserting text at the caret when selection is empty.
+         * Provided by the `jquery.textSelection` ResourceLoader module.
          *
          * Also focusses the textarea.
          *
          * @param {string} command Command to execute
-         * @param {Partial<TextSelectionEncapsulateOptions>} [options]
+         * @param {TextSelectionEncapsulateOptions} [options]
          * @returns {JQuery}
-         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/jQuery.plugin.textSelection-method-textSelection
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/jQueryPlugins.html#.textSelection
          */
         textSelection(
             command: "encapsulateSelection",
-            options?: Partial<TextSelectionEncapsulateOptions>
+            options?: TextSelectionEncapsulateOptions
         ): this;
 
         /**
          * Get the current cursor position (in UTF-16 code units) in a textarea.
+         * Provided by the `jquery.textSelection` ResourceLoader module.
          *
          * @param {string} command Command to execute
-         * @param {Object} [options]
-         * @param {boolean} [options.startAndEnd=false] Return range of the selection rather than just start
+         * @param {GetCaretPositionOptions} [options]
          * @returns {number|number[]} Array with two numbers, for start and end of selection
-         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/jQuery.plugin.textSelection-method-textSelection
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/jQueryPlugins.html#.textSelection
          */
         textSelection(
             command: "getCaretPosition",
-            options: { startAndEnd: true }
+            options: GetCaretPositionOptions & { startAndEnd: true }
         ): [number, number];
-        textSelection(command: "getCaretPosition", options?: { startAndEnd?: false }): number;
         textSelection(
             command: "getCaretPosition",
-            options?: { startAndEnd: boolean }
+            options?: GetCaretPositionOptions & { startAndEnd?: false }
+        ): number;
+        textSelection(
+            command: "getCaretPosition",
+            options?: GetCaretPositionOptions
         ): number | [number, number];
 
         /**
          * Set the current cursor position (in UTF-16 code units) in a textarea.
+         * Provided by the `jquery.textSelection` ResourceLoader module.
          *
          * @param {string} command Command to execute
-         * @param {Object} options
-         * @param {number} options.start
-         * @param {number} [options.end=options.start]
+         * @param {SetSelectionOptions} options
          * @returns {JQuery}
-         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/jQuery.plugin.textSelection-method-textSelection
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/jQueryPlugins.html#.textSelection
          */
-        textSelection(command: "setSelection", options: { start: number; end?: number }): this;
+        textSelection(command: "setSelection", options: SetSelectionOptions): this;
 
         /**
          * Scroll a textarea to the current cursor position. You can set the cursor
          * position with 'setSelection'.
+         * Provided by the `jquery.textSelection` ResourceLoader module.
          *
          * @param {string} command Command to execute
-         * @param {Object} [options]
-         * @param {boolean} [options.force=false] Whether to force a scroll even if the caret position
-         *  is already visible.
+         * @param {ScrollToCaretPositionOptions} [options]
          * @returns {JQuery}
-         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/jQuery.plugin.textSelection-method-textSelection
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/jQueryPlugins.html#.textSelection
          */
-        textSelection(command: "scrollToCaretPosition", options: { force?: boolean }): this;
+        textSelection(
+            command: "scrollToCaretPosition",
+            options?: ScrollToCaretPositionOptions
+        ): this;
 
         /**
          * Register an alternative textSelection API for this element.
+         * Provided by the `jquery.textSelection` ResourceLoader module.
          *
          * @param {string} command Command to execute
          * @param {Object.<string, Function>} functions Functions to replace. Keys are command names (as in {@link textSelection},
          *  except 'register' and 'unregister'). Values are functions to execute when a given command is
          *  called.
-         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/jQuery.plugin.textSelection-method-textSelection
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/jQueryPlugins.html#.textSelection
          */
         textSelection(
             command: "register",
@@ -114,19 +124,27 @@ declare global {
 
         /**
          * Unregister the alternative textSelection API for this element (see 'register').
+         * Provided by the `jquery.textSelection` ResourceLoader module.
          *
          * @param {string} command Command to execute
-         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/jQuery.plugin.textSelection-method-textSelection
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/jQueryPlugins.html#.textSelection
          */
         textSelection(command: "unregister"): void;
 
         /**
          * Do things to the selection in the textarea, using a command from the alternative textSelection API for this element.
+         * Provided by the `jquery.textSelection` ResourceLoader module.
          *
+         * @example
+         * ```js
+         * mw.loader.using( 'jquery.textSelection' ).then( () => {
+         *     const contents = $( 'textarea' ).textSelection( 'getContents' );
+         * } );
+         * ```
          * @param {string} command Command to execute
          * @param {any} [commandOptions] Options to pass to the command
          * @returns {any} Depending on the command
-         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/jQuery.plugin.textSelection-method-textSelection
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/jQueryPlugins.html#.textSelection
          */
         textSelection(command: string, commandOptions?: unknown): any;
     }
@@ -134,41 +152,63 @@ declare global {
 
 interface TextSelectionEncapsulateOptions {
     /**
-     * Text to insert before the cursor/selection.
+     * Put the inserted text on a line of its own. Defaults to false.
      */
-    pre: string;
+    ownline?: boolean;
     /**
      * Text to insert between pre and post and select afterwards.
      */
-    peri: string;
+    peri?: string;
     /**
      * Text to insert after the cursor/selection.
      */
-    post: string;
+    post?: string;
     /**
-     * Put the inserted text on a line of its own. Defaults to false.
+     * Text to insert before the cursor/selection.
      */
-    ownline: boolean;
+    pre?: string;
     /**
      * If there is a selection, replace it with peri instead of leaving it alone. Defaults to false.
      */
-    replace: boolean;
+    replace?: boolean;
+    /**
+     * Position to end selection at. Defaults to the position to start setection at.
+     */
+    selectionEnd?: number;
+    /**
+     * Position to start selection at.
+     */
+    selectionStart?: number;
     /**
      * Select the peri text if it was inserted (but not if there was a selection and replace==false, or if splitlines==true). Defaults to true.
      */
-    selectPeri: boolean;
+    selectPeri?: boolean;
     /**
      * If multiple lines are selected, encapsulate each line individually. Defaults to false.
      */
-    splitlines: boolean;
+    splitlines?: boolean;
+}
+
+interface GetCaretPositionOptions {
     /**
-     * Position to start selection at.
+     * Return range of the selection rather than just start. Defaults to false.
+     */
+    startAndEnd?: boolean;
+}
+
+interface SetSelectionOptions {
+    /**
+     * Defaults to start.
      */
-    selectionStart: number;
+    end?: number;
+    start: number;
+}
+
+interface ScrollToCaretPositionOptions {
     /**
-     * Position to end selection at. Defaults to the position to start setection at.
+     * Whether to force a scroll even if the caret position is already visible. Defaults to false.
      */
-    selectionEnd: number;
+    force?: boolean;
 }
 
 export {};
diff --git a/jquery/tipsy.d.ts b/jquery/tipsy.d.ts
new file mode 100644
index 0000000..c7e080d
--- /dev/null
+++ b/jquery/tipsy.d.ts
@@ -0,0 +1,78 @@
+declare global {
+    interface JQuery<TElement> {
+        /**
+         * @deprecated
+         * @deprecated Removed since 1.41.
+         */
+        tipsy: JQueryTipsy<TElement>;
+    }
+}
+
+type StringProvider<T = HTMLElement> = string | ((ctx: T) => string);
+type MethodsOf<T> = {
+    [P in keyof T]: T[P] extends (...args: unknown[]) => void ? P : never;
+}[keyof T];
+
+type NSDirection = "n" | "s" | "";
+type EWDirection = "e" | "w" | "";
+type Direction = `${NSDirection}${EWDirection}`;
+
+interface JQueryTipsy<T = HTMLElement> {
+    (options: true): Tipsy;
+    (options?: MethodsOf<Tipsy> | Options<T>): JQuery<T>;
+
+    defaults: Required<Options>;
+
+    /**
+     * Yields a closure of the supplied parameters, producing a function that takes
+     * no arguments and is suitable for use as an autogravity function like so:
+     *
+     * @param {number} margin (int) - distance from the viewable region edge that an
+     *  element should be before setting its tooltip's gravity to be away
+     *  from that edge.
+     * @param {Direction} prefer (string, e.g. `n`, `sw`, `w`) - the direction to prefer
+     *  if there are no viewable region edges effecting the tooltip's
+     *  gravity. It will try to vary from this minimally, for example,
+     *  if `sw` is preferred and an element is near the right viewable
+     *  region edge, but not the top edge, it will set the gravity for
+     *  that element's tooltip to be `se`, preserving the southern
+     *  component.
+     */
+    autoBounds(margin: number, prefer: Direction): Direction;
+    autoNS(): boolean;
+    autoWE(): boolean;
+    elementOptions<T extends Options>(ele: HTMLElement, options: T): T;
+}
+
+interface Options<T = HTMLElement> {
+    center?: boolean;
+    className?: StringProvider<T> | null;
+    delayIn?: number;
+    delayOut?: number;
+    fade?: boolean;
+    fallback?: string;
+    gravity?: StringProvider<T>;
+    html?: boolean;
+    live?: boolean;
+    offset?: number;
+    opacity?: number;
+    title?: StringProvider<T>;
+    trigger?: "hover" | "manual";
+}
+
+interface Tipsy<T = HTMLElement> {
+    $element: JQuery<T>;
+    enabled: boolean;
+    options: Required<Options>;
+
+    closeOnEsc(e: KeyboardEvent): void;
+    getTitle(): string;
+    fixTitle(): void;
+    hide(): void;
+    keyHandler(e: KeyboardEvent): void;
+    show(): void;
+    tip(): JQuery;
+    validate(): void;
+}
+
+export {};
diff --git a/jquery/updateTooltipAccessKeys.d.ts b/jquery/updateTooltipAccessKeys.d.ts
index 53e4517..0666398 100644
--- a/jquery/updateTooltipAccessKeys.d.ts
+++ b/jquery/updateTooltipAccessKeys.d.ts
@@ -11,8 +11,18 @@ type KeyModifier = "alt" | "alt-shift" | "ctrl" | "ctrl-option";
 interface TooltipAccessKeys<This = JQuery> {
     /**
      * Update the titles for all elements in a jQuery selection.
+     * Installed by {@link mediawiki.util} module.
      *
+     * @example
+     * ```js
+     * // Converts tooltip "[z]" to associated browser shortcut key e.g. "[ctrl-option-z]"
+     * mw.loader.using( 'mediawiki.util' ).then( () => {
+     *     var $a = $('<a href="/wiki/Main_Page" title="Visit the main page [z]" accesskey="z"><span>Main page</span></a>');
+     *     $a.updateTooltipAccessKeys();
+     * } );
+     * ```
      * @returns {JQuery}
+     * @see https://doc.wikimedia.org/mediawiki-core/REL1_42/js/jQueryPlugins.html#.updateTooltipAccessKeys
      */
     (): This;
 
diff --git a/mw/Api.d.ts b/mw/Api.d.ts
index d4da224..a945e65 100644
--- a/mw/Api.d.ts
+++ b/mw/Api.d.ts
@@ -1,17 +1,15 @@
 import {
-    ApiParams,
+    ApiAssert,
     ApiEditPageParams,
     ApiLegacyTokenType,
     ApiParseParams,
     ApiQueryAllMessagesParams,
+    ApiQueryTokensParams,
     ApiRollbackParams,
     ApiTokenType,
     ApiUploadParams,
-    ApiAssert,
-    ApiQueryTokensParams,
 } from "../api_params";
 import { TitleLike } from "./Title";
-import { UserInfo } from "./user";
 
 type TypeOrArray<T> = T extends any ? T | T[] : never; // T[] would be a mixed array
 type ReplaceValue<T extends U | U[], U, V> = T extends U[] ? V[] : V;
@@ -21,6 +19,9 @@ type UnknownApiParams = Record<string, string | string[] | boolean | number | nu
 export type ApiResponse = Record<string, any>; // it will always be a JSON object, the rest is uncertain ...
 
 interface Revision {
+    /**
+     * Revision content.
+     */
     content: string;
     timestamp: string;
 }
@@ -47,9 +48,9 @@ interface EditNoChangeResult extends EditSuccessResult {
 }
 
 interface EditChangedResult extends EditSuccessResult {
-    oldrevid: number;
     newrevid: number;
     newtimestamp: string;
+    oldrevid: number;
 }
 
 // type alias to fix #45
@@ -58,12 +59,6 @@ type AssertUser = {
     assertUser: string;
 };
 
-interface WatchStatus {
-    ns: number;
-    title: string;
-    watched: boolean;
-}
-
 interface RollbackInfo {
     /**
      * The revision being restored (the last revision before revision(s) by the reverted user).
@@ -89,121 +84,68 @@ interface FinishUpload {
     (data?: ApiUploadParams): JQuery.Promise<ApiResponse>;
 }
 
-/**
- * Default options for {@link jQuery.ajax} calls. Can be overridden by passing
- * `options` to {@link mw.Api} constructor.
- *
- * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Api-property-defaultOptions
- */
-export interface ApiOptions {
-    /**
-     * Default query parameters for API requests
-     */
-    parameters: UnknownApiParams;
-    /**
-     * Default options for {@link jQuery.ajax}
-     */
-    ajax: JQuery.AjaxSettings;
-    /**
-     * Whether to use U+001F when joining multi-valued parameters (since 1.28).
-     * Default is true if ajax.url is not set, false otherwise for compatibility.
-     */
-    useUS?: boolean;
-}
-
 declare global {
     namespace mw {
         /**
-         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Api
+         * Interact with the API of a particular MediaWiki site. mw.Api objects represent the API of
+         * one particular MediaWiki site.
+         *
+         * ```js
+         * var api = new mw.Api();
+         * api.get( {
+         *     action: 'query',
+         *     meta: 'userinfo'
+         * } ).done( function ( data ) {
+         *     console.log( data );
+         * } );
+         * ```
+         *
+         * Since MW 1.25, multiple values for a parameter can be specified using an array:
+         *
+         * ```js
+         * var api = new mw.Api();
+         * api.get( {
+         *     action: 'query',
+         *     meta: [ 'userinfo', 'siteinfo' ] // same effect as 'userinfo|siteinfo'
+         * } ).done( function ( data ) {
+         *     console.log( data );
+         * } );
+         * ```
+         *
+         * Since MW 1.26, boolean values for API parameters can be specified natively. Parameter
+         * values set to `false` or `undefined` will be omitted from the request, as required by
+         * the API.
+         *
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Api.html
          */
         class Api {
             /**
-             * Constructor to create an object to interact with the API of a particular MediaWiki server. mw.Api objects represent the API of a particular MediaWiki server.
-             *
-             * ```js
-             * var api = new mw.Api();
-             * api.get( {
-             *     action: 'query',
-             *     meta: 'userinfo'
-             * } ).done( function ( data ) {
-             *     console.log( data );
-             * } );
-             * ```
-             *
-             * Since MW 1.25, multiple values for a parameter can be specified using an array:
-             *
-             * ```js
-             * var api = new mw.Api();
-             * api.get( {
-             *     action: 'query',
-             *     meta: [ 'userinfo', 'siteinfo' ] // same effect as 'userinfo|siteinfo'
-             * } ).done( function ( data ) {
-             *     console.log( data );
-             * } );
-             * ```
-             *
-             * Since MW 1.26, boolean values for a parameter can be specified directly. If the value is false or undefined, the parameter will be omitted from the request, as required by the API.
-             *
-             * @param {ApiOptions} [options]
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Api-method-constructor
+             * @param {Api.Options} [options] See {@link mw.Api.Options}. This can also be overridden for
+             *  each request by passing them to {@link get()} or {@link post()} (or directly to {@link ajax()}) later on.
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Api.html#Api
              */
-            constructor(options?: Partial<ApiOptions>);
+            constructor(options?: Api.Options);
 
-            private defaults: ApiOptions;
+            private defaults: Required<Api.Options>;
 
             /**
              * Abort all unfinished requests issued by this Api object.
              *
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Api-method-abort
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Api.html#abort
              */
             abort(): void;
 
-            /**
-             * Perform API get request. See {@link ajax()} for details.
-             *
-             * @param {UnknownApiParams} parameters
-             * @param {JQuery.AjaxSettings} [ajaxOptions]
-             * @returns {JQuery.Promise<ApiResponse>}
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Api-method-get
-             */
-            get(
-                parameters: UnknownApiParams,
-                ajaxOptions?: JQuery.AjaxSettings
-            ): JQuery.Promise<ApiResponse>;
-
-            /**
-             * Perform API post request. See {@link ajax()} for details.
-             *
-             * @param {UnknownApiParams} parameters
-             * @param {JQuery.AjaxSettings} [ajaxOptions]
-             * @returns {JQuery.Promise<ApiResponse>}
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Api-method-post
-             */
-            post(
-                parameters: UnknownApiParams,
-                ajaxOptions?: JQuery.AjaxSettings
-            ): JQuery.Promise<ApiResponse>;
-
-            /**
-             * Massage parameters from the nice format we accept into a format suitable for the API.
-             *
-             * @param {UnknownApiParams} parameters (modified in-place)
-             * @param {boolean} useUS Whether to use U+001F when joining multi-valued parameters.
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Api-method-preprocessParameters
-             */
-            private preprocessParameters(parameters: UnknownApiParams, useUS: boolean): void;
-
             /**
              * Perform the API call.
              *
-             * @param {UnknownApiParams} parameters Parameters to the API. See also {@link ApiOptions.parameters}
-             * @param {JQuery.AjaxSettings} [ajaxOptions] Parameters to pass to jQuery.ajax. See also {@link ApiOptions.ajax}
+             * @param {UnknownApiParams} parameters Parameters to the API. See also {@link mw.Api.Options.parameters}.
+             * @param {JQuery.AjaxSettings} [ajaxOptions] Parameters to pass to jQuery.ajax. See also {@link mw.Api.Options.ajax}.
              * @returns {JQuery.Promise<ApiResponse>} A promise that settles when the API response is processed.
              *   Has an 'abort' method which can be used to abort the request.
              *
              *   - On success, resolves to `( result, jqXHR )` where `result` is the parsed API response.
              *   - On an API error, rejects with `( code, result, result, jqXHR )` where `code` is the
-             *     [API error code](https://www.mediawiki.org/wiki/API:Errors_and_warnings), and `result`
+             *     {@link https://www.mediawiki.org/wiki/Special:MyLanguage/API:Errors_and_warnings API error code}, and `result`
              *     is as above. When there are multiple errors, the code from the first one will be used.
              *     If there is no error code, "unknown" is used.
              *   - On other types of errors, rejects with `( 'http', details )` where `details` is an object
@@ -219,8 +161,8 @@ declare global {
              *       first line of the server response). For HTTP/2, `exception` is always an empty string.
              *     - When the response is not valid JSON but the previous error conditions aren't met,
              *       textStatus is "parsererror" and exception is the exception object thrown by
-             *       `JSON.parse`.
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Api-method-ajax
+             *       {@link JSON.parse}.
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Api.html#ajax
              */
             ajax(
                 parameters: UnknownApiParams,
@@ -228,75 +170,46 @@ declare global {
             ): JQuery.Promise<ApiResponse>;
 
             /**
-             * Post to API with the specified type of token. If we have no token, get one and try to post.
-             * If we already have a cached token, try using that, and if the request fails using the cached token,
-             * blank it out and start over. For example, to change a user option, you could do:
+             * Extend an API parameter object with an assertion that the user won't change.
              *
+             * This is useful for API calls which create new revisions or log entries. When the current
+             * page was loaded when the user was logged in, but at the time of the API call the user
+             * is not logged in anymore (e.g. due to session expiry), their IP is recorded in the page
+             * history or log, which can cause serious privacy issues. Extending the API parameters via
+             * this method ensures that that won't happen, by checking the user's identity that was
+             * embedded into the page when it was rendered against the active session on the server.
+             *
+             * When the assertion fails, the API request will fail, with one of the following error codes:
+             * - `apierror-assertanonfailed`: when the client-side logic thinks the user is anonymous
+             *   but the server thinks it is logged in
+             * - `apierror-assertuserfailed`: when the client-side logic thinks the user is logged in but the
+             *   server thinks it is anonymous
+             * - `apierror-assertnameduserfailed`: when both the client-side logic and the server thinks the
+             *   user is logged in but they see it logged in under a different username.
+             *
+             * @example
              * ```js
-             * new mw.Api().postWithToken( 'csrf', {
-             *     action: 'options',
-             *     optionname: 'gender',
-             *     optionvalue: 'female'
-             * } );
+             * api.postWithToken( 'csrf', api.assertCurrentUser( { action: 'edit', ... } ) )
              * ```
-             *
-             * @since 1.22
-             * @param {string} tokenType The name of the token, like `options` or `edit`.
-             * @param {UnknownApiParams} params API parameters
-             * @param {JQuery.AjaxSettings} [ajaxOptions]
-             * @returns {JQuery.Promise<ApiResponse>} See {@link post}
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Api-method-postWithToken
-             */
-            postWithToken(
-                tokenType: ApiTokenType,
-                params: UnknownApiParams,
-                ajaxOptions?: JQuery.AjaxSettings
-            ): JQuery.Promise<ApiResponse>;
-            /** @deprecated Use "csrf" instead */
-            postWithToken(
-                tokenType: ApiLegacyTokenType,
-                params: UnknownApiParams,
-                ajaxOptions?: JQuery.AjaxSettings
-            ): JQuery.Promise<ApiResponse>;
-            postWithToken(
-                tokenType: string,
-                params: UnknownApiParams,
-                ajaxOptions?: JQuery.AjaxSettings
-            ): JQuery.Promise<ApiResponse>;
-
-            /**
-             * Get a token for a certain action from the API.
-             *
-             * @since 1.22
-             * @param {string} type Token type
-             * @param {ApiQueryTokensParams|ApiAssert} [additionalParams] Additional parameters for the API (since 1.35). When given a string, it's treated as the `assert` parameter (since 1.25)
-             * @returns {JQuery.Promise<string>} Received token
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Api-method-getToken
+             * @since 1.27
+             * @param {UnknownApiParams} query Query parameters. The object will not be changed
+             * @returns {AssertUser}
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Api.html#assertCurrentUser
              */
-            getToken(
-                type: ApiTokenType,
-                additionalParams?: ApiQueryTokensParams | ApiAssert
-            ): JQuery.Promise<string>;
-            /** @deprecated Use "csrf" instead */
-            getToken(
-                type: ApiLegacyTokenType,
-                additionalParams?: ApiQueryTokensParams | ApiAssert
-            ): JQuery.Promise<string>;
-            getToken(
-                type: string,
-                additionalParams?: ApiQueryTokensParams | ApiAssert
-            ): JQuery.Promise<string>;
+            assertCurrentUser<T extends UnknownApiParams>(
+                query: T
+            ): Omit<T, keyof AssertUser> & AssertUser;
 
             /**
              * Indicate that the cached token for a certain action of the API is bad.
              *
-             * Call this if you get a `badtoken` error when using the token returned by `getToken()`.
-             * You may also want to use `postWithToken()` instead, which invalidates bad cached tokens
+             * Call this if you get a `badtoken` error when using the token returned by {@link getToken()}.
+             * You may also want to use {@link postWithToken()} instead, which invalidates bad cached tokens
              * automatically.
              *
              * @since 1.26
              * @param {string} type Token type
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Api-method-badToken
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Api.html#badToken
              */
             badToken(type: ApiTokenType): void;
             /** @deprecated Use "csrf" instead */
@@ -304,82 +217,59 @@ declare global {
             badToken(type: string): void;
 
             /**
-             * Given an API response indicating an error, get a jQuery object containing a human-readable
-             * error message that you can display somewhere on the page.
-             *
-             * For better quality of error messages, it's recommended to use the following options in your
-             * API queries:
-             *
-             * ```js
-             * errorformat: 'html',
-             * errorlang: mw.config.get( 'wgUserLanguage' ),
-             * errorsuselocal: true,
-             * ```
-             *
-             * Error messages, particularly for editing pages, may consist of multiple paragraphs of text.
-             * Your user interface should have enough space for that.
-             *
-             * Example usage:
-             *
-             * ```js
-             * var api = new mw.Api();
-             * // var title = 'Test valid title';
-             * var title = 'Test invalid title <>';
-             * api.postWithToken( 'watch', {
-             *     action: 'watch',
-             *     title: title
-             * } ).then( function ( data ) {
-             *     mw.notify( 'Success!' );
-             * }, function ( code, data ) {
-             *     mw.notify( api.getErrorMessage( data ), { type: 'error' } );
-             * } );
-             * ```
-             *
-             * @param {ApiResponse} data API response indicating an error
-             * @returns {JQuery} Error messages, each wrapped in a `<div>`
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Api-method-getErrorMessage
-             */
-            getErrorMessage(data: ApiResponse): JQuery;
-
-            /**
-             * Post to API with csrf token. If we have no token, get one and try to post. If we have a cached token try using that, and if it fails, blank out the cached token and start over.
+             * Upload a file in several chunks.
              *
-             * @param {UnknownApiParams} params API parameters
-             * @param {JQuery.AjaxSettings} [ajaxOptions] See {@link post}
+             * @param {File} file
+             * @param {ApiUploadParams} data Other upload options, see `action=upload` API docs for more
+             * @param {number} [chunkSize] Size (in bytes) per chunk (default: 5MB)
+             * @param {number} [chunkRetries] Amount of times to retry a failed chunk (default: 1)
              * @returns {JQuery.Promise<ApiResponse>}
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Api.plugin.edit-method-postWithEditToken
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Api.html#chunkedUpload
              */
-            postWithEditToken(
-                params: UnknownApiParams,
-                ajaxOptions?: JQuery.AjaxSettings
+            chunkedUpload(
+                file: File,
+                data: ApiUploadParams,
+                chunkSize?: number,
+                chunkRetries?: number
             ): JQuery.Promise<ApiResponse>;
 
             /**
-             * API helper to grab a csrf token.
+             * Upload a file to the stash, in chunks.
              *
-             * @returns {JQuery.Promise<string>} Received token.
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Api.plugin.edit-method-getEditToken
+             * This function will return a promise that will resolve with a function to finish the stash upload.
+             * See {@link uploadToStash}.
+             *
+             * @param {File|HTMLInputElement} file
+             * @param {ApiUploadParams} [data]
+             * @param {number} [chunkSize] Size (in bytes) per chunk (default: 5MB)
+             * @param {number} [chunkRetries] Amount of times to retry a failed chunk (default: 1)
+             * @returns {JQuery.Promise<FinishUpload>} Promise that resolves with a
+             *  function that should be called to finish the upload.
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Api.html#chunkedUploadToStash
              */
-            getEditToken(): JQuery.Promise<string>;
+            chunkedUploadToStash(
+                file: File | HTMLInputElement,
+                data?: ApiUploadParams,
+                chunkSize?: number,
+                chunkRetries?: number
+            ): JQuery.Promise<FinishUpload>;
 
             /**
              * Create a new page.
              *
-             * Example:
-             *
+             * @example
              * ```js
              * new mw.Api().create( 'Sandbox',
              *     { summary: 'Load sand particles.' },
              *     'Sand.'
              * );
              * ```
-             *
              * @since 1.28
              * @param {TitleLike} title Page title
              * @param {ApiEditPageParams} params Edit API parameters
              * @param {string} content Page content
              * @returns {JQuery.Promise<EditResult>} API response
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Api.plugin.edit-method-create
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Api.html#create
              */
             create(
                 title: TitleLike,
@@ -390,7 +280,7 @@ declare global {
             /**
              * Edit an existing page.
              *
-             * To create a new page, use create() instead.
+             * To create a new page, use {@link create()} instead.
              *
              * Simple transformation:
              *
@@ -444,144 +334,151 @@ declare global {
              *
              * @since 1.28
              * @param {TitleLike} title Page title
-             * @param {function(Revision):string|ApiEditPageParams} transform Callback that prepares the edit
+             * @param {Api.EditTransform} transform Callback that prepares the edit
              * @returns {JQuery.Promise<EditResult>} Edit API response
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Api.plugin.edit-method-edit
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Api.html#edit
              */
-            edit(
-                title: TitleLike,
-                transform: (revision: Revision) => string | ApiEditPageParams
-            ): JQuery.Promise<EditResult>;
+            edit(title: TitleLike, transform: Api.EditTransform): JQuery.Promise<EditResult>;
 
             /**
-             * Post a new section to the page.
+             * Perform API get request. See {@link ajax()} for details.
              *
-             * @param {TitleLike} title Target page
-             * @param {string} header
-             * @param {string} message Wikitext message
-             * @param {ApiEditPageParams} additionalParams Additional API parameters
+             * @param {UnknownApiParams} parameters
+             * @param {JQuery.AjaxSettings} [ajaxOptions]
              * @returns {JQuery.Promise<ApiResponse>}
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Api.plugin.edit-method-newSection
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Api.html#get
              */
-            newSection(
-                title: TitleLike,
-                header: string,
-                message: string,
-                additionalParams?: ApiEditPageParams
+            get(
+                parameters: UnknownApiParams,
+                ajaxOptions?: JQuery.AjaxSettings
             ): JQuery.Promise<ApiResponse>;
 
             /**
-             * Get the current user's groups and rights.
+             * Get the categories that a particular page on the wiki belongs to.
              *
-             * @since 1.27
-             * @returns {JQuery.Promise<UserInfo>}
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Api.plugin.user-method-getUserInfo
+             * @param {TitleLike} title
+             * @returns {JQuery.Promise<false|Title[]>} Promise that resolves with an array of category titles, or with false if the title was not found.
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Api.html#getCategories
              */
-            getUserInfo(): JQuery.Promise<UserInfo>;
+            getCategories(title: TitleLike): JQuery.Promise<false | Title[]>;
 
             /**
-             * Extend an API parameter object with an assertion that the user won't change.
-             *
-             * This is useful for API calls which create new revisions or log entries. When the current page was loaded when the user was logged in, but at the time of the API call the user is not logged in anymore (e.g. due to session expiry), their IP is recorded in the page history or log, which can cause serious privacy issues. Extending the API parameters via this method ensures that that won't happen, by checking the user's identity that was embedded into the page when it was rendered against the active session on the server.
+             * Get a list of categories that match a certain prefix.
              *
-             * Use it like this: `api.postWithToken( 'csrf', api.assertCurrentUser( { action: 'edit', ... } ) )`. When the assertion fails, the API request will fail, with one of the following error codes:
-             * * `apierror-assertanonfailed`: when the client-side logic thinks the user is anonymous but the server thinks it is logged in
-             * * `apierror-assertuserfailed`: when the client-side logic thinks the user is logged in but the server thinks it is anonymous
-             * * `apierror-assertnameduserfailed`: when both the client-side logic and the server thinks the user is logged in but they see it logged in under a different username.
+             * E.g. given "Foo", return "Food", "Foolish people", "Foosball tables"...
              *
-             * @since 1.27
-             * @param {UnknownApiParams} query Query parameters. The object will not be changed
-             * @returns {AssertUser}
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Api.plugin.user-method-assertCurrentUser
+             * @param {string} prefix Prefix to match.
+             * @returns {JQuery.Promise<string[]>} Promise that resolves with an array of matched categories
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Api.html#getCategoriesByPrefix
              */
-            assertCurrentUser<T extends UnknownApiParams>(
-                query: T
-            ): Omit<T, keyof AssertUser> & AssertUser;
+            getCategoriesByPrefix(prefix: string): JQuery.Promise<string[]>;
 
             /**
-             * Asynchronously save the value of a single user option using the API. See `saveOptions()`.
+             * API helper to grab a csrf token.
              *
-             * @param {string} name
-             * @param {string|null} value
-             * @returns {JQuery.Promise<ApiResponse>}
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Api.plugin.options-method-saveOption
+             * @returns {JQuery.Promise<string>} Received token.
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Api.html#getEditToken
              */
-            saveOption(name: string, value: string | null): JQuery.Promise<ApiResponse>;
+            getEditToken(): JQuery.Promise<string>;
 
             /**
-             * Asynchronously save the values of user options using the [Options API](https://www.mediawiki.org/wiki/API:Options).
-             *
-             * If a value of `null` is provided, the given option will be reset to the default value.
+             * Given an API response indicating an error, get a jQuery object containing a human-readable
+             * error message that you can display somewhere on the page.
              *
-             * Any warnings returned by the API, including warnings about invalid option names or values, are ignored. However, do not rely on this behavior.
+             * For better quality of error messages, it's recommended to use the following options in your
+             * API queries:
              *
-             * If necessary, the options will be saved using several sequential API requests. Only one promise is always returned that will be resolved when all requests complete.
+             * ```js
+             * errorformat: 'html',
+             * errorlang: mw.config.get( 'wgUserLanguage' ),
+             * errorsuselocal: true,
+             * ```
              *
-             * If a request from a previous `saveOptions()` call is still pending, this will wait for it to be completed, otherwise MediaWiki gets sad. No requests are sent for anonymous users, as they would fail anyway. See T214963.
+             * Error messages, particularly for editing pages, may consist of multiple paragraphs of text.
+             * Your user interface should have enough space for that.
              *
-             * @param {Object.<string, string|null>} options Options as a `{ name: value, … }` object
-             * @returns {JQuery.Promise<ApiResponse>}
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Api.plugin.options-method-saveOptions
+             * @example
+             * ```js
+             * var api = new mw.Api();
+             * // var title = 'Test valid title';
+             * var title = 'Test invalid title <>';
+             * api.postWithToken( 'watch', {
+             *     action: 'watch',
+             *     title: title
+             * } ).then( function ( data ) {
+             *     mw.notify( 'Success!' );
+             * }, function ( code, data ) {
+             *     mw.notify( api.getErrorMessage( data ), { type: 'error' } );
+             * } );
+             * ```
+             * @param {ApiResponse} data API response indicating an error
+             * @returns {JQuery} Error messages, each wrapped in a `<div>`
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Api.html#getErrorMessage
              */
-            saveOptions(options: Record<string, string | null>): JQuery.Promise<ApiResponse>;
+            getErrorMessage(data: ApiResponse): JQuery;
 
             /**
-             * Convenience method for `action=watch`.
+             * Get a set of messages.
              *
-             * @since 1.35 - expiry parameter can be passed when Watchlist Expiry is enabled
-             * @param {TypeOrArray<TitleLike>} pages
-             * @param {string} [expiry]
-             * @returns {JQuery.Promise<TypeOrArray<WatchStatus>>}
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Api.plugin.watch-method-watch
+             * @since 1.27
+             * @param {string|string[]} messages Messages to retrieve
+             * @param {ApiQueryAllMessagesParams} [options] Additional parameters for the API call
+             * @returns {JQuery.Promise<Object.<string, string>>}
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Api.html#getMessages
              */
-            watch<P extends TypeOrArray<TitleLike>>(
-                pages: P,
-                expiry?: string
-            ): JQuery.Promise<ReplaceValue<P, TitleLike, WatchStatus>>;
+            getMessages<T extends string>(
+                messages: T | T[],
+                options?: ApiQueryAllMessagesParams
+            ): JQuery.Promise<Partial<Record<T, string>>>;
 
             /**
-             * Convenience method for `action=watch&unwatch=1`.
+             * Get a token for a certain action from the API.
              *
-             * @param {TypeOrArray<TitleLike>} pages
-             * @returns {JQuery.Promise<TypeOrArray<WatchStatus>>}
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Api.plugin.watch-method-unwatch
+             * @since 1.22
+             * @param {string} type Token type
+             * @param {ApiQueryTokensParams|ApiAssert} [additionalParams] Additional parameters for the API (since 1.35). When given a string, it's treated as the `assert` parameter (since 1.25).
+             * @returns {JQuery.Promise<string>} Received token.
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Api.html#getToken
              */
-            unwatch<P extends TypeOrArray<TitleLike>>(
-                pages: P
-            ): JQuery.Promise<ReplaceValue<P, TitleLike, WatchStatus>>;
+            getToken(
+                type: ApiTokenType,
+                additionalParams?: ApiQueryTokensParams | ApiAssert
+            ): JQuery.Promise<string>;
+            /** @deprecated Use "csrf" instead */
+            getToken(
+                type: ApiLegacyTokenType,
+                additionalParams?: ApiQueryTokensParams | ApiAssert
+            ): JQuery.Promise<string>;
+            getToken(
+                type: string,
+                additionalParams?: ApiQueryTokensParams | ApiAssert
+            ): JQuery.Promise<string>;
 
             /**
-             * Convenience method for `action=parse`.
+             * Get the current user's groups and rights.
              *
-             * @param {TitleLike} content Content to parse, either as a wikitext string or a mw.Title
-             * @param {ApiParseParams} [additionalParams] Parameters object to set custom settings, e.g.
-             *   redirects, sectionpreview.  prop should not be overridden.
-             * @returns {JQuery.Promise<string>} Parsed HTML of `wikitext`.
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Api.plugin.parse-method-parse
+             * @since 1.27
+             * @returns {JQuery.Promise<Api.UserInfo>}
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Api.html#getUserInfo
              */
-            parse(content: TitleLike, additionalParams?: ApiParseParams): JQuery.Promise<string>;
+            getUserInfo(): JQuery.Promise<Api.UserInfo>;
 
             /**
-             * Get a set of messages.
+             * Determine if a category exists.
              *
-             * @since 1.27
-             * @param {string|string[]} messages Messages to retrieve
-             * @param {ApiQueryAllMessagesParams} [options] Additional parameters for the API call
-             * @returns {JQuery.Promise<Object.<string, string>>}
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Api.plugin.messages-method-getMessages
+             * @param {TitleLike} title
+             * @returns {JQuery.Promise<boolean>} Promise that resolves with a boolean indicating whether the category exists.
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Api.html#isCategory
              */
-            getMessages<T extends string>(
-                messages: T | T[],
-                options?: ApiQueryAllMessagesParams
-            ): JQuery.Promise<Partial<Record<T, string>>>;
+            isCategory(title: TitleLike): JQuery.Promise<boolean>;
 
             /**
-             * Load a set of messages and add them to `mw.messages`.
+             * Load a set of messages and add them to {@link mw.messages}.
              *
              * @param {string|string[]} messages Messages to retrieve
              * @param {ApiQueryAllMessagesParams} [options] Additional parameters for the API call
              * @returns {JQuery.Promise<boolean>}
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Api.plugin.messages-method-loadMessages
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Api.html#loadMessages
              */
             loadMessages(
                 messages: string | string[],
@@ -589,47 +486,119 @@ declare global {
             ): JQuery.Promise<boolean>;
 
             /**
-             * Load a set of messages and add them to `mw.messages`. Only messages that are not already known are loaded. If all messages are known, the returned promise is resolved immediately.
+             * Load a set of messages and add them to {@link mw.messages}. Only messages that are not already known
+             * are loaded. If all messages are known, the returned promise is resolved immediately.
              *
              * @since 1.27
-             * @param {string[]} messages Messages to retrieve
+             * @since 1.42 - accepts a single string message as parameter.
+             * @param {string|string[]} messages Messages to retrieve
              * @param {ApiQueryAllMessagesParams} [options] Additional parameters for the API call
              * @returns {JQuery.Promise<boolean>}
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Api.plugin.messages-method-loadMessagesIfMissing
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Api.html#loadMessagesIfMissing
              */
             loadMessagesIfMissing(
-                messages: string[],
+                messages: string | string[],
                 options?: ApiQueryAllMessagesParams
             ): JQuery.Promise<boolean>;
 
             /**
-             * Determine if a category exists.
+             * @param {string} username
+             * @param {string} password
+             * @returns {JQuery.Promise<ApiResponse>} See {@link post()}
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Api.html#login
+             */
+            login(username: string, password: string): JQuery.Promise<ApiResponse>;
+
+            /**
+             * Post a new section to the page.
              *
-             * @param {TitleLike} title
-             * @returns {JQuery.Promise<boolean>}
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Api.plugin.category-method-isCategory
+             * @param {TitleLike} title Target page
+             * @param {string} header
+             * @param {string} message Wikitext message
+             * @param {ApiEditPageParams} additionalParams Additional API parameters
+             * @returns {JQuery.Promise<ApiResponse>} See {@link postWithEditToken}
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Api.html#newSection
              */
-            isCategory(title: TitleLike): JQuery.Promise<boolean>;
+            newSection(
+                title: TitleLike,
+                header: string,
+                message: string,
+                additionalParams?: ApiEditPageParams
+            ): JQuery.Promise<ApiResponse>;
 
             /**
-             * Get a list of categories that match a certain prefix.
+             * Convenience method for `action=parse`.
              *
-             * E.g. given "Foo", return "Food", "Foolish people", "Foosball tables"...
+             * @param {TitleLike} content Content to parse, either as a wikitext string or a {@link mw.Title}
+             * @param {ApiParseParams} [additionalParams] Parameters object to set custom settings, e.g.
+             *  `redirects`, `sectionpreview`. `prop` should not be overridden.
+             * @returns {JQuery.Promise<string>} Promise that resolves with the parsed HTML of `wikitext`
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Api.html#parse
+             */
+            parse(content: TitleLike, additionalParams?: ApiParseParams): JQuery.Promise<string>;
+
+            /**
+             * Perform API post request. See {@link ajax()} for details.
              *
-             * @param {string} prefix Prefix to match.
-             * @returns {JQuery.Promise<string[]>} Matched categories
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Api.plugin.category-method-getCategoriesByPrefix
+             * @param {UnknownApiParams} parameters
+             * @param {JQuery.AjaxSettings} [ajaxOptions]
+             * @returns {JQuery.Promise<ApiResponse>}
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Api.html#post
              */
-            getCategoriesByPrefix(prefix: string): JQuery.Promise<string[]>;
+            post(
+                parameters: UnknownApiParams,
+                ajaxOptions?: JQuery.AjaxSettings
+            ): JQuery.Promise<ApiResponse>;
 
             /**
-             * Get the categories that a particular page on the wiki belongs to.
+             * Post to API with csrf token. If we have no token, get one and try to post. If we have a cached token try using that, and if it fails, blank out the cached token and start over.
              *
-             * @param {TitleLike} title
-             * @returns {JQuery.Promise<false|Title[]>} List of category titles or false if title was not found
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Api.plugin.category-method-getCategories
+             * @param {UnknownApiParams} params API parameters
+             * @param {JQuery.AjaxSettings} [ajaxOptions]
+             * @returns {JQuery.Promise<ApiResponse>} See {@link post}
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Api.html#postWithEditToken
              */
-            getCategories(title: TitleLike): JQuery.Promise<false | Title[]>;
+            postWithEditToken(
+                params: UnknownApiParams,
+                ajaxOptions?: JQuery.AjaxSettings
+            ): JQuery.Promise<ApiResponse>;
+
+            /**
+             * Post to API with the specified type of token. If we have no token, get one and try to post.
+             * If we already have a cached token, try using that, and if the request fails using the cached token,
+             * blank it out and start over.
+             *
+             * @example <caption>For example, to change a user option, you could do:</caption>
+             * ```js
+             * new mw.Api().postWithToken( 'csrf', {
+             *     action: 'options',
+             *     optionname: 'gender',
+             *     optionvalue: 'female'
+             * } );
+             * ```
+             * @since 1.22
+             * @param {string} tokenType The name of the token, like `options` or `edit`.
+             * @param {UnknownApiParams} params API parameters
+             * @param {JQuery.AjaxSettings} [ajaxOptions]
+             * @returns {JQuery.Promise<ApiResponse>} See {@link post()}
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Api.html#postWithToken
+             */
+            postWithToken(
+                tokenType: ApiTokenType,
+                params: UnknownApiParams,
+                ajaxOptions?: JQuery.AjaxSettings
+            ): JQuery.Promise<ApiResponse>;
+            /** @deprecated Use "csrf" instead */
+            postWithToken(
+                tokenType: ApiLegacyTokenType,
+                params: UnknownApiParams,
+                ajaxOptions?: JQuery.AjaxSettings
+            ): JQuery.Promise<ApiResponse>;
+            postWithToken(
+                tokenType: string,
+                params: UnknownApiParams,
+                ajaxOptions?: JQuery.AjaxSettings
+            ): JQuery.Promise<ApiResponse>;
 
             /**
              * Convenience method for `action=rollback`.
@@ -639,7 +608,7 @@ declare global {
              * @param {string} user
              * @param {ApiRollbackParams} [params] Additional parameters
              * @returns {JQuery.Promise<RollbackInfo>}
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Api.plugin.rollback-method-rollback
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Api.html#rollback
              */
             rollback(
                 page: TitleLike,
@@ -648,40 +617,51 @@ declare global {
             ): JQuery.Promise<RollbackInfo>;
 
             /**
-             * Upload a file in several chunks.
+             * Asynchronously save the value of a single user option using the API.
+             * See {@link saveOptions()}.
              *
-             * @param {File} file
-             * @param {ApiUploadParams} data Other upload options, see `action=upload` API docs for more
-             * @param {number} [chunkSize] Size (in bytes) per chunk (default: 5MB)
-             * @param {number} [chunkRetries] Amount of times to retry a failed chunk (default: 1)
+             * @param {string} name
+             * @param {string|null} value
              * @returns {JQuery.Promise<ApiResponse>}
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Api.plugin.upload-method-chunkedUpload
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Api.html#saveOption
              */
-            chunkedUpload(
-                file: File,
-                data: ApiUploadParams,
-                chunkSize?: number,
-                chunkRetries?: number
-            ): JQuery.Promise<ApiResponse>;
+            saveOption(name: string, value: string | null): JQuery.Promise<ApiResponse>;
 
             /**
-             * Upload a file to the stash, in chunks.
+             * Asynchronously save the values of user options using the {@link https://www.mediawiki.org/wiki/Special:MyLanguage/API:Options Options API}.
              *
-             * This function will return a promise that will resolve with a function to finish the stash upload.
+             * If a value of `null` is provided, the given option will be reset to the default value.
              *
-             * @param {File|HTMLInputElement} file
-             * @param {ApiUploadParams} [data]
-             * @param {number} [chunkSize] Size (in bytes) per chunk (default: 5MB)
-             * @param {number} [chunkRetries] Amount of times to retry a failed chunk (default: 1)
-             * @returns {JQuery.Promise<FinishUpload>}
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Api.plugin.upload-method-chunkedUploadToStash
+             * Any warnings returned by the API, including warnings about invalid option names or values,
+             * are ignored. However, do not rely on this behavior.
+             *
+             * If necessary, the options will be saved using several sequential API requests. Only one promise
+             * is always returned that will be resolved when all requests complete.
+             *
+             * If a request from a previous {@link saveOptions()} call is still pending, this will wait for it to be
+             * completed, otherwise MediaWiki gets sad. No requests are sent for anonymous users, as they
+             * would fail anyway. See T214963.
+             *
+             * @param {Object.<string, string|null>} options Options as a `{ name: value, … }` object
+             * @returns {JQuery.Promise<ApiResponse>}
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Api.html#saveOptions
              */
-            chunkedUploadToStash(
-                file: File | HTMLInputElement,
-                data?: ApiUploadParams,
-                chunkSize?: number,
-                chunkRetries?: number
-            ): JQuery.Promise<FinishUpload>;
+            saveOptions(options: Record<string, string | null>): JQuery.Promise<ApiResponse>;
+
+            /**
+             * Convenience method for `action=watch&unwatch=1`.
+             *
+             * @param {TypeOrArray<TitleLike>} pages Full page name or instance of {@link mw.Title}, or an
+             *  array thereof. If an array is passed, the return value passed to the promise will also be an
+             *  array of appropriate objects.
+             * @returns {JQuery.Promise<TypeOrArray<Api.WatchedPage>>} A promise that resolves
+             *  with an object (or array of objects) describing each page that was passed in and its
+             *  current watched/unwatched status.
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Api.html#unwatch
+             */
+            unwatch<P extends TypeOrArray<TitleLike>>(
+                pages: P
+            ): JQuery.Promise<ReplaceValue<P, TitleLike, Api.WatchedPage>>;
 
             /**
              * Upload a file to MediaWiki.
@@ -691,7 +671,7 @@ declare global {
              * @param {File|Blob|HTMLInputElement} file HTML `input type=file` element with a file already inside of it, or a File object.
              * @param {ApiUploadParams} data Other upload options, see `action=upload` API docs for more
              * @returns {JQuery.Promise<ApiResponse>}
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Api.plugin.upload-method-upload
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Api.html#upload
              */
             upload(
                 file: File | Blob | HTMLInputElement,
@@ -704,15 +684,18 @@ declare global {
              * @param {string} filekey
              * @param {ApiUploadParams} data
              * @returns {JQuery.Promise<ApiResponse>}
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Api.plugin.upload-method-uploadFromStash
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Api.html#uploadFromStash
              */
             uploadFromStash(filekey: string, data: ApiUploadParams): JQuery.Promise<ApiResponse>;
 
             /**
              * Upload a file to the stash.
              *
-             * This function will return a promise that will resolve with a function to finish the stash upload. You can call that function with an argument containing more, or conflicting, data to pass to the server. For example:
+             * This function will return a promise, which when resolved, will pass back a function
+             * to finish the stash upload. You can call that function with an argument containing
+             * more, or conflicting, data to pass to the server.
              *
+             * @example
              * ```js
              * // upload a file to the stash with a placeholder filename
              * api.uploadToStash( file, { filename: 'testing.png' } ).done( function ( finish ) {
@@ -723,11 +706,11 @@ declare global {
              *     } );
              * } );
              * ```
-             *
              * @param {File|HTMLInputElement} file
              * @param {ApiUploadParams} [data]
-             * @returns {JQuery.Promise<FinishUpload>}
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Api.plugin.upload-method-uploadToStash
+             * @returns {JQuery.Promise<FinishUpload>} Promise that resolves with a
+             *  function that should be called to finish the upload.
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Api.html#uploadToStash
              */
             uploadToStash(
                 file: File | HTMLInputElement,
@@ -735,14 +718,104 @@ declare global {
             ): JQuery.Promise<FinishUpload>;
 
             /**
-             * @param {string} username
-             * @param {string} password
-             * @returns {JQuery.Promise<ApiResponse>} See {@link post()}
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Api.plugin.login-method-login
+             * Convenience method for `action=watch`.
+             *
+             * @since 1.35 - expiry parameter can be passed when Watchlist Expiry is enabled.
+             * @param {TypeOrArray<TitleLike>} pages Full page name or instance of {@link mw.Title}, or an
+             *  array thereof. If an array is passed, the return value passed to the promise will also be an
+             *  array of appropriate objects.
+             * @param {string} [expiry] When the page should expire from the watchlist. If omitted, the
+             *  page will not expire.
+             * @returns {JQuery.Promise<TypeOrArray<Api.WatchedPage>>} A promise that resolves
+             *  with an object (or array of objects) describing each page that was passed in and its
+             *  current watched/unwatched status.
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Api.html#watch
              */
-            login(username: string, password: string): JQuery.Promise<ApiResponse>;
+            watch<P extends TypeOrArray<TitleLike>>(
+                pages: P,
+                expiry?: string
+            ): JQuery.Promise<ReplaceValue<P, TitleLike, Api.WatchedPage>>;
+
+            /**
+             * Massage parameters from the nice format we accept into a format suitable for the API.
+             *
+             * @param {UnknownApiParams} parameters (modified in-place)
+             * @param {boolean} useUS Whether to use U+001F when joining multi-valued parameters.
+             */
+            private preprocessParameters(parameters: UnknownApiParams, useUS: boolean): void;
+        }
+
+        namespace Api {
+            /**
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Api.html#.EditTransform
+             */
+            interface EditTransform {
+                /**
+                 * @param {Revision} revision Current revision
+                 * @returns {string|ApiEditPageParams|JQuery.Promise<string|ApiEditPageParams>} New content, object with edit API parameters, or promise providing one of those.
+                 */
+                (revision: Revision):
+                    | string
+                    | ApiEditPageParams
+                    | JQuery.Promise<string>
+                    | JQuery.Promise<ApiEditPageParams>;
+            }
+
+            /**
+             * Default options for {@link jQuery.ajax} calls. Can be overridden by passing
+             * `options` to {@link mw.Api} constructor.
+             *
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Api.html#.Options
+             */
+            interface Options {
+                /**
+                 * Default options for {@link jQuery.ajax}
+                 */
+                ajax?: JQuery.AjaxSettings;
+                /**
+                 * Default query parameters for API requests
+                 */
+                parameters?: UnknownApiParams;
+                /**
+                 * Whether to use U+001F when joining multi-valued parameters (since 1.28).
+                 * Default is true if ajax.url is not set, false otherwise for compatibility.
+                 */
+                useUS?: boolean;
+            }
+
+            /**
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Api.html#.UserInfo
+             */
+            interface UserInfo {
+                /**
+                 * User groups that the user belongs to.
+                 */
+                groups: string[];
+                /**
+                 * User's rights.
+                 */
+                rights: string[];
+            }
+
+            /**
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Api.html#.WatchedPage
+             */
+            interface WatchedPage {
+                ns: number;
+                /**
+                 * Full page name.
+                 */
+                title: string;
+                /**
+                 * Whether the page is now watched (true) or unwatched (false).
+                 */
+                watched: boolean;
+            }
         }
     }
 }
 
+/** @deprecated Use `mw.Api.Options` instead. Note that `ApiOptions` is strictly equivalent to `Required<mw.Api.Options>` as properties are now optional for consistency. */
+export type ApiOptions = Required<mw.Api.Options>;
+
 export {};
diff --git a/mw/ForeignApi.d.ts b/mw/ForeignApi.d.ts
index 0ac4fd3..aa274ee 100644
--- a/mw/ForeignApi.d.ts
+++ b/mw/ForeignApi.d.ts
@@ -1,16 +1,7 @@
-import { ApiOptions } from "./Api";
-
-export interface ForeignApiOptions extends ApiOptions {
-    /**
-     * Whether to perform all requests anonymously. Use this option if the target wiki may otherwise not accept cross-origin requests, or if you don't need to perform write actions or read restricted information and want to avoid the overhead.
-     */
-    anonymous: boolean;
-}
-
 declare global {
     namespace mw {
         /**
-         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.ForeignApi
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.ForeignApi.html
          */
         class ForeignApi extends Api {
             static static: {};
@@ -19,9 +10,11 @@ declare global {
             static parent: typeof Api;
 
             /**
-             * Create an object like {@link mw.Api}, but automatically handling everything required to communicate with another MediaWiki wiki via cross-origin requests (CORS).
+             * Create an object like {@link mw.Api}, but automatically handling everything required to communicate
+             * with another MediaWiki wiki via cross-origin requests (CORS).
              *
-             * The foreign wiki must be configured to accept requests from the current wiki. See <https://www.mediawiki.org/wiki/Manual:$wgCrossSiteAJAXdomains> for details.
+             * The foreign wiki must be configured to accept requests from the current wiki. See
+             * {@link https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:$wgCrossSiteAJAXdomains} for details.
              *
              * ```js
              * var api = new mw.ForeignApi( 'https://commons.wikimedia.org/w/api.php' );
@@ -33,7 +26,11 @@ declare global {
              * } );
              * ```
              *
-             * To ensure that the user at the foreign wiki is logged in, pass the `assert: 'user'` parameter to `get()`/`post()` (since MW 1.23): if they are not, the API request will fail. (Note that this doesn't guarantee that it's the same user.)
+             * To ensure that the user at the foreign wiki is logged in, pass the `assert: 'user'` parameter
+             * to {@link mw.ForeignApi.get}/{@link mw.ForeignApi.post} (since MW 1.23), otherwise the API
+             * request will fail. (Note that this doesn't guarantee that it's the same user. To assert that
+             * the user at the foreign wiki has a specific username, pass the `assertuser` parameter with
+             * the desired username.)
              *
              * Authentication-related MediaWiki extensions may extend this class to ensure that the user authenticated on the current wiki will be automatically authenticated on the foreign one. These extension modules should be registered using the ResourceLoaderForeignApiModules hook. See CentralAuth for a practical example. The general pattern to extend and override the name is:
              *
@@ -45,20 +42,31 @@ declare global {
              *
              * @since 1.26
              * @param {string|Uri} url URL pointing to another wiki's `api.php` endpoint.
-             * @param {Partial<ForeignApiOptions>} [options]
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.ForeignApi-method-constructor
+             * @param {ForeignApi.Options} [options] Also accepts all the options from {@link mw.Api.Options}.
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.ForeignApi.html#ForeignApi
              */
-            constructor(url: string | Uri, options?: Partial<ForeignApiOptions>);
+            constructor(url: string | Uri, options?: ForeignApi.Options);
 
             /**
              * Return the origin to use for API requests, in the required format (protocol, host and port, if any).
              *
              * @returns {string|undefined}
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.ForeignApi-method-getOrigin
              */
             protected getOrigin(): "*" | `${string}//${string}` | undefined;
         }
+
+        namespace ForeignApi {
+            interface Options extends Api.Options {
+                /**
+                 * Whether to perform all requests anonymously. Use this option if the target wiki may otherwise not accept cross-origin requests, or if you don't need to perform write actions or read restricted information and want to avoid the overhead.
+                 */
+                anonymous?: boolean;
+            }
+        }
     }
 }
 
+/** @deprecated Use `mw.ForeignApi.Options` instead. Note that `ForeignApiOptions` is strictly equivalent to `Required<mw.ForeignApi.Options>` as properties are now optional for consistency. */
+export type ForeignApiOptions = Required<mw.ForeignApi.Options>;
+
 export {};
diff --git a/mw/ForeignRest.d.ts b/mw/ForeignRest.d.ts
index 1302232..b4d813f 100644
--- a/mw/ForeignRest.d.ts
+++ b/mw/ForeignRest.d.ts
@@ -1,18 +1,7 @@
-import { RestOptions } from "./Rest";
-
-interface ForeignRestOptions extends RestOptions {
-    /**
-     * Perform all requests anonymously. Use this option if the target wiki may otherwise not
-     * accept cross-origin requests, or if you don't need to perform write actions or read
-     * restricted information and want to avoid the overhead.
-     */
-    anonymous: boolean;
-}
-
 declare global {
     namespace mw {
         /**
-         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.ForeignRest
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.ForeignRest.html
          */
         class ForeignRest extends Rest {
             static static: {};
@@ -21,10 +10,11 @@ declare global {
             static parent: typeof Rest;
 
             /**
-             * Create an object like {@link mw.Rest}, but automatically handling everything required
-             * to communicate with another MediaWiki wiki via cross-origin requests (CORS).
+             * Create an object like {@link mw.Rest}, but automatically handling everything required to communicate
+             * with another MediaWiki wiki via cross-origin requests (CORS).
              *
-             * The foreign wiki must be configured to accept requests from the current wiki. See https://www.mediawiki.org/wiki/Manual:$wgCrossSiteAJAXdomains for details.
+             * The foreign wiki must be configured to accept requests from the current wiki. See
+             * {@link https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:$wgCrossSiteAJAXdomains} for details.
              *
              * ```js
              * var api = new mw.ForeignRest( 'https://commons.wikimedia.org/w/rest.php' );
@@ -34,11 +24,10 @@ declare global {
              * } );
              * ```
              *
-             * Authentication-related MediaWiki extensions may extend this class to ensure that
-             * the user authenticated on the current wiki will be automatically authenticated on
-             * the foreign one. These extension modules should be registered using the
-             * ResourceLoaderForeignApiModules hook. See CentralAuth for a practical example.
-             * The general pattern to extend and override the name is:
+             * Authentication-related MediaWiki extensions may extend this class to ensure that the user
+             * authenticated on the current wiki will be automatically authenticated on the foreign one. These
+             * extension modules should be registered using the ResourceLoaderForeignApiModules hook. See
+             * CentralAuth for a practical example. The general pattern to extend and override the name is:
              *
              * ```js
              * function MyForeignRest() {};
@@ -49,14 +38,21 @@ declare global {
              * @since 1.36
              * @param {string} url URL pointing to another wiki's `rest.php` endpoint.
              * @param {ForeignApi} foreignActionApi
-             * @param {Partial<ForeignRestOptions>} [options]
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.ForeignRest-method-constructor
+             * @param {ForeignRest.Options} [options] See {@link mw.Rest}.
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.ForeignRest.html#ForeignRest
              */
-            constructor(
-                url: string,
-                foreignActionApi: ForeignApi,
-                options?: Partial<ForeignRestOptions>
-            );
+            constructor(url: string, foreignActionApi: ForeignApi, options?: ForeignRest.Options);
+        }
+
+        namespace ForeignRest {
+            interface Options extends Rest.Options {
+                /**
+                 * Whether to perform all requests anonymously. Use this option if
+                 * the target wiki may otherwise not accept cross-origin requests, or if you don't need to
+                 * perform write actions or read restricted information and want to avoid the overhead.
+                 */
+                anonymous?: boolean;
+            }
         }
     }
 }
diff --git a/mw/ForeignUpload.d.ts b/mw/ForeignUpload.d.ts
index 441b43c..0cd81e4 100644
--- a/mw/ForeignUpload.d.ts
+++ b/mw/ForeignUpload.d.ts
@@ -1,6 +1,3 @@
-import { ApiOptions } from "./Api";
-import { ForeignApiOptions } from "./ForeignApi";
-
 declare global {
     namespace mw {
         /**
@@ -12,6 +9,8 @@ declare global {
          * Note you can provide the {@link target} or not - if the first argument is
          * an object, we assume you want the default, and treat it as apiconfig
          * instead.
+         *
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.ForeignUpload.html
          */
         class ForeignUpload extends Upload {
             static static: {};
@@ -31,6 +30,8 @@ declare global {
              *
              * Defaults to the first available foreign upload target,
              * or to local uploads if no foreign target is configured.
+             *
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.ForeignUpload.html#.target
              */
             target: string;
 
@@ -48,10 +49,11 @@ declare global {
              *     wiki. If not remote, this class behaves identically to mw.Upload (unless further subclassed)
              *     Use the same names as set in $wgForeignFileRepos for this. Also,
              *     make sure there is an entry in the $wgForeignUploadTargets array for this name.
-             * @param {Partial<ApiOptions>} [apiconfig] Passed to the constructor of mw.ForeignApi or mw.Api, as needed.
+             * @param {Api.Options} [apiconfig] Passed to the constructor of mw.ForeignApi or mw.Api, as needed.
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.ForeignUpload.html#ForeignUpload
              */
-            constructor(target: string, apiconfig?: Partial<ForeignApiOptions>);
-            constructor(apiconfig?: Partial<ApiOptions>);
+            constructor(target: string, apiconfig?: ForeignApi.Options);
+            constructor(apiconfig?: Api.Options);
         }
     }
 }
diff --git a/mw/Map.d.ts b/mw/Map.d.ts
index 0475f5a..f91b62b 100644
--- a/mw/Map.d.ts
+++ b/mw/Map.d.ts
@@ -26,7 +26,7 @@ export interface ExtensibleMap<V extends Record<string, any>, TX = unknown>
      *
      * @param selection Key to check
      * @returns True if the key exists
-     * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Map-method-exists
+     * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Map.html#.exists
      */
     exists<S extends keyof V>(selection: S): selection is S;
     exists<S extends string>(selection: S): selection is S;
@@ -40,7 +40,7 @@ export interface ExtensibleMap<V extends Record<string, any>, TX = unknown>
      * @param fallback Value for keys that don't exist.
      * @returns If selection was a string, returns the value. If selection was an array, returns
      * an object of key/values. If no selection is passed, a new object with all key/values is returned.
-     * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Map-method-get
+     * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Map.html#.get
      */
     get<S extends TypeOrArray<keyof V>, TD>(
         selection: S,
@@ -57,7 +57,7 @@ export interface ExtensibleMap<V extends Record<string, any>, TX = unknown>
      * @param selection Key to set value for, or object mapping keys to values
      * @param value Value to set (optional, only in use when key is a string)
      * @returns True on success, false on failure
-     * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Map-method-set
+     * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Map.html#.set
      */
     set<S extends keyof V>(selection: S, value: V[S]): boolean;
     set<S extends string>(selection: S, value: TX): boolean;
@@ -67,23 +67,33 @@ export interface ExtensibleMap<V extends Record<string, any>, TX = unknown>
 declare global {
     namespace mw {
         /**
-         * Create an object that can be read from or written to via methods that allow interaction both
-         * with single and multiple properties at once.
+         * ES3 compatible class similar to {@link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Map ES6 Map}.
          *
-         * **NOTE**: This is a private utility class for internal use by the framework.
-         * Don't rely on its existence.
+         * Create an object that can be read from or written to via methods that allow
+         * interaction both with single and multiple properties at once.
          *
-         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Map
+         * @example
+         * ```js
+         * const map = new mw.Map();
+         * map.set( 'foo', 5 );
+         * alert( 5 === map.get( 'foo' ) );
+         * ```
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Map.html
          */
         class Map<V extends Record<string, any> = any> {
             private values: V;
 
+            /**
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Map.html#Map
+             */
+            constructor();
+
             /**
              * Check if a given key exists in the map.
              *
              * @param selection Key to check
              * @returns True if the key exists
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Map-method-exists
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Map.html#.exists
              */
             exists<S extends keyof V>(selection: S): selection is S;
 
@@ -96,7 +106,7 @@ declare global {
              * @param fallback Value for keys that don't exist.
              * @returns If selection was a string, returns the value. If selection was an array, returns
              * an object of key/values. If no selection is passed, a new object with all key/values is returned.
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Map-method-get
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Map.html#.get
              */
             get<S extends TypeOrArray<keyof V>, TD>(
                 selection: S,
@@ -111,7 +121,7 @@ declare global {
              * @param selection Key to set value for, or object mapping keys to values
              * @param value Value to set (optional, only in use when key is a string)
              * @returns True on success, false on failure
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Map-method-set
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Map.html#.set
              */
             set<S extends keyof V>(selection: S, value: V[S]): boolean;
             set<S extends Partial<V>>(selection: S): boolean;
diff --git a/mw/RegExp.d.ts b/mw/RegExp.d.ts
index b66cc1a..86a50fe 100644
--- a/mw/RegExp.d.ts
+++ b/mw/RegExp.d.ts
@@ -1,7 +1,7 @@
 declare global {
     namespace mw {
         /**
-         * @see https://doc.wikimedia.org/mediawiki-core/REL1_29/js/source/mediawiki.RegExp.html
+         * @see https://doc.wikimedia.org/mediawiki-core/REL1_33/js/#!/api/mw.RegExp
          */
         namespace RegExp {
             /**
@@ -15,7 +15,7 @@ declare global {
              * @since 1.26
              * @param {string} str String to escape
              * @returns {string} Escaped string
-             * @see https://doc.wikimedia.org/mediawiki-core/REL1_29/js/source/mediawiki.RegExp.html#mw-RegExp-static-method-escape
+             * @see https://doc.wikimedia.org/mediawiki-core/REL1_33/js/#!/api/mw.RegExp-static-method-escape
              */
             function escape(str: string): string;
         }
diff --git a/mw/Rest.d.ts b/mw/Rest.d.ts
index d412830..a886aa3 100644
--- a/mw/Rest.d.ts
+++ b/mw/Rest.d.ts
@@ -1,13 +1,9 @@
-export interface RestOptions {
-    ajax: JQuery.AjaxSettings;
-}
-
 export type RestResponse = Record<string, any>; // Unknown JSON object
 
 declare global {
     namespace mw {
         /**
-         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Rest
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Rest.html
          */
         class Rest {
             /**
@@ -15,6 +11,7 @@ declare global {
              * MediaWiki server. mw.Rest objects represent the REST API of a particular
              * MediaWiki server.
              *
+             * @example
              * ```js
              * var api = new mw.Rest();
              * api.get( '/v1/page/Main_Page/html' )
@@ -23,10 +20,10 @@ declare global {
              * } );
              *
              * api.post( '/v1/page/Main_Page', {
-             *      token: 'anon_token',
-             *      source: 'Lörem Ipsüm',
-             *      comment: 'tästing',
-             *      title: 'My_Page'
+             *     token: 'anon_token',
+             *     source: 'Lörem Ipsüm',
+             *     comment: 'tästing',
+             *     title: 'My_Page'
              * }, {
              *     'authorization': 'token'
              * } )
@@ -34,98 +31,114 @@ declare global {
              *     console.log( data );
              * } );
              * ```
-             *
-             * @param {Partial<RestOptions>} [options]
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Rest-method-constructor
+             * @param {Rest.Options} [options] See {@link mw.Rest.Options}
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Rest.html#Rest
              */
-            constructor(options?: Partial<RestOptions>);
+            constructor(options?: Rest.Options);
 
-            private defaults: RestOptions;
+            private defaults: Required<Rest.Options>;
 
             /**
              * Abort all unfinished requests issued by this Api object.
              *
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Rest-method-abort
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Rest.html#abort
              */
             abort(): void;
 
             /**
-             * Perform REST API get request.
+             * Perform the API call.
              *
              * @param {string} path
-             * @param {Object.<string, any>} query
+             * @param {JQuery.AjaxSettings} [ajaxOptions]
+             * @returns {JQuery.Promise<RestResponse>} Done: API response data and the jqXHR object.
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Api.html#ajax
+             */
+            ajax(path: string, ajaxOptions?: JQuery.AjaxSettings): JQuery.Promise<RestResponse>;
+
+            /**
+             * Perform REST API DELETE request.
+             *
+             * Note: only sending `application/json` is currently supported.
+             *
+             * @param {string} path
+             * @param {Object.<string, any>} body
              * @param {Object.<string, any>} [headers]
              * @returns {JQuery.Promise<RestResponse>}
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Rest-method-get
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Rest.html#delete
              */
-            get(
+            delete(
                 path: string,
-                query: Record<string, any>,
+                body: Record<string, any>,
                 headers?: Record<string, any>
             ): JQuery.Promise<RestResponse>;
 
             /**
-             * Perform REST API post request.
-             *
-             * Note: only sending application/json is currently supported.
+             * Perform REST API get request.
              *
              * @param {string} path
-             * @param {Object.<string, any>} body
+             * @param {Object.<string, any>} query
              * @param {Object.<string, any>} [headers]
              * @returns {JQuery.Promise<RestResponse>}
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Rest-method-post
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Rest.html#get
              */
-            post(
+            get(
                 path: string,
-                body: Record<string, any>,
+                query: Record<string, any>,
                 headers?: Record<string, any>
             ): JQuery.Promise<RestResponse>;
 
             /**
-             * Perform REST API PUT request.
+             * Perform REST API post request.
              *
-             * Note: only sending application/json is currently supported.
+             * Note: only sending `application/json` is currently supported.
              *
+             * @since 1.42 - body parameter is optional.
              * @param {string} path
-             * @param {Object.<string, any>} body
+             * @param {Object.<string, any>} [body]
              * @param {Object.<string, any>} [headers]
              * @returns {JQuery.Promise<RestResponse>}
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Rest-method-put
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Rest.html#post
              */
-            put(
+            post(
                 path: string,
-                body: Record<string, any>,
+                body?: Record<string, any>,
                 headers?: Record<string, any>
             ): JQuery.Promise<RestResponse>;
 
             /**
-             * Perform REST API DELETE request.
+             * Perform REST API PUT request.
              *
-             * Note: only sending application/json is currently supported.
+             * Note: only sending `application/json` is currently supported.
              *
              * @param {string} path
              * @param {Object.<string, any>} body
              * @param {Object.<string, any>} [headers]
              * @returns {JQuery.Promise<RestResponse>}
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Rest-method-delete
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Rest.html#put
              */
-            delete(
+            put(
                 path: string,
                 body: Record<string, any>,
                 headers?: Record<string, any>
             ): JQuery.Promise<RestResponse>;
+        }
 
+        namespace Rest {
             /**
-             * Perform the API call.
-             *
-             * @param {string} path
-             * @param {JQuery.AjaxSettings} [ajaxOptions]
-             * @returns {JQuery.Promise<RestResponse>} Done: API response data and the jqXHR object.
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Api-method-ajax
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Rest.html#.Options
              */
-            ajax(path: string, ajaxOptions?: JQuery.AjaxSettings): JQuery.Promise<RestResponse>;
+            interface Options {
+                /**
+                 * Default options for {@link Rest.ajax ajax()} calls. Can be overridden by passing `options` to
+                 * the {@link mw.Rest} constructor.
+                 */
+                ajax?: JQuery.AjaxSettings;
+            }
         }
     }
 }
 
+/** @deprecated Use `mw.Rest.Options` instead. Note that `RestOptions` is strictly equivalent to `Required<mw.Rest.Options>` as properties are now optional for consistency. */
+export type RestOptions = Required<mw.Rest.Options>;
+
 export {};
diff --git a/mw/Title.d.ts b/mw/Title.d.ts
index b03910d..2941e65 100644
--- a/mw/Title.d.ts
+++ b/mw/Title.d.ts
@@ -2,124 +2,152 @@ import { QueryParams } from "./Uri";
 
 export type TitleLike = string | mw.Title;
 
+/**
+ * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Title.html#~TitleExistenceStore
+ */
+interface TitleExistenceStore {
+    /**
+     * Keyed by title. Boolean true value indicates page does exist.
+     */
+    pages: { [title: string]: boolean };
+
+    /**
+     * The setter function. Returns a boolean.
+     *
+     * Example to declare existing titles:
+     *
+     * ```js
+     * Title.exist.set( ['User:John_Doe', ...] );
+     * ```
+     *
+     * Example to declare titles nonexistent:
+     *
+     * ```js
+     * Title.exist.set( ['File:Foo_bar.jpg', ...], false );
+     * ```
+     *
+     * @param {string|string[]} titles Title(s) in strict prefixedDb title form
+     * @param {boolean} [state=true] State of the given titles
+     * @returns {boolean}
+     */
+    set(titles: string | string[], state?: boolean): boolean;
+}
+
+interface UserInputOptions {
+    /**
+     * Makes sure that a file is uploadable under the title returned.
+     * There are pages in the file namespace under which file upload is impossible.
+     * Automatically assumed if the title is created in the Media namespace.
+     * Defaults to true.
+     */
+    forUploading?: boolean;
+}
+
 declare global {
     namespace mw {
         /**
-         * Parse titles into an object structure. Note that when using the constructor
-         * directly, passing invalid titles will result in an exception. Use {@link newFromText} to use the
-         * logic directly and get null for invalid titles which is easier to work with.
+         * Library for constructing MediaWiki titles.
          *
          * Note that in the constructor and {@link newFromText} method, `namespace` is the **default** namespace
          * only, and can be overridden by a namespace prefix in `title`. If you do not want this behavior,
-         * use {@link makeTitle}. Compare:
+         * use {@link makeTitle}.
          *
+         * @example
          * ```js
-         * new mw.Title( 'Foo', NS_TEMPLATE ).getPrefixedText();                  // => 'Template:Foo'
-         * mw.Title.newFromText( 'Foo', NS_TEMPLATE ).getPrefixedText();          // => 'Template:Foo'
-         * mw.Title.makeTitle( NS_TEMPLATE, 'Foo' ).getPrefixedText();            // => 'Template:Foo'
+         * new mw.Title( 'Foo', NS_TEMPLATE ).getPrefixedText();
+         * // => 'Template:Foo'
+         * mw.Title.newFromText( 'Foo', NS_TEMPLATE ).getPrefixedText();
+         * // => 'Template:Foo'
+         * mw.Title.makeTitle( NS_TEMPLATE, 'Foo' ).getPrefixedText();
+         * // => 'Template:Foo'
          *
-         * new mw.Title( 'Category:Foo', NS_TEMPLATE ).getPrefixedText();         // => 'Category:Foo'
-         * mw.Title.newFromText( 'Category:Foo', NS_TEMPLATE ).getPrefixedText(); // => 'Category:Foo'
-         * mw.Title.makeTitle( NS_TEMPLATE, 'Category:Foo' ).getPrefixedText();   // => 'Template:Category:Foo'
+         * new mw.Title( 'Category:Foo', NS_TEMPLATE ).getPrefixedText();
+         * // => 'Category:Foo'
+         * mw.Title.newFromText( 'Category:Foo', NS_TEMPLATE ).getPrefixedText();
+         * // => 'Category:Foo'
+         * mw.Title.makeTitle( NS_TEMPLATE, 'Category:Foo' ).getPrefixedText();
+         * // => 'Template:Category:Foo'
          *
-         * new mw.Title( 'Template:Foo', NS_TEMPLATE ).getPrefixedText();         // => 'Template:Foo'
-         * mw.Title.newFromText( 'Template:Foo', NS_TEMPLATE ).getPrefixedText(); // => 'Template:Foo'
-         * mw.Title.makeTitle( NS_TEMPLATE, 'Template:Foo' ).getPrefixedText();   // => 'Template:Template:Foo'
+         * new mw.Title( 'Template:Foo', NS_TEMPLATE ).getPrefixedText();
+         * // => 'Template:Foo'
+         * mw.Title.newFromText( 'Template:Foo', NS_TEMPLATE ).getPrefixedText();
+         * // => 'Template:Foo'
+         * mw.Title.makeTitle( NS_TEMPLATE, 'Template:Foo' ).getPrefixedText();
+         * // => 'Template:Template:Foo'
          * ```
-         *
          * @since 1.18
-         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Title
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Title.html
          */
         class Title {
             /**
              * Store page existence
              *
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Title-static-property-exist
-             */
-            static exist: {
-                /**
-                 * Keyed by title. Boolean true value indicates page does exist.
-                 */
-                pages: { [title: string]: boolean };
-
-                /**
-                 * The setter function.
-                 *
-                 * Example to declare existing titles:
-                 *
-                 * ```js
-                 * Title.exist.set( ['User:John_Doe', ...] );
-                 * ```
-                 *
-                 * Example to declare titles nonexistent:
-                 *
-                 * ```js
-                 * Title.exist.set( ['File:Foo_bar.jpg', ...], false );
-                 * ```
-                 *
-                 * @param {string|string[]} titles Title(s) in strict prefixedDb title form
-                 * @param {boolean} [state=true] State of the given titles
-                 * @returns {boolean}
-                 */
-                set(titles: string | string[], state?: boolean): boolean;
-            };
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Title.html#.exist
+             */
+            static exist: TitleExistenceStore;
 
             /**
+             * Parse titles into an object structure. Note that when using the constructor
+             * directly, passing invalid titles will result in an exception. See {@link newFromText} to use the
+             * logic directly and get null for invalid titles which is easier to work with.
+             *
              * @param {string} title Title of the page. If no second argument given,
              *  this will be searched for a namespace
              * @param {number} [namespace=NS_MAIN] If given, will used as default namespace for the given title
              * @throws {Error} When the title is invalid
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Title-method-constructor
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Title.html#Title
              */
             constructor(title: string, namespace?: number);
 
             /**
-             * Check the title can have an associated talk page
+             * Check the title can have an associated talk page.
              *
              * @returns {boolean} The title can have an associated talk page
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Title-method-canHaveTalkPage
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Title.html#canHaveTalkPage
              */
             canHaveTalkPage(): boolean;
 
             /**
-             * Whether this title exists on the wiki.
+             * Whether this title exists on the wiki. See {@link mw.Title.exists}.
              *
              * @returns {boolean|null} Boolean if the information is available, otherwise null
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Title-method-exists
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Title.html#exists
              */
             exists(): boolean | null;
 
             /**
-             * Get the extension of the page name (if any)
+             * Get the extension of the page name (if any).
              *
              * @returns {string|null} Name extension or null if there is none
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Title-method-getExtension
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Title.html#getExtension
              */
             getExtension(): string | null;
 
             /**
              * Get the page name as if it is a file name, without extension or namespace prefix,
              * in the human-readable form with spaces instead of underscores. For example, the title
-             * "File:Example_image.svg" will be returned as "Example image".
+             * `File:Example_image.svg` will be returned as `Example image`.
              *
              * Note that this method will work for non-file titles but probably give nonsensical results.
-             * A title like "User:Dr._J._Fail" will be returned as "Dr. J"! Use {@link getMainText} instead.
+             * A title like `User:Dr._J._Fail` will be returned as `Dr. J`! Use {@link getMainText} instead.
              *
+             * @since 1.40
              * @returns {string}
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Title-method-getFileNameTextWithoutExtension
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Title.html#getFileNameTextWithoutExtension
              */
             getFileNameTextWithoutExtension(): string;
 
             /**
              * Get the page name as if it is a file name, without extension or namespace prefix,
              * in the canonical form with underscores instead of spaces. For example, the title
-             * "File:Example_image.svg" will be returned as "Example_image".
+             * `File:Example_image.svg` will be returned as `Example_image`.
              *
              * Note that this method will work for non-file titles but probably give nonsensical results.
-             * A title like "User:Dr._J._Fail" will be returned as "Dr._J"! Use {@link getMain} instead.
+             * A title like `User:Dr._J._Fail` will be returned as `Dr._J`! Use {@link getMain} instead.
              *
+             * @since 1.40
              * @returns {string}
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Title-method-getFileNameWithoutExtension
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Title.html#getFileNameWithoutExtension
              */
             getFileNameWithoutExtension(): string;
 
@@ -130,100 +158,100 @@ declare global {
              * the value is not url encoded.
              *
              * @returns {string|null}
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Title-method-getFragment
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Title.html#getFragment
              */
             getFragment(): string | null;
 
             /**
-             * Get the main page name
+             * Get the main page name.
              *
-             * Example: "Example_image.svg" for "File:Example_image.svg".
+             * Example: `Example_image.svg` for `File:Example_image.svg`.
              *
              * @returns {string}
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Title-method-getMain
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Title.html#getMain
              */
             getMain(): string;
 
             /**
-             * Get the main page name (transformed by #text)
+             * Get the main page name (transformed by {@link text()}).
              *
-             * Example: "Example image.svg" for "File:Example_image.svg".
+             * Example: `Example image.svg` for `File:Example_image.svg`.
              *
              * @returns {string}
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Title-method-getMainText
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Title.html#getMainText
              */
             getMainText(): string;
 
             /**
              * Get the page name as if it is a file name, without extension or namespace prefix. Warning,
-             * this is usually not what you want! A title like "User:Dr._J._Fail" will be returned as
-             * "Dr. J"! Use {@link getMain} or {@link getMainText} for the actual page name.
+             * this is usually not what you want! A title like `User:Dr._J._Fail` will be returned as
+             * `Dr. J`! Use {@link getMain} or {@link getMainText} for the actual page name.
              *
              * @deprecated since 1.40, use {@link getFileNameWithoutExtension} instead
              * @returns {string} File name without file extension, in the canonical form with underscores
-             *  instead of spaces. For example, the title "File:Example_image.svg" will be returned as
-             *  "Example_image".
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Title-method-getName
+             *  instead of spaces. For example, the title `File:Example_image.svg` will be returned as
+             *  `Example_image`.
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Title.html#getName
              */
             getName(): string;
 
             /**
-             * Get the namespace number
+             * Get the namespace number.
              *
-             * Example: 6 for "File:Example_image.svg".
+             * Example: 6 for `File:Example_image.svg`.
              *
              * @returns {number}
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Title-method-getNamespaceId
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Title.html#getNamespaceId
              */
             getNamespaceId(): number;
 
             /**
-             * Get the namespace prefix (in the content language)
+             * Get the namespace prefix (in the content language).
              *
-             * Example: "File:" for "File:Example_image.svg".
+             * Example: `File:` for `File:Example_image.svg`.
              * In #NS_MAIN this is '', otherwise namespace name plus ':'
              *
              * @returns {string}
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Title-method-getNamespacePrefix
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Title.html#getNamespacePrefix
              */
             getNamespacePrefix(): string;
 
             /**
              * Get the page name as if it is a file name, without extension or namespace prefix. Warning,
-             * this is usually not what you want! A title like "User:Dr._J._Fail" will be returned as
-             * "Dr. J"! Use {@link getMainText} for the actual page name.
+             * this is usually not what you want! A title like `User:Dr._J._Fail` will be returned as
+             * `Dr. J`! Use {@link getMainText} for the actual page name.
              *
              * @deprecated since 1.40, use {@link getFileNameTextWithoutExtension} instead
              * @returns {string} File name without file extension, formatted with spaces instead of
-             *  underscores. For example, the title "File:Example_image.svg" will be returned as
-             *  "Example image".
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Title-method-getNameText
+             *  underscores. For example, the title `File:Example_image.svg` will be returned as
+             *  `Example image`.
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Title.html#getNameText
              */
             getNameText(): string;
 
             /**
-             * Get the full page name
+             * Get the full page name.
              *
-             * Example: "File:Example_image.svg".
+             * Example: `File:Example_image.svg`.
              * Most useful for API calls, anything that must identify the "title".
              *
              * @returns {string}
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Title-method-getPrefixedDb
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Title.html#getPrefixedDb
              */
             getPrefixedDb(): string;
 
             /**
-             * Get the full page name (transformed by #text)
+             * Get the full page name (transformed by {@link text()}).
              *
-             * Example: "File:Example image.svg" for "File:Example_image.svg".
+             * Example: `File:Example image.svg` for `File:Example_image.svg`.
              *
              * @returns {string}
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Title-method-getPrefixedText
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Title.html#getPrefixedText
              */
             getPrefixedText(): string;
 
             /**
-             * Get the page name relative to a namespace
+             * Get the page name relative to a namespace.
              *
              * Example:
              *
@@ -233,55 +261,55 @@ declare global {
              *
              * @param {number} namespace The namespace to be relative to
              * @returns {string}
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Title-method-getRelativeText
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Title.html#getRelativeText
              */
             getRelativeText(namespace: number): string;
 
             /**
-             * Get the title for the subject page of a talk page
+             * Get the title for the subject page of a talk page.
              *
              * @returns {Title|null} The title for the subject page of a talk page, null if not available
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Title-method-getSubjectPage
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Title.html#getSubjectPage
              */
             getSubjectPage(): Title | null;
 
             /**
-             * Get the title for the associated talk page
+             * Get the title for the associated talk page.
              *
              * @returns {Title|null} The title for the associated talk page, null if not available
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Title-method-getTalkPage
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Title.html#getTalkPage
              */
             getTalkPage(): Title | null;
 
             /**
-             * Get the URL to this title
+             * Get the URL to this title. See {@link mw.util.getUrl()}.
              *
              * @param {QueryParams} [params] A mapping of query parameter names to values,
              *     e.g. `{ action: 'edit' }`.
              * @returns {string}
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Title-method-getUrl
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Title.html#getUrl
              */
             getUrl(params?: QueryParams): string;
 
             /**
-             * Check if the title is in a talk namespace
+             * Check if the title is in a talk namespace.
              *
              * @returns {boolean} The title is in a talk namespace
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Title-method-isTalkPage
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Title.html#isTalkPage
              */
             isTalkPage(): boolean;
 
             /**
-             * Alias of {@link getPrefixedDb}
+             * Alias of {@link getPrefixedDb}.
              *
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Title-method-toString
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Title.html#toString
              */
             toString(): string;
 
             /**
-             * Alias of {@link getPrefixedText}
+             * Alias of {@link getPrefixedText}.
              *
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Title-method-toText
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Title.html#toText
              */
             toText(): string;
 
@@ -291,26 +319,26 @@ declare global {
              * @param {string|Title} title prefixed db-key name (string) or instance of Title
              * @returns {boolean|null} Boolean if the information is available, otherwise null
              * @throws {Error} If title is not a string or mw.Title
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Title-static-method-exists
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Title.html#.exists
              */
             static exists(title: TitleLike): boolean | null;
 
             /**
-             * Check if a given namespace is a talk namespace
+             * Check if a given namespace is a talk namespace.
              *
              * See NamespaceInfo::isTalk in PHP
              *
              * @param {number} namespaceId Namespace ID
              * @returns {boolean} Namespace is a talk namespace
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Title-method-isTalkNamespace
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Title.html#.isTalkNamespace
              */
             static isTalkNamespace(namespaceId: number): boolean;
 
             /**
              * Constructor for Title objects with predefined namespace.
              *
-             * Unlike {@link newFromText} or {@link constructor}, this function doesn't allow the given `namespace` to be
-             * overridden by a namespace prefix in `title`. See {@link constructor} for details about this behavior.
+             * Unlike {@link newFromText} or the constructor, this function doesn't allow the given `namespace` to be
+             * overridden by a namespace prefix in `title`. See the constructor documentation for details about this behavior.
              *
              * The single exception to this is when `namespace` is 0, indicating the main namespace. The
              * function behaves like {@link newFromText} in that case.
@@ -318,7 +346,7 @@ declare global {
              * @param {number} namespace Namespace to use for the title
              * @param {string} title
              * @returns {Title|null} A valid Title object or null if the title is invalid
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Title-static-method-makeTitle
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Title.html#.makeTitle
              */
             static makeTitle(namespace: number, title: string): Title | null;
 
@@ -328,22 +356,22 @@ declare global {
              * Returns null on fatal errors.
              *
              * @param {string} uncleanName The unclean file name including file extension but
-             *   without namespace
+             *  without namespace
              * @returns {Title|null} A valid Title object or null if the title is invalid
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Title-static-method-newFromFileName
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Title.html#.newFromFileName
              */
             static newFromFileName(uncleanName: string): Title | null;
 
             /**
-             * Get the file title from an image element
+             * Get the file title from an image element.
              *
+             * @example
              * ```js
              * var title = mw.Title.newFromImg( imageNode );
              * ```
-             *
              * @param {HTMLElement|JQuery} img The image to use as a base
              * @returns {Title|null} The file title or null if unsuccessful
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Title-static-method-newFromImg
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Title.html#.newFromImg
              */
             static newFromImg(img: HTMLElement | JQuery): Title | null;
 
@@ -357,29 +385,25 @@ declare global {
              * @param {string} title
              * @param {number} [namespace=NS_MAIN] Default namespace
              * @returns {Title|null} A valid Title object or null if the title is invalid
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Title-static-method-newFromText
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Title.html#.newFromText
              */
             static newFromText(title: string, namespace?: number): Title | null;
 
             /**
              * Constructor for Title objects from user input altering that input to
-             * produce a title that MediaWiki will accept as legal
+             * produce a title that MediaWiki will accept as legal.
              *
              * @param {string} title
              * @param {number} [defaultNamespace=NS_MAIN]
              *  If given, will used as default namespace for the given title.
-             * @param {Object} [options] additional options
-             * @param {boolean} [options.forUploading=true]
-             *  Makes sure that a file is uploadable under the title returned.
-             *  There are pages in the file namespace under which file upload is impossible.
-             *  Automatically assumed if the title is created in the Media namespace.
+             * @param {UserInputOptions} [options] additional options
              * @returns {Title|null} A valid Title object or null if the input cannot be turned into a valid title
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Title-static-method-newFromUserInput
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Title.html#.newFromUserInput
              */
             static newFromUserInput(
                 title: string,
                 defaultNamespace?: number,
-                options?: { forUploading?: boolean }
+                options?: UserInputOptions
             ): Title | null;
 
             /**
@@ -389,7 +413,7 @@ declare global {
              *
              * @param {string} extension File extension (without the leading dot)
              * @returns {string} File extension in canonical form
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Title-method-normalizeExtension
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Title.html#.normalizeExtension
              */
             static normalizeExtension(extension: string): string;
 
@@ -398,18 +422,18 @@ declare global {
              *
              * @param {string} chr Unicode character
              * @returns {string} Unicode character, in upper case, according to the same rules as in PHP
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Title-method-phpCharToUpper
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Title.html#.phpCharToUpper
              */
             static phpCharToUpper(chr: string): string;
 
             /**
-             * Check if signature buttons should be shown in a given namespace
+             * Check if signature buttons should be shown in a given namespace.
              *
              * See NamespaceInfo::wantSignatures in PHP
              *
              * @param {number} namespaceId Namespace ID
              * @returns {boolean} Namespace is a signature namespace
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Title-method-wantSignaturesNamespace
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Title.html#.wantSignaturesNamespace
              */
             static wantSignatureNamespace(namespaceId: number): boolean;
         }
diff --git a/mw/Upload.d.ts b/mw/Upload.d.ts
index 222489a..589f97a 100644
--- a/mw/Upload.d.ts
+++ b/mw/Upload.d.ts
@@ -1,4 +1,4 @@
-import { ApiOptions, ApiResponse } from "./Api";
+import { ApiResponse } from "./Api";
 
 declare global {
     namespace mw {
@@ -45,6 +45,8 @@ declare global {
          *     } );
          * } );
          * ```
+         *
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Upload.html
          */
         class Upload {
             /**
@@ -91,15 +93,17 @@ declare global {
              * } );
              * ```
              *
-             * @param {Api|Partial<ApiOptions>} [apiconfig] A mw.Api object (or subclass), or configuration
+             * @param {Api|Api.Options} [apiconfig] A mw.Api object (or subclass), or configuration
              *     to pass to the constructor of mw.Api.
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Upload.html#Upload
              */
-            constructor(apiconfig?: Api | Partial<ApiOptions>);
+            constructor(apiconfig?: Api | Api.Options);
 
             /**
              * Finish a stash upload.
              *
              * @returns {JQuery.Promise<ApiResponse>}
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Upload.html#finishStashUpload
              */
             finishStashUpload(): JQuery.Promise<ApiResponse>;
 
@@ -107,6 +111,7 @@ declare global {
              * Get the mw.Api instance used by this Upload object.
              *
              * @returns {JQuery.Promise<Api>}
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Upload.html#getApi
              */
             getApi(): JQuery.Promise<Api>;
 
@@ -115,6 +120,7 @@ declare global {
              *
              * @param {string} path
              * @returns {string}
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Upload.html#getBasename
              */
             getBasename(path: string): string;
 
@@ -122,6 +128,7 @@ declare global {
              * Get the current value of the edit comment for the upload.
              *
              * @returns {string}
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Upload.html#getComment
              */
             getComment(): string;
 
@@ -129,6 +136,7 @@ declare global {
              * Get the file being uploaded.
              *
              * @returns {HTMLInputElement|File|Blob}
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Upload.html#getFile
              */
             getFile(): HTMLInputElement | File | Blob;
 
@@ -136,6 +144,7 @@ declare global {
              * Get the filename, to be finalized on upload.
              *
              * @returns {string}
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Upload.html#getFilename
              */
             getFilename(): string;
 
@@ -145,6 +154,7 @@ declare global {
              * beforehand.
              *
              * @returns {ApiResponse|undefined}
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Upload.html#getImageInfo
              */
             getImageInfo(): ApiResponse | undefined;
 
@@ -152,6 +162,7 @@ declare global {
              * Gets the state of the upload.
              *
              * @returns {Upload.State}
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Upload.html#getState
              */
             getState(): Upload.State;
 
@@ -159,6 +170,7 @@ declare global {
              * Gets details of the current state.
              *
              * @returns {any}
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Upload.html#getStateDetails
              */
             getStateDetails(): any;
 
@@ -166,6 +178,7 @@ declare global {
              * Get the text of the file page, to be created on file upload.
              *
              * @returns {string}
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Upload.html#getText
              */
             getText(): string;
 
@@ -173,6 +186,7 @@ declare global {
              * Get the boolean for whether the file will be watchlisted after upload.
              *
              * @returns {boolean}
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Upload.html#getWatchlist
              */
             getWatchlist(): boolean;
 
@@ -180,6 +194,7 @@ declare global {
              * Set the edit comment for the upload.
              *
              * @param {string} comment
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Upload.html#setComment
              */
             setComment(comment: string): void;
 
@@ -187,6 +202,7 @@ declare global {
              * Set the file to be uploaded.
              *
              * @param {HTMLInputElement|File|Blob} file
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Upload.html#setFile
              */
             setFile(file: HTMLInputElement | File | Blob): void;
 
@@ -194,6 +210,7 @@ declare global {
              * Set the stashed file to finish uploading.
              *
              * @param {string} filekey
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Upload.html#setFilekey
              */
             setFilekey(filekey: string): void;
 
@@ -201,11 +218,14 @@ declare global {
              * Set the filename, to be finalized on upload.
              *
              * @param {string} filename
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Upload.html#setFilename
              */
             setFilename(filename: string): void;
 
             /**
              * Sets the filename based on the filename as it was on the upload.
+             *
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Upload.html#setFilenameFromFile
              */
             setFilenameFromFile(): void;
 
@@ -214,6 +234,7 @@ declare global {
              *
              * @param {Upload.State} state
              * @param {any} stateDetails
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Upload.html#setState
              */
             setState(state: Upload.State, stateDetails: any): void;
 
@@ -221,6 +242,7 @@ declare global {
              * Set the text of the file page, to be created on file upload.
              *
              * @param {string} text
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Upload.html#setText
              */
             setText(text: string): void;
 
@@ -228,6 +250,7 @@ declare global {
              * Set whether the file should be watchlisted after upload.
              *
              * @param {boolean} watchlist
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Upload.html#setWatchlist
              */
             setWatchlist(watchlist: boolean): void;
 
@@ -235,6 +258,7 @@ declare global {
              * Upload the file directly.
              *
              * @returns {JQuery.Promise<ApiResponse>}
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Upload.html#upload
              */
             upload(): JQuery.Promise<ApiResponse>;
 
@@ -242,6 +266,7 @@ declare global {
              * Upload the file to the stash to be completed later.
              *
              * @returns {JQuery.Promise<ApiResponse>}
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Upload.html#uploadToStash
              */
             uploadToStash(): JQuery.Promise<ApiResponse>;
         }
@@ -249,35 +274,37 @@ declare global {
         namespace Upload {
             /**
              * State of uploads represented in simple terms.
+             *
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Upload.html#.State
              */
             enum State {
                 /**
-                 * Upload not yet started
+                 * Upload not yet started.
                  */
                 NEW,
 
                 /**
-                 * Upload finished, but there was a warning
+                 * Upload finished, but there was a warning.
                  */
                 WARNING,
 
                 /**
-                 * Upload finished, but there was an error
+                 * Upload finished, but there was an error.
                  */
                 ERROR,
 
                 /**
-                 * Upload in progress
+                 * Upload in progress.
                  */
                 UPLOADING,
 
                 /**
-                 * Upload finished, but not published, call #finishStashUpload
+                 * Upload finished, but not published, call {@link Upload.finishStashUpload finishStashUpload}.
                  */
                 STASHED,
 
                 /**
-                 * Upload finished and published
+                 * Upload finished and published.
                  */
                 UPLOADED,
             }
diff --git a/mw/Uri.d.ts b/mw/Uri.d.ts
index f748e3b..4647dfc 100644
--- a/mw/Uri.d.ts
+++ b/mw/Uri.d.ts
@@ -1,37 +1,20 @@
 export type QueryParams = Record<string, string | number | boolean | null | undefined>;
 
-interface UriOptions {
-    /**
-     * Trigger strict mode parsing of the url.
-     */
-    strictMode: boolean;
-    /**
-     * Whether to let duplicate query parameters override each other (`true`) or automagically convert them to an array (`false`).
-     */
-    overrideKeys: boolean;
-    /**
-     * Whether to parse array query parameters (e.g. `&foo[0]=a&foo[1]=b` or `&foo[]=a&foo[]=b`) or leave them alone.
-     * Currently this does not handle associative or multi-dimensional arrays, but that may be improved in the future.
-     * Implies `overrideKeys: true` (query parameters without `[...]` are not parsed as arrays).
-     */
-    arrayParams: boolean;
-}
-
 interface UriParser {
-    strict: RegExp;
     loose: RegExp;
+    strict: RegExp;
 }
 
 declare global {
     namespace mw {
         /**
-         * A factory method to create an mw.Uri class with a default location to resolve relative URLs
+         * A factory method to create an {@link mw.Uri} class with a default location to resolve relative URLs
          * against (including protocol-relative URLs).
          *
          * @param {string|Function} documentLocation A full url, or function returning one.
          *  If passed a function, the return value may change over time and this will be honoured. (T74334)
          * @returns {Function} An mw.Uri class constructor
-         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw-method-UriRelative
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.html#.UriRelative
          */
         function UriRelative(documentLocation: string | (() => string)): typeof Uri;
 
@@ -88,55 +71,55 @@ declare global {
          * Parsing based on parseUri 1.2.2 (c) Steven Levithan <http://stevenlevithan.com>, MIT License.
          * <http://stevenlevithan.com/demo/parseuri/js/>
          *
-         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Uri
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Uri.html
          */
         class Uri {
             /**
-             * For example `top`
+             * For example `top`.
              *
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Uri-property-fragment
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Uri.html#fragment
              */
             fragment: string | undefined;
             /**
-             * For example `www.example.com` (always present)
+             * For example `www.example.com` (always present).
              *
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Uri-property-host
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Uri.html#host
              */
             host: string;
             /**
-             * For example `pwd`
+             * For example `pwd`.
              *
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Uri-property-password
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Uri.html#password
              */
             password: string | undefined;
             /**
-             * For example `/dir/dir.2/index.htm` (always present)
+             * For example `/dir/dir.2/index.htm` (always present).
              *
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Uri-property-path
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Uri.html#path
              */
             path: string;
             /**
-             * For example `81`
+             * For example `81`.
              *
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Uri-property-port
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Uri.html#port
              */
             port: string | undefined;
             /**
-             * For example `http` (always present)
+             * For example `http` (always present).
              *
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Uri-property-protocol
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Uri.html#protocol
              */
             protocol: string;
             /**
-             * For example `{ a: '0', b: '', c: 'value' }` (always present)
+             * For example `{ a: '0', b: '', c: 'value' }` (always present).
              *
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Uri-property-query
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Uri.html#query
              */
             query: QueryParams;
             /**
-             * For example `usr`
+             * For example `usr`.
              *
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Uri-property-user
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Uri.html#user
              */
             user: string | undefined;
 
@@ -146,15 +129,11 @@ declare global {
              * These are gnarly expressions. For improved readability, they have been moved to a separate
              * file where they make use of named capture groups. That syntax isn't valid in JavaScript ES5,
              * so the server-side strips these before delivering to the client.
-             *
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Uri-static-property-parser
              */
             private static parser: UriParser;
 
             /**
              * The order here matches the order of captured matches in the `parser` property regexes.
-             *
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Uri-static-property-properties
              */
             private static properties: [
                 "protocol",
@@ -168,29 +147,28 @@ declare global {
             ];
 
             /**
-             * Construct a new URI object. Throws error if arguments are illegal/impossible, or
-             * otherwise don't parse.
+             * Create and manipulate MediaWiki URIs.
              *
-             * @param {Object|string} [uri] URI string, or an Object with appropriate properties (especially
+             * @param {string|Uri|Object.<string,string>} [uri] URI string, or an Object with appropriate properties (especially
              *  another URI object to clone). Object must have non-blank `protocol`, `host`, and `path`
              *  properties. If omitted (or set to `undefined`, `null` or empty string), then an object
              *  will be created for the default `uri` of this constructor (`location.href` for mw.Uri,
-             *  other values for other instances -- see mw.UriRelative for details).
-             * @param {Partial<UriOptions>|boolean} [options] Object with options, or (backwards compatibility) a boolean
+             *  other values for other instances -- see {@link mw.UriRelative} for details).
+             * @param {Uri.UriOptions|boolean} [options] Object with options, or (backwards compatibility) a boolean
              *  for strictMode
              * @throws {Error} when the query string or fragment contains an unknown % sequence
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Uri-method-constructor
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Uri.html#Uri
              */
             constructor(
                 uri?: string | Uri | Partial<Record<typeof Uri.properties[number], string>>,
-                options?: Partial<UriOptions> | boolean
+                options?: Uri.UriOptions | boolean
             );
 
             /**
-             * Clone this URI
+             * Clone this URI.
              *
              * @returns {Uri} New URI object with same properties
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Uri-method-clone
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Uri.html#clone
              */
             clone(): Uri;
 
@@ -200,7 +178,7 @@ declare global {
              * @param {QueryParams} parameters Query parameters to add to ours (or to override ours with) as an
              *  object
              * @returns {Uri} This URI object
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Uri-method-extend
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Uri.html#extend
              */
             extend(parameters: QueryParams): Uri;
 
@@ -210,7 +188,7 @@ declare global {
              * In most real-world URLs this is simply the hostname, but the definition of 'authority' section is more general.
              *
              * @returns {string}
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Uri-method-getAuthority
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Uri.html#getAuthority
              */
             getAuthority(): string;
 
@@ -218,7 +196,7 @@ declare global {
              * Get host and port section of a URI.
              *
              * @returns {string}
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Uri-method-getHostPort
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Uri.html#getHostPort
              */
             getHostPort(): string;
 
@@ -228,7 +206,7 @@ declare global {
              * Does not preserve the original order of arguments passed in the URI. Does handle escaping.
              *
              * @returns {string}
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Uri-method-getQueryString
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Uri.html#getQueryString
              */
             getQueryString(): string;
 
@@ -236,7 +214,7 @@ declare global {
              * Get everything after the authority section of the URI.
              *
              * @returns {string}
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Uri-method-getRelativePath
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Uri.html#getRelativePath
              */
             getRelativePath(): string;
 
@@ -244,7 +222,7 @@ declare global {
              * Get user and password section of a URI.
              *
              * @returns {string}
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Uri-method-getUserInfo
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Uri.html#getUserInfo
              */
             getUserInfo(): string;
 
@@ -260,7 +238,7 @@ declare global {
              * is important.
              *
              * @returns {string} The URI string
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Uri-method-toString
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Uri.html#toString
              */
             toString(): `${string}://${string}`;
 
@@ -268,11 +246,10 @@ declare global {
              * Parse a string and set our properties accordingly.
              *
              * @param {string} str URI, see constructor.
-             * @param {Partial<UriOptions>} options See constructor.
+             * @param {Uri.UriOptions} options See constructor.
              * @throws {Error} when the query string or fragment contains an unknown % sequence
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Uri-method-parse
              */
-            private parse(str: string, options: Partial<UriOptions>): void;
+            private parse(str: string, options: Uri.UriOptions): void;
 
             /**
              * Decode a url encoded value.
@@ -283,7 +260,7 @@ declare global {
              * @param {string} s String to decode
              * @returns {string} Decoded string
              * @throws {Error} when the string contains an unknown % sequence
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Uri-static-method-decode
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Uri.html#.decode
              */
             static decode(s: string): string;
 
@@ -292,14 +269,39 @@ declare global {
              *
              * Standard encodeURIComponent, with extra stuff to make all browsers work similarly and more
              * compliant with RFC 3986. Similar to rawurlencode from PHP and our JS library
-             * mw.util.rawurlencode, except this also replaces spaces with `+`.
+             * {@link mw.util.rawurlencode}, except this also replaces spaces with `+`.
              *
              * @param {string} s String to encode
              * @returns {string} Encoded string for URI
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Uri-static-method-encode
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Uri.html#.encode
              */
             static encode(s: string): string;
         }
+
+        namespace Uri {
+            /**
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Uri.html#.UriOptions
+             */
+            interface UriOptions {
+                /**
+                 * Whether to parse array query parameters (e.g. `&foo[0]=a&foo[1]=b` or `&foo[]=a&foo[]=b`) or leave them alone.
+                 * Currently this does not handle associative or multi-dimensional arrays, but that may be improved in the future.
+                 * Implies `overrideKeys: true` (query parameters without `[...]` are not parsed as arrays). Defaults to false.
+                 */
+                arrayParams?: boolean;
+
+                /**
+                 * Whether to let duplicate query parameters override each other (`true`) or automagically convert them to an array (`false`).
+                 * Defaults to false.
+                 */
+                overrideKeys?: boolean;
+
+                /**
+                 * Trigger strict mode parsing of the url. Defaults to false.
+                 */
+                strictMode?: boolean;
+            }
+        }
     }
 }
 
diff --git a/mw/cldr.d.ts b/mw/cldr.d.ts
index ac27f04..9cea46d 100644
--- a/mw/cldr.d.ts
+++ b/mw/cldr.d.ts
@@ -2,6 +2,9 @@ declare global {
     namespace mw {
         /**
          * Namespace for CLDR-related utility methods.
+         * Provided by the `mediawiki.cdlr` ResourceLoader module.
+         *
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.cldr.html
          */
         namespace cldr {
             /**
@@ -13,6 +16,7 @@ declare global {
              * @param {number} number
              * @param {string[]} pluralRules
              * @returns {number} plural form index
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.cldr.html#.getPluralForm
              */
             function getPluralForm(number: number, pluralRules: string[]): number;
         }
diff --git a/mw/config.d.ts b/mw/config.d.ts
index ba74e7f..c28faf2 100644
--- a/mw/config.d.ts
+++ b/mw/config.d.ts
@@ -5,13 +5,13 @@ declare global {
         /**
          * Map of configuration values.
          *
-         * Check out {@link https://www.mediawiki.org/wiki/Manual:Interface/JavaScript#mw.config the complete list of configuration values}
+         * Check out {@link https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Interface/JavaScript#mw.config the complete list of configuration values}
          * on mediawiki.org.
          *
          * If `$wgLegacyJavaScriptGlobals` is true, this Map will add its values to the
          * global `window` object.
          *
-         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw-property-config
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.html#.config
          */
         const config: ExtensibleMap<{
             /**
@@ -19,64 +19,64 @@ declare global {
              *
              * In MediaWiki 1.35 and earlier, false and true were used (phab:T85805).
              *
-             * @see https://www.mediawiki.org/wiki/Manual:Interface/JavaScript#debug
+             * @see https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Interface/JavaScript#debug
              */
             debug: boolean | number;
             /**
              * The internal name of the currently used skin.
              *
-             * @see https://www.mediawiki.org/wiki/Manual:Interface/JavaScript#skin
+             * @see https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Interface/JavaScript#skin
              */
             skin: string;
             /**
              * Full URL to the root directory for skins, containing stylesheets and skin-specific scripts. The path does not contain the skin subdirectory, and is not terminated by a "/".
              *
-             * @see https://www.mediawiki.org/wiki/Manual:Interface/JavaScript#stylepath
+             * @see https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Interface/JavaScript#stylepath
              */
             stylepath: string;
             wgActionPaths: Record<string, string>;
             /**
              * Local path, starting at the root, to reference articles, containing a "$1" placeholder that may be replaced by a page title to get a valid URL to that page. Given a valid page title title, a valid URL may be constructed using wgArticlePath.replace('$1', title). See also $wgArticlePath.
              *
-             * @see https://www.mediawiki.org/wiki/Manual:Interface/JavaScript#wgArticlePath
+             * @see https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Interface/JavaScript#wgArticlePath
              */
             wgArticlePath: string;
             /**
              * The IDs of the namespaces treated as case-sensitive by MediaWiki. Determined by the values of them $wgCapitalLinks and $wgCapitalLinksOverrides configuration variables.
              *
-             * @see https://www.mediawiki.org/wiki/Manual:Interface/JavaScript#wgCaseSensitiveNamespaces
+             * @see https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Interface/JavaScript#wgCaseSensitiveNamespaces
              */
             wgCaseSensitiveNamespaces: number[];
             wgCommentCodePointLimit: number;
             /**
              * The language code for the default content language of the wiki.
              *
-             * @see https://www.mediawiki.org/wiki/Manual:Interface/JavaScript#wgContentLanguage
+             * @see https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Interface/JavaScript#wgContentLanguage
              */
             wgContentLanguage: string;
             /**
              * The IDs of the namespaces considered "content namespaces" by MediaWiki. Equivalent to the value of the $wgContentNamespaces configuration variable, with 0 included if it is not already.
              *
-             * @see https://www.mediawiki.org/wiki/Manual:Interface/JavaScript#wgContentNamespaces
+             * @see https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Interface/JavaScript#wgContentNamespaces
              */
             wgContentNamespaces: number[];
             /**
              * The name of the wiki's database.
              *
-             * @see https://www.mediawiki.org/wiki/Manual:Interface/JavaScript#wgDBname
+             * @see https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Interface/JavaScript#wgDBname
              */
             wgDBname: string;
             /**
              * Root path used for extension static assets (e.g. images). Append '/' then the name of the extension to get the root path for a given extension.
              *
-             * @see https://www.mediawiki.org/wiki/Manual:Interface/JavaScript#wgExtensionAssetsPath
+             * @see https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Interface/JavaScript#wgExtensionAssetsPath
              */
             wgExtensionAssetsPath: string;
             wgExtraSignatureNamespaces: number[];
             /**
              * Gives a mapping from namespace IDs to localized namespace names. For each namespace, the object has one entry that has the stringified namespace number as the key and the namespace name as its value. Aliases or canonical names are not included.
              *
-             * @see https://www.mediawiki.org/wiki/Manual:Interface/JavaScript#wgFormattedNamespaces
+             * @see https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Interface/JavaScript#wgFormattedNamespaces
              */
             wgFormattedNamespaces: Record<number, string>;
             wgIllegalFileChars: string;
@@ -84,37 +84,37 @@ declare global {
             /**
              * Gives a mapping from namespace names to namespace IDs. For each namespace name, including localized and canonical names as well as aliases, the object has one entry that has namespace name as the key and the namespace ID as its integer value. The keys are all lowercase, with spaces replaced by underscores.
              *
-             * @see https://www.mediawiki.org/wiki/Manual:Interface/JavaScript#wgNamespaceIds
+             * @see https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Interface/JavaScript#wgNamespaceIds
              */
             wgNamespaceIds: Record<string, number>;
             /**
              * Full path to the main access point script, starting at the root, including the full script name with extension. On WMF wikis, normally "/w/index.php". See also $wgScript.
              *
-             * @see https://www.mediawiki.org/wiki/Manual:Interface/JavaScript#wgScript
+             * @see https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Interface/JavaScript#wgScript
              */
             wgScript: string;
             /**
              * The path part of wgScript, without trailing "/". This is the path to use for direct calls to the php access points such as index.php or api.php. See also $wgScriptPath.
              *
-             * @see https://www.mediawiki.org/wiki/Manual:Interface/JavaScript#wgScriptPath
+             * @see https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Interface/JavaScript#wgScriptPath
              */
             wgScriptPath: string;
             /**
              * The server URL, not terminated by "/". The combination wgServer + wgScriptPath + "/api.php", for instance, results in a valid URL to the API access point script.
              *
-             * @see https://www.mediawiki.org/wiki/Manual:Interface/JavaScript#wgServer
+             * @see https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Interface/JavaScript#wgServer
              */
             wgServer: string;
             /**
              * The name of the server, without the protocol or trailing slash (e.g. "en.wikipedia.org").
              *
-             * @see https://www.mediawiki.org/wiki/Manual:Interface/JavaScript#wgServerName
+             * @see https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Interface/JavaScript#wgServerName
              */
             wgServerName: string;
             /**
              * The name of the site, as defined by $wgSitename.
              *
-             * @see https://www.mediawiki.org/wiki/Manual:Interface/JavaScript#wgSiteName
+             * @see https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Interface/JavaScript#wgSiteName
              */
             wgSiteName: string;
             wgTranslateNumerals: boolean;
@@ -122,55 +122,55 @@ declare global {
             /**
              * If a wiki has language variants (such as the Chinese and the Serbian Wikipedias), set to a path beginning at the root for language variants other than wgContentLanguage. The path contains two placeholders: "$1" is to be replaced by the page title, and "$2" is to be replaced by the language code of the language variant (e.g. "zh-tw"). If the wiki does not have language variants, set to false. See also $wgVariantArticlePath.
              *
-             * @see https://www.mediawiki.org/wiki/Manual:Interface/JavaScript#wgVariantArticlePath
+             * @see https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Interface/JavaScript#wgVariantArticlePath
              */
             wgVariantArticlePath: string | false;
             /**
              * Identifies the version of MediaWiki that served the page.
              *
-             * @see https://www.mediawiki.org/wiki/Manual:Interface/JavaScript#wgVersion
+             * @see https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Interface/JavaScript#wgVersion
              */
             wgVersion: string;
             /**
              * The wiki identifier. Should be preferred over wgDBname.
              *
-             * @see https://www.mediawiki.org/wiki/Manual:Interface/JavaScript#wgWikiID
+             * @see https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Interface/JavaScript#wgWikiID
              */
             wgWikiID: string;
             /**
-             * The action performed, e.g. "edit" for edit pages, or "view" for page views. See Manual:Parameters to index.php#Actions.
+             * The action performed, e.g. "edit" for edit pages, or "view" for page views. See {@link https://www.mediawiki.org/wiki/Manual:Parameters_to_index.php#Actions Manual:Parameters to index.php}.
              *
-             * @see https://www.mediawiki.org/wiki/Manual:Interface/JavaScript#wgAction
+             * @see https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Interface/JavaScript#wgAction
              */
             wgAction: string;
             /**
              * The internal ID (page ID) of the page. For non-existent pages and special pages, it is zero.
              *
-             * @see https://www.mediawiki.org/wiki/Manual:Interface/JavaScript#wgArticleId
+             * @see https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Interface/JavaScript#wgArticleId
              */
             wgArticleId: number;
             /**
              * The canonical (i.e., not localized or aliased) namespace name of the page.
              *
-             * @see https://www.mediawiki.org/wiki/Manual:Interface/JavaScript#wgCanonicalNamespace
+             * @see https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Interface/JavaScript#wgCanonicalNamespace
              */
             wgCanonicalNamespace: string;
             /**
              * On special pages, the canonical (i.e., not localized or aliased) name of the special page; otherwise it is not defined at all (up to and including MW 1.15) or is set to false (since MW 1.16).
              *
-             * @see https://www.mediawiki.org/wiki/Manual:Interface/JavaScript#wgCanonicalSpecialPageName
+             * @see https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Interface/JavaScript#wgCanonicalSpecialPageName
              */
             wgCanonicalSpecialPageName: string | false;
             /**
              * The list of all the categories a page belongs to. This is essentially a JavaScript version of the category box shown on the page (grey box at bottom of page, in Monobook/Vector). If the category box is not shown on the current page (as is the case when editing/viewing history), wgCategories will be an empty array.
              *
-             * @see https://www.mediawiki.org/wiki/Manual:Interface/JavaScript#wgCategories
+             * @see https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Interface/JavaScript#wgCategories
              */
             wgCategories: string[];
             /**
              * The top revision ID of the currently viewed page at the time the page was served. Also set on diff and history pages; zero for special pages.
              *
-             * @see https://www.mediawiki.org/wiki/Manual:Interface/JavaScript#wgCurRevisionId
+             * @see https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Interface/JavaScript#wgCurRevisionId
              */
             wgCurRevisionId: number;
             /**
@@ -178,73 +178,73 @@ declare global {
              *
              * This variable is badly named – it is not related to a page being a main namespace "article".
              *
-             * @see https://www.mediawiki.org/wiki/Manual:Interface/JavaScript#wgIsArticle
+             * @see https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Interface/JavaScript#wgIsArticle
              */
             wgIsArticle: boolean;
             /**
              * True if the page is probably editable (based on Title::quickUserCan) by the current user. The 'probably' is necessary for performance reasons. An exact editability check is too costly here, due to cascading protection and hook-based extensions like TitleBlacklist that may be enabled. If this is true, it is likely to be editable. If it is false, it is definitely not editable.
              *
-             * @see https://www.mediawiki.org/wiki/Manual:Interface/JavaScript#wgIsProbablyEditable
+             * @see https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Interface/JavaScript#wgIsProbablyEditable
              */
             wgIsProbablyEditable: boolean;
             /**
-             * true if the page is a redirect to a wiki page using #REDIRECT [[Target page name]]. It is false for anything else (normal pages, special pages, most generated pages, etc.).
+             * true if the page is a redirect to a wiki page using `#REDIRECT [[Target page name]]`. It is false for anything else (normal pages, special pages, most generated pages, etc.).
              *
-             * @see https://www.mediawiki.org/wiki/Manual:Interface/JavaScript#wgIsRedirect
+             * @see https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Interface/JavaScript#wgIsRedirect
              */
             wgIsRedirect: boolean;
             /**
              * The number of the namespace the page is in.
              *
-             * @see https://www.mediawiki.org/wiki/Manual:Interface/JavaScript#wgNamespaceNumber
+             * @see https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Interface/JavaScript#wgNamespaceNumber
              */
             wgNamespaceNumber: number;
             /**
-             * Language code of the page content language (according to $context->getTitle()->getPageLanguage())
+             * Language code of the page content language (according to `$context->getTitle()->getPageLanguage()`)
              *
-             * @see https://www.mediawiki.org/wiki/Manual:Interface/JavaScript#wgPageContentLanguage
+             * @see https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Interface/JavaScript#wgPageContentLanguage
              */
             wgPageContentLanguage: string;
             /**
              * 'wikitext' on typical wiki pages, 'javascript' on pages interpreted as JavaScript, 'css' on pages interpreted as CSS, 'Scribunto' on pages interpreted as Scribunto (Lua).
              *
-             * @see https://www.mediawiki.org/wiki/Manual:Interface/JavaScript#wgPageContentModel
+             * @see https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Interface/JavaScript#wgPageContentModel
              */
             wgPageContentModel: string;
             /**
              * The full name of the page, including the localized namespace name, if the namespace has a name (the main namespace (number 0) doesn't), and with spaces replaced by underscores. To get only the title without the namespace, use wgTitle.
              *
-             * @see https://www.mediawiki.org/wiki/Manual:Interface/JavaScript#wgPageName
+             * @see https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Interface/JavaScript#wgPageName
              */
             wgPageName: string;
             /**
              * Parser limit report for the page when parser data is available. Includes data about parset limits, Lua statistics when Scribunto extension is enabled and parser cache information.
              *
-             * @see https://www.mediawiki.org/wiki/Manual:Interface/JavaScript#wgPageParseReport
+             * @see https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Interface/JavaScript#wgPageParseReport
              */
             wgPageParseReport: PageParseReport;
             /**
              * When redirected contains the title of the page we were redirected from. If the page was not redirected, the value is omitted entirely (absent in mw.config). Uses the same format as wgPageName
              *
-             * @see https://www.mediawiki.org/wiki/Manual:Interface/JavaScript#wgRedirectedFrom
+             * @see https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Interface/JavaScript#wgRedirectedFrom
              */
             wgRedirectedFrom?: string;
             /**
              * The full name of the page to which content actions and navigation links (e.g. a skin's tabs) apply. The AJAX watch function uses this to work correctly on special pages such as Special:MovePage and Special:WhatLinksHere.
              *
-             * @see https://www.mediawiki.org/wiki/Manual:Interface/JavaScript#wgRelevantPageName
+             * @see https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Interface/JavaScript#wgRelevantPageName
              */
             wgRelevantPageName: string;
             /**
              * The relevant name of the user to which content actions and some extra navigation links (e.g. link to user rights or user contributions) apply.
              *
-             * @see https://www.mediawiki.org/wiki/Manual:Interface/JavaScript#wgRelevantUserName
+             * @see https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Interface/JavaScript#wgRelevantUserName
              */
             wgRelevantUserName?: string;
             /**
              * Like wgIsProbablyEditable, but applied to the contextually relevant page name from wgRelevantPageName instead of strictly the current page being viewed. For example, when viewing a page "Special:MovePage/Example" this will indicate whether the subject page is editable.
              *
-             * @see https://www.mediawiki.org/wiki/Manual:Interface/JavaScript#wgRelevantPageIsProbablyEditable
+             * @see https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Interface/JavaScript#wgRelevantPageIsProbablyEditable
              */
             wgRelevantPageIsProbablyEditable: boolean;
             /**
@@ -254,7 +254,7 @@ declare global {
              *
              * If the page does not exist, the variable is not set.
              *
-             * @see https://www.mediawiki.org/wiki/Manual:Interface/JavaScript#wgRestrictionEdit
+             * @see https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Interface/JavaScript#wgRestrictionEdit
              */
             wgRestrictionEdit?: string[];
             /**
@@ -262,67 +262,67 @@ declare global {
              *
              * This array contains only explicit protections. Namespace-wide protections (e.g. MediaWiki namespace, $wgNamespaceProtection), cascading protections, or "protections" brought about by the TitleBlacklist extension's "moveonly" attribute, are ignored by this array. On such pages, the value is normally [], unless additional protections have been applied specifically to that page.
              *
-             * @see https://www.mediawiki.org/wiki/Manual:Interface/JavaScript#wgRestrictionMove
+             * @see https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Interface/JavaScript#wgRestrictionMove
              */
             wgRestrictionMove: string[];
             /**
              * The revision ID of the currently viewed revision, or the right revision for diff views (But 0 when diffonly=yes, task T231744). Also set on diff pages; zero for special pages, history pages, or anywhere else inapplicable.
              *
-             * @see https://www.mediawiki.org/wiki/Manual:Interface/JavaScript#wgRevisionId
+             * @see https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Interface/JavaScript#wgRevisionId
              */
             wgRevisionId: number;
             /**
              * The name of the search backend used to execute search requests.
              *
-             * @see https://www.mediawiki.org/wiki/Manual:Interface/JavaScript#wgSearchType
+             * @see https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Interface/JavaScript#wgSearchType
              */
             wgSearchType: string | null;
             /**
              * The page title, without the namespace. May contain spaces – does not contain underscores. To get the title including the namespace, use wgPageName.
              *
-             * @see https://www.mediawiki.org/wiki/Manual:Interface/JavaScript#wgTitle
+             * @see https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Interface/JavaScript#wgTitle
              */
             wgTitle: string;
             /**
              * The number of edits the current user made (null if not logged in).
              *
-             * @see https://www.mediawiki.org/wiki/Manual:Interface/JavaScript#wgUserEditCount
+             * @see https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Interface/JavaScript#wgUserEditCount
              */
             wgUserEditCount?: number;
             /**
              * An array containing all the (local) user groups the current user is a member of, or null for non-logged-in users. User groups are identified by the internal user group names, e.g. "sysop", "autoconfirmed", "bureaucrat", and so on. The default user group is named "*".
              *
-             * @see https://www.mediawiki.org/wiki/Manual:Interface/JavaScript#wgUserGroups
+             * @see https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Interface/JavaScript#wgUserGroups
              */
             wgUserGroups: string[] | null;
             /**
              * The numeric ID of the current user (null if not logged in).
              *
-             * @see https://www.mediawiki.org/wiki/Manual:Interface/JavaScript#wgUserId
+             * @see https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Interface/JavaScript#wgUserId
              */
             wgUserId?: number;
             /**
              * The language code for the user's interface language, as set in Special→Preferences (which may be overridden by a uselang= parameter in the URL).
              *
-             * @see https://www.mediawiki.org/wiki/Manual:Interface/JavaScript#wgUserLanguage
+             * @see https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Interface/JavaScript#wgUserLanguage
              */
             wgUserLanguage: string;
             /**
              * The user name of the user currently viewing the page, if it's a logged-in user. For non-logged-in users, it is null (not the user's IP address, unlike PHP $wgUser->getName() on the server).
              *
-             * @see https://www.mediawiki.org/wiki/Manual:Interface/JavaScript#wgUserName
+             * @see https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Interface/JavaScript#wgUserName
              */
             wgUserName: string | null;
             /**
              * The time and date on which the current user registered, represented as milliseconds since epoch. Null if not logged in.
              *
-             * @see https://www.mediawiki.org/wiki/Manual:Interface/JavaScript#wgUserRegistration
+             * @see https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Interface/JavaScript#wgUserRegistration
              */
             wgUserRegistration?: number;
             /**
              * true if the current page is the main page of the wiki. Omitted entirely otherwise (defaulting to null in mw.config).
              *
-             * @see https://www.mediawiki.org/wiki/Manual:Interface/JavaScript#wgIsMainPage
+             * @see https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Interface/JavaScript#wgIsMainPage
              */
             wgIsMainPage?: true;
             /**
@@ -333,7 +333,7 @@ declare global {
              * mw.config.get( 'wgUserVariant' ); // null.
              * ```
              *
-             * @see https://www.mediawiki.org/wiki/Manual:Interface/JavaScript#wgUserVariant
+             * @see https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Interface/JavaScript#wgUserVariant
              */
             wgUserVariant?: string;
             /**
@@ -345,19 +345,19 @@ declare global {
              *
              * On rollback, this is null
              *
-             * @see https://www.mediawiki.org/wiki/Manual:Interface/JavaScript#wgPostEdit
+             * @see https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Interface/JavaScript#wgPostEdit
              */
             wgPostEdit?: "created" | "restored" | "saved";
             /**
              * Revision ID of the "old" revision when viewing a diff. Only available when viewing a revision comparison.
              *
-             * @see https://www.mediawiki.org/wiki/Manual:Interface/JavaScript#wgDiffOldId
+             * @see https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Interface/JavaScript#wgDiffOldId
              */
             wgDiffOldId?: number;
             /**
              * Revision ID of the "new" revision when viewing a diff. Only available when viewing a revision comparison.
              *
-             * @see https://www.mediawiki.org/wiki/Manual:Interface/JavaScript#wgDiffNewId
+             * @see https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Interface/JavaScript#wgDiffNewId
              */
             wgDiffNewId?: number;
         }>;
@@ -388,8 +388,8 @@ interface LimitReport {
 }
 
 interface LimitReportValue {
-    value: number;
     limit: number;
+    value: number;
 }
 
 export {};
diff --git a/mw/confirmCloseWindow.d.ts b/mw/confirmCloseWindow.d.ts
index 0378fda..887b8e0 100644
--- a/mw/confirmCloseWindow.d.ts
+++ b/mw/confirmCloseWindow.d.ts
@@ -35,32 +35,35 @@ declare global {
     namespace mw {
         /**
          * Prevent the closing of a window with a confirm message (the onbeforeunload event seems to
-         * work in most browsers.)
+         * work in most browsers).
+         *
+         * Provided by the `mediawiki.confirmCloseWindow` module.
          *
          * This supersedes any previous onbeforeunload handler. If there was a handler before, it is
          * restored when you execute the returned release() function.
          *
+         * @example
          * ```js
-         * var allowCloseWindow = mw.confirmCloseWindow();
-         * // ... do stuff that can't be interrupted ...
-         * allowCloseWindow.release();
-         * ```
+         * mw.loader.using( 'mediawiki.confirmCloseWindow' ).then(() => {
+         *     var allowCloseWindow = mw.confirmCloseWindow();
+         *     // ... do stuff that can't be interrupted ...
+         *     allowCloseWindow.release();
          *
-         * The second function returned is a trigger function to trigger the check and an alert
-         * window manually, e.g.:
+         *     // The second function returned is a trigger function to trigger the check and an alert
+         *     // window manually, e.g.:
          *
-         * ```js
-         * var allowCloseWindow = mw.confirmCloseWindow();
-         * // ... do stuff that can't be interrupted ...
-         * if ( allowCloseWindow.trigger() ) {
-         *     // don't do anything (e.g. destroy the input field)
-         * } else {
-         *     // do whatever you wanted to do
-         * }
+         *     var allowCloseWindow = mw.confirmCloseWindow();
+         *     // ... do stuff that can't be interrupted ...
+         *     if ( allowCloseWindow.trigger() ) {
+         *         // don't do anything (e.g. destroy the input field)
+         *     } else {
+         *         // do whatever you wanted to do
+         *     }
+         * })
          * ```
-         *
          * @param {Options} [options]
          * @returns {ConfirmCloseWindow} An object of functions to work with this module
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.html#.confirmCloseWindow
          */
         function confirmCloseWindow(options?: Options): ConfirmCloseWindow;
     }
diff --git a/mw/cookie.d.ts b/mw/cookie.d.ts
index e207505..9ca7a2a 100644
--- a/mw/cookie.d.ts
+++ b/mw/cookie.d.ts
@@ -3,9 +3,17 @@ type SameSite = "none" | "lax" | "strict";
 declare global {
     namespace mw {
         /**
-         * Manage cookies in a way that is syntactically and functionally similar to the `WebRequest#getCookie` and `WebResponse#setcookie` methods in PHP.
+         * Manage cookies in a way that is syntactically and functionally similar
+         * to the `WebRequest#getCookie` and `WebResponse#setcookie` methods in PHP.
+         * Provided by the `mediawiki.cookie` ResourceLoader module.
          *
-         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.cookie
+         * @example
+         * ```js
+         * mw.loader.using( 'mediawiki.cookie' ).then( () => {
+         *     mw.cookie.set('hello', 'world' );
+         * })
+         * ```
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.cookie.html
          */
         namespace cookie {
             /**
@@ -13,11 +21,11 @@ declare global {
              *
              * @param {string} key The key for the cookie
              * @param {string} [prefix] The prefix of the key. If undefined or null, `$wgCookiePrefix` is used
-             * @param {any} [defaultValue] A value to return if the cookie does not exist
-             * @returns {any} If the cookie exists, the value of the cookie, otherwise `defaultValue`
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.cookie-method-get
+             * @param {string|null} [defaultValue] A value to return if the cookie does not exist
+             * @returns {string|null} If the cookie exists, the value of the cookie, otherwise `defaultValue`
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.cookie.html#.get
              */
-            function get<D>(
+            function get<D extends string | null>(
                 key: string,
                 prefix: string | undefined | null,
                 defaultValue: D
@@ -29,11 +37,11 @@ declare global {
              *
              * @param {string} key The key for the cookie
              * @param {string} [prefix] The prefix of the key. If undefined or null, `$wgCookiePrefix` is used
-             * @param {any} [defaultValue] A value to return if the cookie does not exist
-             * @returns {any} If the cookie exists, the value of the cookie, otherwise `defaultValue`
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.cookie-method-getCrossSite
+             * @param {string|null} [defaultValue] A value to return if the cookie does not exist
+             * @returns {string|null|undefined} If the cookie exists, the value of the cookie, otherwise `defaultValue`
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.cookie.html#.getCrossSite
              */
-            function getCrossSite<D>(
+            function getCrossSite<D extends string | null>(
                 key: string,
                 prefix: string | undefined | null,
                 defaultValue: D
@@ -50,34 +58,61 @@ declare global {
              * Without an expiry, this creates a session cookie. In a browser, session cookies persist for the lifetime of the browser *process*. Including across tabs, page views, and windows, until the browser itself is *fully* closed, or until the browser clears all storage for a given website. An exception to this is if the user evokes a "restore previous session" feature that some browsers have.
              *
              * @param {string} key
-             * @param {string | null} value Value of cookie. If `value` is `null` then this method will instead remove a cookie by name of `key`
-             * @param {Object | Date | number} [options] Options object, or expiry date
-             * @param {Date | number | null} [options.expires] The expiry date of the cookie or lifetime in seconds. If `options.expires` is null or 0, then a session cookie is set
-             * @param {string} [options.prefix] The prefix of the key
-             * @param {string} [options.domain] The domain attribute of the cookie
-             * @param {string} [options.path] The path attribute of the cookie
-             * @param {boolean} [options.secure] Whether or not to include the secure attribute (Does **not** use the wgCookieSecure configuration variable)
-             * @param {string} [options.sameSite] The `SameSite` flag of the cookie (case-insensitive; default is to omit the flag, which results in `Lax` on modern browsers). Set to `None` *and* set `secure` to `true` if the cookie needs to be visible on cross-domain requests
-             * @param {boolean} [options.sameSiteLegacy] If true, `SameSite` = `None` cookies will also be sent as non-`SameSite` cookies with an "ss0-" prefix, to work around old browsers interpreting the standard differently
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.cookie-method-set
+             * @param {string|null} value Value of cookie. If `value` is `null` then this method will instead remove a cookie by name of `key`
+             * @param {CookieOptions|Date|number} [options] Options object, or expiry date
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.cookie.html#.set
              */
             // see https://stackoverflow.com/a/64932909 for <SS>
             function set<SS extends string = SameSite>(
                 key: string,
                 value: string | null,
-                options?:
-                    | Date
-                    | number
-                    | Partial<{
-                          domain: string;
-                          expires: Date | number | null;
-                          path: string;
-                          prefix: string;
-                          sameSite: Lowercase<SS> extends SameSite ? SS : SameSite;
-                          sameSiteLegacy: boolean;
-                          secure: boolean;
-                      }>
+                options?: CookieOptions<SS> | Date | number
             ): void;
+
+            /**
+             * Custom scope for cookie key, must match the way it was set.
+             *
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.cookie.html#.CookieOptions
+             */
+            interface CookieOptions<SS extends string = SameSite> {
+                /**
+                 * Custom scope for cookie key. The domain attribute of the cookie.
+                 * Defaults to wgCookieDomain.
+                 */
+                domain?: string;
+                /**
+                 * Number of days to store the value (when setting).
+                 * The expiry date of the cookie, or lifetime in seconds.
+                 * If null or 0, then a session cookie is set. Defaults to wgCookieExpiration.
+                 */
+                expires?: Date | number | null;
+                /**
+                 * The path attribute of the cookie. Defaults to wgCookiePath.
+                 */
+                path?: string;
+                /**
+                 * The prefix of the key. Defaults to wgCookiePrefix.
+                 */
+                prefix?: string;
+                /**
+                 * The SameSite flag of the cookie ('None' / 'Lax'
+                 * / 'Strict', case-insensitive; default is to omit the flag, which results in Lax on
+                 * modern browsers). Set to None AND set secure=true if the cookie needs to be visible on
+                 * cross-domain requests.
+                 */
+                sameSite?: Lowercase<SS> extends SameSite ? SS : SameSite;
+                /**
+                 * Deprecated, ignored.
+                 *
+                 * @deprecated
+                 */
+                sameSiteLegacy?: boolean;
+                /**
+                 * Whether or not to include the secure attribute. Defaults to false.
+                 * (Does **not** use the wgCookieSecure configuration variable)
+                 */
+                secure?: boolean;
+            }
         }
     }
 }
diff --git a/mw/debug.d.ts b/mw/debug.d.ts
index 7349dbf..98de6a8 100644
--- a/mw/debug.d.ts
+++ b/mw/debug.d.ts
@@ -41,15 +41,20 @@ declare global {
          * Enabled server-side through `$wgDebugToolbar`.
          *
          * @since 1.19
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Debug.html
          */
         namespace Debug {
             /**
              * Toolbar container element.
+             *
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Debug.html#.$container
              */
             const $container: JQuery;
 
             /**
              * Object containing data for the debug toolbar.
+             *
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Debug.html#.data
              */
             const data: Data;
 
@@ -57,6 +62,7 @@ declare global {
              * Build the console panel.
              *
              * @returns {JQuery} Console panel
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Debug.html#.buildConsoleTable
              */
             function buildConsoleTable(): JQuery;
 
@@ -64,11 +70,14 @@ declare global {
              * Build legacy debug log pane.
              *
              * @returns {JQuery}
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Debug.html#.buildDebugLogTable
              */
             function buildDebugLogTable(): JQuery;
 
             /**
              * Construct the HTML for the debugging toolbar.
+             *
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Debug.html#.buildHtml
              */
             function buildHtml(): void;
 
@@ -76,6 +85,7 @@ declare global {
              * Build included files pane.
              *
              * @returns {JQuery}
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Debug.html#.buildIncludesPane
              */
             function buildIncludesPane(): JQuery;
 
@@ -83,6 +93,7 @@ declare global {
              * Build query list pane.
              *
              * @returns {JQuery}
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Debug.html#.buildQueryTable
              */
             function buildQueryTable(): JQuery;
 
@@ -90,6 +101,7 @@ declare global {
              * Build request information pane.
              *
              * @returns {JQuery}
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Debug.html#.buildRequestPane
              */
             function buildRequestPane(): JQuery;
 
@@ -100,6 +112,7 @@ declare global {
              * (since it binds to elements on the page).
              *
              * @param {Data} [data] Defaults to 'debugInfo' from {@link mw.config}
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Debug.html#.init
              */
             function init(data?: Data): void;
 
@@ -110,6 +123,7 @@ declare global {
              * because it's meant to be an event handler.
              *
              * @param {JQuery.Event} e
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Debug.html#.switchPane
              */
             function switchPane(e: JQuery.Event): void;
         }
diff --git a/mw/deflate.d.ts b/mw/deflate.d.ts
index 5be4a4a..c8cb751 100644
--- a/mw/deflate.d.ts
+++ b/mw/deflate.d.ts
@@ -1,19 +1,18 @@
 declare global {
     namespace mw {
         /**
-         * Compress the content and add the 'rawdeflate,' prefix.
+         * Convert a byte stream to base64 text.
+         * Before using load the `mediawiki.deflate` ResourceLoader module.
          *
          * @example
          * ```js
          * mw.loader.using( 'mediawiki.deflate' ).then( function () {
-         *     var deflated = mw.deflate( myContent );
+         *     return mw.deflate( html );
          * } );
          * ```
-         *
          * @param {string|ArrayBuffer} data Undeflated data
          * @returns {string} Deflated data
-         * @see https://github.com/wikimedia/mediawiki/blob/master/resources/src/mediawiki.deflate/mw.deflate.js#L3
-         * @see https://doc.wikimedia.org/mediawiki-core/master/php/classDeflate.html
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.html#.deflate
          */
         function deflate(data: string | ArrayBuffer): `rawdeflate,${string}`;
     }
diff --git a/mw/errorLogger.d.ts b/mw/errorLogger.d.ts
new file mode 100644
index 0000000..235c0b9
--- /dev/null
+++ b/mw/errorLogger.d.ts
@@ -0,0 +1,24 @@
+declare global {
+    namespace mw {
+        /**
+         * Allows the logging of client errors for later inspections.
+         *
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.errorLogger.html
+         */
+        namespace errorLogger {
+            /**
+             * Logs an error by notifying subscribers to the given {@link mw.track()} topic
+             * (by default `error.caught`) that an event has occurred.
+             *
+             * @param {Error} error
+             * @param {string} [topic='error.caught'] Error topic. Conventionally in the form
+             *  'error.%component%' (where %component% identifies the code logging the error at a
+             *  high level; e.g. an extension name).
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.errorLogger.html#.logError
+             */
+            function logError(error: Error, topic?: `error.${string}`): void;
+        }
+    }
+}
+
+export {};
diff --git a/mw/experiments.d.ts b/mw/experiments.d.ts
index 2d09da8..fe92203 100644
--- a/mw/experiments.d.ts
+++ b/mw/experiments.d.ts
@@ -1,22 +1,24 @@
 interface Experiment {
     /**
-     * The name of the experiment
+     * A map of bucket name to probability that the user will be assigned to that bucket
      */
-    name: string;
+    buckets: Record<string, number>;
     /**
      * Whether the experiment is enabled. If the experiment is disabled, then the user is always assigned to the control bucket
      */
     enabled: boolean;
     /**
-     * A map of bucket name to probability that the user will be assigned to that bucket
+     * The name of the experiment
      */
-    buckets: Record<string, number>;
+    name: string;
 }
 
 declare global {
     namespace mw {
         /**
-         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.experiments
+         * Provides an API for bucketing users in experiments.
+         *
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.experiments.html
          */
         namespace experiments {
             /**
@@ -41,18 +43,11 @@ declare global {
              *     }
              * }
              * ```
-             *
              * @param {Experiment} experiment
-             * @param {string} experiment.name The name of the experiment
-             * @param {boolean} experiment.enabled Whether or not the experiment is
-             *  enabled. If the experiment is disabled, then the user is always assigned
-             *  to the control bucket
-             * @param {Object.<string, number>} experiment.buckets A map of bucket name to probability
-             *  that the user will be assigned to that bucket
              * @param {string} token A token that uniquely identifies the user for the
              *  duration of the experiment
              * @returns {string|undefined} The bucket
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.experiments-method-getBucket
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.experiments.html#.getBucket
              */
             function getBucket(experiment: Experiment, token: string): string | undefined;
         }
diff --git a/mw/global.d.ts b/mw/global.d.ts
index f4d3f94..bd6873e 100644
--- a/mw/global.d.ts
+++ b/mw/global.d.ts
@@ -1,16 +1,10 @@
 declare global {
-    /**
-     * Global variables and functions.
-     *
-     * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/global
-     */
-
     /**
      * Schedule a function to run once the page is ready (DOM loaded).
      *
      * @since 1.5.8
      * @param {Function} fn
-     * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/global-method-addOnloadHook
+     * @see https://doc.wikimedia.org/mediawiki-core/master/js/window.html#.addOnloadHook
      */
     function addOnloadHook(fn: () => void): void;
 
@@ -23,15 +17,17 @@ declare global {
      * @since 1.12.2
      * @param {string} title
      * @returns {HTMLScriptElement|null} Script tag, or null if it was already imported before
-     * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/global-method-importScript
+     * @see https://doc.wikimedia.org/mediawiki-core/master/js/window.html#.importScript
      */
     function importScript(title: string): HTMLScriptElement | null;
 
     /**
+     * Import a script using an absolute URI.
+     *
      * @since 1.12.2
      * @param {string} url
      * @returns {HTMLScriptElement|null} Script tag, or null if it was already imported before
-     * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/global-method-importScriptURI
+     * @see https://doc.wikimedia.org/mediawiki-core/master/js/window.html#.importScriptURI
      */
     function importScriptURI(url: string): HTMLScriptElement | null;
 
@@ -41,16 +37,18 @@ declare global {
      * @since 1.12.2
      * @param {string} title
      * @returns {HTMLLinkElement} Link tag
-     * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/global-method-importStylesheet
+     * @see https://doc.wikimedia.org/mediawiki-core/master/js/window.html#.importStylesheet
      */
     function importStylesheet(title: string): HTMLLinkElement;
 
     /**
+     * Import a stylesheet using an absolute URI.
+     *
      * @since 1.12.2
      * @param {string} url
      * @param {string} media
      * @returns {HTMLLinkElement} Link tag
-     * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/global-method-importStylesheetURI
+     * @see https://doc.wikimedia.org/mediawiki-core/master/js/window.html#.importStylesheetURI
      */
     function importStylesheetURI(url: string, media: string): HTMLLinkElement;
 }
diff --git a/mw/hook.d.ts b/mw/hook.d.ts
index 5e1e15c..3fc6f27 100644
--- a/mw/hook.d.ts
+++ b/mw/hook.d.ts
@@ -28,35 +28,34 @@ import { User } from "./user";
  * This means if an event is fired, and a handler added afterwards, the added
  * function will be fired right away with the last given event data.
  *
- * Like Deferreds and Promises, the mw.hook object is both detachable and chainable.
+ * Like Deferreds and Promises, the {@link mw.hook} object is both detachable and chainable.
  * Thus allowing flexible use and optimal maintainability and authority control.
  * You can pass around the `add` and/or `fire` method to another piece of code
- * without it having to know the event name (or `mw.hook` for that matter).
+ * without it having to know the event name (or {@link mw.hook} for that matter).
  *
  * ```js
  * var h = mw.hook( 'bar.ready' );
  * new mw.Foo( .. ).fetch( { callback: h.fire } );
  * ```
  *
- * Note: Events are documented with an underscore instead of a dot in the event
- * name due to jsduck not supporting dots in that position.
- *
- * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.hook
+ * @see https://doc.wikimedia.org/mediawiki-core/master/js/Hook.html
  */
 interface Hook<T extends any[] = any[]> {
     /**
      * Register a hook handler.
      *
      * @param {...Function} handler Function to bind.
-     * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.hook-method-add
+     * @returns {Hook}
+     * @see https://doc.wikimedia.org/mediawiki-core/master/js/Hook.html#.add
      */
     add(...handler: Array<(...data: T) => any>): this;
 
     /**
      * Call hook handlers with data.
      *
-     * @param {any} data
-     * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.hook-method-fire
+     * @param {...any} data
+     * @returns {Hook}
+     * @see https://doc.wikimedia.org/mediawiki-core/master/js/Hook.html#.fire
      */
     fire(...data: T): this;
 
@@ -64,7 +63,8 @@ interface Hook<T extends any[] = any[]> {
      * Unregister a hook handler.
      *
      * @param {...Function} handler Function to unbind.
-     * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.hook-method-remove
+     * @returns {Hook}
+     * @see https://doc.wikimedia.org/mediawiki-core/master/js/Hook.html#.remove
      */
     remove(...handler: Array<(...data: T) => any>): this;
 }
@@ -75,14 +75,14 @@ interface PostEditData {
      * String for plain text, use array or jQuery object to pass actual nodes.
      */
     message?: string | JQuery | HTMLElement[];
-    /**
-     * User that made the edit.
-     */
-    user?: string | User;
     /**
      * Whether a temporary user account was created.
      */
     tempUserCreated?: boolean;
+    /**
+     * User that made the edit.
+     */
+    user?: string | User;
 }
 
 interface SearchIndex {
@@ -90,10 +90,10 @@ interface SearchIndex {
 }
 
 interface SearchIndexEntry {
-    $highlight: JQuery;
     $field: JQuery;
-    $wrapper: JQuery;
+    $highlight: JQuery;
     $tabPanel: JQuery;
+    $wrapper: JQuery;
 }
 
 interface EditRecovery {
@@ -103,12 +103,12 @@ interface EditRecovery {
 declare global {
     namespace mw {
         /**
-         * Create an instance of mw.hook.
+         * Create an instance of {@link Hook}.
          *
-         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.hook
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.html#.hook
          */
         function hook(
-            event: "apisandbox.formatRequest"
+            name: "apisandbox.formatRequest"
         ): Hook<
             [
                 items: OO.ui.MenuOptionWidget[],
@@ -120,205 +120,227 @@ declare global {
         >;
 
         /**
-         * Create an instance of mw.hook, fired after EditRecovery has loaded any recovery data, added event handlers, etc.
+         * Create an instance of {@link Hook}, fired after EditRecovery has loaded any recovery data, added event handlers, etc.
          *
-         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.hook
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/Hooks.html#~event:'editRecovery.loadEnd'
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.html#.hook
          */
-        function hook(event: "editRecovery.loadEnd"): Hook<[editRecovery: EditRecovery]>;
+        function hook(name: "editRecovery.loadEnd"): Hook<[editRecovery: EditRecovery]>;
 
         /**
-         * Create an instance of mw.hook.
+         * Create an instance of {@link Hook}.
          *
-         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.hook
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/Hooks.html#~event:'htmlform.enhance'
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.html#.hook
          */
-        function hook(event: "htmlform.enhance"): Hook<[$root: JQuery]>;
+        function hook(name: "htmlform.enhance"): Hook<[$root: JQuery]>;
 
         /**
-         * Create an instance of mw.hook, fired after an edit was successfully saved.
+         * Create an instance of {@link Hook}, fired after an edit was successfully saved.
          *
          * Does not fire for null edits.
          *
          * Code that fires the postEdit hook should first set `wgRevisionId` and `wgCurRevisionId` to the revision associated with the edit that triggered the postEdit hook, then fire the postEdit hook, e.g.:
          *
+         * @example
          * ```js
          * mw.config.set( {
-         *    wgCurRevisionId: data.newrevid,
-         *    wgRevisionId: data.newrevid
+         *     wgCurRevisionId: data.newrevid,
+         *     wgRevisionId: data.newrevid
          * } );
          * // Now fire the hook.
          * mw.hook( 'postEdit' ).fire();
          * ```
-         *
-         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.hook
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/Hooks.html#~event:'postEdit'
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.html#.hook
          */
-        function hook(event: "postEdit"): Hook<[data?: PostEditData]>;
+        function hook(name: "postEdit"): Hook<[data?: PostEditData]>;
 
         /**
-         * Create an instance of mw.hook, fired after the listener for #postEdit removes the notification.
+         * Create an instance of {@link Hook}, fired after the listener for #postEdit removes the notification.
          *
          * @deprecated
-         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.hook
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/Hooks.html#~event:'postEdit.afterRemoval'
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.html#.hook
          */
-        function hook(event: "postEdit.afterRemoval"): Hook<[]>;
+        function hook(name: "postEdit.afterRemoval"): Hook<[]>;
 
         /**
-         * Create an instance of mw.hook.
+         * Create an instance of {@link Hook}.
          *
-         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.hook
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.html#.hook
          */
-        function hook(event: "prefs.search.buildIndex"): Hook<[index: SearchIndex]>;
+        function hook(name: "prefs.search.buildIndex"): Hook<[index: SearchIndex]>;
 
         /**
-         * Create an instance of mw.hook, fired when a trusted UI element to perform a logout has been activated.
+         * Create an instance of {@link Hook}, fired when a trusted UI element to perform a logout has been activated.
          *
          * This will end the user session, and either redirect to the given URL on success, or queue an error message via mw.notification.
          *
-         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.hook
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/Hooks.html#~event:'skin.logout'
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.html#.hook
          */
-        function hook(event: "skin.logout"): Hook<[href: string]>;
+        function hook(name: "skin.logout"): Hook<[href: string]>;
 
         /**
-         * Create an instance of mw.hook, fired when initialization of the filtering interface for changes list is complete.
+         * Create an instance of {@link Hook}, fired when initialization of the filtering interface for changes list is complete.
          *
-         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.hook
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/Hooks.html#~event:'structuredChangeFilters.ui.initialized'
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.html#.hook
          */
-        function hook(event: "structuredChangeFilters.ui.initialized"): Hook<[]>;
+        function hook(name: "structuredChangeFilters.ui.initialized"): Hook<[]>;
 
         /**
-         * Create an instance of mw.hook, fired when a portlet is successfully created.
-         *
-         * Example usage:
+         * Create an instance of {@link Hook}, fired when a portlet is successfully created.
          *
-         * ```
+         * @example
+         * ```js
          * mw.hook( 'util.addPortlet' ).add( ( p ) => {
-         *  p.style.border = 'solid 1px black';
+         *     p.style.border = 'solid 1px black';
          * } );
          * ```
-         *
-         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.hook
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/Hooks.html#~event:'util.addPortlet'
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.html#.hook
          */
         function hook(
-            event: "util.addPortlet"
+            name: "util.addPortlet"
         ): Hook<[portlet: HTMLElement, before: string | undefined]>;
 
         /**
-         * Create an instance of mw.hook, fired when a portlet link is successfully created.
-         *
-         * Example usage:
+         * Create an instance of {@link Hook}, fired when a portlet link is successfully created.
          *
-         * ```
+         * @example
+         * ```js
          * mw.hook( 'util.addPortletLink' ).add( ( link ) => {
-         *  const span = $( '<span class="icon">' );
-         *  link.appendChild( span );
+         *     const span = $( '<span class="icon">' );
+         *     link.appendChild( span );
          * } );
          * ```
-         *
-         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.hook
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/Hooks.html#~event:'util.addPortletLink'
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.html#.hook
          */
-        function hook(event: "util.addPortletLink"): Hook<[item: HTMLLIElement, data: object]>;
+        function hook(name: "util.addPortletLink"): Hook<[item: HTMLLIElement, data: object]>;
 
         /**
-         * Create an instance of mw.hook, fired when categories are being added to the DOM.
+         * Create an instance of {@link Hook}, fired when categories are being added to the DOM.
          *
          * It is encouraged to fire it before the main DOM is changed (when $content is still detached).  However, this order is not defined either way, so you should only rely on $content itself.
          *
          * This includes the ready event on a page load (including post-edit loads) and when content has been previewed with LivePreview.
          *
-         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.hook
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/Hooks.html#~event:'wikipage.categories'
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.html#.hook
          */
-        function hook(event: "wikipage.categories"): Hook<[$content: JQuery]>;
+        function hook(name: "wikipage.categories"): Hook<[$content: JQuery]>;
 
         /**
-         * Create an instance of mw.hook, fired after collapsible content has been initialized.
+         * Create an instance of {@link Hook}, fired after collapsible content has been initialized.
          *
          * This gives an option to modify the collapsible behavior.
          *
-         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.hook
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/Hooks.html#~event:'wikipage.collapsibleContent'
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.html#.hook
          */
-        function hook(event: "wikipage.collapsibleContent"): Hook<[$collapsible: JQuery]>;
+        function hook(name: "wikipage.collapsibleContent"): Hook<[$collapsible: JQuery]>;
 
         /**
-         * Create an instance of mw.hook, fired when wiki content has been added to the DOM.
+         * Create an instance of {@link Hook}, fired when wiki content has been added to the DOM.
          *
          * This should only be fired after $content has been attached.
          *
          * This includes the ready event on a page load (including post-edit loads) and when content has been previewed with LivePreview.
          *
-         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.hook
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/Hooks.html#~event:'wikipage.content'
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.html#.hook
          */
-        function hook(event: "wikipage.content"): Hook<[$content: JQuery]>;
+        function hook(name: "wikipage.content"): Hook<[$content: JQuery]>;
 
         /**
-         * Create an instance of mw.hook, fired when a diff is added to a page or dynamically displayed to the user.
+         * Create an instance of {@link Hook}, fired when a diff is added to a page or dynamically displayed to the user.
          *
          * Similar to the wikipage.content hook, `$diff` may still be detached when the hook is fired.
          *
-         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.hook
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/Hooks.html#~event:'wikipage.diff'
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.html#.hook
          */
-        function hook(event: "wikipage.diff"): Hook<[$table: JQuery<HTMLTableElement>]>;
+        function hook(name: "wikipage.diff"): Hook<[$table: JQuery<HTMLTableElement>]>;
 
         /**
-         * Create an instance of mw.hook.
+         * Create an instance of {@link Hook}.
          *
-         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.hook
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/Hooks.html#~event:'wikipage.diff.diffTypeSwitch'
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.html#.hook
          */
         function hook(
-            event: "wikipage.diff.diffTypeSwitch"
+            name: "wikipage.diff.diffTypeSwitch"
         ): Hook<[inlineToggleSwitch: OO.ui.ToggleSwitchWidget]>;
 
         /**
-         * Create an instance of mw.hook.
+         * Create an instance of {@link Hook}.
          *
-         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.hook
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/Hooks.html#~event:'wikipage.diff.wikitextDiffBody'
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.html#.hook
          */
-        function hook(event: "wikipage.diff.wikitextBodyUpdate"): Hook<[$wikitextDiffBody: JQuery]>;
+        function hook(name: "wikipage.diff.wikitextBodyUpdate"): Hook<[$wikitextDiffBody: JQuery]>;
 
         /**
-         * Create an instance of mw.hook, fired when the editform is added to the edit page.
+         * Create an instance of {@link Hook}, fired when the editform is added to the edit page.
          *
          * Similar to the wikipage.content hoo $editForm can still be detached when this hook is fired.
          *
-         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.hook
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/Hooks.html#~event:'wikipage.editform'
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.html#.hook
          */
-        function hook(event: "wikipage.editform"): Hook<[$editForm: JQuery]>;
+        function hook(name: "wikipage.editform"): Hook<[$editForm: JQuery]>;
 
         /**
-         * Create an instance of mw.hook, fired when a page's {@link https://www.mediawiki.org/wiki/Special:MyLanguage/Help:Page_status_indicators status indicators} are being added to the DOM or updated.
+         * Create an instance of {@link Hook}, fired when a page's
+         * {@link https://www.mediawiki.org/wiki/Special:MyLanguage/Help:Page_status_indicators status indicators}
+         * are being added to the DOM or updated.
          *
-         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.hook
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/Hooks.html#~event:'wikipage.indicators'
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.html#.hook
          */
-        function hook(event: "wikipage.indicators"): Hook<[$indicators: JQuery]>;
+        function hook(name: "wikipage.indicators"): Hook<[$indicators: JQuery]>;
 
         /**
-         * Create an instance of mw.hook, fired when dynamic changes have been made to the table of contents.
+         * Create an instance of {@link Hook}, fired when dynamic changes have been made to the table of contents.
          *
-         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.hook
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/Hooks.html#~event:'wikipage.tableOfContents'
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.html#.hook
          */
-        function hook(event: "wikipage.tableOfContents"): Hook<[sections: any[]]>;
+        function hook(name: "wikipage.tableOfContents"): Hook<[sections: any[]]>;
 
         /**
-         * Create an instance of mw.hook, fired when the page watch status has changed.
-         *
-         * Example usage:
+         * Create an instance of {@link Hook}, fired when the page watch status has changed.
          *
+         * @example
          * ```js
          * mw.hook( 'wikipage.watchlistChange' ).add( ( isWatched, expiry, expirySelected ) => {
          *     // Do things
          * } );
          * ```
-         *
-         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.hook
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/Hooks.html#~event:'wikipage.watchlistChange'
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.html#.hook
          */
         function hook(
-            event: "wikipage.watchlistChange"
+            name: "wikipage.watchlistChange"
         ): Hook<[isWatched: boolean, expiry: string, expirySelected: string]>;
 
         /**
-         * Create an instance of mw.hook.
+         * Create an instance of {@link Hook}.
          *
-         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw-method-hook
+         * @example
+         * ```js
+         * const hook = mw.hook( 'name' );
+         * hook.add( () => alert( 'Hook was fired' ) );
+         * hook.fire();
+         * ```
+         * @param {string} name Name of hook.
+         * @returns {Hook}
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.html#.hook
          */
-        function hook<T extends any[] = any[]>(event: string): Hook<T>;
+        function hook<T extends any[] = any[]>(name: string): Hook<T>;
     }
 }
 
diff --git a/mw/html.d.ts b/mw/html.d.ts
index 2ec8b5c..53f1050 100644
--- a/mw/html.d.ts
+++ b/mw/html.d.ts
@@ -1,7 +1,7 @@
 declare global {
     namespace mw {
         /**
-         * HTML construction helper functions
+         * HTML construction helper functions.
          *
          * @example
          * ```js
@@ -13,8 +13,7 @@ declare global {
          * ) );
          * mw.log( output ); // <div><img src="&lt;"/></div>
          * ```
-         *
-         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.html
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.html.html
          */
         namespace html {
             /**
@@ -28,7 +27,7 @@ declare global {
              *  - null: The element is treated as void with short closing form, e.g. `<br/>`.
              *  - this.Raw: The raw value is directly included.
              * @returns {string} HTML
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.html-method-element
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.html.html#.element
              */
             function element(
                 name: string,
@@ -41,26 +40,35 @@ declare global {
              *
              * Converts special characters to HTML entities.
              *
+             * @example
              * ```js
              * mw.html.escape( '< > \' & "' );
              * // Returns &lt; &gt; &#039; &amp; &quot;
              * ```
-             *
              * @param {string} s The string to escape
              * @returns {string} HTML
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.html-method-escape
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.html.html#.escape
              */
             function escape(s: string): string;
 
             /**
-             * Wrapper object for raw HTML passed to {@link mw.html.element()}.
+             * Wrapper object for raw HTML. Can be used with {@link mw.html.element}.
              *
-             * @param {string} value
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.html.Raw-method-constructor
+             * @example
+             * ```js
+             * const raw = new mw.html.Raw( 'Text' );
+             * mw.html.element( 'div', { class: 'html' }, raw );
+             * ```
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.html.Raw.html
              */
             class Raw<V extends string = string> {
+                value: V;
+
+                /**
+                 * @param {string} value
+                 * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.html.Raw.html#Raw
+                 */
                 constructor(value: V);
-                private value: V;
             }
         }
     }
diff --git a/mw/index.d.ts b/mw/index.d.ts
index 210d46d..f86bc5f 100644
--- a/mw/index.d.ts
+++ b/mw/index.d.ts
@@ -5,6 +5,7 @@ import "./confirmCloseWindow";
 import "./cookie";
 import "./debug";
 import "./deflate";
+import "./errorLogger";
 import "./ForeignApi";
 import "./ForeignRest";
 import "./ForeignUpload";
@@ -18,29 +19,46 @@ import "./log";
 import "./Map";
 import "./message";
 import "./notification";
+import "./pluralRuleParser";
 import "./RegExp";
 import "./Rest";
 import "./searchSuggest";
 import "./storage";
 import "./template";
+import "./tempUserCreated";
 import "./Title";
 import "./Upload";
 import "./Uri";
 import "./user";
 import "./util";
 
+interface IdleCallbackOptions {
+    /**
+     * If set, the callback will be scheduled for
+     * immediate execution after this amount of time (in milliseconds) if it didn't run
+     * by that time.
+     */
+    timeout?: number;
+}
+
 type ObjectAnalyticEventData = Record<string, any>;
 type AnalyticEventData = ObjectAnalyticEventData | number | string | undefined;
 
 interface ErrorAnalyticEventData extends ObjectAnalyticEventData {
-    exception?: any;
+    exception?: Error;
+    /**
+     * Name of module which caused the error.
+     */
     module?: string;
+    /**
+     * Error source.
+     */
     source: string;
 }
 
 interface AnalyticEvent {
-    topic: string;
     data: AnalyticEventData;
+    topic: string;
 }
 
 interface AnalyticEventCallback {
@@ -51,18 +69,14 @@ declare global {
     /**
      * Base library for MediaWiki.
      *
-     * Exposed globally as `mw`, with `mediaWiki` as alias.
-     *
-     * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw
+     * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.html
      */
     const mediaWiki: typeof mw;
 
     /**
      * Base library for MediaWiki.
      *
-     * Exposed globally as `mw`, with `mediaWiki` as alias.
-     *
-     * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw
+     * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.html
      */
     namespace mw {
         /**
@@ -70,29 +84,43 @@ declare global {
          * want to add a new global, or the global is bad and needs containment
          * or wrapping.
          *
-         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw-property-libs
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.html#.libs
          */
-        const libs: Record<string, any>;
+        namespace libs {}
 
         /**
-         * OOUI widgets specific to MediaWiki
+         * Store for templates associated with a module.
+         *
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.html#.templates
+         */
+        const templates: Map<Record<string, any>>;
+
+        /**
+         * OOUI widgets specific to MediaWiki.
+         * Initially empty. To expand the amount of available widgets the `mediawiki.widget` module can be loaded.
          *
          * types for mw.widgets are out of scope!
          *
-         * @see https://doc.wikimedia.org/mediawiki-core/master/js/source/mediawiki.base.html#mw-property-libs
+         * @example
+         * ```js
+         * mw.loader.using('mediawiki.widget').then(() => {
+         *     OO.ui.getWindowManager().addWindows( [ new mw.widget.AbandonEditDialog() ] );
+         * });
+         * ```
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.widgets.html
          */
-        const widgets: any;
+        namespace widgets {}
 
         /**
          * Format a string. Replace $1, $2 ... $N with positional arguments.
          *
-         * Used by {@link Message.parser()}.
+         * Used by {@link mw.Message.parse}.
          *
          * @since 1.25
          * @param {string} formatString Format string
          * @param {...string} parameters Values for $N replacements
          * @returns {string} Formatted string
-         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw-method-format
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.html#.format
          */
         function format(formatString: string, ...parameters: string[]): string;
 
@@ -104,7 +132,7 @@ declare global {
          * On all other browsers, it will fall back to using `Date`.
          *
          * @returns {number} Current time
-         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw-method-now
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.html#.now
          */
         function now(): number;
 
@@ -116,7 +144,7 @@ declare global {
          *
          * Basic logic is as follows:
          *
-         * - User input event should be acknowledged within 100ms per [RAIL].
+         * - User input event should be acknowledged within 100ms per {@link https://developers.google.com/web/fundamentals/performance/rail RAIL}.
          * - Idle work should be grouped in blocks of upto 50ms so that enough time
          *   remains for the event handler to execute and any rendering to take place.
          * - Whenever a native event happens (e.g. user input), the deadline for any
@@ -126,21 +154,17 @@ declare global {
          *
          * See also:
          *
-         * - <https://developer.mozilla.org/en-US/docs/Web/API/Window/requestIdleCallback>
-         * - <https://w3c.github.io/requestidlecallback/>
-         * - <https://developers.google.com/web/updates/2015/08/using-requestidlecallback>
-         * [RAIL]: https://developers.google.com/web/fundamentals/performance/rail
+         * - {@link https://developer.mozilla.org/en-US/docs/Web/API/Window/requestIdleCallback}
+         * - {@link https://w3c.github.io/requestidlecallback/}
+         * - {@link https://developers.google.com/web/updates/2015/08/using-requestidlecallback}
          *
          * @param {Function} callback
-         * @param {Object} [options]
-         * @param {number} [options.timeout] If set, the callback will be scheduled for
-         *  immediate execution after this amount of time (in milliseconds) if it didn't run
-         *  by that time.
-         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw-method-requestIdleCallback
+         * @param {IdleCallbackOptions} [options]
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.html#.requestIdleCallback
          */
         function requestIdleCallback(
             callback: (...args: any[]) => any,
-            options?: { timeout?: number }
+            options?: IdleCallbackOptions
         ): void;
 
         /**
@@ -158,17 +182,19 @@ declare global {
          *
          * @param {string} topic Topic name
          * @param {AnalyticEventData} [data] Data describing the event.
-         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw-method-track
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.html#.track
          */
         function track(topic: string, data?: AnalyticEventData): void;
 
         /**
-         * Track an early error event via mw.track and send it to the window console.
+         * Track `'resourceloader.exception'` event and send it to the window console.
+         *
+         * This exists for internal use by mw.loader only, to remember and buffer
+         * very early events for `mw.trackSubscribe( 'resourceloader.exception' )`
+         * even while `mediawiki.base` and `mw.track` are still in-flight.
          *
          * @private
-         * @param {string} topic Topic name
          * @param {ErrorAnalyticEventData} data Data describing the event, encoded as an object; see {@link errorLogger.logError}
-         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw-method-trackError
          */
         function trackError(topic: string, data: ErrorAnalyticEventData): void;
 
@@ -180,39 +206,36 @@ declare global {
          * `data` event object. The `this` value for the callback is a plain object with `topic` and
          * `data` properties set to those same values.
          *
-         * Example to monitor all topics for debugging:
-         *
+         * @example
          * ```js
+         * // To monitor all topics for debugging
          * mw.trackSubscribe( '', console.log );
          * ```
-         *
-         * Example to subscribe to any of `foo.*`, e.g. both `foo.bar` and `foo.quux`:
-         *
+         * @example
          * ```js
+         * // To subscribe to any of `foo.*`, e.g. both `foo.bar` and `foo.quux`
          * mw.trackSubscribe( 'foo.', console.log );
          * ```
-         *
          * @param {string} topic Handle events whose name starts with this string prefix
          * @param {function(string, AnalyticEventData): void} callback Handler to call for each matching tracked event
-         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw-method-trackSubscribe
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.html#.trackSubscribe
          */
         function trackSubscribe(topic: string, callback: AnalyticEventCallback): void;
 
         /**
-         * Stop handling events for a particular handler
+         * Stop handling events for a particular handler.
          *
          * @param {function(string, AnalyticEventData): void} callback
-         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw-method-trackUnsubscribe
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.html#.trackUnsubscribe
          */
         function trackUnsubscribe(callback: AnalyticEventCallback): void;
 
         /**
          * List of all analytic events emitted so far.
          *
-         * Exposed only for use by mediawiki.base.
+         * Exposed only for use by `mediawiki.base`.
          *
          * @private
-         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw-property-trackQueue
          */
         const trackQueue: AnalyticEvent[];
     }
diff --git a/mw/inspect.d.ts b/mw/inspect.d.ts
index 69895f9..3d7c2df 100644
--- a/mw/inspect.d.ts
+++ b/mw/inspect.d.ts
@@ -70,21 +70,27 @@ interface ResourceLoaderReportMap {
 }
 
 interface Dependency {
-    requires: string[];
     requiredBy: string[];
+    requires: string[];
 }
 
 declare global {
     namespace mw {
         /**
-         * Generate and print reports.
+         * Generates a ResourceLoader report using the {@link mw.inspect mediawiki.inspect module}.
          *
          * When invoked without arguments, prints all available reports.
          *
-         * @param {...string} [reports] One or more of "size", "css", "store", or "time".
+         * @param {...string} [reports]
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.html#.inspect
          */
         function inspect(...reports: ResourceLoaderReport[]): void;
 
+        /**
+         * Tools for inspecting page composition and performance.
+         *
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/mediawiki.inspect.html
+         */
         namespace inspect {
             /**
              * @private
@@ -98,6 +104,7 @@ declare global {
              *
              * @param {string} css CSS source
              * @returns {SelectorCounts} Selector counts
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mediawiki.inspect.html#.auditSelectors
              */
             function auditSelectors(css: string): SelectorCounts;
 
@@ -106,6 +113,7 @@ declare global {
              *
              * @param {any[]} data Tabular data represented as an array of objects
              *  with common properties.
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mediawiki.inspect.html#.dumpTable
              */
             function dumpTable(data: any[]): void;
 
@@ -114,6 +122,7 @@ declare global {
              *
              * @returns {Object.<string, Dependency>} Maps module names to objects. Each sub-object has
              *  two properties, 'requires' and 'requiredBy'.
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mediawiki.inspect.html#.getDependencyGraph
              */
             function getDependencyGraph(): Record<string, Dependency>;
 
@@ -121,6 +130,7 @@ declare global {
              * Get a list of all loaded ResourceLoader modules.
              *
              * @returns {string[]} List of module names
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mediawiki.inspect.html#.getLoadedModules
              */
             function getLoadedModules(): string[];
 
@@ -129,6 +139,7 @@ declare global {
              *
              * @param {string} moduleName The name of the module
              * @returns {number|null} Module size in bytes or null
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mediawiki.inspect.html#.getModuleSize
              */
             function getModuleSize(moduleName: string): number | null;
 
@@ -139,6 +150,7 @@ declare global {
              *
              * @param {string|RegExp} pattern String or regexp to match.
              * @returns {string[]} Array of the names of modules that matched.
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mediawiki.inspect.html#.grep
              */
             function grep(pattern: string | RegExp): string[];
 
@@ -148,6 +160,7 @@ declare global {
              * When invoked without arguments, prints all available reports.
              *
              * @param {...ResourceLoaderReport} [reports] One or more of "size", "css", "store", or "time".
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mediawiki.inspect.html#.runReports
              */
             function runReports(...reports: ResourceLoaderReport[]): void;
         }
diff --git a/mw/language.d.ts b/mw/language.d.ts
index 26784c6..48c197c 100644
--- a/mw/language.d.ts
+++ b/mw/language.d.ts
@@ -8,7 +8,7 @@ declare global {
          * - transforming message syntax (`{{PLURAL:}}`, `{{GRAMMAR:}}`, `{{GENDER:}}`)
          * - formatting numbers
          *
-         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.language
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.language.html
          */
         namespace language {
             /**
@@ -44,7 +44,7 @@ declare global {
              * - `bcp47Map`
              * - `languageNames`
              *
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.language-property-data
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.language.html#.data
              */
             const data: Record<string, Map>;
 
@@ -54,10 +54,32 @@ declare global {
              *
              * @param {string} languageTag Well-formed language tag
              * @returns {string}
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.language-method-bcp47
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.language.html#.bcp47
              */
             function bcp47(languageTag: string): string;
 
+            /**
+             * Apply pattern to format value as a string.
+             *
+             * Using patterns from {@link https://www.unicode.org/reports/tr35/#Number_Format_Patterns Unicode TR35}.
+             *
+             * @private
+             * @deprecated This function will be made private in a future release;
+             *  it is poorly named, corresponds to a deprecated function in core, and
+             *  its functionality should be rolled into convertNumber().
+             * @deprecated Removed since 1.40.
+             * @param {number} value
+             * @param {string} pattern Pattern string as described by Unicode TR35
+             * @param {number|null} [minimumGroupingDigits=null]
+             * @throws {Error} If unable to find a number expression in `pattern`.
+             * @return {string}
+             */
+            function commafy(
+                value: number,
+                pattern: string,
+                minimumGroupingDigits?: number | null
+            ): string;
+
             /**
              * Grammatical transformations, needed for inflected languages.
              * Invoked by putting `{{grammar:case|word}}` in a message.
@@ -68,7 +90,7 @@ declare global {
              * @param {string} word
              * @param {string} form
              * @returns {string}
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.language-method-convertGrammar
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.language.html#.convertGrammar
              */
             function convertGrammar(word: string, form: string): string;
 
@@ -78,7 +100,7 @@ declare global {
              * @param {number} num Value to be converted
              * @param {boolean} [integer=false] Whether to convert the return value to an integer
              * @returns {number|string} Formatted number
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.language-method-convertNumber
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.language.html#.convertNumber
              */
             function convertNumber(num: number, integer: true): number;
             function convertNumber(num: number, integer?: false): string;
@@ -91,7 +113,7 @@ declare global {
              * @param {string[]} forms List of plural forms
              * @param {Object.<number, string>} [explicitPluralForms] List of explicit plural forms
              * @returns {string} Correct form for quantifier in this language
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.language-method-convertPlural
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.language.html#.convertPlural
              */
             function convertPlural(
                 count: number,
@@ -110,7 +132,7 @@ declare global {
              * @param {string} gender 'male', 'female', or anything else for neutral.
              * @param {string[]} forms List of gender forms
              * @returns {string}
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.language-method-gender
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.language.html#.gender
              */
             function gender<T extends string>(gender: string, forms: [T, T?, T?]): T;
             function gender<T extends string = never>(gender: string, forms: [T?, T?, T?]): T | "";
@@ -125,7 +147,7 @@ declare global {
              * @param {string} dataKey
              * @returns {any} Value stored in the mw.Map (or `undefined` if there is no map for the
              *  specified langCode)
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.language-method-getData
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.language.html#.getData
              */
             function getData(langCode: string, dataKey: string): any;
 
@@ -133,7 +155,6 @@ declare global {
              * Get the digit transform table for current UI language.
              *
              * @returns {Object.<number|string, string>|string[]}
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.language-method-getDigitTransformTable
              */
             function getDigitTransformTable(): string[] | Record<number | string, string>;
 
@@ -141,7 +162,7 @@ declare global {
              * Get the language fallback chain for current UI language, including the language itself.
              *
              * @returns {string[]} List of language keys, e.g. `['pfl', de', 'en']`
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.language-method-getFallbackLanguageChain
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.language.html#.getFallbackLanguageChain
              */
             function getFallbackLanguageChain(): string[];
 
@@ -149,7 +170,7 @@ declare global {
              * Get the language fallback chain for current UI language (not including the language itself).
              *
              * @returns {string[]} List of language keys, e.g. `['de', 'en']`
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.language-method-getFallbackLanguages
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.language.html#.getFallbackLanguages
              */
             function getFallbackLanguages(): string[];
 
@@ -157,7 +178,6 @@ declare global {
              * Get the separator transform table for current UI language.
              *
              * @returns {Object.<number|string, string>|string[]}
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.language-method-getSeparatorTransformTable
              */
             function getSeparatorTransformTable(): string[] | Record<number | string, string>;
 
@@ -168,7 +188,7 @@ declare global {
              *
              * @param {string[]} list
              * @returns {string}
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.language-method-listToText
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.language.html#.listToText
              */
             function listToText(list: string[]): string;
 
@@ -180,7 +200,7 @@ declare global {
              * @param {string} langCode
              * @param {string|Object.<string, any>} dataKey Key or object of key/values
              * @param {any} [value] Value for dataKey, omit if dataKey is an object
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.language-method-setData
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.language.html#.setData
              */
             function setData(langCode: string, dataKey: string, value: any): void;
             function setData(langCode: string, dataKey: Record<string, any>): void;
@@ -192,7 +212,6 @@ declare global {
              * @param {string[]} forms Number of forms given to convertPlural
              * @param {number} count Number of forms required
              * @returns {string[]} Padded array of forms
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.language-method-preConvertPlural
              */
             function preConvertPlural<T extends string[]>(
                 forms: T,
@@ -202,7 +221,7 @@ declare global {
             /**
              * Information about month names in current UI language.
              *
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.language-property-months
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.language.html#.months
              */
             namespace months {
                 /**
@@ -212,15 +231,15 @@ declare global {
                 const abbrev: string[];
 
                 /**
-                 * Object containing zero-indexed arrays of message keys for appropriate messages
-                 * which can be passed to {@link mw.msg}.
+                 * Array of month names in genitive case, zero-indexed.
                  */
-                const keys: Record<"abbrev" | "genitive" | "names", string[]>;
+                const genitive: string[];
 
                 /**
-                 * Array of month names in genitive case, zero-indexed.
+                 * Object containing zero-indexed arrays of message keys for appropriate messages
+                 * which can be passed to {@link mw.msg}.
                  */
-                const genitive: string[];
+                const keys: Record<"abbrev" | "genitive" | "names", string[]>;
 
                 /**
                  * Array of month names (in nominative case in languages which have the distinction),
diff --git a/mw/loader.d.ts b/mw/loader.d.ts
index 6932513..6805529 100644
--- a/mw/loader.d.ts
+++ b/mw/loader.d.ts
@@ -30,8 +30,8 @@ interface ModuleRequire {
     /**
      * Get the exported value of a module.
      *
-     * @param moduleName Module name
-     * @returns Exported value
+     * @param {string} moduleName Module name
+     * @returns {any} Exported value
      */
     (moduleName: string): any;
 }
@@ -46,19 +46,32 @@ type ModuleScript =
     | string;
 
 interface ModuleRegistryEntry {
+    /**
+     * @since 1.41
+     */
     declarator?: ModuleDeclarator | null;
     dependencies: string[];
+    /**
+     * @since 1.41
+     */
     deprecationWarning?: string | null;
     group: number | null;
     messages?: ModuleMessages | null;
     module: Module;
     packageExports: any;
+    script?: ModuleScript | null;
     skip: string | null;
     source: string;
     state: "error" | "loaded" | "missing" | "registered" | "ready";
     version: string;
 }
 
+interface JsonModuleStore {
+    asOf: number;
+    items: string;
+    vary: string;
+}
+
 export interface ResourceLoaderStoreStats {
     expired: number;
     failed: number;
@@ -76,9 +89,9 @@ declare global {
          * well as dependency resolution and execution of source code.
          *
          * For more information, refer to
-         * <https://www.mediawiki.org/wiki/ResourceLoader/Features>
+         * {@link https://www.mediawiki.org/wiki/Special:MyLanguage/ResourceLoader/Features}
          *
-         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.loader
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.loader.html
          */
         namespace loader {
             /**
@@ -88,7 +101,7 @@ declare global {
              * @param {Node|null} [nextNode] The element where the style tag
              *  should be inserted before
              * @returns {HTMLStyleElement} Reference to the created style element
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.loader-method-addStyleTag
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.loader.html#.addStyleTag
              */
             function addStyleTag(text: string, nextNode?: Node | null): HTMLStyleElement;
 
@@ -96,15 +109,14 @@ declare global {
              * Get the names of all registered ResourceLoader modules.
              *
              * @returns {string[]}
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.loader-method-getModuleNames
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.loader.html#.getModuleNames
              */
             function getModuleNames(): string[];
 
             /**
              * Load a script by URL.
              *
-             * Example:
-             *
+             * @example
              * ```js
              * mw.loader.getScript(
              *     'https://example.org/x-1.0.0.js'
@@ -117,10 +129,9 @@ declare global {
              *     } );
              * } );
              * ```
-             *
              * @param {string} url Script URL
              * @returns {JQuery.Promise} Resolved when the script is loaded
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.loader-method-getScript
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.loader.html#.getScript
              */
             function getScript(url: string): JQuery.Promise<any>;
 
@@ -136,94 +147,38 @@ declare global {
              *    uncaught error from the module's script files.
              * - `missing`: The module was requested but is not defined according to the server.
              *
+             * Internal mw.loader state machine:
+             *
+             * - `registered`:
+             *    The module is known to the system but not yet required.
+             *    Meta data is stored by {@link mw.loader.register}.
+             *    Calls to that method are generated server-side by StartupModule.
+             * - `loading`:
+             *    The module was required through mw.loader (either directly or as dependency of
+             *    another module). The client will fetch module contents from mw.loader.store
+             *    or from the server. The contents should later be received by {@link mw.loader.implement}.
+             * - `loaded`:
+             *    The module has been received by mw.loader#implement.
+             *    Once the module has no more dependencies in-flight, the module will be executed,
+             *    controlled via #setAndPropagate and #doPropagation.
+             * - `executing`:
+             *    The module is being executed (apply messages and stylesheets, execute scripts)
+             *    by mw.loader#execute.
+             * - `ready`:
+             *    The module has been successfully executed.
+             * - `error`:
+             *    The module (or one of its dependencies) produced an uncaught error during execution.
+             * - `missing`:
+             *    The module was registered client-side and requested, but the server denied knowledge
+             *    of the module's existence.
+             *
              * @param {string} module Name of module
              * @returns {string|null} The state, or null if the module (or its state) is not
              *  in the registry.
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.loader-method-getState
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.loader.html#.getState
              */
             function getState(module: string): ModuleState | null;
 
-            /**
-             * Implement a module given a function which returns the components of the module
-             *
-             * @param {Function} declarator
-             *
-             * The declarator should return an array with the following keys:
-             *
-             * - 0. {string} module Name of module and current module version. Formatted
-             *   as '`[name]@[version]`". This version should match the requested version
-             *   (from #batchRequest and #registry). This avoids race conditions (T117587).
-             *
-             * - 1. {ModuleScript} [script] Module code. This can be a function,
-             *   a list of URLs to load via `<script src>`, a string for `globalEval()`, or an
-             *   object like {"files": {"foo.js":function, "bar.js": function, ...}, "main": "foo.js"}.
-             *   If an object is provided, the main file will be executed immediately, and the other
-             *   files will only be executed if loaded via require(). If a function or string is
-             *   provided, it will be executed/evaluated immediately. If an array is provided, all
-             *   URLs in the array will be loaded immediately, and executed as soon as they arrive.
-             *
-             * - 2. {ModuleStyle} [style] Should follow one of the following patterns:
-             *
-             *   ```js
-             *   { "css": [css, ..] }
-             *   { "url": { (media): [url, ..] } }
-             *   ```
-             *
-             *   The reason css strings are not concatenated anymore is T33676. We now check
-             *   whether it's safe to extend the stylesheet.
-             *
-             * - 3. {ModuleMessages} [messages] List of key/value pairs to be added to {@link mw.messages}.
-             * - 4. {ModuleTemplates} [templates] List of key/value pairs to be added to {@link mw.templates}.
-             * - 5. {String|null} [deprecationWarning] Deprecation warning if any
-             *
-             * The declarator must not use any scope variables, since it will be serialized with
-             * {@link Function.prototype.toString()} and later restored and executed in the global scope.
-             *
-             * The elements are all optional except the name.
-             */
-            function impl(declarator: ModuleDeclarator): void;
-
-            /**
-             * Implement a module given the components of the module.
-             *
-             * See {@link impl} for a full description of the parameters.
-             *
-             * Prior to MW 1.41, this was used internally, but now it is only kept
-             * for backwards compatibility.
-             *
-             * Does not support mw.loader.store caching.
-             *
-             * @param {string} module
-             * @param {ModuleScript} [script] Module code. This can be a function,
-             *  a list of URLs to load via `<script src>`, a string for `domEval()`, or an
-             *  object like {"files": {"foo.js":function, "bar.js": function, ...}, "main": "foo.js"}.
-             *  If an object is provided, the main file will be executed immediately, and the other
-             *  files will only be executed if loaded via require(). If a function or string is
-             *  provided, it will be executed/evaluated immediately. If an array is provided, all
-             *  URLs in the array will be loaded immediately, and executed as soon as they arrive.
-             * @param {ModuleStyle} [style] Should follow one of the following patterns:
-             *
-             * ```js
-             * { "css": [css, ..] }
-             * { "url": { <media>: [url, ..] } }
-             * ```
-             *
-             * The reason css strings are not concatenated anymore is T33676. We now check
-             * whether it's safe to extend the stylesheet.
-             * @param {ModuleMessages} [messages] List of key/value pairs to be added to {@link mw.messages}.
-             * @param {ModuleTemplates} [templates] List of key/value pairs to be added to {@link mw.templates}.
-             * @param {string|null} [deprecationWarning] Deprecation warning if any
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.loader-method-implement
-             */
-            function implement(
-                module: string,
-                script?: ModuleScript,
-                style?: ModuleStyle,
-                messages?: ModuleMessages,
-                templates?: ModuleTemplates,
-                deprecationWarning?: string | null
-            ): void;
-
             /**
              * Load an external script or one or more modules.
              *
@@ -238,62 +193,14 @@ declare global {
              *
              * @param {string|string[]} modules Either the name of a module, array of modules,
              *  or a URL of an external script or style
-             * @param {string} [type='text/javascript'] MIME type to use if calling with a URL of an
+             * @param {string} [type="text/javascript"] MIME type to use if calling with a URL of an
              *  external script or style; acceptable values are "text/css" and
              *  "text/javascript"; if no type is provided, text/javascript is assumed.
              * @throws {Error} If type is invalid
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.loader-method-load
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.loader.html#.load
              */
             function load(modules: string | string[], type?: "text/css" | "text/javascript"): void;
 
-            /**
-             * Register a module, letting the system know about it and its properties.
-             *
-             * The startup module calls this method.
-             *
-             * When using multiple module registration by passing an array, dependencies that
-             * are specified as references to modules within the array will be resolved before
-             * the modules are registered.
-             *
-             * @param {string|Array} modules Module name or array of arrays, each containing
-             *  a list of arguments compatible with this method
-             * @param {string|number} [version] Module version hash (falls backs to empty string)
-             *  Can also be a number (timestamp) for compatibility with MediaWiki 1.25 and earlier.
-             * @param {string[]} [dependencies] Array of module names on which this module depends.
-             * @param {string} [group=null] Group which the module is in
-             * @param {string} [source='local'] Name of the source
-             * @param {string} [skip=null] Script body of the skip function
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.loader-method-register
-             */
-            function register(
-                modules: string,
-                version?: string | number,
-                dependencies?: string[],
-                group?: string | null,
-                source?: string,
-                skip?: string | null
-            ): void;
-            function register(
-                modules: Array<
-                    [
-                        module: string,
-                        version?: string | number,
-                        dependencies?: Array<string | number>,
-                        group?: string | null,
-                        source?: string,
-                        skip?: string | null
-                    ]
-                >
-            ): void;
-
-            /**
-             * Change the state of one or more modules.
-             *
-             * @param {Object.<string, ModuleState>} states Object of module name/state pairs
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.loader-method-state
-             */
-            function state(states: Record<string, ModuleState>): void;
-
             /**
              * Execute a function after one or more modules are ready.
              *
@@ -333,7 +240,7 @@ declare global {
              * @param {Function} [ready] Callback to execute when all dependencies are ready
              * @param {Function} [error] Callback to execute if one or more dependencies failed
              * @returns {JQuery.Promise<ModuleRequire>} With a `require` function
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.loader-method-using
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.loader.html#.using
              */
             function using(
                 dependencies: string | string[],
@@ -345,7 +252,6 @@ declare global {
              * Exposed for testing and debugging only.
              *
              * @private
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.loader-property-maxQueryLength
              */
             const maxQueryLength: number;
 
@@ -354,7 +260,6 @@ declare global {
              * state; it is not a public interface for modifying the registry.
              *
              * @private
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.loader-property-moduleRegistry
              */
             const moduleRegistry: Record<string, ModuleRegistryEntry>;
 
@@ -366,7 +271,6 @@ declare global {
              * @param {string} [media] Media attribute
              * @param {Node|null} [nextNode]
              * @returns {HTMLLinkElement}
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/source/mediawiki.loader.html#global-method-addLinkTag
              */
             function addLinkTag(
                 url: string,
@@ -383,7 +287,6 @@ declare global {
              * @param {string[]} [modules] List of modules being requested, for state to be marked as error
              * in case the script fails to load
              * @returns {HTMLScriptElement}
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/source/mediawiki.loader.html#mw-loader-method-addScriptTag
              */
             function addScriptTag(
                 src: string,
@@ -391,6 +294,21 @@ declare global {
                 modules?: string[]
             ): HTMLScriptElement;
 
+            /**
+             * Register a source.
+             *
+             * The {@link work()} method will use this information to split up requests by source.
+             *
+             * @example
+             * ```js
+             * mw.loader.addSource( { mediawikiwiki: 'https://www.mediawiki.org/w/load.php' } );
+             * ```
+             * @private
+             * @param {Object.<string, string>} ids An object mapping ids to load.php end point urls
+             * @throws {Error} If source id is already registered
+             */
+            function addSource(ids: Record<string, string>): void;
+
             /**
              * Add one or more modules to the module load queue.
              *
@@ -400,7 +318,6 @@ declare global {
              * @param {string[]} dependencies Array of module names in the registry
              * @param {Function} [ready] Callback to execute when all dependencies are ready
              * @param {Function} [error] Callback to execute when any dependency fails
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.loader-method-enqueue
              */
             function enqueue(
                 dependencies: string[],
@@ -408,6 +325,129 @@ declare global {
                 error?: (error: Error, ...args: any[]) => void
             ): void;
 
+            /**
+             * Implement a module given a function which returns the components of the module
+             *
+             * @private
+             * @since 1.41
+             * @param {ModuleDeclarator} declarator The declarator should return an array with the following keys:
+             *
+             * - 0. {string} module Name of module and current module version. Formatted
+             *   as `[name]@[version]`. This version should match the requested version
+             *   (from #batchRequest and #registry). This avoids race conditions (T117587).
+             *
+             * - 1. {ModuleScript} [script] Module code. This can be a function,
+             *   a list of URLs to load via `<script src>`, a string for `globalEval()`, or an
+             *   object like `{"files": {"foo.js":function, "bar.js": function, ...}, "main": "foo.js"}`.
+             *   If an object is provided, the main file will be executed immediately, and the other
+             *   files will only be executed if loaded via require(). If a function or string is
+             *   provided, it will be executed/evaluated immediately. If an array is provided, all
+             *   URLs in the array will be loaded immediately, and executed as soon as they arrive.
+             *
+             * - 2. {ModuleStyle} [style] Should follow one of the following patterns:
+             *
+             *   ```js
+             *   { "css": [css, ..] }
+             *   { "url": { (media): [url, ..] } }
+             *   ```
+             *
+             *   The reason css strings are not concatenated anymore is T33676. We now check
+             *   whether it's safe to extend the stylesheet.
+             *
+             * - 3. {ModuleMessages} [messages] List of key/value pairs to be added to {@link mw.messages}.
+             * - 4. {ModuleTemplates} [templates] List of key/value pairs to be added to {@link mw.templates}.
+             * - 5. {String|null} [deprecationWarning] Deprecation warning if any
+             *
+             * The declarator must not use any scope variables, since it will be serialized with
+             * {@link Function.prototype.toString()} and later restored and executed in the global scope.
+             *
+             * The elements are all optional except the name.
+             */
+            function impl(declarator: ModuleDeclarator): void;
+
+            /**
+             * Implement a module given the components of the module.
+             *
+             * See {@link impl} for a full description of the parameters.
+             *
+             * Prior to MW 1.41, this was used internally, but now it is only kept
+             * for backwards compatibility.
+             *
+             * Does not support mw.loader.store caching.
+             *
+             * @private
+             * @since 1.41 - deprecationWarning parameter can be passed.
+             * @deprecated since 1.41
+             * @param {string} module
+             * @param {ModuleScript} [script] Module code. This can be a function,
+             *  a list of URLs to load via `<script src>`, a string for `domEval()`, or an
+             *  object like {"files": {"foo.js":function, "bar.js": function, ...}, "main": "foo.js"}.
+             *  If an object is provided, the main file will be executed immediately, and the other
+             *  files will only be executed if loaded via require(). If a function or string is
+             *  provided, it will be executed/evaluated immediately. If an array is provided, all
+             *  URLs in the array will be loaded immediately, and executed as soon as they arrive.
+             * @param {ModuleStyle} [style] Should follow one of the following patterns:
+             *
+             * ```js
+             * { "css": [css, ..] }
+             * { "url": { <media>: [url, ..] } }
+             * ```
+             *
+             * The reason css strings are not concatenated anymore is T33676. We now check
+             * whether it's safe to extend the stylesheet.
+             * @param {ModuleMessages} [messages] List of key/value pairs to be added to {@link mw.messages}.
+             * @param {ModuleTemplates} [templates] List of key/value pairs to be added to {@link mw.templates}.
+             * @param {string|null} [deprecationWarning] Deprecation warning if any
+             */
+            function implement(
+                module: string,
+                script?: ModuleScript,
+                style?: ModuleStyle,
+                messages?: ModuleMessages,
+                templates?: ModuleTemplates,
+                deprecationWarning?: string | null
+            ): void;
+
+            /**
+             * Register a module, letting the system know about it and its properties.
+             *
+             * The startup module calls this method.
+             *
+             * When using multiple module registration by passing an array, dependencies that
+             * are specified as references to modules within the array will be resolved before
+             * the modules are registered.
+             *
+             * @private
+             * @since 1.41 - version can no longer be a number (timestamp).
+             * @param {string|Array} modules Module name or array of arrays, each containing
+             *  a list of arguments compatible with this method
+             * @param {string|number} [version] Module version hash (falls backs to empty string)
+             * @param {Array<string|number>} [dependencies] Array of module names on which this module depends.
+             * @param {string|null} [group=null] Group which the module is in
+             * @param {string} [source="local"] Name of the source
+             * @param {string|null} [skip=null] Script body of the skip function
+             */
+            function register(
+                modules: string,
+                version?: string | number,
+                dependencies?: string[],
+                group?: string | null,
+                source?: string,
+                skip?: string | null
+            ): void;
+            function register(
+                modules: Array<
+                    [
+                        module: string,
+                        version?: string | number,
+                        dependencies?: Array<string | number>,
+                        group?: string | null,
+                        source?: string,
+                        skip?: string | null
+                    ]
+                >
+            ): void;
+
             /**
              * Get the exported value of a module.
              *
@@ -420,7 +460,6 @@ declare global {
              *
              * @since 1.27
              * @private
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.loader-method-require
              */
             const require: ModuleRequire;
 
@@ -431,28 +470,30 @@ declare global {
              * @param {string[]} modules Array of string module names
              * @returns {string[]} List of dependencies, including 'module'.
              * @throws {Error} If an unregistered module or a dependency loop is encountered
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.loader-method-resolve
              */
             // note: U is required so T is not inferred from the "modules" argument
             function resolve<T extends string, U extends T = T>(modules: U[]): T[];
 
             /**
-             * Start loading of all queued module dependencies.
+             * Change the state of one or more modules.
              *
              * @private
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.loader-method-work
+             * @param {Object.<string, ModuleState>} states Object of module name/state pairs
              */
-            function work(): void;
+            function state(states: Record<string, ModuleState>): void;
 
             /**
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.loader.store
+             * Start loading of all queued module dependencies.
+             *
+             * @private
              */
+            function work(): void;
+
             namespace store {
                 /**
                  * The localStorage key for the entire module store. The key references
                  * $wgDBname to prevent clashes between wikis which share a common host.
                  *
-                 * @property {string}
                  * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.loader.store-property-key
                  */
                 const key: string;
@@ -461,9 +502,6 @@ declare global {
                  * A string containing various factors by which the module cache should vary.
                  *
                  * Defined by ResourceLoader\StartupModule::getStoreVary() in PHP.
-                 *
-                 * @property {string}
-                 * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.loader.store-property-vary
                  */
                 const vary: string;
 
@@ -472,14 +510,11 @@ declare global {
                  *
                  * @since 1.32
                  * @param {string} module Module name
-                 * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.loader.store-method-add
                  */
                 function add(module: string): void;
 
                 /**
                  * Clear the entire module store right now.
-                 *
-                 * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.loader.store-method-clear
                  */
                 function clear(): void;
 
@@ -488,7 +523,6 @@ declare global {
                  *
                  * @param {string} module Module name
                  * @returns {string|boolean} Module implementation or false if unavailable
-                 * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.loader.store-method-get
                  */
                 function get(module: string): string | false;
 
@@ -497,60 +531,46 @@ declare global {
                  *
                  * Retrieves store from localStorage and (if successfully retrieved) decoding
                  * the stored JSON value to a plain object.
-                 *
-                 * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.loader.store-method-init
                  */
                 function init(): void;
 
                 /**
                  * Internal helper for {@link init()}. Separated for ease of testing.
-                 *
-                 * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.loader.store-method-load
                  */
                 function load(): void;
 
                 /**
                  * Iterate through the module store, removing any item that does not correspond
                  * (in name and version) to an item in the module registry.
-                 *
-                 * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.loader.store-method-prune
                  */
                 function prune(): void;
 
                 /**
                  * Construct a JSON-serializable object representing the content of the store.
                  *
-                 * @returns {Object} Module store contents.
-                 * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.loader.store-method-toJSON
+                 * @deprecated Removed since 1.41.
+                 * @returns {JsonModuleStore} Module store contents.
                  */
-                function toJSON(): { items: string; vary: string; asOf: number };
+                function toJSON(): JsonModuleStore;
 
                 /**
                  * Whether the store is in use on this page.
-                 *
-                 * @see https://doc.wikimedia.org/mediawiki-core/master/js/source/mediawiki.loader.html
                  */
                 const enabled: boolean | null;
 
                 /**
                  * The contents of the store, mapping '[name]@[version]' keys
                  * to module implementations.
-                 *
-                 * @see https://doc.wikimedia.org/mediawiki-core/master/js/source/mediawiki.loader.html
                  */
                 const items: Record<ModuleKey, any>;
 
                 /**
                  * Names of modules to be stored during the next update.
-                 *
-                 * @see https://doc.wikimedia.org/mediawiki-core/master/js/source/mediawiki.loader.html
                  */
                 const queue: string[];
 
                 /**
-                 * Cache hit stats
-                 *
-                 * @see https://doc.wikimedia.org/mediawiki-core/master/js/source/mediawiki.loader.html
+                 * Cache hit stats.
                  */
                 const stats: ResourceLoaderStoreStats;
 
@@ -565,7 +585,6 @@ declare global {
                  *
                  * @private
                  * @param {string} module Module name
-                 * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.loader.store-method-set
                  */
                 function set(module: string): void;
 
@@ -598,7 +617,6 @@ declare global {
                  * be called if the store is enabled.
                  *
                  * @private
-                 * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.loader.store-method-requestUpdate
                  */
                 function requestUpdate(): void;
             }
diff --git a/mw/log.d.ts b/mw/log.d.ts
index 3fc05a0..ed17f5e 100644
--- a/mw/log.d.ts
+++ b/mw/log.d.ts
@@ -1,19 +1,5 @@
 declare global {
     namespace mw {
-        namespace errorLogger {
-            /**
-             * Logs an error by notifying subscribers to the given {@link mw.track()} topic
-             * (by default `error.caught`) that an event has occurred.
-             *
-             * @param {Error} error
-             * @param {string} [topic='error.caught'] Error topic. Conventionally in the form
-             *   'error.?component?' (where ?component? identifies the code logging the error at a
-             *   high level; e.g. an extension name).
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.log
-             */
-            function logError(error: Error, topic?: `error.${string}`): void;
-        }
-
         /**
          * Write a verbose message to the browser's console in debug mode.
          *
@@ -23,35 +9,34 @@ declare global {
          * See {@link mw.log} for other logging methods.
          *
          * @param {...any} msg Messages to output to console.
-         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw-method-log
          */
         function log(...msg: any[]): void;
 
         /**
-         * Collection of methods to help log messages to the console.
+         * Library for logging developer warnings to the JavaScript console.
          *
-         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.log
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.log.html
          */
         namespace log {
             /**
              * Create a property on a host object that, when accessed, will log
              * a deprecation warning to the console.
              *
-             * Usage:
-             *
+             * @example
              * ```js
              * mw.log.deprecate( window, 'myGlobalFn', myGlobalFn );
-             *
+             * ```
+             * @example
+             * ```js
              * mw.log.deprecate( Thing, 'old', old, 'Use Other.thing instead', 'Thing.old'  );
              * ```
-             *
              * @param {Object} obj Host object of deprecated property
              * @param {string} key Name of property to create in `obj`
              * @param {any} val The value this property should return when accessed
              * @param {string} [msg] Optional extra text to add to the deprecation warning
              * @param {string} [logName] Name of the feature for deprecation tracker.
              *  Tracking is disabled by default, except for global variables on `window`.
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw-method-deprecate
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.log.html#.deprecate
              */
             function deprecate<T, K extends string & keyof T>(
                 obj: T,
@@ -69,15 +54,14 @@ declare global {
              *
              * @since 1.26
              * @param {...any} msg Messages to output to console
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw-method-error
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.log.html#.error
              */
             function error(...msg: any[]): void;
 
             /**
              * Create a function that logs a deprecation warning when called.
              *
-             * Usage:
-             *
+             * @example
              * ```js
              * var deprecatedNoB = mw.log.makeDeprecated( 'hello_without_b', 'Use of hello without b is deprecated.' );
              *
@@ -91,13 +75,12 @@ declare global {
              *
              * hello( 1 );
              * ```
-             *
              * @since 1.38
              * @param {string|null} key Name of the feature for deprecation tracker,
              *  or null for a console-only deprecation.
              * @param {string} msg Deprecation warning.
              * @returns {Function}
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw-method-makeDeprecated
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.log.html#.makeDeprecated
              */
             function makeDeprecated(key: string | null, msg: string): () => void;
 
@@ -105,7 +88,7 @@ declare global {
              * Write a message to the browser console's warning channel.
              *
              * @param {...any} msg Messages to output to console
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.log-method-warn
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.log.html#.warn
              */
             function warn(...msg: any[]): void;
         }
diff --git a/mw/message.d.ts b/mw/message.d.ts
index 0ef9735..383e974 100644
--- a/mw/message.d.ts
+++ b/mw/message.d.ts
@@ -8,21 +8,19 @@ declare global {
          * @param {string} key Key of message to get
          * @param {...any} parameters Values for $N replacements
          * @returns {Message}
-         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw-method-message
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.html#.message
          */
         function message(key: string, ...parameters: any[]): Message;
 
         /**
          * Store for messages.
          *
-         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw-property-messages
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.html#.messages
          */
         const messages: Map<{ [key: string]: string }>;
 
         /**
-         * Object constructor for messages.
-         *
-         * Similar to the Message class in MediaWiki PHP.
+         * Describes a translateable text or HTML string. Similar to the Message class in MediaWiki PHP.
          *
          * @example
          * ```js
@@ -60,14 +58,12 @@ declare global {
          * mw.log( obj.escaped() );
          * // You will find: Time &quot;after&quot; &lt;time&gt;
          * ```
-         *
-         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Message
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Message.html
          */
         class Message {
             /**
              * Object constructor for messages.
-             *
-             * Similar to the Message class in MediaWiki PHP.
+             * The constructor is not publicly accessible; use {@link mw.message} instead.
              *
              * @example
              * ```js
@@ -105,11 +101,10 @@ declare global {
              * mw.log( obj.escaped() );
              * // You will find: Time &quot;after&quot; &lt;time&gt;
              * ```
-             *
              * @param {Map} map Message store
              * @param {string} key
              * @param {Array} [parameters]
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Message-method-constructor
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Message.html#Message
              */
             constructor(map: Map<Record<string, string>>, key: string, parameters?: any[]);
 
@@ -119,15 +114,15 @@ declare global {
              * This is equivalent to the {@link text} format, which is then HTML-escaped.
              *
              * @returns {string} String form of html escaped message
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Message-method-escaped
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Message.html#escaped
              */
             escaped(): string;
 
             /**
-             * Check if a message exists
+             * Check if a message exists. Equivalent to {@link mw.Map.exists}.
              *
              * @returns {boolean}
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Message-method-exists
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Message.html#exists
              */
             exists(): boolean;
 
@@ -138,7 +133,7 @@ declare global {
              *
              * @since 1.41
              * @returns {boolean}
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Message-method-isParseable
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Message.html#isParseable
              */
             isParseable(): boolean;
 
@@ -147,7 +142,7 @@ declare global {
              *
              * @param {Array} parameters
              * @returns {Message}
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Message-method-params
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Message.html#params
              */
             params(parameters: any[]): this;
 
@@ -158,7 +153,7 @@ declare global {
              * into HTML. Without jqueryMsg, it is equivalent to {@link escaped}.
              *
              * @returns {string} String form of parsed message
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Message-method-parse
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Message.html#parse
              */
             parse(): string;
 
@@ -169,26 +164,10 @@ declare global {
              *
              * @since 1.27
              * @returns {JQuery}
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Message-method-parseDom
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Message.html#parseDom
              */
             parseDom(): JQuery;
 
-            /**
-             * Get parsed contents of the message.
-             *
-             * The default parser does simple $N replacements and nothing else.
-             * This may be overridden to provide a more complex message parser.
-             * The primary override is in the mediawiki.jqueryMsg module.
-             *
-             * This function will not be called for nonexistent messages.
-             *
-             * @private For internal use by mediawiki.jqueryMsg only
-             * @param {string} format
-             * @returns {string} Parsed message
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Message-method-parser
-             */
-            private parser(format: string): string;
-
             /**
              * Return message plainly.
              *
@@ -196,7 +175,7 @@ declare global {
              * message content.
              *
              * @returns {string} String form of plain message
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Message-method-plain
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Message.html#plain
              */
             plain(): string;
 
@@ -208,10 +187,25 @@ declare global {
              * Without jqueryMsg, it is equivalent to {@link plain}.
              *
              * @returns {string} String form of text message
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Message-method-text
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.Message.html#text
              */
             text(): string;
 
+            /**
+             * Get parsed contents of the message.
+             *
+             * The default parser does simple $N replacements and nothing else.
+             * This may be overridden to provide a more complex message parser.
+             * The primary override is in the mediawiki.jqueryMsg module.
+             *
+             * This function will not be called for nonexistent messages.
+             *
+             * @private For internal use by mediawiki.jqueryMsg only
+             * @param {string} format
+             * @returns {string} Parsed message
+             */
+            private parser(format: string): string;
+
             /**
              * Convert message object to a string using the "text"-format .
              *
@@ -223,7 +217,6 @@ declare global {
              *  implicitly through string casting.
              * @returns {string} Message in the given format, or `⧼key⧽` if the key
              *  does not exist.
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Message-method-toString
              */
             private toString(format?: "escaped" | "parse" | "plain" | "text"): string;
         }
@@ -236,7 +229,7 @@ declare global {
          * @param {string} key Key of message to get
          * @param {...any} parameters Values for $N replacements
          * @returns {string}
-         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw-method-msg
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.html#.msg
          */
         function msg(key: string, ...parameters: any[]): string;
     }
diff --git a/mw/notification.d.ts b/mw/notification.d.ts
index 0d18a18..de8be0c 100644
--- a/mw/notification.d.ts
+++ b/mw/notification.d.ts
@@ -1,85 +1,34 @@
-interface NotificationOptions {
-    /**
-     * A boolean indicating whether the notification should automatically
-     * be hidden after shown. Or if it should persist.
-     */
-    autoHide: boolean;
-
-    /**
-     * Key to {@link mw.notification.autoHideSeconds} for number of seconds for timeout of auto-hide
-     * notifications.
-     */
-    autoHideSeconds: "long" | "short";
-
-    /**
-     * An optional string. When a notification is tagged only one message
-     * with that tag will be displayed. Trying to display a new notification
-     * with the same tag as one already being displayed will cause the other
-     * notification to be closed and this new notification to open up inside
-     * the same place as the previous notification.
-     */
-    tag: string | null;
-
-    /**
-     * An optional title for the notification. Will be displayed above the
-     * content. Usually in bold.
-     */
-    title: string | null;
-
-    /**
-     * An optional string for the type of the message used for styling:
-     * Examples: 'info', 'warn', 'error', 'success'.
-     */
-    type: "error" | "info" | "success" | "warn" | null;
-
-    /**
-     * A boolean indicating if the autoHide timeout should be based on
-     * time the page was visible to user. Or if it should use wall clock time.
-     */
-    visibleTimeout: boolean;
-
-    /**
-     * HTML ID to set on the notification element.
-     */
-    id: string | false;
-
-    /**
-     * CSS class names in the form of a single string or
-     * array of strings, to be set on the notification element.
-     */
-    classes: string | string[] | false;
-}
-
 /**
- * A Notification object for 1 message.
+ * Describes a notification. See {@link mw.notification mw.notification module}. A Notification object for 1 message.
  *
  * The constructor is not publicly accessible; use {@link mw.notification.notify} instead.
- * This does not insert anything into the document (see {@link start}).
+ * This does not insert anything into the document. To add to document use
+ * {@link mw.notification.notify}.
  *
- * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Notification_
+ * @see https://doc.wikimedia.org/mediawiki-core/master/js/Notification.html
  */
 interface Notification {
     $notification: JQuery;
     autoHideSeconds: number;
     isOpen: boolean;
     isPaused: boolean;
-    options: Partial<NotificationOptions>;
+    options: mw.notification.NotificationOptions;
     timeout: {
-        set: typeof setTimeout;
         clear: typeof clearTimeout;
+        set: typeof setTimeout;
     };
 
     /**
      * Close the notification.
      *
-     * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Notification_-method-close
+     * @see https://doc.wikimedia.org/mediawiki-core/master/js/Notification.html#close
      */
     close(): void;
 
     /**
-     * Pause any running auto-hide timer for this notification
+     * Pause any running auto-hide timer for this notification.
      *
-     * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Notification_-method-pause
+     * @see https://doc.wikimedia.org/mediawiki-core/master/js/Notification.html#pause
      */
     pause(): void;
 
@@ -88,7 +37,7 @@ interface Notification {
      * Does nothing if autoHide is disabled.
      * Either to resume from pause or to make the first start.
      *
-     * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Notification_-method-resume
+     * @see https://doc.wikimedia.org/mediawiki-core/master/js/Notification.html#pause
      */
     resume(): void;
 
@@ -100,7 +49,6 @@ interface Notification {
      * handles the fadeIn animations and replacement transitions, and starts autoHide timers.
      *
      * @private
-     * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Notification_-method-start
      */
     start(): void;
 }
@@ -108,21 +56,23 @@ interface Notification {
 declare global {
     namespace mw {
         /**
-         * Display a notification message to the user.
+         * Convenience method for loading and accessing the {@link mw.notification.notify mw.notification module}.
          *
          * @param {HTMLElement|HTMLElement[]|JQuery|Message|string} message
-         * @param {Partial<NotificationOptions>} [options] The options to use for the notification.
-         *  See {@link NotificationOptions defaults} for details.
+         * @param {notification.NotificationOptions} [options] The options to use for the notification.
+         *  See {@link notification.defaults the defaults}.
          * @returns {JQuery.Promise<Notification>} Notification object
-         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw-method-notify
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.html#.notify
          */
         function notify(
             message: string | Message | JQuery | HTMLElement | HTMLElement[],
-            options?: Partial<NotificationOptions>
+            options?: notification.NotificationOptions
         ): JQuery.Promise<Notification>;
 
         /**
-         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.notification
+         * Library for sending notifications to end users.
+         *
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.notification.html
          */
         namespace notification {
             /**
@@ -134,31 +84,44 @@ declare global {
              * This basically represents the minimal number of notifications the user should
              * be able to process during the {@link notification.defaults default} {@link autoHideSeconds} time.
              *
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.notification-property-autoHideLimit
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.notification.html#.autoHideLimit
              */
             const autoHideLimit: number;
 
             /**
              * @private
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.notification-property-autoHideSeconds
              */
             const autoHideSeconds: {
-                short: number;
                 long: number;
+                short: number;
             };
 
             /**
-             * The defaults for notify options parameter.
+             * The defaults for {@link notify} options parameter.
              *
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.notification-property-defaults
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.notification.html#.defaults
              */
-            const defaults: NotificationOptions;
+            const defaults: Required<NotificationOptions>;
+
+            /**
+             * Display a notification message to the user.
+             *
+             * @param {HTMLElement|HTMLElement[]|JQuery|Message|string} message
+             * @param {NotificationOptions} [options] The options to use for the notification.
+             *  Options not specified default to the values in {@link defaults}.
+             * @returns {Notification} Notification object
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.notification.html#.notify
+             */
+            function notify(
+                message: string | Message | JQuery | HTMLElement | HTMLElement[],
+                options?: NotificationOptions
+            ): Notification;
 
             /**
              * Pause auto-hide timers for all notifications.
              * Notifications will not auto-hide until resume is called.
              *
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.notification-method-pause
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.notification.html#.pause
              */
             function pause(): void;
 
@@ -166,23 +129,63 @@ declare global {
              * Resume any paused auto-hide timers from the beginning.
              * Only the first {@link autoHideLimit} timers will be resumed.
              *
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.notification-method-resume
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.notification.html#.resume
              */
             function resume(): void;
 
             /**
-             * Display a notification message to the user.
-             *
-             * @param {HTMLElement|HTMLElement[]|JQuery|Message|string} message
-             * @param {Partial<NotificationOptions>} [options] The options to use for the notification.
-             *  See {@link NotificationOptions defaults} for details.
-             * @returns {Notification} Notification object
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.notification-method-notify
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.notification.html#.NotificationOptions
              */
-            function notify(
-                message: string | Message | JQuery | HTMLElement | HTMLElement[],
-                options?: Partial<NotificationOptions>
-            ): Notification;
+            interface NotificationOptions {
+                /**
+                 * Whether the notification should automatically
+                 * be hidden after shown. Or if it should persist.
+                 */
+                autoHide?: boolean;
+
+                /**
+                 * Key to {@link autoHideSeconds} for number of seconds for timeout of auto-hide
+                 * notifications.
+                 */
+                autoHideSeconds?: "long" | "short";
+
+                /**
+                 * CSS class names to be set on the notification element.
+                 */
+                classes?: string | string[] | false;
+
+                /**
+                 * HTML ID to set on the notification element.
+                 */
+                id?: string | false;
+
+                /**
+                 * An optional string. When a notification is tagged only one message
+                 * with that tag will be displayed. Trying to display a new notification
+                 * with the same tag as one already being displayed will cause the other
+                 * notification to be closed and this new notification to open up inside
+                 * the same place as the previous notification.
+                 */
+                tag?: string | null;
+
+                /**
+                 * An optional title for the notification. Will be displayed above the
+                 * content. Usually in bold.
+                 */
+                title?: string | null;
+
+                /**
+                 * An optional string for the type of the message used for styling.
+                 * Examples: `info`, `warn`, `error`, `success`.
+                 */
+                type?: "error" | "info" | "success" | "warn" | null;
+
+                /**
+                 * A boolean indicating if the autoHide timeout should be based on
+                 * time the page was visible to user. Or if it should use wall clock time.
+                 */
+                visibleTimeout?: boolean;
+            }
         }
     }
 }
diff --git a/mw/pluralRuleParser.d.ts b/mw/pluralRuleParser.d.ts
new file mode 100644
index 0000000..24d68ec
--- /dev/null
+++ b/mw/pluralRuleParser.d.ts
@@ -0,0 +1,15 @@
+declare global {
+    namespace mw.libs {
+        /**
+         * Evaluates a plural rule in CLDR syntax for a number.
+         *
+         * @param {string} rule
+         * @param {number} number
+         * @returns {boolean} true if evaluation passed, false if evaluation failed.
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/module-mediawiki.libs.pluralruleparser.html
+         */
+        function pluralRuleParser(rule: string, number: number): boolean;
+    }
+}
+
+export {};
diff --git a/mw/searchSuggest.d.ts b/mw/searchSuggest.d.ts
index 68c31c6..5ed8d6f 100644
--- a/mw/searchSuggest.d.ts
+++ b/mw/searchSuggest.d.ts
@@ -1,23 +1,68 @@
 import { ApiResponse } from "./Api";
 
-interface ResultInfo {
-    type: string;
-    searchId: string;
+/**
+ * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.searchSuggest.html#~ResponseFunction
+ */
+interface ResponseFunction {
+    /**
+     * @param {string[]} titles titles of pages that match search
+     * @param {ResponseMetaData} meta meta data relating to search
+     */
+    (titles: string[], meta: ResponseMetaData): void;
+}
+
+/**
+ * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.searchSuggest.html#~ResponseMetaData
+ */
+interface ResponseMetaData {
     query: string;
+    /**
+     * The contents of the X-Search-ID response header.
+     */
+    searchId: string;
+    /**
+     * The contents of the X-OpenSearch-Type response header.
+     */
+    type: string;
 }
 
 declare global {
-    namespace mw.searchSuggest {
+    namespace mw {
         /**
-         * Queries the wiki and calls response with the result.
+         * Convenience library for making searches for titles that match a string.
+         * Loaded via the `mediawiki.searchSuggest` ResourceLoader library.
+         *
+         * @example
+         * ```js
+         * mw.loader.using('mediawiki.searchSuggest').then(() => {
+         *     var api = new mw.Api();
+         *     mw.searchSuggest.request(api, 'Dogs that', ( results ) => {
+         *         alert( `Results that match: ${results.join( '\n' );}` );
+         *     });
+         * });
+         * ```
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.searchSuggest.html
          */
-        function request(
-            api: Api,
-            query: string,
-            response: (result: string[], info: ResultInfo) => void,
-            maxRows?: number | "max",
-            namespace?: number | number[]
-        ): JQuery.Promise<ApiResponse>;
+        namespace searchSuggest {
+            /**
+             * Queries the wiki and calls response with the result.
+             *
+             * @param {Api} api
+             * @param {string} query
+             * @param {ResponseFunction} response
+             * @param {string|number} [limit]
+             * @param {string|number|string[]|number[]} [namespace]
+             * @returns {JQuery.Promise<ApiResponse>}
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.searchSuggest.html#.request
+             */
+            function request(
+                api: Api,
+                query: string,
+                response: ResponseFunction,
+                limit?: number | "max",
+                namespace?: number | number[]
+            ): JQuery.Promise<ApiResponse>;
+        }
     }
 }
 
diff --git a/mw/storage.d.ts b/mw/storage.d.ts
index 7a68de7..f3f2b30 100644
--- a/mw/storage.d.ts
+++ b/mw/storage.d.ts
@@ -2,8 +2,10 @@
  * A wrapper for the HTML5 Storage interface (`localStorage` or `sessionStorage`)
  * that is safe to call in all browsers.
  *
- * @private
- * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.SafeStorage
+ * The constructor is not publicly accessible. An instance can be accessed from
+ * {@link mw.storage} or {@link module:mediawiki.storage}.
+ *
+ * @see https://doc.wikimedia.org/mediawiki-core/master/js/module-mediawiki.storage-SafeStorage.html
  */
 interface SafeStorage {
     /**
@@ -12,7 +14,7 @@ interface SafeStorage {
      * @param {string} key Key of item to retrieve
      * @returns {string|null|false} String value, null if no value exists, or false
      *  if storage is not available.
-     * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.SafeStorage-method-get
+     * @see https://doc.wikimedia.org/mediawiki-core/master/js/module-mediawiki.storage-SafeStorage.html#get
      */
     get(key: string): string | null | false;
 
@@ -22,7 +24,7 @@ interface SafeStorage {
      * @param {string} key Key of item to retrieve
      * @returns {Object|null|boolean} Object, null if no value exists or value
      *  is not JSON-parseable, or false if storage is not available.
-     * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.SafeStorage-method-getObject
+     * @see https://doc.wikimedia.org/mediawiki-core/master/js/module-mediawiki.storage-SafeStorage.html#getObject
      */
     getObject(key: string): any;
 
@@ -31,7 +33,7 @@ interface SafeStorage {
      *
      * @param {string} key Key of item to remove
      * @returns {boolean} Whether the key was removed
-     * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.SafeStorage-method-remove
+     * @see https://doc.wikimedia.org/mediawiki-core/master/js/module-mediawiki.storage-SafeStorage.html#remove
      */
     remove(key: string): boolean;
 
@@ -42,90 +44,98 @@ interface SafeStorage {
      * @param {string} value Value to be stored
      * @param {number} [expiry] Number of seconds after which this item can be deleted
      * @returns {boolean} The value was set
-     * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.SafeStorage-method-set
+     * @see https://doc.wikimedia.org/mediawiki-core/master/js/module-mediawiki.storage-SafeStorage.html#set
      */
     set(key: string, value: string, expiry?: number): boolean;
 
     /**
-     * Set the expiry time for an item in the store
+     * Set the expiry time for an item in the store.
      *
      * @param {string} key Key name
      * @param {number} [expiry] Number of seconds after which this item can be deleted,
      *  omit to clear the expiry (either making the item never expire, or to clean up
      *  when deleting a key).
      * @returns {boolean} The expiry was set (or cleared) [since 1.41]
-     * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.SafeStorage-method-setExpires
+     * @see https://doc.wikimedia.org/mediawiki-core/master/js/module-mediawiki.storage-SafeStorage.html#setExpires
      */
     setExpires(key: string, expiry?: number): boolean;
 
     /**
-     * Set an object value in device storage by JSON encoding
+     * Set an object value in device storage by JSON encoding.
      *
+     * @since 1.41 - returns a boolean indicating whether the value was set.
      * @param {string} key Key name to store under
      * @param {Object} value Object value to be stored
      * @param {number} [expiry] Number of seconds after which this item can be deleted
      * @returns {boolean} The value was set
-     * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.SafeStorage-method-setObject
+     * @see https://doc.wikimedia.org/mediawiki-core/master/js/module-mediawiki.storage-SafeStorage.html#setObject
      */
     setObject(key: string, value: any, expiry?: number): boolean;
 
     /**
-     * Clear any expired items from the store
+     * Clear any expired items from the store.
      *
      * @private
      * @returns {JQuery.Promise} Resolves when items have been expired
-     * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.SafeStorage-method-clearExpired
      */
     clearExpired(): JQuery.Promise<undefined>;
 
     /**
-     * Get all keys with expiry values
+     * Get all keys with expiry values.
      *
      * @private
      * @returns {JQuery.Promise<string[]>} Promise resolving with all the keys which have
      *  expiry values (unprefixed), or as many could be retrieved in the allocated time.
-     * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.SafeStorage-method-getExpiryKeys
      */
     getExpiryKeys(): JQuery.Promise<string[]>;
 
     /**
-     * Check if a given key has expired
+     * Check if a given key has expired.
      *
      * @private
      * @param {string} key Key name
      * @returns {boolean} Whether key is expired
-     * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.SafeStorage-method-isExpired
      */
     isExpired(key: string): boolean;
 }
 
 interface MwStorage extends SafeStorage {
     /**
-     * A safe interface to HTML5 `sessionStorage`.
+     * A safe interface to HTML5 `localStorage` and `sessionStorage`.
      *
      * This normalises differences across browsers and silences any and all
      * exceptions that may occur.
      *
-     * **Note**: Data persisted via `sessionStorage` will persist for the lifetime
-     * of the browser *tab*, not the browser *window*.
-     * For longer-lasting persistence across tabs, refer to {@link mw.storage} or {@link mw.cookie} instead.
-     *
-     * Example:
-     *
+     * **Note**: Storage keys are not automatically prefixed in relation to
+     * MediaWiki and/or the current wiki. Always **prefix your keys** with "mw" to
+     * avoid conflicts with gadgets, JavaScript libraries, browser extensions,
+     * internal CDN or webserver cookies, and third-party applications that may
+     * be embedded on the page.
+     *
+     * **Warning**: This API has limited storage space and does not use an expiry
+     * by default. This means unused **keys are stored forever**, unless you
+     * opt-in to the `expiry` parameter or otherwise make sure that your code
+     * can rediscover and delete keys you created in the past.
+     *
+     * If you don't use the `expiry` parameter, avoid keys with variable
+     * components as this leads to untracked keys that your code has no way
+     * to know about and delete when the data is no longer needed. Instead,
+     * store dynamic values in an object under a single constant key that you
+     * manage or replace over time.
+     * See also {@link https://phabricator.wikimedia.org/T121646}.
+     *
+     * @example
      * ```js
      * mw.storage.session.set( key, value );
      * mw.storage.session.get( key );
      * ```
-     *
-     * Example:
-     *
+     * @example
      * ```js
      * var session = require( 'mediawiki.storage' ).session;
      * session.set( key, value );
      * session.get( key );
      * ```
-     *
-     * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.storage.session
+     * @see https://doc.wikimedia.org/mediawiki-core/master/js/module-mediawiki.storage.html#.session
      */
     session: SafeStorage;
 }
@@ -133,7 +143,7 @@ interface MwStorage extends SafeStorage {
 declare global {
     namespace mw {
         /**
-         * A safe interface to HTML5 `localStorage`.
+         * A safe interface to HTML5 `localStorage` and `sessionStorage`.
          *
          * This normalises differences across browsers and silences any and all
          * exceptions that may occur.
@@ -154,25 +164,21 @@ declare global {
          * to know about and delete when the data is no longer needed. Instead,
          * store dynamic values in an object under a single constant key that you
          * manage or replace over time.
-         * See also <https://phabricator.wikimedia.org/T121646>.
-         *
-         * Example:
+         * See also {@link https://phabricator.wikimedia.org/T121646}.
          *
+         * @example
          * ```js
          * mw.storage.set( key, value, expiry );
          * mw.storage.set( key, value ); // stored indefinitely
          * mw.storage.get( key );
          * ```
-         *
-         * Example:
-         *
+         * @example
          * ```js
          * var local = require( 'mediawiki.storage' ).local;
          * local.set( key, value, expiry );
          * local.get( key );
          * ```
-         *
-         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.storage
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.html#.storage
          */
         const storage: MwStorage;
     }
diff --git a/mw/tempUserCreated.d.ts b/mw/tempUserCreated.d.ts
new file mode 100644
index 0000000..1816f55
--- /dev/null
+++ b/mw/tempUserCreated.d.ts
@@ -0,0 +1,19 @@
+declare global {
+    namespace mw {
+        /**
+         * Respond to the creation of a temporary user.
+         *
+         * @since 1.42
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.tempUserCreated.html
+         */
+        namespace tempUserCreated {
+            /**
+             * Show popup after creation of a temporary user.
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.tempUserCreated.html#.showPopup
+             */
+            function showPopup(): void;
+        }
+    }
+}
+
+export {};
diff --git a/mw/template.d.ts b/mw/template.d.ts
index 20a197f..c250393 100644
--- a/mw/template.d.ts
+++ b/mw/template.d.ts
@@ -1,49 +1,58 @@
-type CompiledTemplate = any; // Can this be made more specific?
+/**
+ * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.template.html#~TemplateRenderer
+ */
+interface TemplateRenderer {
+    /**
+     * Compiles a template for rendering.
+     *
+     * @param {Object} [data] for the template
+     * @param {Object} [partials] additional partial templates
+     * @returns {JQuery}
+     * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.template.html#~TemplateCompileFunction
+     */
+    render(data?: unknown, partials?: unknown): JQuery;
+}
 
-interface Compiler {
-    compile(src: string): CompiledTemplate;
+/**
+ * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.template.html#~TemplateCompiler
+ */
+interface TemplateCompiler {
+    /**
+     * Compiles a template for rendering.
+     *
+     * @param {string} src source of the template
+     * @returns {TemplateRenderer} for rendering
+     * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.template.html#~TemplateCompileFunction
+     */
+    compile(src: string): TemplateRenderer;
 }
 
 declare global {
     namespace mw {
         /**
-         * Requires mediawiki.template ResourceLoader module
+         * An extensible library for rendering templates in different template languages.
+         * Requires `mediawiki.template` ResourceLoader module.
+         *
+         * By default only the `html` template library is provided.
+         * The Mustache library is also provided in mediawiki core via the mediawiki.template.mustache library.
          *
-         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.template
+         * @example
+         * ```js
+         * // returns $( '<div>hello world</div>' );
+         * const $node = mw.template.compile( '<div>hello world</div>', 'html' ).render();
+         *
+         * // also returns $( '<div>hello world</div>' );
+         * mw.loader.using( 'mediawiki.template.mustache' ).then( () => {
+         *     const $node = mw.template.compile( '<div>{{ >Foo }}</div>', 'mustache' ).render( {
+         *         text: 'Hello world'
+         *     }, {
+         *         Foo: mw.template.compile( '{{text}}', 'mustache' )
+         *     } );
+         * } );
+         * ```
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.template.html
          */
         namespace template {
-            /**
-             * Register a new compiler.
-             *
-             * A compiler is any object that implements a compile() method. The compile() method must
-             * return a Template interface with a method render() that returns HTML.
-             *
-             * The compiler name must correspond with the name suffix of templates that use this compiler.
-             *
-             * @param {string} name Compiler name
-             * @param {Compiler} compiler
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.template-method-registerCompiler
-             */
-            function registerCompiler(name: string, compiler: Compiler): void;
-
-            /**
-             * Get the name of the associated compiler based on a template name.
-             *
-             * @param {string} templateName Name of a template (including suffix)
-             * @returns {string} Name of a compiler
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.template-method-getCompilerName
-             */
-            function getCompilerName(templateName: string): string;
-
-            /**
-             * Get a compiler via its name.
-             *
-             * @param {string} name Name of a compiler
-             * @returns {Compiler} The compiler
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.template-method-getCompiler
-             */
-            function getCompiler(name: string): Compiler;
-
             /**
              * Register a template associated with a module.
              *
@@ -52,34 +61,68 @@ declare global {
              * @param {string} moduleName Name of the ResourceLoader module the template is associated with
              * @param {string} templateName Name of the template (including suffix)
              * @param {string} templateBody Contents of the template (e.g. html markup)
-             * @returns {CompiledTemplate} Compiled template
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.template-method-add
+             * @returns {TemplateRenderer} Compiled template
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.template.html#.add
              */
             function add(
                 moduleName: string,
                 templateName: string,
                 templateBody: string
-            ): CompiledTemplate;
+            ): TemplateRenderer;
+
+            /**
+             * Compile a string of template markup with an engine of choice.
+             *
+             * @param {string} templateBody Template body
+             * @param {string} compilerName The name of a registered compiler.
+             * @returns {TemplateRenderer} Compiled template
+             * @throws {Error} when unknown compiler name provided.
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.template.html#.compile
+             */
+            function compile(templateBody: string, compilerName: string): TemplateRenderer;
 
             /**
              * Get a compiled template by module and template name.
              *
              * @param {string} moduleName Name of the module to retrieve the template from
              * @param {string} templateName Name of template to be retrieved
-             * @returns {CompiledTemplate} Compiled template
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.template-method-get
+             * @returns {TemplateRenderer} Compiled template
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.template.html#.get
              */
-            function get(moduleName: string, templateName: string): CompiledTemplate;
+            function get(moduleName: string, templateName: string): TemplateRenderer;
 
             /**
-             * Compile a string of template markup with an engine of choice.
+             * Get a compiler via its name.
              *
-             * @param {string} templateBody Template body
-             * @param {string} compilerName The name of a registered compiler
-             * @returns {CompiledTemplate} Compiled template
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.template-method-compile
+             * @param {string} name Name of a compiler
+             * @returns {TemplateCompiler} The compiler
+             * @throws {Error} when unknown compiler provided
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.template.html#.getCompiler
+             */
+            function getCompiler(name: string): TemplateCompiler;
+
+            /**
+             * Get the name of the associated compiler based on a template name.
+             *
+             * @param {string} templateName Name of a template (including suffix)
+             * @returns {string} Name of a compiler
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.template.html#.getCompilerName
+             */
+            function getCompilerName(templateName: string): string;
+
+            /**
+             * Register a new compiler.
+             *
+             * A compiler is any object that implements a {@link mw.template.compile} method. The compile() method must
+             * return a Template interface with a method {@link TemplateRenderer.render render()} that returns HTML.
+             *
+             * The compiler name must correspond with the name suffix of templates that use this compiler.
+             *
+             * @param {string} name Compiler name
+             * @param {TemplateCompiler} compiler
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.template.html#.registerCompiler
              */
-            function compile(templateBody: string, compilerName: string): CompiledTemplate;
+            function registerCompiler(name: string, compiler: TemplateCompiler): void;
         }
     }
 }
diff --git a/mw/user.d.ts b/mw/user.d.ts
index 1fa6757..9e25003 100644
--- a/mw/user.d.ts
+++ b/mw/user.d.ts
@@ -1,14 +1,3 @@
-export interface UserInfo {
-    /**
-     * User groups that the user belongs to
-     */
-    groups: string[];
-    /**
-     * User's rights
-     */
-    rights: string[];
-}
-
 interface UserTokens extends Record<string, string> {
     csrfToken: string;
     patrolToken: string;
@@ -17,7 +6,7 @@ interface UserTokens extends Record<string, string> {
 
 export interface User {
     /**
-     * Manage client preferences
+     * Manage client preferences.
      *
      * For skins that enable the `clientPrefEnabled` option (see Skin class in PHP),
      * this feature allows you to store preferences in the browser session that will
@@ -28,46 +17,53 @@ export interface User {
      * and swap class names server-side through the Skin interface.
      *
      * This feature is limited to page views by unregistered users. For logged-in requests,
-     * store preferences in the database instead, via UserOptionsManager or mw.Api#saveOption
+     * store preferences in the database instead, via UserOptionsManager or {@link mw.Api.saveOption}
      * (may be hidden or API-only to exclude from Special:Preferences), and then include the
      * desired classes directly in Skin::getHtmlElementAttributes.
      *
      * Classes toggled by this feature must be named as `<feature>-clientpref-<value>`,
-     * where `value` contains only alphanumerical characters (a-zA-Z0-9), and `feature`
+     * where `value` contains only alphanumerical characters (a-z, A-Z, and 0-9), and `feature`
      * can also include hyphens.
+     *
+     * @since 1.41
+     * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.user.clientPrefs.html
      */
     clientPrefs: {
         /**
-         * Retrieve the current value of the feature from the HTML document element
+         * Retrieve the current value of the feature from the HTML document element.
          *
          * @param {string} feature
-         * @return {false|string} returns false if the feature is not recognized.
-         *   returns string if a feature was found.
-         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.user.clientPrefs-method-get
+         * @returns {false|string} returns false if the feature is not recognized.
+         *  returns string if a feature was found.
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.user.clientPrefs.html#.get
          */
         get(feature: string): false | string;
 
         /**
-         * Change the class on the HTML document element, and save the value in a cookie
+         * Change the class on the HTML document element, and save the value in a cookie.
          *
          * @param {string} feature
          * @param {string} value
-         * @return {boolean} True if feature was stored successfully, false if the value
-         *   uses a forbidden character or the feature is not recognised
-         *   e.g. a matching class was not defined on the HTML document element.
-         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.user.clientPrefs-method-set
+         * @returns {boolean} True if feature was stored successfully, false if the value
+         *  uses a forbidden character or the feature is not recognised
+         *  e.g. a matching class was not defined on the HTML document element.
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.user.clientPrefs.html#.set
          */
         set(feature: string, value: string): boolean;
     };
 
     /**
-     * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.user-property-options
+     * Map of user preferences and their values.
+     *
+     * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.user.html#.options
      */
     // TODO: add types for items in the options map
     options: mw.Map;
 
     /**
-     * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.user-property-tokens
+     * Map of retrieved user tokens.
+     *
+     * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.user.html#.tokens
      */
     tokens: mw.Map<UserTokens>;
 
@@ -80,9 +76,10 @@ export interface User {
      * will be used for their account. It may also be used in previews. However, the account is not
      * created yet, and the name is not visible to other users.
      *
+     * @since 1.41
      * @returns {JQuery.Promise<string>} Promise resolved with the username if we succeeded,
-     *   or resolved with `null` if we failed
-     * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.user-method-acquireTempUserName
+     *  or resolved with `null` if we failed
+     * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.user.html#.acquireTempUserName
      */
     acquireTempUserName(): JQuery.Promise<string>;
 
@@ -93,8 +90,8 @@ export interface User {
      * session or series of sessions. Its uniqueness should not be depended on unless the
      * browser supports the crypto API.
      *
-     * Known problems with Math.random():
-     * Using the Math.random function we have seen sets
+     * Known problems with {@link Math.random()}:
+     * Using the `Math.random` function we have seen sets
      * with 1% of non uniques among 200,000 values with Safari providing most of these.
      * Given the prevalence of Safari in mobile the percentage of duplicates in
      * mobile usages of this code is probably higher.
@@ -103,39 +100,50 @@ export interface User {
      * We need about 80 bits to make sure that probability of collision
      * on 155 billion  is <= 1%
      *
-     * See https://en.wikipedia.org/wiki/Birthday_attack#Mathematics
-     * n(p;H) = n(0.01,2^80)= sqrt (2 * 2^80 * ln(1/(1-0.01)))
+     * See {@link https://en.wikipedia.org/wiki/Birthday_attack#Mathematics}
+     *
+     * `n(p;H) = n(0.01,2^80)= sqrt (2 * 2^80 * ln(1/(1-0.01)))`
      *
      * @returns {string} 80 bit integer (20 characters) in hex format, padded
-     * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.user-method-generateRandomSessionId
+     * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.user.html#.generateRandomSessionId
      */
     generateRandomSessionId(): string;
 
     /**
-     * Get the current user's groups
+     * Get date user first registered, if available.
+     *
+     * @since 1.42
+     * @returns {false|null|Date} False for anonymous users, null if data is
+     *  unavailable, or Date for when the user registered. For temporary users
+     *  that is when their temporary account was created.
+     */
+    getFirstRegistration(): false | null | Date;
+
+    /**
+     * Get the current user's groups.
      *
-     * @param {Function} [callback]
+     * @param {function(string[]):any} [callback]
      * @returns {JQuery.Promise<string[]>}
-     * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.user-method-getGroups
+     * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.user.html#.getGroups
      */
     getGroups<T>(callback: (groups: string[]) => T): JQuery.Promise<T>;
     getGroups(): JQuery.Promise<string[]>;
 
     /**
-     * Get the current user's database id
+     * Get the current user's database id.
      *
      * Not to be confused with {@link id}.
      *
      * @returns {number} Current user's id, or 0 if user is anonymous
-     * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.user-method-getId
+     * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.user.html#.getId
      */
     getId(): number;
 
     /**
-     * Get the current user's name
+     * Get the current user's name.
      *
      * @returns {string|null} User name string or null if user is anonymous
-     * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.user-method-getName
+     * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.user.html#.getName
      */
     getName(): string | null;
 
@@ -145,65 +153,67 @@ export interface User {
      *
      * @since 1.32
      * @returns {string} 80 bit integer in hex format, padded
-     * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.user-method-getPageviewToken
+     * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.user.html#.getPageviewToken
      */
     getPageviewToken(): string;
 
     /**
-     * Get date user registered, if available
+     * Get date user registered, if available.
      *
      * @returns {false|null|Date} False for anonymous users, null if data is
      *  unavailable, or Date for when the user registered.
-     * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.user-method-getRegistration
+     * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.user.html#.getRegistration
      */
     getRegistration(): false | null | Date;
 
     /**
-     * Get the current user's rights
+     * Get the current user's rights.
      *
-     * @param {Function} [callback]
+     * @param {function(string[]):any} [callback]
      * @returns {JQuery.Promise<string[]>}
-     * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.user-method-getRights
+     * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.user.html#.getRights
      */
     getRights<T>(callback: (rights: string[]) => T): JQuery.Promise<T>;
     getRights(): JQuery.Promise<string[]>;
 
     /**
-     * Get the current user's name or the session ID
+     * Get the current user's name or the session ID.
      *
      * Not to be confused with {@link getId}.
      *
      * @returns {string} User name or random session ID
-     * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.user-method-id
+     * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.user.html#.id
      */
     id(): string;
 
     /**
-     * Whether the current user is anonymous
+     * Check whether the current user is anonymous.
      *
      * @returns {boolean}
-     * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.user-method-isAnon
+     * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.user.html#.isAnon
      */
     isAnon(): boolean;
 
     /**
-     * Is the user a normal non-temporary registered user?
+     * Check whether the user is a normal non-temporary registered user.
      *
+     * @since 1.40
      * @returns {boolean}
-     * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.user-method-isNamed
+     * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.user.html#.isNamed
      */
     isNamed(): boolean;
 
     /**
-     * Is the user an autocreated temporary user?
+     * Check whether the user is an autocreated temporary user.
      *
+     * @since 1.40
      * @returns {boolean}
-     * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.user-method-isTemp
+     * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.user.html#.isTemp
      */
     isTemp(): boolean;
 
     /**
-     * Retrieve a random ID, generating it if needed
+     * Retrieve a random ID, generating it if needed.
      *
      * This ID is shared across windows, tabs, and page views. It is persisted
      * for the duration of one browser session (until the browser app is closed),
@@ -212,27 +222,31 @@ export interface User {
      * **Note:** Server-side code must never interpret or modify this value.
      *
      * @returns {string} Random session ID (20 hex characters)
-     * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.user-method-sessionId
+     * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.user.html#.sessionId
      */
     sessionId(): string;
 
     /**
-     * Get the current user's groups or rights
+     * Get the current user's groups or rights.
      *
      * @private
-     * @returns {JQuery.Promise<UserInfo>}
-     * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.user-method-getUserInfo
+     * @returns {JQuery.Promise<mw.Api.UserInfo>}
      */
-    getUserInfo(): JQuery.Promise<UserInfo>;
+    getUserInfo(): JQuery.Promise<mw.Api.UserInfo>;
 }
 
 declare global {
     namespace mw {
         /**
-         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.user
+         * User library provided by `mediawiki.user` ResourceLoader module.
+         *
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/mw.user.html
          */
         const user: User;
     }
 }
 
+/** @deprecated Use `mw.Api.UserInfo` instead. */
+export type UserInfo = mw.Api.UserInfo;
+
 export {};
diff --git a/mw/util.d.ts b/mw/util.d.ts
index 9507829..c2a7c0f 100644
--- a/mw/util.d.ts
+++ b/mw/util.d.ts
@@ -9,7 +9,10 @@ type NoReturn<T extends (...args: any[]) => any> = T extends (
         : (this: U, ...args: V) => void
     : never;
 
-interface ImageUrlData {
+/**
+ * @see https://doc.wikimedia.org/mediawiki-core/master/js/module-mediawiki.util.html#~ResizeableThumbnailUrl
+ */
+interface ResizeableThumbnailUrl {
     /**
      * File name (same format as {@link mw.Title.getMainText()}).
      */
@@ -22,25 +25,33 @@ interface ImageUrlData {
 
     /**
      * @param w Width, which must be smaller than the width of the original image (or equal to it; that
-     *   only works if `MediaHandler::mustRender` returns true for the file). Null when the
-     *   file in the original URL is not a thumbnail.
-     *   On wikis with `$wgGenerateThumbnailOnParse` set to true, this will fall back to using
-     *   `Special:Redirect` which is less efficient. Otherwise, it is a direct thumbnail URL.
+     *  only works if `MediaHandler::mustRender` returns true for the file). Null when the
+     *  file in the original URL is not a thumbnail.
+     *  On wikis with `$wgGenerateThumbnailOnParse` set to true, this will fall back to using
+     *  `Special:Redirect` which is less efficient. Otherwise, it is a direct thumbnail URL.
      * @returns A thumbnail URL (URL-encoded) with that width.
      */
-    resizeUrl: (w: number) => string | null;
+    resizeUrl: ((w: number) => string) | null;
 }
 
 declare global {
     namespace mw {
         /**
-         * Utility library provided by the `mediawiki.util` module.
+         * Utility library provided by the `mediawiki.util` ResourceLoader module. Accessible
+         * inside ResourceLoader modules or for gadgets as part of the {@link mw mw global object}.
          *
-         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.util
+         * @example
+         * ```js
+         * // Inside MediaWiki extensions
+         * const util = require( 'mediawiki.util' );
+         * // In gadgets
+         * const mwUtil = mw.util;
+         * ```
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/module-mediawiki.util.html
          */
         namespace util {
             /**
-             * The content wrapper of the skin (e.g. `.mw-body`).
+             * The content wrapper of the skin (`.mw-body`, for example).
              *
              * Populated on document ready. To use this property,
              * wait for `$.ready` and be sure to have a module dependency on
@@ -56,8 +67,7 @@ declare global {
              * allow your code to re-run when the page changes (e.g. live preview
              * or re-render after ajax save).
              *
-             * @property {JQuery}
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.util-property-S-content
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/module-mediawiki.util.html#.$content
              */
             const $content: JQuery;
 
@@ -67,7 +77,7 @@ declare global {
              * To access the `<style>` element, reference `sheet.ownerNode`, or call
              * the {@link mw.loader.addStyleTag} method directly.
              *
-             * This function returns the CSSStyleSheet object for convience with features
+             * This function returns the CSSStyleSheet object for convenience with features
              * that are managed at that level, such as toggling of styles:
              *
              * ```js
@@ -78,17 +88,18 @@ declare global {
              * } );
              * ```
              *
-             * See also [MDN: CSSStyleSheet](https://developer.mozilla.org/en-US/docs/Web/API/CSSStyleSheet).
+             * See also {@link https://developer.mozilla.org/en-US/docs/Web/API/CSSStyleSheet MDN: CSSStyleSheet}.
              *
              * @param {string} text CSS to be appended
              * @returns {CSSStyleSheet} The sheet object
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.util-method-addCSS
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/module-mediawiki.util.html#.addCSS
              */
             function addCSS(text: string): CSSStyleSheet;
 
             /**
              * Creates a detached portlet Element in the skin with no elements.
              *
+             * @since 1.41
              * @param {string} id of the new portlet.
              * @param {string} [label] of the new portlet.
              * @param {string} [before] selector of the element preceding the new portlet. If not passed
@@ -96,17 +107,19 @@ declare global {
              * @returns {HTMLElement|null} will be null if it was not possible to create an portlet with
              *  the required information e.g. the selector given in before parameter could not be resolved
              *  to an existing element in the page.
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.util-method-addPortlet
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/module-mediawiki.util.html#.addPortlet
              */
             function addPortlet(id: string, label?: string, before?: string): HTMLElement | null;
 
             /**
-             * Add a link to a portlet menu on the page, such as:
+             * Add a link to a portlet menu on the page.
              *
-             * - p-cactions (Content actions),
-             * - p-personal (Personal tools),
-             * - p-navigation (Navigation),
-             * - p-tb (Toolbox).
+             * The portlets that are supported include:
+             *
+             * - p-cactions (Content actions)
+             * - p-personal (Personal tools)
+             * - p-navigation (Navigation)
+             * - p-tb (Toolbox)
              * - p-associated-pages (For namespaces and special page tabs on supported skins)
              * - p-namespaces (For namespaces on legacy skins)
              *
@@ -147,7 +160,7 @@ declare global {
              *
              * ```js
              * $.when( mw.loader.using( [ 'mediawiki.util' ] ), $.ready ).then( function () {
-             *      mw.util.addPortletLink( 'p-tb', 'https://www.mediawiki.org/', 'mediawiki.org' );
+             *     mw.util.addPortletLink( 'p-tb', 'https://www.mediawiki.org/', 'mediawiki.org' );
              * } );
              * ```
              *
@@ -164,7 +177,7 @@ declare global {
              *  Must be another item in the same list, it will be ignored otherwise.
              *  Can be specified as DOM reference, as jQuery object, or as CSS selector string.
              * @returns {HTMLLIElement|null} The added list item, or null if no element was added.
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.util-method-addPortletLink
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/module-mediawiki.util.html#.addPortletLink
              */
             function addPortletLink(
                 portletId: string,
@@ -179,8 +192,9 @@ declare global {
             /**
              * Add content to the subtitle of the skin.
              *
+             * @since 1.40
              * @param {HTMLElement|string} nodeOrHTMLString
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.util-method-addSubtitle
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/module-mediawiki.util.html#.addSubtitle
              */
             function addSubtitle(nodeOrHTMLString: HTMLElement | string): void;
 
@@ -188,7 +202,8 @@ declare global {
              * Clears the entire subtitle if present in the page. Used for refreshing subtitle
              * after edit with response from parse API.
              *
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.util-method-clearSubtitle
+             * @since 1.40
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/module-mediawiki.util.html#.clearSubtitle
              */
             function clearSubtitle(): void;
 
@@ -200,14 +215,14 @@ declare global {
              *
              * Ported from Underscore.js 1.5.2, Copyright 2009-2013 Jeremy Ashkenas, DocumentCloud
              * and Investigative Reporters & Editors, distributed under the MIT license, from
-             * <https://github.com/jashkenas/underscore/blob/1.5.2/underscore.js#L689>.
+             * {@link https://github.com/jashkenas/underscore/blob/1.5.2/underscore.js#L689}.
              *
              * @since 1.34
              * @param {Function} func Function to debounce
              * @param {number} [wait=0] Wait period in milliseconds
              * @param {boolean} [immediate] Trigger on leading edge
              * @returns {Function} Debounced function
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.util-method-debounce
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/module-mediawiki.util.html#.debounce
              */
             function debounce<T extends (...args: any[]) => any>(
                 func: T,
@@ -227,7 +242,7 @@ declare global {
              * @since 1.30
              * @param {string} str String to encode
              * @returns {string} Encoded string
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.util-method-escapeIdForAttribute
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/module-mediawiki.util.html#.escapeIdForAttribute
              */
             function escapeIdForAttribute(str: string): string;
 
@@ -239,12 +254,12 @@ declare global {
              * @since 1.30
              * @param {string} str String to encode
              * @returns {string} Encoded string
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.util-method-escapeIdForLink
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/module-mediawiki.util.html#.escapeIdForLink
              */
             function escapeIdForLink(str: string): string;
 
             /**
-             * Escape string for safe inclusion in regular expression
+             * Escape string for safe inclusion in regular expression.
              *
              * The following characters are escaped:
              *
@@ -252,10 +267,11 @@ declare global {
              * \ { } ( ) | . ? * + - ^ $ [ ]
              * ```
              *
-             * @since 1.26; moved to {@link mw.util} in 1.34
+             * @since 1.26
+             * @since 1.34 - moved to {@link mw.util}.
              * @param {string} str String to escape
              * @returns {string} Escaped string
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.util-method-escapeRegExp
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/module-mediawiki.util.html#.escapeRegExp
              */
             function escapeRegExp(str: string): string;
 
@@ -264,37 +280,38 @@ declare global {
              * Currently this does not handle associative or multi-dimensional arrays, but that may be
              * improved in the future.
              *
+             * @example
              * ```js
              * mw.util.getArrayParam( 'foo', new URLSearchParams( '?foo[0]=a&foo[1]=b' ) ); // [ 'a', 'b' ]
              * mw.util.getArrayParam( 'foo', new URLSearchParams( '?foo[]=a&foo[]=b' ) ); // [ 'a', 'b' ]
              * mw.util.getArrayParam( 'foo', new URLSearchParams( '?foo=a' ) ); // null
              * ```
-             *
+             * @since 1.41
              * @param {string} param The parameter name.
              * @param {URLSearchParams} [params] Parsed URL parameters to search through, defaulting to the current browsing location.
              * @returns {string[]|null} Parameter value, or null if parameter was not found.
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.util-method-getArrayParam
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/module-mediawiki.util.html#.getArrayParam
              */
             function getArrayParam(param: string, params?: URLSearchParams): string[] | null;
 
             /**
              * Get the value for a given URL query parameter.
              *
+             * @example
              * ```js
              * mw.util.getParamValue( 'foo', '/?foo=x' ); // "x"
              * mw.util.getParamValue( 'foo', '/?foo=' ); // ""
              * mw.util.getParamValue( 'foo', '/' ); // null
              * ```
-             *
              * @param {string} param The parameter name.
              * @param {string} [url=location.href] URL to search through, defaulting to the current browsing location.
              * @returns {string|null} Parameter value, or null if parameter was not found.
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.util-method-getParamValue
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/module-mediawiki.util.html#.getParamValue
              */
             function getParamValue(param: string, url?: string): string | null;
 
             /**
-             * Get the target element from a link hash
+             * Get the target element from a link hash.
              *
              * This is the same element as you would get from
              * `document.querySelectorAll(':target')`, but can be used on
@@ -311,18 +328,18 @@ declare global {
              * @param {string} [hash] Hash fragment, without the leading '#'.
              *  Taken from location.hash if omitted.
              * @returns {HTMLElement|null} Element, if found
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.util-method-getTargetFromFragment
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/module-mediawiki.util.html#.getTargetFromFragment
              */
             function getTargetFromFragment(hash?: string): HTMLElement | null;
 
             /**
-             * Get the URL to a given local wiki page name,
+             * Get the URL to a given local wiki page name.
              *
-             * @param {string|null} [pageName=wgPageName] Page name
+             * @param {string|null} [pageName="wgPageName"] Page name
              * @param {QueryParams} [params] A mapping of query parameter names to values,
              *  e.g. `{ action: 'edit' }`
              * @returns {string} URL, relative to `wgServer`.
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.util-method-getUrl
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/module-mediawiki.util.html#.getUrl
              */
             // params are handled by $.param, which converts any value to a string. However, instead of using toString(),
             // object are serialized (deep ones recursively), so only simple values are allowed to prevent mistakes.
@@ -332,18 +349,30 @@ declare global {
              * Hide a portlet.
              *
              * @param {string} portletId ID of the target portlet (e.g. 'p-cactions' or 'p-personal')
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.util-method-hidePortlet
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/module-mediawiki.util.html#.hidePortlet
              */
             function hidePortlet(portletId: string): void;
 
             /**
-             * Check whether a string is a valid IP address
+             * Determine if an input string represents a value of infinity.
+             * This is used when testing for infinity in the context of expiries,
+             * such as watchlisting, page protection, and block expiries.
+             *
+             * @since 1.42
+             * @param {string|null} str
+             * @returns {boolean}
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/module-mediawiki.util.html#.isInfinity
+             */
+            function isInfinity(str: string | null): boolean;
+
+            /**
+             * Check whether a string is a valid IP address.
              *
              * @since 1.25
              * @param {string} address String to check
              * @param {boolean} [allowBlock=false] If a block of IPs should be allowed
              * @returns {boolean}
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.util-method-isIPAddress
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/module-mediawiki.util.html#.isIPAddress
              */
             function isIPAddress(address: string, allowBlock?: boolean): boolean;
 
@@ -352,6 +381,7 @@ declare global {
              *
              * Based on \Wikimedia\IPUtils::isIPv4 in PHP.
              *
+             * @example
              * ```js
              * // Valid
              * mw.util.isIPv4Address( '80.100.20.101' );
@@ -361,11 +391,10 @@ declare global {
              * mw.util.isIPv4Address( '192.0.2.0/24' );
              * mw.util.isIPv4Address( 'hello' );
              * ```
-             *
              * @param {string} address
              * @param {boolean} [allowBlock=false]
              * @returns {boolean}
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.util-method-isIPv4Address
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/module-mediawiki.util.html#.isIPv4Address
              */
             function isIPv4Address(
                 address: string,
@@ -381,6 +410,7 @@ declare global {
              *
              * Based on \Wikimedia\IPUtils::isIPv6 in PHP.
              *
+             * @example
              * ```js
              * // Valid
              * mw.util.isIPv6Address( '2001:db8:a:0:0:0:0:0' );
@@ -390,31 +420,31 @@ declare global {
              * mw.util.isIPv6Address( '2001:db8:a::/32' );
              * mw.util.isIPv6Address( 'hello' );
              * ```
-             *
              * @param {string} address
              * @param {boolean} [allowBlock=false]
              * @returns {boolean}
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.util-method-isIPv6Address
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/module-mediawiki.util.html#.isIPv6Address
              */
             function isIPv6Address(address: string, allowBlock?: boolean): boolean;
 
             /**
-             * Is a portlet visible?
+             * Whether a portlet is visible.
              *
              * @param {string} portletId ID of the target portlet (e.g. 'p-cactions' or 'p-personal')
              * @returns {boolean}
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.util-method-isPortletVisible
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/module-mediawiki.util.html#.isPortletVisible
              */
             function isPortletVisible(portletId: string): boolean;
 
             /**
-             * Does given username match $wgAutoCreateTempUser?
+             * Checks if the given username matches $wgAutoCreateTempUser.
              *
              * This functionality has been adapted from `MediaWiki\User\TempUser\Pattern::isMatch()`
              *
+             * @since 1.40
              * @param {string} username
              * @returns {boolean}
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.util-method-isTemporaryUser
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/module-mediawiki.util.html#.isTemporaryUser
              */
             function isTemporaryUser(username: string): boolean;
 
@@ -424,14 +454,14 @@ declare global {
              * the image.
              *
              * @param {string} url URL to parse (URL-encoded)
-             * @returns {ImageUrlData|null} URL data, or null if the URL is not a valid MediaWiki
-             *   image/thumbnail URL.
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.util-method-parseImageUrl
+             * @returns {ResizeableThumbnailUrl|null} URL data, or null if the URL is not a valid MediaWiki
+             *  image/thumbnail URL.
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/module-mediawiki.util.html#.parseImageUrl
              */
-            function parseImageUrl(url: string): ImageUrlData | null;
+            function parseImageUrl(url: string): ResizeableThumbnailUrl | null;
 
             /**
-             * Percent-decode a string, as found in a URL hash fragment
+             * Percent-decode a string, as found in a URL hash fragment.
              *
              * Implements the percent-decode method as defined in
              * {@link https://url.spec.whatwg.org/#percent-decode}.
@@ -444,7 +474,7 @@ declare global {
              *
              * @param {string} text Text to decode
              * @returns {string|null} Decoded text, null if decoding failed
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.util-method-percentDecodeFragment
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/module-mediawiki.util.html#.percentDecodeFragment
              */
             function percentDecodeFragment(text: string): string | null;
 
@@ -457,16 +487,16 @@ declare global {
              *
              * @param {string} ip IP address in quad or octet form (CIDR or not).
              * @returns {string|null}
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.util-method-prettifyIP
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/module-mediawiki.util.html#.prettifyIP
              */
             function prettifyIP(ip: string): string | null;
 
             /**
-             * Encode the string like PHP's rawurlencode
+             * Encode the string like PHP's rawurlencode.
              *
              * @param {string} str String to be encoded.
              * @returns {string} Encoded string
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.util-method-rawurlencode
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/module-mediawiki.util.html#.rawurlencode
              */
             function rawurlencode(str: string): string;
 
@@ -481,7 +511,7 @@ declare global {
              *
              * @param {string} ip IP address in quad or octet form (CIDR or not).
              * @returns {string|null}
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.util-method-sanitizeIP
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/module-mediawiki.util.html#.sanitizeIP
              */
             function sanitizeIP(ip: string): string | null;
 
@@ -489,7 +519,7 @@ declare global {
              * Reveal a portlet if it is hidden.
              *
              * @param {string} portletId ID of the target portlet (e.g. 'p-cactions' or 'p-personal')
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.util-method-showPortlet
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/module-mediawiki.util.html#.showPortlet
              */
             function showPortlet(portletId: string): void;
 
@@ -507,7 +537,7 @@ declare global {
              * @param {Function} func Function to throttle
              * @param {number} wait Throttle window length, in milliseconds
              * @returns {Function} Throttled function
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.util-method-throttle
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/module-mediawiki.util.html#.throttle
              */
             function throttle<T extends (...args: any[]) => any>(
                 func: T,
@@ -519,13 +549,13 @@ declare global {
              *
              * This validation is based on the HTML5 specification.
              *
+             * @example
              * ```js
              * mw.util.validateEmail( "me@example.org" ) === true;
              * ```
-             *
              * @param {string} email E-mail address
              * @returns {boolean|null} True if valid, false if invalid, null if `email` was empty.
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.util-method-validateEmail
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/module-mediawiki.util.html#.validateEmail
              */
             function validateEmail(email: string): boolean | null;
 
@@ -537,7 +567,7 @@ declare global {
              * @since 1.18
              * @param {string} [str="index"] Name of entry point (e.g. 'index' or 'api')
              * @returns {string} URL to the script file (e.g. `/w/api.php`)
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.util-method-wikiScript
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/module-mediawiki.util.html#.wikiScript
              */
             function wikiScript(str?: string): string;
 
@@ -552,7 +582,7 @@ declare global {
              *
              * @param {string} str String to be encoded.
              * @returns {string} Encoded string
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.util-method-wikiUrlencode
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/module-mediawiki.util.html#.wikiUrlencode
              */
             function wikiUrlencode(str: string): string;
         }
diff --git a/package-lock.json b/package-lock.json
index d7a7bd4..612eb36 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "types-mediawiki",
-    "version": "1.7.1",
+    "version": "1.8.0",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
         "": {
             "name": "types-mediawiki",
-            "version": "1.7.1",
+            "version": "1.8.0",
             "license": "GPL-3.0-or-later",
             "dependencies": {
                 "@types/jquery": "^3.5.5",
diff --git a/package.json b/package.json
index efd8b25..57b5852 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "types-mediawiki",
-    "version": "1.7.1",
+    "version": "1.8.0",
     "description": "TypeScript definitions for MediaWiki JS interface",
     "types": "index.d.ts",
     "scripts": {
diff --git a/scripts/config-types-scraper.js b/scripts/config-types-scraper.js
index 6d1390f..1d7d2f0 100644
--- a/scripts/config-types-scraper.js
+++ b/scripts/config-types-scraper.js
@@ -42,7 +42,7 @@ function formatEntry(name, data) {
         "/**",
         ...data.description.split("\n").map((e) => ` * ${e.trim()}`),
         " *",
-        ` * @see https://www.mediawiki.org/wiki/Manual:Interface/JavaScript#${name}`,
+        ` * @see https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Interface/JavaScript#${name}`,
         " */",
         `${name}${data.optional ? "?" : ""}: ${data.type};`,
     ];