webext-schema 5.3.4 → 5.4.0

package/schemas/mail/mailext.json

@@ -2524,11 +2524,11 @@
           "choices": [
             {
               "type": "string",
-              "description": "A string containing a valid `CSS color string <|link-css-color-string|>`__, including hexadecimal or functional representations. For example the color *crimson* can be specified as: <li><value>crimson</value> <li><value>#dc143c</value> <li><value>rgb(220, 20, 60)</value> (or <value>rgba(220, 20, 60, 0.5)</value> to set 50% opacity) <li><value>hsl(348, 83%, 47%)</value> (or <value>hsla(348, 83%, 47%, 0.5)</value> to set 50% opacity)"
+              "description": "A string containing a valid <a href='url-css-color-string'>CSS color string</a>, including hexadecimal or functional representations. For example the color *crimson* can be specified as: <li><var>crimson</var> <li><var>#dc143c</var> <li><var>rgb(220, 20, 60)</var> (or <var>rgba(220, 20, 60, 0.5)</var> to set 50% opacity) <li><var>hsl(348, 83%, 47%)</var> (or <var>hsla(348, 83%, 47%, 0.5)</var> to set 50% opacity)"
             },
             {
               "type": "array",
-              "description": "An RGB array of 3 integers. For example <value>[220, 20, 60]</value> for the color *crimson*.",
+              "description": "An RGB array of 3 integers. For example <var>[220, 20, 60]</var> for the color *crimson*.",
               "minItems": 3,
               "maxItems": 3,
               "items": {
@@ -2539,7 +2539,7 @@
             },
             {
               "type": "array",
-              "description": "An RGBA array of 3 integers and a fractional (a float between 0 and 1). For example <value>[220, 20, 60, 0.5]<value> for the color *crimson* with 50% opacity.",
+              "description": "An RGBA array of 3 integers and a fractional (a float between 0 and 1). For example <var>[220, 20, 60, 0.5]<var> for the color *crimson* with 50% opacity.",
               "minItems": 4,
               "maxItems": 4,
               "items": {
@@ -2550,18 +2550,18 @@
         },
         {
           "id": "ThemeExperiment",
-          "description": "Defines additional color, image and property keys to be used in :ref:`theme.ThemeType`, extending the theme-able areas of Thunderbird.",
+          "description": "Defines additional color, image and property keys to be used in $(ref:theme.ThemeType), extending the theme-able areas of Thunderbird.",
           "type": "object",
           "properties": {
             "stylesheet": {
               "optional": true,
-              "description": "URL to a stylesheet introducing additional CSS variables, extending the theme-able areas of Thunderbird. The `theme_experiment add-on in our example repository <https://github.com/thunderbird/sample-extensions/tree/master/manifest_v2/theme_experiment>`__ is using the stylesheet shown below, to add the <value>--chat-button-color</value> CSS color variable: <literalinclude>includes/theme/theme_experiment_style.css<lang>CSS</lang></literalinclude>The following <em>manifest.json</em> file maps the </value>--chat-button-color</value> CSS color variable to the theme color key <value>exp_chat_button</value> and uses it to set a color for the chat button: <literalinclude>includes/theme/theme_experiment_manifest.json<lang>JSON</lang></literalinclude>",
+              "description": "URL to a stylesheet introducing additional CSS variables, extending the theme-able areas of Thunderbird. The <a href='url-theme-experiment'>theme_experiment add-on in our example repository</a> is using the stylesheet shown below, to add the <var>--chat-button-color</var> CSS color variable: <literalinclude>includes/theme/theme_experiment_style.css<lang>CSS</lang></literalinclude>The following <em>manifest.json</em> file maps the </var>--chat-button-color</var> CSS color variable to the theme color key <var>exp_chat_button</var> and uses it to set a color for the chat button: <literalinclude>includes/theme/theme_experiment_manifest.json<lang>JSON</lang></literalinclude>",
               "$ref": "ExtensionURL"
             },
             "images": {
               "type": "object",
               "optional": true,
-              "description": "A <em>dictionary object</em> with one or more <em>key-value</em> pairs to map new theme image keys to internal Thunderbird CSS image variables. The new image key is usable as an image reference in :ref:`theme.ThemeType`. Example: <literalinclude>includes/theme/theme_experiment_image.json<lang>JSON</lang></literalinclude>",
+              "description": "A <em>dictionary object</em> with one or more <em>key-value</em> pairs to map new theme image keys to internal Thunderbird CSS image variables. The new image key is usable as an image reference in $(ref:theme.ThemeType). Example: <literalinclude>includes/theme/theme_experiment_image.json<lang>JSON</lang></literalinclude>",
               "additionalProperties": {
                 "type": "string"
               }
@@ -2569,7 +2569,7 @@
             "colors": {
               "type": "object",
               "optional": true,
-              "description": "A <em>dictionary object</em> with one or more <em>key-value</em> pairs to map new theme color keys to internal Thunderbird CSS color variables. The example shown below maps the theme color key <value>popup_affordance</value> to the CSS color variable </value>--arrowpanel-dimmed</value>. The new color key is usable as a color reference in :ref:`theme.ThemeType`. <literalinclude>includes/theme/theme_experiment_color.json<lang>JSON</lang></literalinclude>",
+              "description": "A <em>dictionary object</em> with one or more <em>key-value</em> pairs to map new theme color keys to internal Thunderbird CSS color variables. The example shown below maps the theme color key <var>popup_affordance</var> to the CSS color variable </var>--arrowpanel-dimmed</var>. The new color key is usable as a color reference in $(ref:theme.ThemeType). <literalinclude>includes/theme/theme_experiment_color.json<lang>JSON</lang></literalinclude>",
               "additionalProperties": {
                 "type": "string"
               }
@@ -2577,7 +2577,7 @@
             "properties": {
               "type": "object",
               "optional": true,
-              "description": "A <em>dictionary object</em> with one or more <em>key-value</em> pairs to map new theme property keys to internal Thunderbird CSS property variables. The new property key is usable as a property reference in :ref:`theme.ThemeType`. Example: <literalinclude>includes/theme/theme_experiment_property.json<lang>JSON</lang></literalinclude>",
+              "description": "A <em>dictionary object</em> with one or more <em>key-value</em> pairs to map new theme property keys to internal Thunderbird CSS property variables. The new property key is usable as a property reference in $(ref:theme.ThemeType). Example: <literalinclude>includes/theme/theme_experiment_property.json<lang>JSON</lang></literalinclude>",
               "additionalProperties": {
                 "type": "string"
               }
@@ -2601,12 +2601,12 @@
                   },
                   "maxItems": 15,
                   "optional": true,
-                  "description": "Additional images added to the header area and displayed behind the ``theme_frame`` image."
+                  "description": "Additional images added to the header area and displayed behind the <var>theme_frame</var> image."
                 },
                 "headerURL": {
                   "$ref": "ImageDataOrExtensionURL",
                   "optional": true,
-                  "deprecated": "Unsupported images property, use ``theme.images.theme_frame``, this alias is ignored in Thunderbird >= 70."
+                  "deprecated": "Unsupported images property, use <var>theme.images.theme_frame</var>, this alias is ignored in Thunderbird >= 70."
                 },
                 "theme_frame": {
                   "$ref": "ImageDataOrExtensionURL",
@@ -2626,12 +2626,12 @@
                 "tab_selected": {
                   "$ref": "ThemeColor",
                   "optional": true,
-                  "description": "Background color of the selected tab. Defaults to the color specified by ``toolbar``."
+                  "description": "Background color of the selected tab. Defaults to the color specified by <var>toolbar</var>."
                 },
                 "accentcolor": {
                   "$ref": "ThemeColor",
                   "optional": true,
-                  "deprecated": "Unsupported colors property, use ``theme.colors.frame``, this alias is ignored in Thunderbird >= 70."
+                  "deprecated": "Unsupported colors property, use <var>theme.colors.frame</var>, this alias is ignored in Thunderbird >= 70."
                 },
                 "frame": {
                   "$ref": "ThemeColor",
@@ -2646,7 +2646,7 @@
                 "textcolor": {
                   "$ref": "ThemeColor",
                   "optional": true,
-                  "deprecated": "Unsupported color property, use ``theme.colors.tab_background_text``, this alias is ignored in Thunderbird >= 70."
+                  "deprecated": "Unsupported color property, use <var>theme.colors.tab_background_text</var>, this alias is ignored in Thunderbird >= 70."
                 },
                 "tab_background_text": {
                   "$ref": "ThemeColor",
@@ -2666,7 +2666,7 @@
                 "tab_text": {
                   "$ref": "ThemeColor",
                   "optional": true,
-                  "description": "The text color for the selected tab. Defaults to the color specified by ``toolbar_text``."
+                  "description": "The text color for the selected tab. Defaults to the color specified by <var>toolbar_text</var>."
                 },
                 "tab_line": {
                   "$ref": "ThemeColor",
@@ -2676,12 +2676,12 @@
                 "toolbar": {
                   "$ref": "ThemeColor",
                   "optional": true,
-                  "description": "The background color of the toolbars. Also used as default value for ``tab_selected``."
+                  "description": "The background color of the toolbars. Also used as default value for <var>tab_selected</var>."
                 },
                 "toolbar_text": {
                   "$ref": "ThemeColor",
                   "optional": true,
-                  "description": "The text color in the main Thunderbird toolbar. Also used as default value for ``icons`` and ``tab_text``."
+                  "description": "The text color in the main Thunderbird toolbar. Also used as default value for <var>icons</var> and <var>tab_text</var>."
                 },
                 "bookmark_text": {
                   "$ref": "ThemeColor",
@@ -2727,7 +2727,7 @@
                 "icons": {
                   "$ref": "ThemeColor",
                   "optional": true,
-                  "description": "The color of the toolbar icons. Defaults to the color specified by ``toolbar_text``."
+                  "description": "The color of the toolbar icons. Defaults to the color specified by <var>toolbar_text</var>."
                 },
                 "icons_attention": {
                   "$ref": "ThemeColor",
@@ -2953,7 +2953,7 @@
             "theme_experiment": {
               "$ref": "ThemeExperiment",
               "optional": true,
-              "description": "A theme experiment allows modifying the user interface of Thunderbird beyond what is currently possible using the built-in color, image and property keys of :ref:`theme.ThemeType`. These experiments are a precursor to proposing new theme features for inclusion in Thunderbird. Experimentation is done by mapping internal CSS color, image and property variables to new theme keys and using them in :ref:`theme.ThemeType` and by loading additional style sheets to add new CSS variables, extending the theme-able areas of Thunderbird. Can be used in static and dynamic themes."
+              "description": "A theme experiment allows modifying the user interface of Thunderbird beyond what is currently possible using the built-in color, image and property keys of $(ref:theme.ThemeType). These experiments are a precursor to proposing new theme features for inclusion in Thunderbird. Experimentation is done by mapping internal CSS color, image and property variables to new theme keys and using them in $(ref:theme.ThemeType) and by loading additional style sheets to add new CSS variables, extending the theme-able areas of Thunderbird. Can be used in static and dynamic themes."
             }
           }
         }
@@ -3086,7 +3086,7 @@
       "types": [
         {
           "id": "MailAccount",
-          "description": "An object describing a mail account, as returned for example by the :ref:`accounts.list` and :ref:`accounts.get` methods.",
+          "description": "An object describing a mail account, as returned for example by the $(ref:accounts.list) and $(ref:accounts.get) methods.",
           "type": "object",
           "properties": {
             "id": {
@@ -3099,11 +3099,11 @@
             },
             "type": {
               "type": "string",
-              "description": "What sort of account this is, e.g. <value>imap</value>, <value>nntp</value>, or <value>pop3</value>."
+              "description": "What sort of account this is, e.g. <var>imap</var>, <var>nntp</var>, or <var>pop3</var>."
             },
             "folders": {
               "max_manifest_version": 2,
-              "description": "The folders for this account. The property may be <value>null</value>, if inclusion of folders had not been requested.",
+              "description": "The folders for this account. The property may be <var>null</var>, if inclusion of folders had not been requested.",
               "choices": [
                 {
                   "type": "array",
@@ -3132,7 +3132,7 @@
         {
           "id": "MailAccountId",
           "type": "string",
-          "description": "A unique id representing a :ref:`accounts.MailAccount`."
+          "description": "A unique id representing a $(ref:accounts.MailAccount)."
         },
         {
           "id": "MailAccountType",
@@ -3170,11 +3170,11 @@
           "async": "callback",
           "parameters": [
             {
-              "name": "includeFolders",
+              "name": "includeSubFolders",
               "optional": true,
               "default": false,
               "type": "boolean",
-              "description": "Specifies whether the returned :ref:`accounts.MailAccount` objects should include their account's folders. Defaults to <value>false</value>."
+              "description": "Specifies whether the $(ref:folders.MailFolder) in the <var>rootFolder</var> property of each found $(ref:accounts.MailAccount) should populate its <var>subFolders</var> property, and include all (nested!) subfolders. Defaults to <var>false</var>."
             },
             {
               "type": "function",
@@ -3199,11 +3199,11 @@
           "async": "callback",
           "parameters": [
             {
-              "name": "includeFolders",
+              "name": "includeSubFolders",
               "optional": true,
               "default": true,
               "type": "boolean",
-              "description": "Specifies whether the returned :ref:`accounts.MailAccount` objects should include their account's folders. Defaults to <value>true</value>."
+              "description": "Specifies whether the $(ref:folders.MailFolder) in the <var>rootFolder</var> property of each found $(ref:accounts.MailAccount) should populate its <var>subFolders</var> property, and include all (nested!) subfolders. This also affects the deprecated <var>folders</var> property of each found $(ref:accounts.MailAccount). Defaults to <var>true</var>."
             },
             {
               "type": "function",
@@ -3224,7 +3224,7 @@
           "name": "get",
           "type": "function",
           "min_manifest_version": 3,
-          "description": "Returns details of the requested account, or <value>null</value> if it doesn't exist.",
+          "description": "Returns details of the requested account, or <var>null</var> if it doesn't exist.",
           "async": "callback",
           "parameters": [
             {
@@ -3232,11 +3232,11 @@
               "$ref": "MailAccountId"
             },
             {
-              "name": "includeFolders",
+              "name": "includeSubFolders",
               "optional": true,
               "default": false,
               "type": "boolean",
-              "description": "Specifies whether the returned :ref:`accounts.MailAccount` object should included the account's folders. Defaults to <value>false</value>."
+              "description": "Specifies whether the $(ref:folders.MailFolder) in the <var>rootFolder</var> property of the returned $(ref:accounts.MailAccount) should populate its <var>subFolders</var> property, and include all (nested!) subfolders. Defaults to <var>false</var>."
             },
             {
               "type": "function",
@@ -3255,7 +3255,7 @@
           "name": "get",
           "type": "function",
           "max_manifest_version": 2,
-          "description": "Returns details of the requested account, or <value>null</value> if it doesn't exist.",
+          "description": "Returns details of the requested account, or <var>null</var> if it doesn't exist.",
           "async": "callback",
           "parameters": [
             {
@@ -3263,11 +3263,11 @@
               "$ref": "MailAccountId"
             },
             {
-              "name": "includeFolders",
+              "name": "includeSubFolders",
               "optional": true,
               "default": true,
               "type": "boolean",
-              "description": "Specifies whether the returned :ref:`accounts.MailAccount` object should included the account's folders. Defaults to <value>true</value>."
+              "description": "Specifies whether the $(ref:folders.MailFolder) in the <var>rootFolder</var> property of the returned $(ref:accounts.MailAccount) should populate its <var>subFolders</var> property, and include all (nested!) subfolders. This also affects the deprecated <var>folders</var> property of the returned $(ref:accounts.MailAccount). Defaults to <var>true</var>."
             },
             {
               "type": "function",
@@ -3291,12 +3291,46 @@
         {
           "name": "getDefault",
           "type": "function",
-          "description": "Returns the default account, or <value>null</value> if it is not defined.",
+          "min_manifest_version": 3,
+          "description": "Returns the default account, or <var>null</var> if it is not defined.",
           "async": "callback",
           "parameters": [
             {
-              "name": "includeFolders",
-              "description": "Specifies whether the returned :ref:`accounts.MailAccount` object should included the account's folders. Defaults to <value>true</value>.",
+              "name": "includeSubFolders",
+              "description": "Specifies whether the $(ref:folders.MailFolder) in the <var>rootFolder</var> property of the default $(ref:accounts.MailAccount) should populate its <var>subFolders</var> property, and include all (nested!) subfolders. Defaults to <var>false</var>",
+              "optional": true,
+              "default": false,
+              "type": "boolean"
+            },
+            {
+              "type": "function",
+              "name": "callback",
+              "optional": true,
+              "parameters": [
+                {
+                  "choices": [
+                    {
+                      "$ref": "accounts.MailAccount"
+                    },
+                    {
+                      "type": "null"
+                    }
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "name": "getDefault",
+          "type": "function",
+          "max_manifest_version": 2,
+          "description": "Returns the default account, or <var>null</var> if it is not defined.",
+          "async": "callback",
+          "parameters": [
+            {
+              "name": "includeSubFolders",
+              "description": "Specifies whether the $(ref:folders.MailFolder) in the <var>rootFolder</var> property of the default $(ref:accounts.MailAccount) should populate its <var>subFolders</var> property, and include all (nested!) subfolders. This also affects the deprecated <var>folders</var> property of the default $(ref:accounts.MailAccount). Defaults to <var>true</var>",
               "optional": true,
               "default": true,
               "type": "boolean"
@@ -3341,7 +3375,7 @@
         {
           "name": "getDefaultIdentity",
           "type": "function",
-          "description": "Returns the default identity for an account, or <value>null</value> if it is not defined.",
+          "description": "Returns the default identity for an account, or <var>null</var> if it is not defined.",
           "async": "callback",
           "max_manifest_version": 2,
           "deprecated": "Deprecated since Thunderbird 91 and removed in Manifest V3: accounts.getDefaultIdentity() is now available as identities.getDefault.",
@@ -3400,7 +3434,7 @@
         {
           "name": "onUpdated",
           "type": "function",
-          "description": "Fired when a property of an account has been modified. Folders and identities of accounts are not monitored by this event, use the dedicated folder and identity events instead. A changed ``defaultIdentity`` is reported only after a different identity has been assigned as default identity, but not after a property of the default identity has been changed.",
+          "description": "Fired when a property of an account has been modified. Folders and identities of accounts are not monitored by this event, use the dedicated folder and identity events instead. A changed <var>defaultIdentity</var> is reported only after a different identity has been assigned as default identity, but not after a property of the default identity has been changed.",
           "parameters": [
             {
               "name": "accountId",
@@ -3471,11 +3505,11 @@
             "parentId": {
               "type": "string",
               "optional": true,
-              "description": "The ``id`` of the parent object."
+              "description": "The <var>id</var> of the parent object."
             },
             "type": {
               "$ref": "NodeType",
-              "description": "Always set to <value>addressBook</value>."
+              "description": "Always set to <var>addressBook</var>."
             },
             "readOnly": {
               "type": "boolean",
@@ -3738,7 +3772,7 @@
                 "id": {
                   "type": "string",
                   "optional": true,
-                  "description": "The unique ID of the created address book. If several listeners have been added, the ``id`` allows to identify which address book initiated the search request. If not provided, a unique ID will be generated for you."
+                  "description": "The unique ID of the created address book. If several listeners have been added, the <var>id</var> allows to identify which address book initiated the search request. If not provided, a unique ID will be generated for you."
                 }
               }
             }
@@ -3765,7 +3799,7 @@
       "types": [
         {
           "id": "QueryInfo",
-          "description": "Object defining a query for :ref:`contacts.quickSearch`.",
+          "description": "Object defining a query for $(ref:contacts.quickSearch).",
           "type": "object",
           "properties": {
             "parentId": {
@@ -3777,31 +3811,31 @@
             "searchString": {
               "type": "string",
               "optional": true,
-              "description": "One or more space-separated terms to search for in predefined contact fields (defined by the preference <value>mail.addr_book.quicksearchquery.format</value>)."
+              "description": "One or more space-separated terms to search for in predefined contact fields (defined by the preference <var>mail.addr_book.quicksearchquery.format</var>)."
             },
             "includeLocal": {
               "type": "boolean",
               "optional": true,
               "default": true,
-              "description": "Whether to include results from local address books. Defaults to <value>true</value>."
+              "description": "Whether to include results from local address books. Defaults to <var>true</var>."
             },
             "includeRemote": {
               "type": "boolean",
               "optional": true,
               "default": true,
-              "description": "Whether to include results from remote address books. Defaults to <value>true</value>."
+              "description": "Whether to include results from remote address books. Defaults to <var>true</var>."
             },
             "includeReadOnly": {
               "type": "boolean",
               "optional": true,
               "default": true,
-              "description": "Whether to include results from read-only address books. Defaults to <value>true</value>."
+              "description": "Whether to include results from read-only address books. Defaults to <var>true</var>."
             },
             "includeReadWrite": {
               "type": "boolean",
               "optional": true,
               "default": true,
-              "description": "Whether to include results from read-write address books. Defaults to <value>true</value>."
+              "description": "Whether to include results from read-write address books. Defaults to <var>true</var>."
             }
           }
         },
@@ -3817,11 +3851,11 @@
             "parentId": {
               "type": "string",
               "optional": true,
-              "description": "The ``id`` of the parent object."
+              "description": "The <var>id</var> of the parent object."
             },
             "type": {
               "$ref": "addressBooks.NodeType",
-              "description": "Always set to <value>contact</value>."
+              "description": "Always set to <var>contact</var>."
             },
             "readOnly": {
               "type": "boolean",
@@ -3846,7 +3880,7 @@
         {
           "id": "ContactProperties",
           "type": "object",
-          "description": "A set of individual properties for a particular contact, and its vCard string. Further information can be found in :doc:`examples/vcard`.",
+          "description": "A set of individual properties for a particular contact, and its vCard string. Further information can be found in $(doc:examples/vcard).",
           "patternProperties": {
             "^\\w+$": {
               "choices": [
@@ -3863,7 +3897,7 @@
         {
           "id": "PropertyChange",
           "type": "object",
-          "description": "A dictionary of changed properties. Keys are the property name that changed, values are an object containing ``oldValue`` and ``newValue``. Values can be either a string or <value>null</value>.",
+          "description": "A dictionary of changed properties. Keys are the property name that changed, values are an object containing <var>oldValue</var> and <var>newValue</var>. Values can be either a string or <var>null</var>.",
           "patternProperties": {
             "^\\w+$": {
               "type": "object",
@@ -3917,7 +3951,7 @@
               ]
             }
           ],
-          "description": "Gets all the contacts in the address book with the id ``parentId``."
+          "description": "Gets all the contacts in the address book with the id <var>parentId</var>."
         },
         {
           "name": "quickSearch",
@@ -3933,7 +3967,7 @@
             },
             {
               "name": "queryInfo",
-              "description": "Either a <em>string</em> with one or more space-separated terms to search for, or a complex :ref:`contacts.QueryInfo` search query.",
+              "description": "Either a <em>string</em> with one or more space-separated terms to search for, or a complex $(ref:contacts.QueryInfo) search query.",
               "choices": [
                 {
                   "type": "string"
@@ -3957,7 +3991,7 @@
               ]
             }
           ],
-          "description": "Gets all contacts matching ``queryInfo`` in the address book with the id ``parentId``."
+          "description": "Gets all contacts matching <var>queryInfo</var> in the address book with the id <var>parentId</var>."
         },
         {
           "name": "query",
@@ -3983,7 +4017,7 @@
               ]
             }
           ],
-          "description": "Gets all contacts matching ``queryInfo``."
+          "description": "Gets all contacts matching <var>queryInfo</var>."
         },
         {
           "name": "get",
@@ -4036,7 +4070,7 @@
               ]
             }
           ],
-          "description": "Gets the photo associated with this contact. Returns <value>null</value>, if no photo is available."
+          "description": "Gets the photo associated with this contact. Returns <var>null</var>, if no photo is available."
         },
         {
           "name": "setPhoto",
@@ -4075,7 +4109,7 @@
             {
               "name": "properties",
               "$ref": "ContactProperties",
-              "description": "The properties object for the new contact. If it includes a ``vCard`` member, all specified `legacy properties <|link-legacy-properties|>`__ are ignored and the new contact will be based on the provided vCard string. If a UID is specified in the vCard string, which is already used by another contact, an exception is thrown. **Note:** Using individual properties is deprecated, use the ``vCard`` member instead."
+              "description": "The properties object for the new contact. If it includes a <var>vCard</var> member, all specified <a href='url-legacy-properties'>legacy properties</a> are ignored and the new contact will be based on the provided vCard string. If a UID is specified in the vCard string, which is already used by another contact, an exception is thrown. **Note:** Using individual properties is deprecated, use the <var>vCard</var> member instead."
             },
             {
               "type": "function",
@@ -4089,7 +4123,7 @@
               ]
             }
           ],
-          "description": "Adds a new contact to the address book with the id ``parentId``."
+          "description": "Adds a new contact to the address book with the id <var>parentId</var>."
         },
         {
           "name": "create",
@@ -4119,7 +4153,7 @@
               ]
             }
           ],
-          "description": "Adds a new contact to the address book with the id ``parentId``."
+          "description": "Adds a new contact to the address book with the id <var>parentId</var>."
         },
         {
           "name": "update",
@@ -4134,7 +4168,7 @@
             {
               "name": "properties",
               "$ref": "ContactProperties",
-              "description": "An object with properties to update the specified contact. Individual properties are removed, if they are set to <value>null</value>. If the provided object includes a ``vCard`` member, all specified `legacy properties <|link-legacy-properties|>`__ are ignored and the details of the contact will be replaced by the provided vCard. Changes to the UID will be ignored. **Note:** Using individual properties is deprecated, use the ``vCard`` member instead. "
+              "description": "An object with properties to update the specified contact. Individual properties are removed, if they are set to <var>null</var>. If the provided object includes a <var>vCard</var> member, all specified <a href='url-legacy-properties'>legacy properties</a> are ignored and the details of the contact will be replaced by the provided vCard. Changes to the UID will be ignored. **Note:** Using individual properties is deprecated, use the <var>vCard</var> member instead. "
             }
           ],
           "description": "Updates a contact."
@@ -4250,11 +4284,11 @@
             "parentId": {
               "type": "string",
               "optional": true,
-              "description": "The ``id`` of the parent object."
+              "description": "The <var>id</var> of the parent object."
             },
             "type": {
               "$ref": "addressBooks.NodeType",
-              "description": "Always set to <value>mailingList</value>."
+              "description": "Always set to <var>mailingList</var>."
             },
             "readOnly": {
               "type": "boolean",
@@ -4310,7 +4344,7 @@
               ]
             }
           ],
-          "description": "Gets all the mailing lists in the address book with id ``parentId``."
+          "description": "Gets all the mailing lists in the address book with id <var>parentId</var>."
         },
         {
           "name": "get",
@@ -4372,7 +4406,7 @@
               ]
             }
           ],
-          "description": "Creates a new mailing list in the address book with id ``parentId``."
+          "description": "Creates a new mailing list in the address book with id <var>parentId</var>."
         },
         {
           "name": "update",
@@ -4429,7 +4463,7 @@
               "type": "string"
             }
           ],
-          "description": "Adds a contact to the mailing list with id ``id``. If the contact and mailing list are in different address books, the contact will also be copied to the list's address book."
+          "description": "Adds a contact to the mailing list with id <var>id</var>. If the contact and mailing list are in different address books, the contact will also be copied to the list's address book."
         },
         {
           "name": "listMembers",
@@ -4454,7 +4488,7 @@
               ]
             }
           ],
-          "description": "Gets all contacts that are members of the mailing list with id ``id``."
+          "description": "Gets all contacts that are members of the mailing list with id <var>id</var>."
         },
         {
           "name": "removeMember",
@@ -4470,7 +4504,7 @@
               "type": "string"
             }
           ],
-          "description": "Removes a contact from the mailing list with id ``id``. This does not delete the contact from the address book."
+          "description": "Removes a contact from the mailing list with id <var>id</var>. This does not delete the contact from the address book."
         }
       ],
       "events": [
@@ -4578,29 +4612,29 @@
                   "items": {
                     "$ref": "ThemeIcons"
                   },
-                  "description": "Specifies dark and light icons to be used with themes. The ``light`` icon is used on dark backgrounds and vice versa. **Note:** The default theme uses the ``default_icon`` for light backgrounds (if specified)."
+                  "description": "Specifies dark and light icons to be used with themes. The <var>light</var> icon is used on dark backgrounds and vice versa. **Note:** The default theme uses the <var>default_icon</var> for light backgrounds (if specified)."
                 },
                 "default_popup": {
                   "type": "string",
                   "format": "relativeUrl",
                   "optional": true,
-                  "description": "The html document to be opened as a popup when the user clicks on the action button. Ignored for action buttons with type <value>menu</value>.",
+                  "description": "The html document to be opened as a popup when the user clicks on the action button. Ignored for action buttons with type <var>menu</var>.",
                   "preprocess": "localize"
                 },
                 "browser_style": {
                   "type": "boolean",
                   "optional": true,
-                  "description": "Enable browser styles. See the `MDN documentation on browser styles <|link-mdn-browser-styles|>`__ for more information.",
+                  "description": "Enable browser styles. See the <a href='url-mdn-browser-styles'>MDN documentation on browser styles</a> for more information.",
                   "default": false
                 },
                 "default_area": {
                   "type": "string",
                   "optional": true,
-                  "description": "Defines the location the action button will appear. Deprecated and ignored. Replaced by ``allowed_spaces``",
+                  "description": "Defines the location the action button will appear. Deprecated and ignored. Replaced by <var>allowed_spaces</var>",
                   "deprecated": "Unsupported on Thunderbird."
                 },
                 "default_windows": {
-                  "description": "Defines the windows, the action button should appear in. Defaults to showing it only in the <value>normal</value> Thunderbird window, but can also be shown in the <value>messageDisplay</value> window.",
+                  "description": "Defines the windows, the action button should appear in. Defaults to showing it only in the <var>normal</var> Thunderbird window, but can also be shown in the <var>messageDisplay</var> window.",
                   "type": "array",
                   "items": {
                     "type": "string",
@@ -4615,7 +4649,7 @@
                   "optional": true
                 },
                 "allowed_spaces": {
-                  "description": "Defines for which spaces the action button will be added to Thunderbird's unified toolbar. Defaults to only allowing the action in the <value>mail</value> space. The <value>default</value> space is for tabs that don't belong to any space. If this is an empty array, the action button is shown in all spaces.",
+                  "description": "Defines for which spaces the action button will be added to Thunderbird's unified toolbar. Defaults to only allowing the action in the <var>mail</var> space. The <var>default</var> space is for tabs that don't belong to any space. If this is an empty array, the action button is shown in all spaces.",
                   "type": "array",
                   "items": {
                     "type": "string",
@@ -4635,7 +4669,7 @@
                   "optional": true
                 },
                 "type": {
-                  "description": "Specifies the type of the button. Default type is <value>button</value>.",
+                  "description": "Specifies the type of the button. Default type is <var>button</var>.",
                   "type": "string",
                   "enum": [
                     "button",
@@ -4683,23 +4717,23 @@
                   "items": {
                     "$ref": "ThemeIcons"
                   },
-                  "description": "Specifies dark and light icons to be used with themes. The ``light`` icon is used on dark backgrounds and vice versa. **Note:** The default theme uses the ``default_icon`` for light backgrounds (if specified)."
+                  "description": "Specifies dark and light icons to be used with themes. The <var>light</var> icon is used on dark backgrounds and vice versa. **Note:** The default theme uses the <var>default_icon</var> for light backgrounds (if specified)."
                 },
                 "default_popup": {
                   "type": "string",
                   "format": "relativeUrl",
                   "optional": true,
-                  "description": "The html document to be opened as a popup when the user clicks on the browserAction button. Ignored for action buttons with type <value>menu</value>.",
+                  "description": "The html document to be opened as a popup when the user clicks on the browserAction button. Ignored for action buttons with type <var>menu</var>.",
                   "preprocess": "localize"
                 },
                 "browser_style": {
                   "type": "boolean",
                   "optional": true,
-                  "description": "Enable browser styles. See the `MDN documentation on browser styles <|link-mdn-browser-styles|>`__ for more information.",
+                  "description": "Enable browser styles. See the <a href='url-mdn-browser-styles'>MDN documentation on browser styles</a> for more information.",
                   "default": false
                 },
                 "default_area": {
-                  "description": "Defines the location the browserAction button will appear. Deprecated and ignored. Replaced by ``allowed_spaces``",
+                  "description": "Defines the location the browserAction button will appear. Deprecated and ignored. Replaced by <var>allowed_spaces</var>",
                   "type": "string",
                   "enum": [
                     "maintoolbar",
@@ -4708,7 +4742,7 @@
                   "optional": true
                 },
                 "default_windows": {
-                  "description": "Defines the windows, the browserAction button should appear in. Defaults to showing it only in the <value>normal</value> Thunderbird window, but can also be shown in the <value>messageDisplay</value> window.",
+                  "description": "Defines the windows, the browserAction button should appear in. Defaults to showing it only in the <var>normal</var> Thunderbird window, but can also be shown in the <var>messageDisplay</var> window.",
                   "type": "array",
                   "items": {
                     "type": "string",
@@ -4723,7 +4757,7 @@
                   "optional": true
                 },
                 "allowed_spaces": {
-                  "description": "Defines for which spaces the browserAction button will be added to Thunderbird's unified toolbar. Defaults to only allowing the browserAction in the <value>mail</value> space. The <value>default</value> space is for tabs that don't belong to any space. If this is an empty array, the browserAction button is shown in all spaces.",
+                  "description": "Defines for which spaces the browserAction button will be added to Thunderbird's unified toolbar. Defaults to only allowing the browserAction in the <var>mail</var> space. The <var>default</var> space is for tabs that don't belong to any space. If this is an empty array, the browserAction button is shown in all spaces.",
                   "type": "array",
                   "items": {
                     "type": "string",
@@ -4743,7 +4777,7 @@
                   "optional": true
                 },
                 "type": {
-                  "description": "Specifies the type of the button. Default type is <value>button</value>.",
+                  "description": "Specifies the type of the button. Default type is <var>button</var>.",
                   "type": "string",
                   "enum": [
                     "button",
@@ -4770,7 +4804,7 @@
       "types": [
         {
           "id": "ColorArray",
-          "description": "An array of four integers in the range [0,255] that make up the RGBA color. For example, opaque red is <value>[255, 0, 0, 255]</value>.",
+          "description": "An array of four integers in the range [0,255] that make up the RGBA color. For example, opaque red is <var>[255, 0, 0, 255]</var>.",
           "type": "array",
           "items": {
             "type": "integer",
@@ -4788,12 +4822,12 @@
             "type": "any"
           },
           "postprocess": "convertImageDataToURL",
-          "description": "Pixel data for an image. Must be an |ImageData| object (for example, from a |Canvas| element)."
+          "description": "Pixel data for an image. Must be an <a href='url-image-data'>ImageData</a> object (for example, from a <a href='url-canvas-element'>canvas</a> element)."
         },
         {
           "id": "ImageDataDictionary",
           "type": "object",
-          "description": "A <em>dictionary object</em> to specify multiple |ImageData| objects in different sizes, so the icon does not have to be scaled for a device with a different pixel density. Each entry is a <em>name-value</em> pair with <em>value</em> being an |ImageData| object, and <em>name</em> its size. Example: <literalinclude>includes/ImageDataDictionary.json<lang>JavaScript</lang></literalinclude>See the `MDN documentation about choosing icon sizes <|link-mdn-icon-size|>`__ for more information on this.",
+          "description": "A <em>dictionary object</em> to specify multiple <a href='url-image-data'>ImageData</a> objects in different sizes, so the icon does not have to be scaled for a device with a different pixel density. Each entry is a <em>name-value</em> pair with <em>value</em> being an <a href='url-image-data'>ImageData</a> object, and <em>name</em> its size. Example: <literalinclude>includes/ImageDataDictionary.json<lang>JavaScript</lang></literalinclude>See the <a href='url-mdn-icon-size'>MDN documentation about choosing icon sizes</a> for more information on this.",
           "patternProperties": {
             "^[1-9]\\d*$": {
               "$ref": "ImageDataType"
@@ -4847,7 +4881,7 @@
                       "type": "null"
                     }
                   ],
-                  "description": "A string the action button should display as its label and when moused over. Cleared by setting it to <value>null</value> or an empty string (title defined the manifest will be used)."
+                  "description": "A string the action button should display as its label and when moused over. Cleared by setting it to <var>null</var> or an empty string (title defined the manifest will be used)."
                 },
                 "tabId": {
                   "type": "integer",
@@ -4929,7 +4963,7 @@
                       "type": "null"
                     }
                   ],
-                  "description": "A string the action button should use as its label, overriding the defined title. Can be set to an empty string to not display any label at all. If the containing toolbar is configured to display text only, its title will be used. Cleared by setting it to <value>null</value>."
+                  "description": "A string the action button should use as its label, overriding the defined title. Can be set to an empty string to not display any label at all. If the containing toolbar is configured to display text only, its title will be used. Cleared by setting it to <var>null</var>."
                 },
                 "tabId": {
                   "type": "integer",
@@ -4957,7 +4991,7 @@
         {
           "name": "getLabel",
           "type": "function",
-          "description": "Gets the label of the action button. Returns <value>null</value>, if no label has been set and the title is used.",
+          "description": "Gets the label of the action button. Returns <var>null</var>, if no label has been set and the title is used.",
           "async": "callback",
           "parameters": [
             {
@@ -5002,7 +5036,7 @@
         {
           "name": "setIcon",
           "type": "function",
-          "description": "Sets the icon for the action button. Either the ``path`` or the ``imageData`` property must be specified.",
+          "description": "Sets the icon for the action button. Either the <var>path</var> or the <var>imageData</var> property must be specified.",
           "async": "callback",
           "parameters": [
             {
@@ -5068,7 +5102,7 @@
                       "type": "null"
                     }
                   ],
-                  "description": "The html file to show in a popup. Can be set to an empty string to not open a popup. Cleared by setting it to <value>null</value> (popup value defined the manifest will be used)."
+                  "description": "The html file to show in a popup. Can be set to an empty string to not open a popup. Cleared by setting it to <var>null</var> (popup value defined the manifest will be used)."
                 },
                 "tabId": {
                   "type": "integer",
@@ -5150,7 +5184,7 @@
                       "type": "null"
                     }
                   ],
-                  "description": "Any number of characters can be passed, but only about four can fit in the space. Cleared by setting it to <value>null</value> or an empty string."
+                  "description": "Any number of characters can be passed, but only about four can fit in the space. Cleared by setting it to <var>null</var> or an empty string."
                 },
                 "tabId": {
                   "type": "integer",
@@ -5235,7 +5269,7 @@
                       "type": "null"
                     }
                   ],
-                  "description": "The color to use as text color in the badge. Cleared by setting it to <value>null</value>."
+                  "description": "The color to use as text color in the badge. Cleared by setting it to <var>null</var>."
                 },
                 "tabId": {
                   "type": "integer",
@@ -5258,7 +5292,7 @@
           "name": "getBadgeTextColor",
           "type": "function",
           "description": "Gets the text color of the badge.",
-          "async": true,
+          "async": "callback",
           "parameters": [
             {
               "name": "details",
@@ -5286,7 +5320,7 @@
               "parameters": [
                 {
                   "name": "result",
-                  "type": "string"
+                  "$ref": "ColorArray"
                 }
               ]
             }
@@ -5314,7 +5348,7 @@
                       "type": "null"
                     }
                   ],
-                  "description": "The color to use as background in the badge. Cleared by setting it to <value>null</value>."
+                  "description": "The color to use as background in the badge. Cleared by setting it to <var>null</var>."
                 },
                 "tabId": {
                   "type": "integer",
@@ -5380,7 +5414,7 @@
         {
           "name": "enable",
           "type": "function",
-          "description": "Enables the action button for a specific tab (if a ``tabId`` is provided), or for all tabs which do not have a custom enable state. Once the enable state of a tab has been updated individually, all further changes to its state have to be done individually as well. By default, an action button is enabled.",
+          "description": "Enables the action button for a specific tab (if a <var>tabId</var> is provided), or for all tabs which do not have a custom enable state. Once the enable state of a tab has been updated individually, all further changes to its state have to be done individually as well. By default, an action button is enabled.",
           "async": "callback",
           "parameters": [
             {
@@ -5401,7 +5435,7 @@
         {
           "name": "disable",
           "type": "function",
-          "description": "Disables the action button for a specific tab (if a ``tabId`` is provided), or for all tabs which do not have a custom enable state. Once the enable state of a tab has been updated individually, all further changes to its state have to be done individually as well.",
+          "description": "Disables the action button for a specific tab (if a <var>tabId</var> is provided), or for all tabs which do not have a custom enable state. Once the enable state of a tab has been updated individually, all further changes to its state have to be done individually as well.",
           "async": "callback",
           "parameters": [
             {
@@ -5459,7 +5493,7 @@
         {
           "name": "openPopup",
           "type": "function",
-          "description": "Opens the action's popup window in the specified window. Defaults to the current window. Returns false if the popup could not be opened because the action has no popup, is of type <value>menu</value>, is disabled or has been removed from the toolbar.",
+          "description": "Opens the action's popup window in the specified window. Defaults to the current window. Returns false if the popup could not be opened because the action has no popup, is of type <var>menu</var>, is disabled or has been removed from the toolbar.",
           "async": "callback",
           "parameters": [
             {
@@ -5493,7 +5527,7 @@
         {
           "name": "onClicked",
           "type": "function",
-          "description": "Fired when an action button is clicked. This event will not fire if the action has a popup. This is a user input event handler. For asynchronous listeners some `restrictions <|link-user-input-restrictions|>`__ apply.",
+          "description": "Fired when an action button is clicked. This event will not fire if the action has a popup. This is a user input event handler. For asynchronous listeners some <a href='url-user-input-restrictions'>restrictions</a> apply.",
           "parameters": [
             {
               "name": "tab",
@@ -5731,7 +5765,7 @@
               "properties": {
                 "browser_style": {
                   "type": "boolean",
-                  "description": "Enable browser styles in the ``management_url`` page. See the `MDN documentation on browser styles <|link-mdn-browser-styles|>`__ for more information.",
+                  "description": "Enable browser styles in the <var>management_url</var> page. See the <a href='url-mdn-browser-styles'>MDN documentation on browser styles</a> for more information.",
                   "optional": true,
                   "default": false
                 },
@@ -5739,10 +5773,10 @@
                   "type": "string",
                   "optional": true,
                   "deprecated": true,
-                  "description": "This property is no longer used. The only supported data format for the ``data`` argument in :ref:`cloudFile.onFileUpload` is |File|."
+                  "description": "This property is no longer used. The only supported data format for the <var>data</var> argument in $(ref:cloudFile.onFileUpload) is <a href='url-dom-file'>File</a>."
                 },
                 "reuse_uploads": {
-                  "description": "If a previously uploaded cloud file attachment is reused at a later time in a different message, Thunderbird may use the already known ``url`` and ``templateInfo`` values without triggering the registered :ref:`cloudFile.onFileUpload` listener again. Setting this option to <value>false</value> will always trigger the registered listener, providing the already known values through the ``relatedFileInfo`` parameter of the :ref:`cloudFile.onFileUpload` event, to let the provider decide how to handle these cases.",
+                  "description": "If a previously uploaded cloud file attachment is reused at a later time in a different message, Thunderbird may use the already known <var>url</var> and <var>templateInfo</var> values without triggering the registered $(ref:cloudFile.onFileUpload) listener again. Setting this option to <var>false</var> will always trigger the registered listener, providing the already known values through the <var>relatedFileInfo</var> parameter of the $(ref:cloudFile.onFileUpload) event, to let the provider decide how to handle these cases.",
                   "type": "boolean",
                   "optional": true,
                   "default": true
@@ -5751,7 +5785,7 @@
                   "type": "string",
                   "format": "relativeUrl",
                   "preprocess": "localize",
-                  "description": "A page for configuring accounts, to be displayed in the preferences UI. **Note:** Within this UI only a limited subset of the WebExtension APIs is available: ``cloudFile``, ``extension``, ``i18n``, ``runtime``, ``storage``, ``test``."
+                  "description": "A page for configuring accounts, to be displayed in the preferences UI. **Note:** Within this UI only a limited subset of the WebExtension APIs is available: <var>cloudFile</var>, <var>extension</var>, <var>i18n</var>, <var>runtime</var>, <var>storage</var>, <var>test</var>."
                 },
                 "name": {
                   "type": "string",
@@ -5768,7 +5802,7 @@
                   "type": "string",
                   "optional": true,
                   "deprecated": true,
-                  "description": "This property is no longer used. The ``service_url`` property of the :ref:`cloudFile.CloudFileTemplateInfo` object returned by the :ref:`cloudFile.onFileUpload` event can be used to add a <em>Learn more about</em> link to the footer of the cloud file attachment element."
+                  "description": "This property is no longer used. The <var>service_url</var> property of the $(ref:cloudFile.CloudFileTemplateInfo) object returned by the $(ref:cloudFile.onFileUpload) event can be used to add a <em>Learn more about</em> link to the footer of the cloud file attachment element."
                 }
               },
               "optional": true
@@ -5818,7 +5852,7 @@
             "properties": {
               "aborted": {
                 "type": "boolean",
-                "description": "Set this to <value>true</value> if the file upload was aborted by the user and an :ref:`cloudFile.onFileUploadAbort` event has been received. No error message will be shown to the user.",
+                "description": "Set this to <var>true</var> if the file upload was aborted by the user and an $(ref:cloudFile.onFileUploadAbort) event has been received. No error message will be shown to the user.",
                 "optional": true
               },
               "error": {
@@ -5830,7 +5864,7 @@
                     "type": "string"
                   }
                 ],
-                "description": "Report an error to the user. Set this to <value>true</value> for showing a generic error message, or set a specific error message.",
+                "description": "Report an error to the user. Set this to <var>true</var> for showing a generic error message, or set a specific error message.",
                 "optional": true
               },
               "url": {
@@ -5907,7 +5941,7 @@
                     "type": "string"
                   }
                 ],
-                "description": "Report an error to the user. Set this to <value>true</value> for showing a generic error message, or set a specific error message.",
+                "description": "Report an error to the user. Set this to <var>true</var> for showing a generic error message, or set a specific error message.",
                 "optional": true
               },
               "url": {
@@ -5988,19 +6022,19 @@
               "type": "integer",
               "minimum": -1,
               "optional": true,
-              "description": "The maximum size in bytes for a single file to upload. Set to <value>-1</value> if unlimited."
+              "description": "The maximum size in bytes for a single file to upload. Set to <var>-1</var> if unlimited."
             },
             "spaceRemaining": {
               "type": "integer",
               "minimum": -1,
               "optional": true,
-              "description": "The amount of remaining space on the cloud provider, in bytes. Set to <value>-1</value> if unsupported."
+              "description": "The amount of remaining space on the cloud provider, in bytes. Set to <var>-1</var> if unsupported."
             },
             "spaceUsed": {
               "type": "integer",
               "minimum": -1,
               "optional": true,
-              "description": "The amount of space already used on the cloud provider, in bytes. Set to <value>-1</value> if unsupported."
+              "description": "The amount of space already used on the cloud provider, in bytes. Set to <var>-1</var> if unsupported."
             },
             "managementUrl": {
               "type": "string",
@@ -6050,7 +6084,7 @@
                 },
                 "format": {
                   "optional": true,
-                  "description": "A format options object as used by |DateTimeFormat|. Defaults to: <literalinclude>includes/cloudFile/defaultDateFormat.js<lang>JavaScript</lang></literalinclude>",
+                  "description": "A format options object as used by <a href='url-date-time-format'>Intl.DateTimeFormat</a>. Defaults to: <literalinclude>includes/cloudFile/defaultDateFormat.js<lang>JavaScript</lang></literalinclude>",
                   "type": "object",
                   "additionalProperties": true
                 }
@@ -6083,7 +6117,7 @@
         {
           "id": "RelatedCloudFile",
           "type": "object",
-          "description": "Information about an already uploaded cloud file, which is related to a new upload. For example if the content of a cloud attachment is updated, if a repeatedly used cloud attachment is renamed (and therefore should be re-uploaded to not invalidate existing links) or if the provider has its manifest property ``reuse_uploads`` set to <value>false</value>.",
+          "description": "Information about an already uploaded cloud file, which is related to a new upload. For example if the content of a cloud attachment is updated, if a repeatedly used cloud attachment is renamed (and therefore should be re-uploaded to not invalidate existing links) or if the provider has its manifest property <var>reuse_uploads</var> set to <var>false</var>.",
           "properties": {
             "id": {
               "type": "integer",
@@ -6116,7 +6150,7 @@
         {
           "name": "getAccount",
           "type": "function",
-          "description": "Retrieve information about a single cloud file account, or <value>undefined</value> if it does not exists",
+          "description": "Retrieve information about a single cloud file account, or <var>undefined</var> if it does not exists",
           "allowedContexts": [
             "content"
           ],
@@ -6192,19 +6226,19 @@
                   "type": "integer",
                   "minimum": -1,
                   "optional": true,
-                  "description": "The maximum size in bytes for a single file to upload. Set to <value>-1</value> if unlimited."
+                  "description": "The maximum size in bytes for a single file to upload. Set to <var>-1</var> if unlimited."
                 },
                 "spaceRemaining": {
                   "type": "integer",
                   "minimum": -1,
                   "optional": true,
-                  "description": "The amount of remaining space on the cloud provider, in bytes. Set to <value>-1</value> if unsupported."
+                  "description": "The amount of remaining space on the cloud provider, in bytes. Set to <var>-1</var> if unsupported."
                 },
                 "spaceUsed": {
                   "type": "integer",
                   "minimum": -1,
                   "optional": true,
-                  "description": "The amount of space already used on the cloud provider, in bytes. Set to <value>-1</value> if unsupported."
+                  "description": "The amount of space already used on the cloud provider, in bytes. Set to <var>-1</var> if unsupported."
                 },
                 "managementUrl": {
                   "type": "string",
@@ -6258,7 +6292,7 @@
           "choices": [
             {
               "type": "string",
-              "description": "A name and email address in the format <value>Name <email@example.com></value>, or just an email address."
+              "description": "A name and email address in the format <var>Name <email@example.com></var>, or just an email address."
             },
             {
               "type": "object",
@@ -6266,12 +6300,12 @@
                 "id": {
                   "type": "string",
                   "max_manifest_version": 2,
-                  "description": "The ID of a contact or mailing list from the :doc:`contacts` or :doc:`mailingLists`."
+                  "description": "The ID of a contact or mailing list from the $(doc:contacts) or $(doc:mailingLists)."
                 },
                 "nodeId": {
                   "type": "string",
                   "min_manifest_version": 3,
-                  "description": "The ID of a contact or mailing list node from the :doc:`addressBook.contacts` or :doc:`addressBook.mailingLists`."
+                  "description": "The ID of a contact or mailing list node from the $(doc:addressBook.contacts) or $(doc:addressBook.mailingLists)."
                 },
                 "type": {
                   "type": "string",
@@ -6322,7 +6356,7 @@
             "additionalFccFolderId": {
               "min_manifest_version": 3,
               "$ref": "folders.MailFolderId",
-              "description": "An additional fcc folder which can be selected while composing the message. Cleared when set to <value>null</value>.",
+              "description": "An additional fcc folder which can be selected while composing the message. Cleared when set to <var>null</var>.",
               "optional": "omit-key-if-missing"
             },
             "additionalFccFolder": {
@@ -6398,7 +6432,7 @@
                 "html",
                 "both"
               ],
-              "description": "Defines the MIME format of the sent message (ignored on plain text messages). Defaults to <value>auto</value>, which will send html messages as plain text, if they do not include any formatting, and as <value>both</value> otherwise (a multipart/mixed message).",
+              "description": "Defines the MIME format of the sent message (ignored on plain text messages). Defaults to <var>auto</var>, which will send html messages as plain text, if they do not include any formatting, and as <var>both</var> otherwise (a multipart/mixed message).",
               "optional": true
             },
             "deliveryStatusNotification": {
@@ -6416,7 +6450,7 @@
                 }
               ],
               "optional": true,
-              "description": "The selected encryption technology (<value>OpenPGP</value> or <value>S/MIME</value>) which is to be used to sign and/or encrypt the message. If the sending identity does not support encryption at all, this will be <value>undefined</value>."
+              "description": "The selected encryption technology (<var>OpenPGP</var> or <var>S/MIME</var>) which is to be used to sign and/or encrypt the message. If the sending identity does not support encryption at all, this will be <var>undefined</var>."
             },
             "followupTo": {
               "$ref": "ComposeRecipientList",
@@ -6424,12 +6458,12 @@
             },
             "from": {
               "$ref": "ComposeRecipient",
-              "description": "*Caution*: Setting a value for ``from`` does not change the used identity, it overrides the <value>From</value> header. Many email servers do not accept emails where the <value>From</value> header does not match the sender identity. Must be set to exactly one valid email address.",
+              "description": "*Caution*: Setting a value for <var>from</var> does not change the used identity, it overrides the <em>From</em> header. Many email servers do not accept emails where the <em>From</em> header does not match the sender identity. Must be set to exactly one valid email address.",
               "optional": true
             },
             "identityId": {
               "type": "string",
-              "description": "The ID of an identity from the :doc:`accounts`. The settings from the identity will be used in the composed message. If ``replyTo`` is also specified, the ``replyTo`` property of the identity is overridden. The permission <permission>accountsRead</permission> is required to include the ``identityId``.",
+              "description": "The ID of an identity from the $(doc:accounts). The settings from the identity will be used in the composed message. If <var>replyTo</var> is also specified, the <var>replyTo</var> property of the identity is overridden. The permission <permission>accountsRead</permission> is required to include the <var>identityId</var>.",
               "optional": true
             },
             "isModified": {
@@ -6461,7 +6495,7 @@
               "max_manifest_version": 2,
               "type": "boolean",
               "optional": true,
-              "description": "Indicates whether the default fcc setting (defined by the used identity) is being overridden for this message. Setting <value>false</value> will clear the override. Setting <value>true</value> will throw an <em>ExtensionError</em>, if ``overrideDefaultFccFolder`` is not set as well."
+              "description": "Indicates whether the default fcc setting (defined by the used identity) is being overridden for this message. Setting <var>false</var> will clear the override. Setting <var>true</var> will throw an <em>ExtensionError</em>, if <var>overrideDefaultFccFolder</var> is not set as well."
             },
             "overrideDefaultFccFolder": {
               "max_manifest_version": 2,
@@ -6480,12 +6514,12 @@
                 }
               ],
               "optional": true,
-              "description": " This value overrides the default fcc setting (defined by the used identity) for this message only. Either a :ref:`folders.MailFolder` specifying the folder for the copy of the sent message, or an empty string to not save a copy at all."
+              "description": " This value overrides the default fcc setting (defined by the used identity) for this message only. Either a $(ref:folders.MailFolder) specifying the folder for the copy of the sent message, or an empty string to not save a copy at all."
             },
             "overrideDefaultFccFolderId": {
               "min_manifest_version": 3,
               "$ref": "folders.MailFolderId",
-              "description": " This value overrides the default fcc setting (defined by the used identity) for this message only. Either a :ref:`folders.MailFolderId` specifying the folder for the copy of the sent message, or an empty string to not save a copy at all. Reset when set to <value>null</value>.",
+              "description": " This value overrides the default fcc setting (defined by the used identity) for this message only. Either a $(ref:folders.MailFolderId) specifying the folder for the copy of the sent message, or an empty string to not save a copy at all. Reset when set to <var>null</var>.",
               "optional": "omit-key-if-missing"
             },
             "plainTextBody": {
@@ -6506,7 +6540,7 @@
               "optional": true
             },
             "relatedMessageId": {
-              "description": "The id of the original message (in case of draft, template, forward or reply). Read-only. Is <value>null</value> in all other cases or if the original message was opened from file.",
+              "description": "The id of the original message (in case of draft, template, forward or reply). Read-only. Is <var>null</var> in all other cases or if the original message was opened from file.",
               "$ref": "messages.MessageId",
               "optional": true
             },
@@ -6555,7 +6589,7 @@
             },
             "name": {
               "type": "string",
-              "description": "The new name for the attachment, as displayed to the user. If not specified, the name of the provided ``file`` object is used.",
+              "description": "The new name for the attachment, as displayed to the user. If not specified, the name of the provided <var>file</var> object is used.",
               "optional": true
             }
           }
@@ -6588,7 +6622,7 @@
           "properties": {
             "name": {
               "type": "string",
-              "description": "Name of a custom header, must be prefixed by <value>X-</value> (but not by <value>X-Mozilla-</value>) or be one of the explicitly allowed headers (<value>MSIP_Labels</value>)"
+              "description": "Name of a custom header, must be prefixed by <var>X-</var> (but not by <var>X-Mozilla-</var>) or be one of the explicitly allowed headers (<var>MSIP_Labels</var>)"
             },
             "value": {
               "type": "string"
@@ -6601,7 +6635,7 @@
           "additionalProperties": {
             "type": "boolean"
           },
-          "description": "A <em>dictionary object</em> with entries for all installed dictionaries, having a language identifier as <em>key</em> (for example <value>en-US</value>) and a boolean expression as <em>value</em>, indicating whether that dictionary is enabled for spellchecking or not."
+          "description": "A <em>dictionary object</em> with entries for all installed dictionaries, having a language identifier as <em>key</em> (for example <var>en-US</var>) and a boolean expression as <em>value</em>, indicating whether that dictionary is enabled for spellchecking or not."
         },
         {
           "id": "EncryptionPropertiesOpenPGP",
@@ -6613,7 +6647,7 @@
             },
             "encryptBody": {
               "type": "boolean",
-              "description": "Whether encryption of the message body using the OpenPGP technology is enabled. **Note:** If encryption is enabled, but the `preconditions <https://support.mozilla.org/en-US/kb/thunderbird-help-cannot-encrypt>`__ for sending an encrypted message are not met, the message cannot be sent."
+              "description": "Whether encryption of the message body using the OpenPGP technology is enabled. **Note:** If encryption is enabled, but the <a href='url-help-cannot-encrypt'>preconditions</a> for sending an encrypted message are not met, the message cannot be sent."
             },
             "encryptSubject": {
               "type": "boolean",
@@ -6635,7 +6669,7 @@
             },
             "encryptBody": {
               "type": "boolean",
-              "description": "Whether encryption of the message body using the S/MIME technology is enabled. **Note:** If encryption is enabled, but the `preconditions <https://support.mozilla.org/en-US/kb/thunderbird-help-cannot-encrypt>`__ for sending an encrypted message are not met, the message cannot be sent."
+              "description": "Whether encryption of the message body using the S/MIME technology is enabled. **Note:** If encryption is enabled, but the <a href='url-help-cannot-encrypt'>preconditions</a> for sending an encrypted message are not met, the message cannot be sent."
             },
             "signMessage": {
               "type": "boolean",
@@ -6648,7 +6682,7 @@
         {
           "name": "onBeforeSend",
           "type": "function",
-          "description": "Fired when a message is about to be sent from the compose window. This is a user input event handler. For asynchronous listeners some `restrictions <|link-user-input-restrictions|>`__ apply.",
+          "description": "Fired when a message is about to be sent from the compose window. This is a user input event handler. For asynchronous listeners some <a href='url-user-input-restrictions'>restrictions</a> apply.",
           "permissions": [
             "compose"
           ],
@@ -6660,7 +6694,7 @@
             {
               "name": "details",
               "$ref": "ComposeDetails",
-              "description": "The current state of the compose window. This is functionally the same as calling the :ref:`compose.getComposeDetails` function."
+              "description": "The current state of the compose window. This is functionally the same as calling the $(ref:compose.getComposeDetails) function."
             }
           ],
           "returns": {
@@ -6674,7 +6708,7 @@
               "details": {
                 "$ref": "ComposeDetails",
                 "optional": true,
-                "description": "Updates the compose window. This is functionally the same as calling the :ref:`compose.setComposeDetails` function."
+                "description": "Updates the compose window. This is functionally the same as calling the $(ref:compose.setComposeDetails) function."
               }
             }
           }
@@ -6854,7 +6888,7 @@
         {
           "name": "beginNew",
           "type": "function",
-          "description": "Open a new message compose window.\n\n**Note:** The compose format can be set by ``details.isPlainText`` or by specifying only one of ``details.body`` or ``details.plainTextBody``. Otherwise the default compose format of the selected identity is used.\n\n**Note:** Specifying ``details.body`` and ``details.plainTextBody`` without also specifying ``details.isPlainText`` threw an exception in Thunderbird up to version 97. Since Thunderbird 98, this combination creates a compose window with the compose format of the selected identity, using the matching ``details.body`` or ``details.plainTextBody`` value.\n\n**Note:** If no identity is specified, this function is using the default identity and not the identity of the referenced message.",
+          "description": "Open a new message compose window.\n\n**Note:** The compose format can be set by <var>details.isPlainText</var> or by specifying only one of <var>details.body</var> or <var>details.plainTextBody</var>. Otherwise the default compose format of the selected identity is used.\n\n**Note:** Specifying <var>details.body</var> and <var>details.plainTextBody</var> without also specifying <var>details.isPlainText</var> threw an exception in Thunderbird up to version 97. Since Thunderbird 98, this combination creates a compose window with the compose format of the selected identity, using the matching <var>details.body</var> or <var>details.plainTextBody</var> value.\n\n**Note:** If no identity is specified, this function is using the default identity and not the identity of the referenced message.",
           "async": "callback",
           "parameters": [
             {
@@ -6884,7 +6918,7 @@
         {
           "name": "beginReply",
           "type": "function",
-          "description": "Open a new message compose window replying to a given message.\n\n**Note:** The compose format can be set by ``details.isPlainText`` or by specifying only one of ``details.body`` or ``details.plainTextBody``. Otherwise the default compose format of the selected identity is used.\n\n**Note:** Specifying ``details.body`` and ``details.plainTextBody`` without also specifying ``details.isPlainText`` threw an exception in Thunderbird up to version 97. Since Thunderbird 98, this combination creates a compose window with the compose format of the selected identity, using the matching ``details.body`` or ``details.plainTextBody`` value.\n\n**Note:** If no identity is specified, this function is using the default identity and not the identity of the referenced message.",
+          "description": "Open a new message compose window replying to a given message.\n\n**Note:** The compose format can be set by <var>details.isPlainText</var> or by specifying only one of <var>details.body</var> or <var>details.plainTextBody</var>. Otherwise the default compose format of the selected identity is used.\n\n**Note:** Specifying <var>details.body</var> and <var>details.plainTextBody</var> without also specifying <var>details.isPlainText</var> threw an exception in Thunderbird up to version 97. Since Thunderbird 98, this combination creates a compose window with the compose format of the selected identity, using the matching <var>details.body</var> or <var>details.plainTextBody</var> value.\n\n**Note:** If no identity is specified, this function is using the default identity and not the identity of the referenced message.",
           "async": "callback",
           "parameters": [
             {
@@ -6923,7 +6957,7 @@
         {
           "name": "beginForward",
           "type": "function",
-          "description": "Open a new message compose window forwarding a given message.\n\n**Note:** The compose format can be set by ``details.isPlainText`` or by specifying only one of ``details.body`` or ``details.plainTextBody``. Otherwise the default compose format of the selected identity is used.\n\n**Note:** Specifying ``details.body`` and ``details.plainTextBody`` without also specifying ``details.isPlainText`` threw an exception in Thunderbird up to version 97. Since Thunderbird 98, this combination creates a compose window with the compose format of the selected identity, using the matching ``details.body`` or ``details.plainTextBody`` value.\n\n**Note:** If no identity is specified, this function is using the default identity and not the identity of the referenced message.",
+          "description": "Open a new message compose window forwarding a given message.\n\n**Note:** The compose format can be set by <var>details.isPlainText</var> or by specifying only one of <var>details.body</var> or <var>details.plainTextBody</var>. Otherwise the default compose format of the selected identity is used.\n\n**Note:** Specifying <var>details.body</var> and <var>details.plainTextBody</var> without also specifying <var>details.isPlainText</var> threw an exception in Thunderbird up to version 97. Since Thunderbird 98, this combination creates a compose window with the compose format of the selected identity, using the matching <var>details.body</var> or <var>details.plainTextBody</var> value.\n\n**Note:** If no identity is specified, this function is using the default identity and not the identity of the referenced message.",
           "async": "callback",
           "parameters": [
             {
@@ -6988,7 +7022,7 @@
           "name": "setComposeDetails",
           "type": "function",
           "async": true,
-          "description": "Updates the compose window. The properties of the given :ref:`compose.ComposeDetails` object will be used to overwrite the current values of the specified compose window, so only properties that are to be changed should be included. Modified settings will be treated as user initiated, and turn off further automatic changes on these settings.\n\nWhen updating any of the array properties (``customHeaders`` and most address fields), make sure to first get the current values to not accidentally remove all existing entries when setting the new value.\n\n**Note:** The compose format of an existing compose window cannot be changed. Since Thunderbird 98, setting conflicting values for ``details.body``, ``details.plainTextBody`` or ``details.isPlaintext`` no longer throws an exception, instead the compose window chooses the matching ``details.body`` or ``details.plainTextBody`` value and ignores the other.",
+          "description": "Updates the compose window. The properties of the given $(ref:compose.ComposeDetails) object will be used to overwrite the current values of the specified compose window, so only properties that are to be changed should be included. Modified settings will be treated as user initiated, and turn off further automatic changes on these settings.\n\nWhen updating any of the array properties (<var>customHeaders</var> and most address fields), make sure to first get the current values to not accidentally remove all existing entries when setting the new value.\n\n**Note:** The compose format of an existing compose window cannot be changed. Since Thunderbird 98, setting conflicting values for <var>details.body</var>, <var>details.plainTextBody</var> or <var>details.isPlaintext</var> no longer throws an exception, instead the compose window chooses the matching <var>details.body</var> or <var>details.plainTextBody</var> value and ignores the other.",
           "permissions": [
             "compose"
           ],
@@ -7008,7 +7042,7 @@
           "name": "getActiveDictionaries",
           "type": "function",
           "async": "callback",
-          "description": "Returns a :ref:`compose.ComposeDictionaries` object, listing all installed dictionaries, including the information whether they are currently enabled or not.",
+          "description": "Returns a $(ref:compose.ComposeDictionaries) object, listing all installed dictionaries, including the information whether they are currently enabled or not.",
           "permissions": [
             "compose"
           ],
@@ -7034,7 +7068,7 @@
           "name": "setActiveDictionaries",
           "type": "function",
           "async": true,
-          "description": "Updates the active dictionaries. Throws if the ``activeDictionaries`` array contains unknown or invalid language identifiers.",
+          "description": "Updates the active dictionaries. Throws if the <var>activeDictionaries</var> array contains unknown or invalid language identifiers.",
           "permissions": [
             "compose"
           ],
@@ -7084,7 +7118,7 @@
         {
           "name": "getAttachmentFile",
           "type": "function",
-          "description": "Gets the content of a :ref:`compose.ComposeAttachment` as a |File| object.",
+          "description": "Gets the content of a $(ref:compose.ComposeAttachment) as a <a href='url-dom-file'>File</a> object.",
           "async": "callback",
           "parameters": [
             {
@@ -7200,7 +7234,7 @@
             "compose.send"
           ],
           "type": "function",
-          "description": "Sends the message currently being composed. If the send mode is not specified or set to <value>default</value>, the message will be send directly if the user is online and placed in the users outbox otherwise. The returned Promise fulfills once the message has been successfully sent or placed in the user's outbox. Throws when the send process has been aborted by the user, by an :ref:`compose.onBeforeSend` event or if there has been an error while sending the message to the outgoing mail server.",
+          "description": "Sends the message currently being composed. If the send mode is not specified or set to <var>default</var>, the message will be send directly if the user is online and placed in the users outbox otherwise. The returned Promise fulfills once the message has been successfully sent or placed in the user's outbox. Throws when the send process has been aborted by the user, by an $(ref:compose.onBeforeSend) event or if there has been an error while sending the message to the outgoing mail server.",
           "async": "callback",
           "parameters": [
             {
@@ -7377,23 +7411,23 @@
                   "items": {
                     "$ref": "ThemeIcons"
                   },
-                  "description": "Specifies dark and light icons to be used with themes. The ``light`` icon is used on dark backgrounds and vice versa. **Note:** The default theme uses the ``default_icon`` for light backgrounds (if specified)."
+                  "description": "Specifies dark and light icons to be used with themes. The <var>light</var> icon is used on dark backgrounds and vice versa. **Note:** The default theme uses the <var>default_icon</var> for light backgrounds (if specified)."
                 },
                 "default_popup": {
                   "type": "string",
                   "format": "relativeUrl",
                   "optional": true,
-                  "description": "The html document to be opened as a popup when the user clicks on the composeAction button. Ignored for action buttons with type <value>menu</value>.",
+                  "description": "The html document to be opened as a popup when the user clicks on the composeAction button. Ignored for action buttons with type <var>menu</var>.",
                   "preprocess": "localize"
                 },
                 "browser_style": {
                   "type": "boolean",
                   "optional": true,
-                  "description": "Enable browser styles. See the `MDN documentation on browser styles <|link-mdn-browser-styles|>`__ for more information.",
+                  "description": "Enable browser styles. See the <a href='url-mdn-browser-styles'>MDN documentation on browser styles</a> for more information.",
                   "default": false
                 },
                 "default_area": {
-                  "description": "Defines the location the composeAction button will appear. The default location is <value>maintoolbar</value>.",
+                  "description": "Defines the location the composeAction button will appear. The default location is <var>maintoolbar</var>.",
                   "type": "string",
                   "enum": [
                     "maintoolbar",
@@ -7402,7 +7436,7 @@
                   "optional": true
                 },
                 "type": {
-                  "description": "Specifies the type of the button. Default type is <value>button</value>.",
+                  "description": "Specifies the type of the button. Default type is <var>button</var>.",
                   "type": "string",
                   "enum": [
                     "button",
@@ -7427,7 +7461,7 @@
       "types": [
         {
           "id": "ColorArray",
-          "description": "An array of four integers in the range [0,255] that make up the RGBA color. For example, opaque red is <value>[255, 0, 0, 255]</value>.",
+          "description": "An array of four integers in the range [0,255] that make up the RGBA color. For example, opaque red is <var>[255, 0, 0, 255]</var>.",
           "type": "array",
           "items": {
             "type": "integer",
@@ -7445,12 +7479,12 @@
             "type": "any"
           },
           "postprocess": "convertImageDataToURL",
-          "description": "Pixel data for an image. Must be an |ImageData| object (for example, from a |Canvas| element)."
+          "description": "Pixel data for an image. Must be an <a href='url-image-data'>ImageData</a> object (for example, from a <a href='url-canvas-element'>canvas</a> element)."
         },
         {
           "id": "ImageDataDictionary",
           "type": "object",
-          "description": "A <em>dictionary object</em> to specify multiple |ImageData| objects in different sizes, so the icon does not have to be scaled for a device with a different pixel density. Each entry is a <em>name-value</em> pair with <em>value</em> being an |ImageData| object, and <em>name</em> its size. Example: <literalinclude>includes/ImageDataDictionary.json<lang>JavaScript</lang></literalinclude>See the `MDN documentation about choosing icon sizes <|link-mdn-icon-size|>`__ for more information on this.",
+          "description": "A <em>dictionary object</em> to specify multiple <a href='url-image-data'>ImageData</a> objects in different sizes, so the icon does not have to be scaled for a device with a different pixel density. Each entry is a <em>name-value</em> pair with <em>value</em> being an <a href='url-image-data'>ImageData</a> object, and <em>name</em> its size. Example: <literalinclude>includes/ImageDataDictionary.json<lang>JavaScript</lang></literalinclude>See the <a href='url-mdn-icon-size'>MDN documentation about choosing icon sizes</a> for more information on this.",
           "patternProperties": {
             "^[1-9]\\d*$": {
               "$ref": "ImageDataType"
@@ -7504,7 +7538,7 @@
                       "type": "null"
                     }
                   ],
-                  "description": "A string the composeAction button should display as its label and when moused over. Cleared by setting it to <value>null</value> or an empty string (title defined the manifest will be used)."
+                  "description": "A string the composeAction button should display as its label and when moused over. Cleared by setting it to <var>null</var> or an empty string (title defined the manifest will be used)."
                 },
                 "tabId": {
                   "type": "integer",
@@ -7586,7 +7620,7 @@
                       "type": "null"
                     }
                   ],
-                  "description": "A string the composeAction button should use as its label, overriding the defined title. Can be set to an empty string to not display any label at all. If the containing toolbar is configured to display text only, its title will be used. Cleared by setting it to <value>null</value>."
+                  "description": "A string the composeAction button should use as its label, overriding the defined title. Can be set to an empty string to not display any label at all. If the containing toolbar is configured to display text only, its title will be used. Cleared by setting it to <var>null</var>."
                 },
                 "tabId": {
                   "type": "integer",
@@ -7614,7 +7648,7 @@
         {
           "name": "getLabel",
           "type": "function",
-          "description": "Gets the label of the composeAction button. Returns <value>null</value>, if no label has been set and the title is used.",
+          "description": "Gets the label of the composeAction button. Returns <var>null</var>, if no label has been set and the title is used.",
           "async": "callback",
           "parameters": [
             {
@@ -7659,7 +7693,7 @@
         {
           "name": "setIcon",
           "type": "function",
-          "description": "Sets the icon for the composeAction button. Either the ``path`` or the ``imageData`` property must be specified.",
+          "description": "Sets the icon for the composeAction button. Either the <var>path</var> or the <var>imageData</var> property must be specified.",
           "async": "callback",
           "parameters": [
             {
@@ -7725,7 +7759,7 @@
                       "type": "null"
                     }
                   ],
-                  "description": "The html file to show in a popup. Can be set to an empty string to not open a popup. Cleared by setting it to <value>null</value> (action will use the popup value defined in the manifest)."
+                  "description": "The html file to show in a popup. Can be set to an empty string to not open a popup. Cleared by setting it to <var>null</var> (action will use the popup value defined in the manifest)."
                 },
                 "tabId": {
                   "type": "integer",
@@ -7807,7 +7841,7 @@
                       "type": "null"
                     }
                   ],
-                  "description": "Any number of characters can be passed, but only about four can fit in the space. Cleared by setting it to <value>null</value> or an empty string."
+                  "description": "Any number of characters can be passed, but only about four can fit in the space. Cleared by setting it to <var>null</var> or an empty string."
                 },
                 "tabId": {
                   "type": "integer",
@@ -7892,7 +7926,7 @@
                       "type": "null"
                     }
                   ],
-                  "description": "The color to use as text color in the badge. Cleared by setting it to <value>null</value>."
+                  "description": "The color to use as text color in the badge. Cleared by setting it to <var>null</var>."
                 },
                 "tabId": {
                   "type": "integer",
@@ -7915,7 +7949,7 @@
           "name": "getBadgeTextColor",
           "type": "function",
           "description": "Gets the text color of the badge.",
-          "async": true,
+          "async": "callback",
           "parameters": [
             {
               "name": "details",
@@ -7943,7 +7977,7 @@
               "parameters": [
                 {
                   "name": "result",
-                  "type": "string"
+                  "$ref": "ColorArray"
                 }
               ]
             }
@@ -7971,7 +8005,7 @@
                       "type": "null"
                     }
                   ],
-                  "description": "The color to use as background in the badge. Cleared by setting it to <value>null</value>."
+                  "description": "The color to use as background in the badge. Cleared by setting it to <var>null</var>."
                 },
                 "tabId": {
                   "type": "integer",
@@ -8037,7 +8071,7 @@
         {
           "name": "enable",
           "type": "function",
-          "description": "Enables the composeAction button for a specific tab (if a ``tabId`` is provided), or for all tabs which do not have a custom enable state. Once the enable state of a tab has been updated individually, all further changes to its state have to be done individually as well. By default, a composeAction button is enabled.",
+          "description": "Enables the composeAction button for a specific tab (if a <var>tabId</var> is provided), or for all tabs which do not have a custom enable state. Once the enable state of a tab has been updated individually, all further changes to its state have to be done individually as well. By default, a composeAction button is enabled.",
           "async": "callback",
           "parameters": [
             {
@@ -8058,7 +8092,7 @@
         {
           "name": "disable",
           "type": "function",
-          "description": "Disables the composeAction button for a specific tab (if a ``tabId`` is provided), or for all tabs which do not have a custom enable state. Once the enable state of a tab has been updated individually, all further changes to its state have to be done individually as well.",
+          "description": "Disables the composeAction button for a specific tab (if a <var>tabId</var> is provided), or for all tabs which do not have a custom enable state. Once the enable state of a tab has been updated individually, all further changes to its state have to be done individually as well.",
           "async": "callback",
           "parameters": [
             {
@@ -8116,7 +8150,7 @@
         {
           "name": "openPopup",
           "type": "function",
-          "description": "Opens the action's popup window in the specified window. Defaults to the current window. Returns false if the popup could not be opened because the action has no popup, is of type <value>menu</value>, is disabled or has been removed from the toolbar.",
+          "description": "Opens the action's popup window in the specified window. Defaults to the current window. Returns false if the popup could not be opened because the action has no popup, is of type <var>menu</var>, is disabled or has been removed from the toolbar.",
           "async": "callback",
           "parameters": [
             {
@@ -8150,7 +8184,7 @@
         {
           "name": "onClicked",
           "type": "function",
-          "description": "Fired when a composeAction button is clicked. This event will not fire if the composeAction has a popup. This is a user input event handler. For asynchronous listeners some `restrictions <|link-user-input-restrictions|>`__ apply.",
+          "description": "Fired when a composeAction button is clicked. This event will not fire if the composeAction has a popup. This is a user input event handler. For asynchronous listeners some <a href='url-user-input-restrictions'>restrictions</a> apply.",
           "parameters": [
             {
               "name": "tab",
@@ -8233,7 +8267,7 @@
         {
           "name": "register",
           "type": "function",
-          "description": "Register a compose script programmatically. **Note:** Registered scripts will only be applied to newly opened message composer tabs. To apply the script to already open message composer tab, manually inject your script by calling :ref:`tabs.executeScript` for each of the open <value>messageCompose</value> tabs.",
+          "description": "Register a compose script programmatically. **Note:** Registered scripts will only be applied to newly opened message composer tabs. To apply the script to already open message composer tab, manually inject your script by calling $(ref:tabs.executeScript) for each of the open <var>messageCompose</var> tabs.",
           "async": true,
           "parameters": [
             {
@@ -8281,7 +8315,7 @@
                 "document_end",
                 "document_idle"
               ],
-              "description": "Determines when the files specified in css and js are injected. The states directly correspond to <code>Document.readyState</code>: <value>loading</value>, <value>interactive</value> and <value>complete</value>"
+              "description": "Determines when the files specified in css and js are injected. The states directly correspond to <code>Document.readyState</code>: <var>loading</var>, <var>interactive</var> and <var>complete</var>"
             }
           }
         },
@@ -8304,7 +8338,7 @@
         {
           "name": "register",
           "type": "function",
-          "description": "Register a message display script programmatically. **Note:** Registered scripts will only be applied to newly opened messages. To apply the script to already open messages, manually inject your script by calling :ref:`tabs.executeScript` for each of the open <value>messageDisplay</value> tabs.",
+          "description": "Register a message display script programmatically. **Note:** Registered scripts will only be applied to newly opened messages. To apply the script to already open messages, manually inject your script by calling $(ref:tabs.executeScript) for each of the open <var>messageDisplay</var> tabs.",
           "async": true,
           "parameters": [
             {
@@ -8386,7 +8420,7 @@
             },
             "path": {
               "type": "string",
-              "description": "Path to this folder in the account. Although paths look predictable, never guess a folder's path, as there are a number of reasons why it may not be what you think it is. Use :ref:`folders.getParentFolders` or :ref:`folders.getSubFolders` to obtain hierarchy information."
+              "description": "Path to this folder in the account. Although paths look predictable, never guess a folder's path, as there are a number of reasons why it may not be what you think it is. Use $(ref:folders.getParentFolders) or $(ref:folders.getSubFolders) to obtain hierarchy information."
             },
             "specialUse": {
               "type": "array",
@@ -8397,7 +8431,7 @@
               "description": "The special use of this folder. A folder can have multiple special uses."
             },
             "subFolders": {
-              "description": "Subfolders of this folder. The property may be <value>null</value>, if inclusion of folders had not been requested. The folders will be returned in the same order as used in Thunderbird's folder pane.",
+              "description": "Subfolders of this folder. The property may be <var>null</var>, if inclusion of folders had not been requested. The folders will be returned in the same order as used in Thunderbird's folder pane.",
               "choices": [
                 {
                   "type": "array",
@@ -8423,7 +8457,7 @@
         {
           "id": "MailFolderId",
           "type": "string",
-          "description": "A unique id representing a :ref:`folders.MailFolder` throughout a session. Renaming or moving a folder will invalidate its id."
+          "description": "A unique id representing a $(ref:folders.MailFolder) throughout a session. Renaming or moving a folder will invalidate its id."
         },
         {
           "id": "MailFolderInfo",
@@ -8434,7 +8468,7 @@
               "type": "boolean",
               "optional": true,
               "max_manifest_version": 2,
-              "description": "Deprecated. This information is now available in :ref:`folders.MailFolder`."
+              "description": "Deprecated. This information is now available in $(ref:folders.MailFolder)."
             },
             "lastUsed": {
               "$ref": "extensionTypes.Date",
@@ -8524,7 +8558,7 @@
                 "STORAGE",
                 "MESSAGE"
               ],
-              "description": "The type of the quota as defined by RFC2087. A <value>STORAGE</value> quota is constraining the available storage in bytes, a <value>MESSAGE</value> quota is constraining the number of storable messages."
+              "description": "The type of the quota as defined by RFC2087. A <var>STORAGE</var> quota is constraining the available storage in bytes, a <var>MESSAGE</var> quota is constraining the number of storable messages."
             },
             "limit": {
               "type": "integer",
@@ -8563,12 +8597,12 @@
           "properties": {
             "regexp": {
               "type": "string",
-              "description": "A regular expression, for example <value>^Projects \\d{4}$</value>."
+              "description": "A regular expression, for example <var>^Projects \\d{4}$</var>."
             },
             "flags": {
               "type": "string",
               "pattern": "^(i|u|v|iu|iv|ui|vi)$",
-              "description": "Supported RegExp flags: <value>i</value> = case insensitive, and/or one of <value>u</value> = unicode support or <value>v</value> = extended unicode support",
+              "description": "Supported RegExp flags: <var>i</var> = case insensitive, and/or one of <var>u</var> = unicode support or <var>v</var> = extended unicode support",
               "optional": true
             }
           }
@@ -8577,7 +8611,7 @@
       "properties": {
         "DEFAULT_MOST_RECENT_LIMIT": {
           "value": -1,
-          "description": "The number of most recent folders used in Thunderbird's UI. Controled by the <value>mail.folder_widget.max_recent</value> preference."
+          "description": "The number of most recent folders used in Thunderbird's UI. Controled by the <var>mail.folder_widget.max_recent</var> preference."
         }
       },
       "functions": [
@@ -8638,7 +8672,7 @@
                     }
                   ],
                   "optional": true,
-                  "description": "Whether the folder (excluding subfolders) contains messages, or not. Supports to specify a :ref:`folders.QueryRange` (min/max) instead of a simple boolean value (none/some)."
+                  "description": "Whether the folder (excluding subfolders) contains messages, or not. Supports to specify a $(ref:folders.QueryRange) (min/max) instead of a simple boolean value (none/some)."
                 },
                 "hasUnreadMessages": {
                   "choices": [
@@ -8650,7 +8684,7 @@
                     }
                   ],
                   "optional": true,
-                  "description": "Whether the folder (excluding subfolders) contains unread messages, or not. Supports to specify a :ref:`folders.QueryRange` (min/max) instead of a simple boolean value (none/some)."
+                  "description": "Whether the folder (excluding subfolders) contains unread messages, or not. Supports to specify a $(ref:folders.QueryRange) (min/max) instead of a simple boolean value (none/some)."
                 },
                 "hasNewMessages": {
                   "choices": [
@@ -8662,7 +8696,7 @@
                     }
                   ],
                   "optional": true,
-                  "description": "Whether the folder (excluding subfolders) contains new messages, or not. Supports to specify a :ref:`folders.QueryRange` (min/max) instead of a simple boolean value (none/some)."
+                  "description": "Whether the folder (excluding subfolders) contains new messages, or not. Supports to specify a $(ref:folders.QueryRange) (min/max) instead of a simple boolean value (none/some)."
                 },
                 "hasSubFolders": {
                   "choices": [
@@ -8674,7 +8708,7 @@
                     }
                   ],
                   "optional": true,
-                  "description": "Whether the folder has subfolders, or not. Supports to specify a :ref:`folders.QueryRange` (min/max) instead of a simple boolean value (none/some)."
+                  "description": "Whether the folder has subfolders, or not. Supports to specify a $(ref:folders.QueryRange) (min/max) instead of a simple boolean value (none/some)."
                 },
                 "isFavorite": {
                   "type": "boolean",
@@ -8689,12 +8723,12 @@
                 "isTag": {
                   "type": "boolean",
                   "optional": true,
-                  "description": "Whether the folder is a virtual tag folder, or not. Note: Virtual tag folders are always skipped, unless this property is set to <value>true</value>"
+                  "description": "Whether the folder is a virtual tag folder, or not. Note: Virtual tag folders are always skipped, unless this property is set to <var>true</var>"
                 },
                 "isUnified": {
                   "type": "boolean",
                   "optional": true,
-                  "description": "Whether the folder is a unified mailbox folder, or not. Note: Unified mailbox folders are always skipped, unless this property is set to <value>true</value>"
+                  "description": "Whether the folder is a unified mailbox folder, or not. Note: Unified mailbox folders are always skipped, unless this property is set to <var>true</var>"
                 },
                 "isVirtual": {
                   "type": "boolean",
@@ -8704,7 +8738,7 @@
                 "limit": {
                   "type": "integer",
                   "optional": true,
-                  "description": "Limits the number of returned folders. If used together with <value>recent</value>, supports being set to :ref:`folders.DEFAULT_MOST_RECENT_LIMIT`"
+                  "description": "Limits the number of returned folders. If used together with <var>recent</var>, supports being set to $(ref:folders.DEFAULT_MOST_RECENT_LIMIT)"
                 },
                 "name": {
                   "choices": [
@@ -8783,7 +8817,7 @@
               "optional": true,
               "type": "boolean",
               "default": false,
-              "description": "Specifies whether the returned :ref:`folders.MailFolder` object should include all its nested subfolders. Defaults to <value>false</value>."
+              "description": "Specifies whether the returned $(ref:folders.MailFolder) should populate its <var>subFolders</var> property and include all its (nested!) subfolders. Defaults to <var>false</var>."
             },
             {
               "type": "function",
@@ -8813,7 +8847,7 @@
               "optional": true,
               "type": "boolean",
               "default": true,
-              "description": "Specifies whether the returned :ref:`folders.MailFolder` object should include all its nested subfolders. Defaults to <value>true</value>."
+              "description": "Specifies whether the returned $(ref:folders.MailFolder) should populate its <var>subFolders</var> property and include all its (nested!) subfolders. Defaults to <var>true</var>."
             },
             {
               "type": "function",
@@ -9362,7 +9396,7 @@
             },
             {
               "name": "includeSubFolders",
-              "description": "Specifies whether the returned :ref:`folders.MailFolder` object for each parent folder should include its nested subfolders. Defaults to <value>false</value>.",
+              "description": "Specifies whether each returned parent $(ref:folders.MailFolder) should populate its <var>subFolders</var> property and include all its (nested!) subfolders. Defaults to <var>false</var>.",
               "optional": true,
               "default": false,
               "type": "boolean"
@@ -9395,7 +9429,7 @@
             },
             {
               "name": "includeSubFolders",
-              "description": "Specifies whether the returned :ref:`folders.MailFolder` object for each parent folder should include its nested subfolders. Defaults to <value>false</value>.",
+              "description": "Specifies whether each returned parent $(ref:folders.MailFolder) should populate its <var>subFolders</var> property and include all its (nested!) subfolders. Defaults to <var>false</var>.",
               "optional": true,
               "default": false,
               "type": "boolean"
@@ -9431,7 +9465,7 @@
               "optional": true,
               "type": "boolean",
               "default": false,
-              "description": "Specifies whether the returned :ref:`folders.MailFolder` object for each direct subfolder should also include all its nested subfolders. Defaults to <value>false</value>."
+              "description": "Specifies whether each returned direct child $(ref:folders.MailFolder) should populate its <var>subFolders</var> property and include all its (nested!) subfolders. Defaults to <var>false</var>."
             },
             {
               "type": "function",
@@ -9476,7 +9510,7 @@
               "optional": true,
               "type": "boolean",
               "default": true,
-              "description": "Specifies whether the returned :ref:`folders.MailFolder` object for each direct subfolder should also include all its nested subfolders. Defaults to <value>true</value>."
+              "description": "Specifies whether each returned direct child $(ref:folders.MailFolder) should populate its <var>subFolders</var> property and include all its (nested!) subfolders. Defaults to <var>true</var>."
             },
             {
               "type": "function",
@@ -9500,6 +9534,7 @@
           "async": "callback",
           "parameters": [
             {
+              "name": "type",
               "type": "string",
               "description": "The requested unified mailbox folder type.",
               "enum": [
@@ -9514,7 +9549,7 @@
             },
             {
               "name": "includeSubFolders",
-              "description": "Specifies whether the returned :ref:`folders.MailFolder` object should include all its nested subfolders . Defaults to <value>false</value>.",
+              "description": "Specifies whether the returned $(ref:folders.MailFolder) should populate its <var>subFolders</var> property and include all its (nested!) subfolders. Defaults to <var>false</var>.",
               "optional": true,
               "default": false,
               "type": "boolean"
@@ -9538,8 +9573,9 @@
           "async": "callback",
           "parameters": [
             {
+              "name": "key",
               "type": "string",
-              "description": "The tag key of the requested folder. See :ref:`messages.tags.list()` for the available tags. Throws when specifying an invalid tag key."
+              "description": "The tag key of the requested folder. See $(ref:messages.tags.list()) for the available tags. Throws when specifying an invalid tag key."
             },
             {
               "type": "function",
@@ -9561,7 +9597,7 @@
           "type": "function",
           "max_manifest_version": 2,
           "description": "Marks all messages in a folder as read.",
-          "async": false,
+          "async": "callback",
           "parameters": [
             {
               "name": "folder",
@@ -9574,6 +9610,12 @@
                   "$ref": "folders.MailFolder"
                 }
               ]
+            },
+            {
+              "name": "callback",
+              "type": "function",
+              "optional": true,
+              "parameters": []
             }
           ]
         },
@@ -9585,11 +9627,17 @@
           "type": "function",
           "min_manifest_version": 3,
           "description": "Marks all messages in a folder as read.",
-          "async": false,
+          "async": "callback",
           "parameters": [
             {
               "name": "folderId",
               "$ref": "folders.MailFolderId"
+            },
+            {
+              "name": "callback",
+              "type": "function",
+              "optional": true,
+              "parameters": []
             }
           ]
         }
@@ -9665,7 +9713,7 @@
         {
           "name": "onUpdated",
           "type": "function",
-          "description": "Fired when properties of a folder have changed (<value>specialUse</value> and <value>isFavorite</value>).",
+          "description": "Fired when properties of a folder have changed (<var>specialUse</var> and <var>isFavorite</var>).",
           "parameters": [
             {
               "name": "originalFolder",
@@ -9739,7 +9787,7 @@
             "accountId": {
               "$ref": "accounts.MailAccountId",
               "optional": true,
-              "description": "The id of the :ref:`accounts.MailAccount` this identity belongs to. The ``accountId`` property is read-only."
+              "description": "The id of the $(ref:accounts.MailAccount) this identity belongs to. The <var>accountId</var> property is read-only."
             },
             "composeHtml": {
               "type": "boolean",
@@ -9754,7 +9802,7 @@
             "id": {
               "type": "string",
               "optional": true,
-              "description": "A unique identifier for this identity. The ``id`` property is read-only."
+              "description": "A unique identifier for this identity. The <var>id</var> property is read-only."
             },
             "label": {
               "type": "string",
@@ -9808,7 +9856,7 @@
         {
           "name": "list",
           "type": "function",
-          "description": "Returns the identities of the specified account, or all identities if no account is specified. Do not expect the returned identities to be in any specific order. Use :ref:`identities.getDefault` to get the default identity of an account.",
+          "description": "Returns the identities of the specified account, or all identities if no account is specified. Do not expect the returned identities to be in any specific order. Use $(ref:identities.getDefault) to get the default identity of an account.",
           "async": "callback",
           "parameters": [
             {
@@ -9834,7 +9882,7 @@
         {
           "name": "get",
           "type": "function",
-          "description": "Returns details of the requested identity, or <value>null</value> if it doesn't exist.",
+          "description": "Returns details of the requested identity, or <var>null</var> if it doesn't exist.",
           "async": "callback",
           "parameters": [
             {
@@ -9936,7 +9984,7 @@
         {
           "name": "getDefault",
           "type": "function",
-          "description": "Returns the default identity for the requested account, or <value>null</value> if it is not defined.",
+          "description": "Returns the default identity for the requested account, or <var>null</var> if it is not defined.",
           "async": "callback",
           "parameters": [
             {
@@ -10009,7 +10057,7 @@
         {
           "name": "onUpdated",
           "type": "function",
-          "description": "Fired when one or more properties of an identity have been modified. The returned :ref:`identities.MailIdentity` includes only the changed values.",
+          "description": "Fired when one or more properties of an identity have been modified. The returned $(ref:identities.MailIdentity) includes only the changed values.",
           "parameters": [
             {
               "name": "identityId",
@@ -10175,7 +10223,7 @@
             },
             "sortType": {
               "type": "string",
-              "description": "Sorts the list of messages. ``sortOrder`` must also be given.",
+              "description": "Sorts the list of messages. <var>sortOrder</var> must also be given.",
               "optional": true,
               "enum": [
                 "none",
@@ -10202,7 +10250,7 @@
             },
             "sortOrder": {
               "type": "string",
-              "description": "Sorts the list of messages. ``sortType`` must also be given.",
+              "description": "Sorts the list of messages. <var>sortType</var> must also be given.",
               "optional": true,
               "enum": [
                 "none",
@@ -10237,7 +10285,7 @@
               "optional": true
             },
             "folderMode": {
-              "description": "Sets the currently used folder mode, enabling it if required. If used without also specifying <value>displayedFolder</value>, the currently selected folder is re-selected in the new folder mode, if possible.",
+              "description": "Sets the currently used folder mode, enabling it if required. If used without also specifying <var>displayedFolder</var>, the currently selected folder is re-selected in the new folder mode, if possible.",
               "$ref": "mailTabs.FolderMode",
               "optional": true
             },
@@ -10258,7 +10306,7 @@
             "displayedFolderId": {
               "$ref": "folders.MailFolderId",
               "min_manifest_version": 3,
-              "description": "Sets the folder displayed in the mail tab. Requires the <permission>accountsRead</permission> permission. The previous message selection in the given folder will be restored, if any. This property is ignored, if <value>selectedMessages</value> is specified.",
+              "description": "Sets the folder displayed in the mail tab. Requires the <permission>accountsRead</permission> permission. The previous message selection in the given folder will be restored, if any. This property is ignored, if <var>selectedMessages</var> is specified.",
               "optional": true
             },
             "displayedFolder": {
@@ -10272,7 +10320,7 @@
                 }
               ],
               "max_manifest_version": 2,
-              "description": "Sets the folder displayed in the mail tab. Requires the <permission>accountsRead</permission> permission. The previous message selection in the given folder will be restored, if any. This property is ignored, if <value>selectedMessages</value> is specified.",
+              "description": "Sets the folder displayed in the mail tab. Requires the <permission>accountsRead</permission> permission. The previous message selection in the given folder will be restored, if any. This property is ignored, if <var>selectedMessages</var> is specified.",
               "optional": true
             }
           }
@@ -10283,26 +10331,26 @@
           "properties": {
             "text": {
               "type": "string",
-              "description": "String to match against the ``recipients``, ``author``, ``subject``, or ``body``."
+              "description": "String to match against the <var>recipients</var>, <var>author</var>, <var>subject</var>, or <var>body</var>."
             },
             "recipients": {
               "type": "boolean",
-              "description": "Shows messages where ``text`` matches the recipients.",
+              "description": "Shows messages where <var>text</var> matches the recipients.",
               "optional": true
             },
             "author": {
               "type": "boolean",
-              "description": "Shows messages where ``text`` matches the author.",
+              "description": "Shows messages where <var>text</var> matches the author.",
               "optional": true
             },
             "subject": {
               "type": "boolean",
-              "description": "Shows messages where ``text`` matches the subject.",
+              "description": "Shows messages where <var>text</var> matches the subject.",
               "optional": true
             },
             "body": {
               "type": "boolean",
-              "description": "Shows messages where ``text`` matches the message body.",
+              "description": "Shows messages where <var>text</var> matches the message body.",
               "optional": true
             }
           }
@@ -10340,7 +10388,7 @@
                   "type": "integer",
                   "optional": true,
                   "minimum": -2,
-                  "description": "The ID of the parent window, or :ref:`windows.WINDOW_ID_CURRENT` for the current window."
+                  "description": "The ID of the parent window, or $(ref:windows.WINDOW_ID_CURRENT) for the current window."
                 }
               }
             },
@@ -10362,13 +10410,13 @@
         {
           "name": "get",
           "type": "function",
-          "description": "Get the :ref:`mailTabs.MailTab` properties of a mail tab.",
+          "description": "Get the $(ref:mailTabs.MailTab) properties of a mail tab.",
           "async": "callback",
           "parameters": [
             {
               "name": "tabId",
               "type": "integer",
-              "description": "ID of the requested mail tab. Throws if the requested <value>tabId</value> does not belong to a mail tab."
+              "description": "ID of the requested mail tab. Throws if the requested <var>tabId</var> does not belong to a mail tab."
             },
             {
               "type": "function",
@@ -10386,7 +10434,7 @@
           "name": "getCurrent",
           "type": "function",
           "max_manifest_version": 2,
-          "description": "Get the :ref:`mailTabs.MailTab` properties of the active mail tab. Returns <value>undefined</value>, if the active tab is not a mail tab.",
+          "description": "Get the $(ref:mailTabs.MailTab) properties of the active mail tab. Returns <var>undefined</var>, if the active tab is not a mail tab.",
           "async": "callback",
           "parameters": [
             {
@@ -10406,7 +10454,7 @@
         {
           "name": "create",
           "type": "function",
-          "description": "Creates a new mail tab. Standard tab properties can be adjusted via :ref:`tabs.update` after the mail tab has been created. **Note:** A new mail window can be created via :ref:`windows.create`.",
+          "description": "Creates a new mail tab. Standard tab properties can be adjusted via $(ref:tabs.update) after the mail tab has been created. **Note:** A new mail window can be created via $(ref:windows.create).",
           "async": "callback",
           "parameters": [
             {
@@ -10432,7 +10480,7 @@
         {
           "name": "update",
           "type": "function",
-          "description": "Modifies the properties of a mail tab. Properties that are not specified in ``updateProperties`` are not modified.",
+          "description": "Modifies the properties of a mail tab. Properties that are not specified in <var>updateProperties</var> are not modified.",
           "async": "callback",
           "parameters": [
             {
@@ -10766,7 +10814,7 @@
               ]
             }
           ],
-          "description": "The different contexts a menu can appear in. Specifying <value>all</value> is equivalent to the combination of all other contexts excluding <value>tab</value> and <value>tools_menu</value>. More information about each context can be found in the `Supported UI Elements <|link-ui-elements|>`__ article on developer.thunderbird.net."
+          "description": "The different contexts a menu can appear in. Specifying <var>all</var> is equivalent to the combination of all other contexts excluding <var>tab</var> and <var>tools_menu</var>. More information about each context can be found in the <a href='url-ui-elements'>Supported UI Elements</a> article on developer.thunderbird.net."
         },
         {
           "id": "ItemType",
@@ -10782,7 +10830,7 @@
         {
           "id": "OnShowData",
           "type": "object",
-          "description": "Information sent when a context menu is being shown. Some properties are only included if the extension has host permission for the given context, for example :permission:`activeTab` for content tabs, :permission:`compose` for compose tabs and :permission:`messagesRead` for message display tabs.",
+          "description": "Information sent when a context menu is being shown. Some properties are only included if the extension has host permission for the given context, for example <permission>activeTab</permission> for content tabs, <permission>compose</permission> for compose tabs and <permission>messagesRead</permission> for message display tabs.",
           "properties": {
             "menuIds": {
               "description": "A list of IDs of the menu items that were shown.",
@@ -10812,7 +10860,7 @@
             "mediaType": {
               "type": "string",
               "optional": true,
-              "description": "One of <value>image</value>, <value>video</value>, or <value>audio</value> if the context menu was activated on one of these types of elements."
+              "description": "One of <var>image</var>, <var>video</var>, or <var>audio</var> if the context menu was activated on one of these types of elements."
             },
             "viewType": {
               "$ref": "extension.ViewType",
@@ -10852,7 +10900,7 @@
             "targetElementId": {
               "type": "integer",
               "optional": true,
-              "description": "An identifier of the clicked content element, if any. Use :ref:`menus.getTargetElement` in the page to find the corresponding element."
+              "description": "An identifier of the clicked content element, if any. Use $(ref:menus.getTargetElement) in the page to find the corresponding element."
             },
             "fieldId": {
               "type": "string",
@@ -10870,19 +10918,19 @@
             "selectedMessages": {
               "$ref": "messages.MessageList",
               "optional": true,
-              "description": "The selected message(s) in the message list (a.k.a. the thread pane). Only available for the `message_list` context. The <permission>messagesRead</permission> permission is required. The returned selection includes the messages which would be affected by a context action through Thunderbirds UI, which may not be the actuall selected messages. For example, if the user has multiple messages selected and opens the context menu for a message outside that selection, only the message for which the context menu was opened, is returned."
+              "description": "The selected message(s) in the message list (a.k.a. the thread pane). Only available for the <var>message_list</var> context. The <permission>messagesRead</permission> permission is required. The returned selection includes the messages which would be affected by a context action through Thunderbirds UI, which may not be the actuall selected messages. For example, if the user has multiple messages selected and opens the context menu for a message outside that selection, only the message for which the context menu was opened, is returned."
             },
             "displayedFolder": {
               "$ref": "folders.MailFolder",
               "optional": true,
-              "description": "The displayed folder. Only available for the `message_list` context. The <permission>accountsRead</permission> permission is required."
+              "description": "The displayed folder. Only available for the <var>message_list</var> context. The <permission>accountsRead</permission> permission is required."
             },
             "selectedFolder": {
               "$ref": "folders.MailFolder",
               "max_manifest_version": 2,
               "optional": true,
               "deprecated": "Deprecated since Thunderbird 128 and removed in Manifest V3: The selectedFolder property has been replaced by the selectedFolders property.",
-              "description": "The selected folder in the folder pane (where the context menu was opened). Only available for the `folder_pane` context. The <permission>accountsRead</permission> permission is required."
+              "description": "The selected folder in the folder pane (where the context menu was opened). Only available for the <var>folder_pane</var> context. The <permission>accountsRead</permission> permission is required."
             },
             "selectedFolders": {
               "type": "array",
@@ -10890,14 +10938,14 @@
                 "$ref": "folders.MailFolder"
               },
               "optional": true,
-              "description": "The selected folders in the folder pane. Only available for the `folder_pane` context. The <permission>accountsRead</permission> permission is required. The returned selection includes the folders which would be affected by a context action through Thunderbirds UI, which may not be the actuall selected folders. For example, if the user has multiple folders selected and opens the context menu for a folder outside that selection, only the folder for which the context menu was opened, is returned."
+              "description": "The selected folders in the folder pane. Only available for the <var>folder_pane</var> context. The <permission>accountsRead</permission> permission is required. The returned selection includes the folders which would be affected by a context action through Thunderbirds UI, which may not be the actuall selected folders. For example, if the user has multiple folders selected and opens the context menu for a folder outside that selection, only the folder for which the context menu was opened, is returned."
             },
             "selectedAccount": {
               "$ref": "accounts.MailAccount",
               "max_manifest_version": 2,
               "optional": true,
               "deprecated": "Deprecated since Thunderbird 128 and removed in Manifest V3: The selectedAccount property has been replaced by the selectedFolders property, returning the root folder of the account.",
-              "description": "The selected account in the folder pane, if the context menu was opened on an account entry. Only available for the `folder_pane` context. The <permission>accountsRead</permission> permission is required."
+              "description": "The selected account in the folder pane, if the context menu was opened on an account entry. Only available for the <var>folder_pane</var> context. The <permission>accountsRead</permission> permission is required."
             },
             "attachments": {
               "type": "array",
@@ -10951,7 +10999,7 @@
             "mediaType": {
               "type": "string",
               "optional": true,
-              "description": "One of <value>image</value>, <value>video</value>, or <value>audio</value> if the context menu was activated on one of these types of elements."
+              "description": "One of <var>image</var>, <var>video</var>, or <var>audio</var> if the context menu was activated on one of these types of elements."
             },
             "viewType": {
               "$ref": "extension.ViewType",
@@ -11026,7 +11074,7 @@
             "targetElementId": {
               "type": "integer",
               "optional": true,
-              "description": "An identifier of the clicked content element, if any. Use :ref:`menus.getTargetElement` in the page to find the corresponding element."
+              "description": "An identifier of the clicked content element, if any. Use $(ref:menus.getTargetElement) in the page to find the corresponding element."
             },
             "fieldId": {
               "type": "string",
@@ -11044,19 +11092,19 @@
             "selectedMessages": {
               "$ref": "messages.MessageList",
               "optional": true,
-              "description": "The selected message(s) in the message list (a.k.a. the thread pane). Only available for the `message_list` context. The <permission>messagesRead</permission> permission is required. The returned selection includes the messages which would be affected by a context action through Thunderbirds UI, which may not be the actuall selected messages. For example, if the user has multiple messages selected and opens the context menu for a message outside that selection, only the message for which the context menu was opened, is returned."
+              "description": "The selected message(s) in the message list (a.k.a. the thread pane). Only available for the <var>message_list</var> context. The <permission>messagesRead</permission> permission is required. The returned selection includes the messages which would be affected by a context action through Thunderbirds UI, which may not be the actuall selected messages. For example, if the user has multiple messages selected and opens the context menu for a message outside that selection, only the message for which the context menu was opened, is returned."
             },
             "displayedFolder": {
               "$ref": "folders.MailFolder",
               "optional": true,
-              "description": "The displayed folder. Only available for the `message_list` context. The <permission>accountsRead</permission> permission is required."
+              "description": "The displayed folder. Only available for the <var>message_list</var> context. The <permission>accountsRead</permission> permission is required."
             },
             "selectedFolder": {
               "$ref": "folders.MailFolder",
               "max_manifest_version": 2,
               "optional": true,
               "deprecated": "Deprecated since Thunderbird 128 and removed in Manifest V3: The selectedFolder property has been replaced by the selectedFolders property.",
-              "description": "The selected folder in the folder pane (where the context menu was opened). Only available for the `folder_pane` context. The <permission>accountsRead</permission> permission is required."
+              "description": "The selected folder in the folder pane (where the context menu was opened). Only available for the <var>folder_pane</var> context. The <permission>accountsRead</permission> permission is required."
             },
             "selectedFolders": {
               "type": "array",
@@ -11064,14 +11112,14 @@
                 "$ref": "folders.MailFolder"
               },
               "optional": true,
-              "description": "The selected folders in the folder pane. Only available for the `folder_pane` context. The <permission>accountsRead</permission> permission is required. The returned selection includes the folders which would be affected by a context action through Thunderbirds UI, which may not be the actuall selected folders. For example, if the user has multiple folders selected and opens the context menu for a folder outside that selection, only the folder for which the context menu was opened, is returned."
+              "description": "The selected folders in the folder pane. Only available for the <var>folder_pane</var> context. The <permission>accountsRead</permission> permission is required. The returned selection includes the folders which would be affected by a context action through Thunderbirds UI, which may not be the actuall selected folders. For example, if the user has multiple folders selected and opens the context menu for a folder outside that selection, only the folder for which the context menu was opened, is returned."
             },
             "selectedAccount": {
               "$ref": "accounts.MailAccount",
               "max_manifest_version": 2,
               "optional": true,
               "deprecated": "Deprecated since Thunderbird 128 and removed in Manifest V3: The selectedAccount property has been replaced by the selectedFolders property, returning the root folder of the account.",
-              "description": "The selected account in the folder pane, if the context menu was opened on an account entry. Only available for the `folder_pane` context. The <permission>accountsRead</permission> permission is required."
+              "description": "The selected account in the folder pane, if the context menu was opened on an account entry. Only available for the <var>folder_pane</var> context. The <permission>accountsRead</permission> permission is required."
             },
             "attachments": {
               "type": "array",
@@ -11102,7 +11150,7 @@
               "pattern": "^(moz-extension|blob|http|https):.*$"
             }
           ],
-          "description": "The path for a menu icon may be a relative path to an icon file, a <value>moz-extension:</value> URL, an image <value>data:</value> URL, a <value>blob:</value> URL, or a remote <value>http(s):</value> URL."
+          "description": "The path for a menu icon may be a relative path to an icon file, a <var>moz-extension:</var> URL, an image <var>data:</var> URL, a <var>blob:</var> URL, or a remote <var>http(s):</var> URL."
         },
         {
           "id": "MenuIconDictionary",
@@ -11112,14 +11160,14 @@
               "$ref": "MenuIconPath"
             }
           },
-          "description": "A <em>dictionary object</em> to specify paths for multiple icons in different sizes, so the best matching icon can be used, instead of scaling a standard icon to fit the pixel density of the user's display. Each entry is a <em>name-value</em> pair, with <em>name</em> being a size and <em>value</em> being a :ref:`menus.MenuIconPath`. Example: <literalinclude>includes/IconPath.json<lang>JSON</lang></literalinclude>See the `MDN documentation about choosing icon sizes <https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/manifest.json/browser_action#choosing_icon_sizes>`__ for more information on this. "
+          "description": "A <em>dictionary object</em> to specify paths for multiple icons in different sizes, so the best matching icon can be used, instead of scaling a standard icon to fit the pixel density of the user's display. Each entry is a <em>name-value</em> pair, with <em>name</em> being a size and <em>value</em> being a $(ref:menus.MenuIconPath). Example: <literalinclude>includes/IconPath.json<lang>JSON</lang></literalinclude>See the <a href='url-choosing-icon-size'>MDN documentation about choosing icon sizes</a> for more information on this. "
         }
       ],
       "functions": [
         {
           "name": "create",
           "type": "function",
-          "description": "Creates a new context menu item. Note that if an error occurs during creation, you may not find out until the creation callback fires (the details will be in `runtime.lastError <|link-runtime-last-error|>`__).",
+          "description": "Creates a new context menu item. Note that if an error occurs during creation, you may not find out until the creation callback fires (the details will be in <a href='url-runtime-last-error'>runtime.lastError</a>).",
           "returns": {
             "choices": [
               {
@@ -11139,7 +11187,7 @@
                 "type": {
                   "$ref": "ItemType",
                   "optional": true,
-                  "description": "The type of menu item. Defaults to <value>normal</value> if not specified."
+                  "description": "The type of menu item. Defaults to <var>normal</var> if not specified."
                 },
                 "id": {
                   "type": "string",
@@ -11161,12 +11209,12 @@
                 "title": {
                   "type": "string",
                   "optional": true,
-                  "description": "The text to be displayed in the item; this is <em>required</em> unless ``type`` is <value>separator</value>. When the context is <value>selection</value>, you can use <value>%s</value> within the string to show the selected text. For example, if this parameter's value is <value>Translate '%s' to Latin</value> and the user selects the word <value>cool</value>, the context menu item for the selection is <value>Translate 'cool' to Latin</value>. To specify an access key for the new menu entry, include a <value>&</value> before the desired letter in the title. For example <value>&Help</value>."
+                  "description": "The text to be displayed in the item; this is <em>required</em> unless <var>type</var> is <var>separator</var>. When the context is <var>selection</var>, you can use <var>%s</var> within the string to show the selected text. For example, if this parameter's value is <var>Translate '%s' to Latin</var> and the user selects the word <var>cool</var>, the context menu item for the selection is <var>Translate 'cool' to Latin</var>. To specify an access key for the new menu entry, include a <var>&</var> before the desired letter in the title. For example <var>&Help</var>."
                 },
                 "checked": {
                   "type": "boolean",
                   "optional": true,
-                  "description": "The initial state of a checkbox or radio item: <value>true</value> for selected and <value>false</value> for unselected. Only one radio item can be selected at a time in a given group of radio items."
+                  "description": "The initial state of a checkbox or radio item: <var>true</var> for selected and <var>false</var> for unselected. Only one radio item can be selected at a time in a given group of radio items."
                 },
                 "contexts": {
                   "type": "array",
@@ -11175,7 +11223,7 @@
                   },
                   "minItems": 1,
                   "optional": true,
-                  "description": "List of contexts this menu item will appear in. Defaults to <value>['page']</value> if not specified."
+                  "description": "List of contexts this menu item will appear in. Defaults to <var>['page']</var> if not specified."
                 },
                 "viewTypes": {
                   "type": "array",
@@ -11226,7 +11274,7 @@
                     "type": "string"
                   },
                   "optional": true,
-                  "description": "Lets you restrict the item to apply only to documents whose URL matches one of the given patterns. (This applies to frames as well.) For details on the format of a pattern, see `Match Patterns <|link-match-patterns|>`__."
+                  "description": "Lets you restrict the item to apply only to documents whose URL matches one of the given patterns. (This applies to frames as well.) For details on the format of a pattern, see <a href='url-match-patterns'>Match Patterns</a>."
                 },
                 "targetUrlPatterns": {
                   "type": "array",
@@ -11247,12 +11295,12 @@
                     {
                       "type": "string",
                       "max_manifest_version": 2,
-                      "description": "Specifies a command to issue for the context click. Currently supports internal commands <value>_execute_browser_action</value>, <value>_execute_compose_action</value> and <value>_execute_message_display_action</value>."
+                      "description": "Specifies a command to issue for the context click. Currently supports internal commands <var>_execute_browser_action</var>, <var>_execute_compose_action</var> and <var>_execute_message_display_action</var>."
                     },
                     {
                       "type": "string",
                       "min_manifest_version": 3,
-                      "description": "Specifies a command to issue for the context click. Currently supports internal commands <value>_execute_action</value>, <value>_execute_compose_action</value> and <value>_execute_message_display_action</value>."
+                      "description": "Specifies a command to issue for the context click. Currently supports internal commands <var>_execute_action</var>, <var>_execute_compose_action</var> and <var>_execute_message_display_action</var>."
                     }
                   ]
                 }
@@ -11262,7 +11310,7 @@
               "type": "function",
               "name": "callback",
               "optional": true,
-              "description": "Called when the item has been created in the browser. If there were any problems creating the item, details will be available in `runtime.lastError <|link-runtime-last-error|>`__.",
+              "description": "Called when the item has been created in the browser. If there were any problems creating the item, details will be available in <a href='url-runtime-last-error'>runtime.lastError</a>.",
               "parameters": []
             }
           ]
@@ -11438,7 +11486,7 @@
             "menus.overrideContext"
           ],
           "type": "function",
-          "description": "Show the matching menu items from this extension instead of the default menu. This should be called during a `contextmenu <|link-contextmenu-event|>`__ event handler, and only applies to the menu that opens after this event.",
+          "description": "Show the matching menu items from this extension instead of the default menu. This should be called during a <a href='url-contextmenu-event'>contextmenu</a> event handler, and only applies to the menu that opens after this event.",
           "parameters": [
             {
               "name": "contextOptions",
@@ -11456,13 +11504,13 @@
                     "tab"
                   ],
                   "optional": true,
-                  "description": "ContextType to override, to allow menu items from other extensions in the menu. Currently only <value>tab</value> is supported. ``contextOptions.showDefaults`` cannot be used with this option."
+                  "description": "ContextType to override, to allow menu items from other extensions in the menu. Currently only <var>tab</var> is supported. <var>contextOptions.showDefaults</var> cannot be used with this option."
                 },
                 "tabId": {
                   "type": "integer",
                   "minimum": 0,
                   "optional": true,
-                  "description": "Required when context is <value>tab</value>. Requires the <permission>tabs</permission> permission."
+                  "description": "Required when context is <var>tab</var>. Requires the <permission>tabs</permission> permission."
                 }
               }
             }
@@ -11480,7 +11528,7 @@
         {
           "name": "onClicked",
           "type": "function",
-          "description": "Fired when a context menu item is clicked. This is a user input event handler. For asynchronous listeners some `restrictions <|link-user-input-restrictions|>`__ apply.",
+          "description": "Fired when a context menu item is clicked. This is a user input event handler. For asynchronous listeners some <a href='url-user-input-restrictions'>restrictions</a> apply.",
           "parameters": [
             {
               "name": "info",
@@ -11498,7 +11546,7 @@
         {
           "name": "onShown",
           "type": "function",
-          "description": "Fired when a menu is shown. The extension can add, modify or remove menu items and call :ref:`menus.refresh` to update the menu.",
+          "description": "Fired when a menu is shown. The extension can add, modify or remove menu items and call $(ref:menus.refresh) to update the menu.",
           "parameters": [
             {
               "name": "info",
@@ -11540,11 +11588,11 @@
             "content",
             "devtools"
           ],
-          "description": "Retrieve the element that was associated with a recent `contextmenu <|link-contextmenu-event|>`__ event.",
+          "description": "Retrieve the element that was associated with a recent <a href='url-contextmenu-event'>contextmenu</a> event.",
           "parameters": [
             {
               "type": "integer",
-              "description": "The identifier of the clicked element, available as ``info.targetElementId`` in the :ref:`menus.onShown` and :ref:`menus.onClicked` events.",
+              "description": "The identifier of the clicked element, available as <var>info.targetElementId</var> in the $(ref:menus.onShown) and $(ref:menus.onClicked) events.",
               "name": "targetElementId"
             }
           ],
@@ -11613,7 +11661,7 @@
           "name": "getDisplayedMessage",
           "max_manifest_version": 2,
           "type": "function",
-          "description": "Gets the currently displayed message in the specified tab (even if the tab itself is currently not visible), or the currently active tab. It returns <value>null</value> if no messages are displayed, or if multiple messages are displayed.",
+          "description": "Gets the currently displayed message in the specified tab (even if the tab itself is currently not visible), or the currently active tab. It returns <var>null</var> if no messages are displayed, or if multiple messages are displayed.",
           "async": "callback",
           "parameters": [
             {
@@ -11698,12 +11746,12 @@
                 "messageId": {
                   "$ref": "messages.MessageId",
                   "optional": true,
-                  "description": "The id of a message to be opened. Will throw an <em>ExtensionError</em>, if the provided ``messageId`` is unknown or invalid."
+                  "description": "The id of a message to be opened. Will throw an <em>ExtensionError</em>, if the provided <var>messageId</var> is unknown or invalid."
                 },
                 "headerMessageId": {
                   "type": "string",
                   "optional": true,
-                  "description": "The headerMessageId of a message to be opened. Will throw an <em>ExtensionError</em>, if the provided ``headerMessageId`` is unknown or invalid. Not supported for external messages."
+                  "description": "The headerMessageId of a message to be opened. Will throw an <em>ExtensionError</em>, if the provided <var>headerMessageId</var> is unknown or invalid. Not supported for external messages."
                 },
                 "location": {
                   "type": "string",
@@ -11780,19 +11828,19 @@
                   "items": {
                     "$ref": "ThemeIcons"
                   },
-                  "description": "Specifies dark and light icons to be used with themes. The ``light`` icon is used on dark backgrounds and vice versa. **Note:** The default theme uses the ``default_icon`` for light backgrounds (if specified)."
+                  "description": "Specifies dark and light icons to be used with themes. The <var>light</var> icon is used on dark backgrounds and vice versa. **Note:** The default theme uses the <var>default_icon</var> for light backgrounds (if specified)."
                 },
                 "default_popup": {
                   "type": "string",
                   "format": "relativeUrl",
                   "optional": true,
-                  "description": "The html document to be opened as a popup when the user clicks on the messageDisplayAction button. Ignored for action buttons with type <value>menu</value>.",
+                  "description": "The html document to be opened as a popup when the user clicks on the messageDisplayAction button. Ignored for action buttons with type <var>menu</var>.",
                   "preprocess": "localize"
                 },
                 "browser_style": {
                   "type": "boolean",
                   "optional": true,
-                  "description": "Enable browser styles. See the `MDN documentation on browser styles <|link-mdn-browser-styles|>`__ for more information.",
+                  "description": "Enable browser styles. See the <a href='url-mdn-browser-styles'>MDN documentation on browser styles</a> for more information.",
                   "default": false
                 },
                 "default_area": {
@@ -11801,7 +11849,7 @@
                   "optional": true
                 },
                 "type": {
-                  "description": "Specifies the type of the button. Default type is <value>button</value>.",
+                  "description": "Specifies the type of the button. Default type is <var>button</var>.",
                   "type": "string",
                   "enum": [
                     "button",
@@ -11826,7 +11874,7 @@
       "types": [
         {
           "id": "ColorArray",
-          "description": "An array of four integers in the range [0,255] that make up the RGBA color. For example, opaque red is <value>[255, 0, 0, 255]</value>.",
+          "description": "An array of four integers in the range [0,255] that make up the RGBA color. For example, opaque red is <var>[255, 0, 0, 255]</var>.",
           "type": "array",
           "items": {
             "type": "integer",
@@ -11844,12 +11892,12 @@
             "type": "any"
           },
           "postprocess": "convertImageDataToURL",
-          "description": "Pixel data for an image. Must be an |ImageData| object (for example, from a |Canvas| element)."
+          "description": "Pixel data for an image. Must be an <a href='url-image-data'>ImageData</a> object (for example, from a <a href='url-canvas-element'>canvas</a> element)."
         },
         {
           "id": "ImageDataDictionary",
           "type": "object",
-          "description": "A <em>dictionary object</em> to specify multiple |ImageData| objects in different sizes, so the icon does not have to be scaled for a device with a different pixel density. Each entry is a <em>name-value</em> pair with <em>value</em> being an |ImageData| object, and <em>name</em> its size. Example: <literalinclude>includes/ImageDataDictionary.json<lang>JavaScript</lang></literalinclude>See the `MDN documentation about choosing icon sizes <|link-mdn-icon-size|>`__ for more information on this.",
+          "description": "A <em>dictionary object</em> to specify multiple <a href='url-image-data'>ImageData</a> objects in different sizes, so the icon does not have to be scaled for a device with a different pixel density. Each entry is a <em>name-value</em> pair with <em>value</em> being an <a href='url-image-data'>ImageData</a> object, and <em>name</em> its size. Example: <literalinclude>includes/ImageDataDictionary.json<lang>JavaScript</lang></literalinclude>See the <a href='url-mdn-icon-size'>MDN documentation about choosing icon sizes</a> for more information on this.",
           "patternProperties": {
             "^[1-9]\\d*$": {
               "$ref": "ImageDataType"
@@ -11903,7 +11951,7 @@
                       "type": "null"
                     }
                   ],
-                  "description": "A string the messageDisplayAction button should display as its label and when moused over. Cleared by setting it to <value>null</value> or an empty string (title defined the manifest will be used)."
+                  "description": "A string the messageDisplayAction button should display as its label and when moused over. Cleared by setting it to <var>null</var> or an empty string (title defined the manifest will be used)."
                 },
                 "tabId": {
                   "type": "integer",
@@ -11985,7 +12033,7 @@
                       "type": "null"
                     }
                   ],
-                  "description": "A string the messageDisplayAction button should use as its label, overriding the defined title. Can be set to an empty string to not display any label at all. If the containing toolbar is configured to display text only, its title will be used. Cleared by setting it to <value>null</value>."
+                  "description": "A string the messageDisplayAction button should use as its label, overriding the defined title. Can be set to an empty string to not display any label at all. If the containing toolbar is configured to display text only, its title will be used. Cleared by setting it to <var>null</var>."
                 },
                 "tabId": {
                   "type": "integer",
@@ -12013,7 +12061,7 @@
         {
           "name": "getLabel",
           "type": "function",
-          "description": "Gets the label of the messageDisplayAction button. Returns <value>null</value>, if no label has been set and the title is used.",
+          "description": "Gets the label of the messageDisplayAction button. Returns <var>null</var>, if no label has been set and the title is used.",
           "async": "callback",
           "parameters": [
             {
@@ -12058,7 +12106,7 @@
         {
           "name": "setIcon",
           "type": "function",
-          "description": "Sets the icon for the messageDisplayAction button. Either the ``path`` or the ``imageData`` property must be specified.",
+          "description": "Sets the icon for the messageDisplayAction button. Either the <var>path</var> or the <var>imageData</var> property must be specified.",
           "async": "callback",
           "parameters": [
             {
@@ -12124,7 +12172,7 @@
                       "type": "null"
                     }
                   ],
-                  "description": "The html file to show in a popup. Can be set to an empty string to not open a popup. Cleared by setting it to <value>null</value> (action will use the popup value defined in the manifest)."
+                  "description": "The html file to show in a popup. Can be set to an empty string to not open a popup. Cleared by setting it to <var>null</var> (action will use the popup value defined in the manifest)."
                 },
                 "tabId": {
                   "type": "integer",
@@ -12206,7 +12254,7 @@
                       "type": "null"
                     }
                   ],
-                  "description": "Any number of characters can be passed, but only about four can fit in the space. Cleared by setting it to <value>null</value> or an empty string."
+                  "description": "Any number of characters can be passed, but only about four can fit in the space. Cleared by setting it to <var>null</var> or an empty string."
                 },
                 "tabId": {
                   "type": "integer",
@@ -12291,7 +12339,7 @@
                       "type": "null"
                     }
                   ],
-                  "description": "The color to use as text color in the badge. Cleared by setting it to <value>null</value>."
+                  "description": "The color to use as text color in the badge. Cleared by setting it to <var>null</var>."
                 },
                 "tabId": {
                   "type": "integer",
@@ -12314,7 +12362,7 @@
           "name": "getBadgeTextColor",
           "type": "function",
           "description": "Gets the text color of the badge.",
-          "async": true,
+          "async": "callback",
           "parameters": [
             {
               "name": "details",
@@ -12342,7 +12390,7 @@
               "parameters": [
                 {
                   "name": "result",
-                  "type": "string"
+                  "$ref": "ColorArray"
                 }
               ]
             }
@@ -12370,7 +12418,7 @@
                       "type": "null"
                     }
                   ],
-                  "description": "The color to use as background in the badge. Cleared by setting it to <value>null</value>."
+                  "description": "The color to use as background in the badge. Cleared by setting it to <var>null</var>."
                 },
                 "tabId": {
                   "type": "integer",
@@ -12436,7 +12484,7 @@
         {
           "name": "enable",
           "type": "function",
-          "description": "Enables the messageDisplayAction button for a specific tab (if a ``tabId`` is provided), or for all tabs which do not have a custom enable state. Once the enable state of a tab has been updated individually, all further changes to its state have to be done individually as well. By default, a messageDisplayAction button is enabled.",
+          "description": "Enables the messageDisplayAction button for a specific tab (if a <var>tabId</var> is provided), or for all tabs which do not have a custom enable state. Once the enable state of a tab has been updated individually, all further changes to its state have to be done individually as well. By default, a messageDisplayAction button is enabled.",
           "async": "callback",
           "parameters": [
             {
@@ -12457,7 +12505,7 @@
         {
           "name": "disable",
           "type": "function",
-          "description": "Disables the messageDisplayAction button for a specific tab (if a ``tabId`` is provided), or for all tabs which do not have a custom enable state. Once the enable state of a tab has been updated individually, all further changes to its state have to be done individually as well.",
+          "description": "Disables the messageDisplayAction button for a specific tab (if a <var>tabId</var> is provided), or for all tabs which do not have a custom enable state. Once the enable state of a tab has been updated individually, all further changes to its state have to be done individually as well.",
           "async": "callback",
           "parameters": [
             {
@@ -12515,7 +12563,7 @@
         {
           "name": "openPopup",
           "type": "function",
-          "description": "Opens the action's popup window in the specified window. Defaults to the current window. Returns false if the popup could not be opened because the action has no popup, is of type <value>menu</value>, is disabled or has been removed from the toolbar.",
+          "description": "Opens the action's popup window in the specified window. Defaults to the current window. Returns false if the popup could not be opened because the action has no popup, is of type <var>menu</var>, is disabled or has been removed from the toolbar.",
           "async": "callback",
           "parameters": [
             {
@@ -12549,7 +12597,7 @@
         {
           "name": "onClicked",
           "type": "function",
-          "description": "Fired when a messageDisplayAction button is clicked. This event will not fire if the messageDisplayAction has a popup. This is a user input event handler. For asynchronous listeners some `restrictions <|link-user-input-restrictions|>`__ apply.",
+          "description": "Fired when a messageDisplayAction button is clicked. This event will not fire if the messageDisplayAction has a popup. This is a user input event handler. For asynchronous listeners some <a href='url-user-input-restrictions'>restrictions</a> apply.",
           "parameters": [
             {
               "name": "tab",
@@ -12600,16 +12648,16 @@
           "id": "MessageId",
           "type": "integer",
           "minimum": 1,
-          "description": "A unique id representing a :ref:`messages.MessageHeader` and the associated message. This id doesn’t refer to the Message-ID email header. It is an internal tracking number that does not remain after a restart. Nor does it follow an email that has been moved to a different folder."
+          "description": "A unique id representing a $(ref:messages.MessageHeader) and the associated message. This id doesn’t refer to the Message-ID email header. It is an internal tracking number that does not remain after a restart. Nor does it follow an email that has been moved to a different folder."
         },
         {
           "id": "InlineTextPart",
           "type": "object",
-          "description": "An inline part with content type <value>text/*</value>. These parts are not returned by :ref:`listAttachments` and usually make up the readable content of the message, mostly with content type <value>text/plain</value> or <value>text/html</value>",
+          "description": "An inline part with content type <var>text/*</var>. These parts are not returned by $(ref:messages.listAttachments) and usually make up the readable content of the message, mostly with content type <var>text/plain</var> or <var>text/html</var>",
           "properties": {
             "contentType": {
               "type": "string",
-              "description": "The content type of the part. Most common types for inline text parts are <value>text/plain</value> and <value>text/html</value>. Possible other (deprecated) types are <value>text/richtext</value> and <value>text/enriched</value>. Some calendaring services include an inline text part with type <value>text/calendar</value>."
+              "description": "The content type of the part. Most common types for inline text parts are <var>text/plain</var> and <var>text/html</var>. Possible other (deprecated) types are <var>text/richtext</var> and <var>text/enriched</var>. Some calendaring services include an inline text part with type <var>text/calendar</var>."
             },
             "content": {
               "type": "string",
@@ -12660,19 +12708,19 @@
               "description": "The message-id header of the message."
             },
             "headersOnly": {
-              "description": "Some account types (for example <value>pop3</value>) allow to download only the headers of the message, but not its body. The body of such messages will not be available.",
+              "description": "Some account types (for example <var>pop3</var>) allow to download only the headers of the message, but not its body. The body of such messages will not be available.",
               "type": "boolean"
             },
             "id": {
               "$ref": "messages.MessageId"
             },
             "junk": {
-              "description": "Whether the message has been marked as junk. Always <value>false</value> for news/nntp messages and external messages.",
+              "description": "Whether the message has been marked as junk. Always <var>false</var> for news/nntp messages and external messages.",
               "type": "boolean"
             },
             "junkScore": {
               "type": "integer",
-              "description": "The junk score associated with the message. Always <value>0</value> for news/nntp messages and external messages.",
+              "description": "The junk score associated with the message. Always <var>0</var> for news/nntp messages and external messages.",
               "minimum": 0,
               "maximum": 100
             },
@@ -12705,14 +12753,14 @@
               "items": {
                 "type": "string"
               },
-              "description": "Tags associated with this message. For a list of available tags, use :ref:`messages.tags.list`."
+              "description": "Tags associated with this message. For a list of available tags, use $(ref:messages.tags.list)."
             }
           }
         },
         {
           "id": "MessageList",
           "type": "object",
-          "description": "See :doc:`examples/messageLists` for more information.",
+          "description": "See $(doc:examples/messageLists) for more information.",
           "properties": {
             "id": {
               "choices": [
@@ -12723,7 +12771,7 @@
                   "type": "null"
                 }
               ],
-              "description": "Id of the message list, to be used with :ref:`messages.continueList` or :ref:`messages.abortList`."
+              "description": "Id of the message list, to be used with $(ref:messages.continueList) or $(ref:messages.abortList)."
             },
             "messages": {
               "type": "array",
@@ -12777,7 +12825,7 @@
             "partName": {
               "type": "string",
               "optional": true,
-              "description": "The identifier of this part, used in :ref:`messages.getAttachmentFile`."
+              "description": "The identifier of this part, used in $(ref:messages.getAttachmentFile)."
             },
             "parts": {
               "type": "array",
@@ -12797,7 +12845,7 @@
         {
           "id": "MessageProperties",
           "type": "object",
-          "description": "Message properties used in :ref:`messages.update` and :ref:`messages.import`. They can also be monitored by :ref:`messages.onUpdated`.",
+          "description": "Message properties used in $(ref:messages.update) and $(ref:messages.import). They can also be monitored by $(ref:messages.onUpdated).",
           "properties": {
             "flagged": {
               "type": "boolean",
@@ -12807,11 +12855,11 @@
             "junk": {
               "type": "boolean",
               "optional": true,
-              "description": "Whether the message is marked as junk. Only supported in :ref:`messages.update`."
+              "description": "Whether the message is marked as junk. Only supported in $(ref:messages.update)."
             },
             "new": {
               "type": "boolean",
-              "description": "Whether the message is marked as new. Only supported in :ref:`messages.import`.",
+              "description": "Whether the message is marked as new. Only supported in $(ref:messages.import).",
               "optional": true
             },
             "read": {
@@ -12821,7 +12869,7 @@
             },
             "tags": {
               "type": "array",
-              "description": "Tags associated with this message. For a list of available tags, call the :ref:`messages.tags.list` method.",
+              "description": "Tags associated with this message. For a list of available tags, call the $(ref:messages.tags.list) method.",
               "optional": true,
               "items": {
                 "type": "string"
@@ -12832,11 +12880,11 @@
         {
           "id": "MessageAttachment",
           "type": "object",
-          "description": "Represents an attachment in a message. This includes all MIME parts with a <value>content-disposition</value> header set to <value>attachment</value>, but also related parts like inline images.",
+          "description": "Represents an attachment in a message. This includes all MIME parts with a <em>content-disposition</em> header set to <var>attachment</var>, but also related parts like inline images.",
           "properties": {
             "contentType": {
               "type": "string",
-              "description": "The content type of the attachment. A value of <value>text/x-moz-deleted</value> indicates that the original attachment was permanently deleted and replaced by a placeholder text attachment with some meta information about the original attachment."
+              "description": "The content type of the attachment. A value of <var>text/x-moz-deleted</var> indicates that the original attachment was permanently deleted and replaced by a placeholder text attachment with some meta information about the original attachment."
             },
             "name": {
               "type": "string",
@@ -12966,7 +13014,7 @@
           "extraParameters": [
             {
               "name": "monitorAllFolders",
-              "description": "Monitor all folders (including all special use folders as defined by :ref:`folders.MailFolderSpecialUse`) instead of just inbox folders and normal folders.",
+              "description": "Monitor all folders (including all special use folders as defined by $(ref:folders.MailFolderSpecialUse)) instead of just inbox folders and normal folders.",
               "type": "boolean",
               "optional": true
             }
@@ -13037,7 +13085,7 @@
         {
           "name": "continueList",
           "type": "function",
-          "description": "Returns the next chunk of messages in a list. See :doc:`examples/messageLists` for more information.",
+          "description": "Returns the next chunk of messages in a list. See $(doc:examples/messageLists) for more information.",
           "async": "callback",
           "parameters": [
             {
@@ -13147,7 +13195,7 @@
                   "choices": [
                     {
                       "max_manifest_version": 2,
-                      "description": "The message can either be returned as a DOM File or as a `binary string <|link-binary-string|>`__. The historic default is to return a binary string (kept for backward compatibility). However, it is now recommended to use the ``File`` format, because the DOM File object can be used as-is with the downloads API and has useful methods to access the content, like `File.text() <|link-DOMFile-text|>`__ and `File.arrayBuffer() <|link-DOMFile-arrayBuffer|>`__. Working with binary strings is error prone and needs special handling: <literalinclude>includes/messages/decodeBinaryString.js<lang>JavaScript</lang></literalinclude> (see MDN for `supported input encodings <|link-input-encoding|>`__).",
+                      "description": "The message can either be returned as a DOM File or as a <a href='url-binary-string'>binary string</a>. The historic default is to return a binary string (kept for backward compatibility). However, it is now recommended to use the <var>File</var> format, because the DOM File object can be used as-is with the downloads API and has useful methods to access the content, like <a href='url-dom-file-text'>File.text()</a> and <a href='url-dom-file-array-buffer'>File.arrayBuffer()</a>. Working with binary strings is error prone and needs special handling: <literalinclude>includes/messages/decodeBinaryString.js<lang>JavaScript</lang></literalinclude> (see MDN for <a href='url-input-encoding'>supported input encodings</a>).",
                       "type": "string",
                       "enum": [
                         "File",
@@ -13156,7 +13204,7 @@
                     },
                     {
                       "min_manifest_version": 3,
-                      "description": "The message can either be returned as a DOM File (default) or as a `binary string <|link-binary-string|>`__. It is recommended to use the ``File`` format, because the DOM File object can be used as-is with the downloads API and has useful methods to access the content, like `File.text() <|link-DOMFile-text|>`__ and `File.arrayBuffer() <|link-DOMFile-arrayBuffer|>`__. Working with binary strings is error prone and needs special handling: <literalinclude>includes/messages/decodeBinaryString.js<lang>JavaScript</lang></literalinclude> (see MDN for `supported input encodings <|link-input-encoding|>`__).",
+                      "description": "The message can either be returned as a DOM File (default) or as a <a href='url-binary-string'>binary string</a>. It is recommended to use the <var>File</var> format, because the DOM File object can be used as-is with the downloads API and has useful methods to access the content, like <a href='url-dom-file-text'>File.text()</a> and <a href='url-dom-file-array-buffer'>File.arrayBuffer()</a>. Working with binary strings is error prone and needs special handling: <literalinclude>includes/messages/decodeBinaryString.js<lang>JavaScript</lang></literalinclude> (see MDN for <a href='url-input-encoding'>supported input encodings</a>).",
                       "type": "string",
                       "enum": [
                         "File",
@@ -13218,7 +13266,7 @@
         {
           "name": "listInlineTextParts",
           "type": "function",
-          "description": "Lists all inline text parts of a message. These parts are not returned by :ref:`listAttachments` and usually make up the readable content of the message, mostly with content type <value>text/plain</value> or <value>text/html</value>. If a message only includes a <value>text/html</value> part, the method :ref:`messengerUtilities.convertToPlainText` can be used to retreive a plain text version. \n\n**Note:** A message usually contains only one inline text part per subtype, but technically messages can contain multiple inline text parts per subtype.",
+          "description": "Lists all inline text parts of a message. These parts are not returned by $(ref:messages.listAttachments) and usually make up the readable content of the message, mostly with content type <var>text/plain</var> or <var>text/html</var>. If a message only includes a part with content type <var>text/html</var>, the method $(ref:messengerUtilities.convertToPlainText) can be used to retreive a plain text version. \n\n**Note:** A message usually contains only one inline text part per subtype, but technically messages can contain multiple inline text parts per subtype.",
           "async": "callback",
           "parameters": [
             {
@@ -13243,7 +13291,7 @@
         {
           "name": "getAttachmentFile",
           "type": "function",
-          "description": "Gets the content of a :ref:`messages.MessageAttachment` as a |File| object.",
+          "description": "Gets the content of a $(ref:messages.MessageAttachment) as a <a href='url-dom-file'>File</a> object.",
           "async": "callback",
           "parameters": [
             {
@@ -13272,7 +13320,7 @@
         {
           "name": "deleteAttachments",
           "type": "function",
-          "description": "Deletes the specified attachments and replaces them by placeholder text attachments with meta information about the original attachments and a <value>text/x-moz-deleted</value> content type. This permanently modifies the message.",
+          "description": "Deletes the specified attachments and replaces them by placeholder text attachments with meta information about the original attachments and a <var>text/x-moz-deleted</var> content type. This permanently modifies the message.",
           "permissions": [
             "messagesModifyPermanent"
           ],
@@ -13285,7 +13333,7 @@
             {
               "name": "partNames",
               "type": "array",
-              "description": "An array of attachments, identifying the to be deleted attachments by their <value>partName</value>.",
+              "description": "An array of attachments, identifying the to be deleted attachments by their <var>partName</var>.",
               "items": {
                 "type": "string",
                 "pattern": "^\\d+(\\.\\d+)*$"
@@ -13329,9 +13377,19 @@
               "default": {},
               "properties": {
                 "accountId": {
-                  "$ref": "accounts.MailAccountId",
-                  "description": "Limits the search to folders of the account with the specified id.",
-                  "optional": true
+                  "choices": [
+                    {
+                      "$ref": "accounts.MailAccountId"
+                    },
+                    {
+                      "type": "array",
+                      "items": {
+                        "$ref": "accounts.MailAccountId"
+                      }
+                    }
+                  ],
+                  "optional": true,
+                  "description": "Limits the search to the specified account(s). Accounts are searched in the specified order."
                 },
                 "attachment": {
                   "choices": [
@@ -13343,12 +13401,12 @@
                     }
                   ],
                   "optional": true,
-                  "description": "Whether the message has attachments, or not. Supports to specify a :ref:`messages.QueryRange` (min/max) instead of a simple boolean value (none/some)."
+                  "description": "Whether the message has attachments, or not. Supports to specify a $(ref:messages.QueryRange) (min/max) instead of a simple boolean value (none/some)."
                 },
                 "author": {
                   "type": "string",
                   "optional": true,
-                  "description": "Returns only messages with this value matching the author. The search value is a single email address, a name or a combination (e.g.: <value>Name <user@domain.org></value>). The address part of the search value (if provided) must match the author's address completely. The name part of the search value (if provided) must match the author's name partially. All matches are done case-insensitive."
+                  "description": "Returns only messages with this value matching the author. The search value is a single email address, a name or a combination (e.g.: <var>Name <user@domain.org></var>). The address part of the search value (if provided) must match the author's address completely. The name part of the search value (if provided) must match the author's name partially. All matches are done case-insensitive."
                 },
                 "body": {
                   "type": "string",
@@ -13361,9 +13419,19 @@
                   "description": "Returns only flagged (or unflagged if false) messages."
                 },
                 "folderId": {
-                  "$ref": "folders.MailFolderId",
+                  "choices": [
+                    {
+                      "$ref": "folders.MailFolderId"
+                    },
+                    {
+                      "type": "array",
+                      "items": {
+                        "$ref": "folders.MailFolderId"
+                      }
+                    }
+                  ],
                   "optional": true,
-                  "description": "Returns only messages from the folder with the specified id. The <permission>accountsRead</permission> permission is required."
+                  "description": "Limits the search to the specified folder(s). Folders are searched in the specified order. The <permission>accountsRead</permission> permission is required."
                 },
                 "folder": {
                   "$ref": "folders.MailFolder",
@@ -13397,10 +13465,15 @@
                   "optional": true,
                   "description": "Search the specified folder recursively."
                 },
+                "online": {
+                  "type": "boolean",
+                  "optional": true,
+                  "description": "Query the server directly instead of the local message database. Online queries currently only support querying the `headerMessageId` property. Currently only supported for NNTP accounts."
+                },
                 "recipients": {
                   "type": "string",
                   "optional": true,
-                  "description": "Returns only messages whose recipients match all specified addresses. The search value is a semicolon separated list of email addresses, names or combinations (e.g.: <value>Name <user@domain.org></value>). For a match, all specified addresses must equal a recipient's address completely and all specified names must match a recipient's name partially. All matches are done case-insensitive."
+                  "description": "Returns only messages whose recipients match all specified addresses. The search value is a semicolon separated list of email addresses, names or combinations (e.g.: <var>Name <user@domain.org></var>). For a match, all specified addresses must equal a recipient's address completely and all specified names must match a recipient's name partially. All matches are done case-insensitive."
                 },
                 "size": {
                   "$ref": "QueryRange",
@@ -13415,7 +13488,7 @@
                 "tags": {
                   "$ref": "messages.tags.TagsDetail",
                   "optional": true,
-                  "description": "Returns only messages with the specified tags. For a list of available tags, call the :ref:`messages.tags.list` method."
+                  "description": "Returns only messages with the specified tags. For a list of available tags, call the $(ref:messages.tags.list) method."
                 },
                 "toDate": {
                   "$ref": "extensionTypes.Date",
@@ -13457,12 +13530,12 @@
                 "autoPaginationTimeout": {
                   "type": "integer",
                   "optional": true,
-                  "description": "Set the timeout in ms after which results should be returned, even if the nominal number of messages-per-page has not yet been reached. Defaults to <value>1000</value> ms. Setting it to <value>0</value> will disable auto-pagination."
+                  "description": "Set the timeout in ms after which results should be returned, even if the nominal number of messages-per-page has not yet been reached. Defaults to <var>1000</var> ms. Setting it to <var>0</var> will disable auto-pagination."
                 },
                 "messagesPerPage": {
                   "type": "integer",
                   "optional": true,
-                  "description": "Set the nominal number of messages-per-page for this query. Defaults to <value>100</value> messages."
+                  "description": "Set the nominal number of messages-per-page for this query. Defaults to <var>100</var> messages."
                 },
                 "returnMessageListId": {
                   "type": "boolean",
@@ -13632,7 +13705,7 @@
         {
           "name": "delete",
           "type": "function",
-          "description": "Deletes messages permanently, or moves them to the trash folder (honoring the account's deletion behavior settings). Deleting external messages will throw an <em>ExtensionError</em>. The ``skipTrash`` parameter allows immediate permanent deletion, bypassing the trash folder.",
+          "description": "Deletes messages permanently, or moves them to the trash folder (honoring the account's deletion behavior settings). Deleting external messages will throw an <em>ExtensionError</em>. The <var>skipTrash</var> parameter allows immediate permanent deletion, bypassing the trash folder.",
           "async": true,
           "permissions": [
             "messagesDelete"
@@ -13796,7 +13869,7 @@
             {
               "type": "string",
               "name": "key",
-              "description": "Unique tag identifier (will be converted to lower case). Must not include <value>()<>{/%*\"</value> or spaces.",
+              "description": "Unique tag identifier (will be converted to lower case). Must not include <var>()<>{/%*\"</var> or spaces.",
               "pattern": "^[^ ()/{%*<>\"]+$"
             },
             {
@@ -13807,7 +13880,7 @@
             {
               "type": "string",
               "name": "color",
-              "description": "Tag color in hex format (i.e.: <value>#000080</value> for navy blue). Value will be stored as upper case.",
+              "description": "Tag color in hex format (i.e.: <var>#000080</var> for navy blue). Value will be stored as upper case.",
               "pattern": "^#[0-9a-fA-F]{6}"
             }
           ]
@@ -13826,7 +13899,7 @@
             {
               "type": "string",
               "name": "key",
-              "description": "Unique tag identifier (will be converted to lower case). Must not include <value>()<>{/%*\"</value> or spaces.",
+              "description": "Unique tag identifier (will be converted to lower case). Must not include <var>()<>{/%*\"</var> or spaces.",
               "pattern": "^[^ ()/{%*<>\"]+$"
             },
             {
@@ -13862,7 +13935,7 @@
             {
               "type": "string",
               "name": "key",
-              "description": "Unique tag identifier (will be converted to lower case). Must not include <value>()<>{/%*\"</value> or spaces.",
+              "description": "Unique tag identifier (will be converted to lower case). Must not include <var>()<>{/%*\"</var> or spaces.",
               "pattern": "^[^ ()/{%*<>\"]+$"
             }
           ]
@@ -13901,7 +13974,7 @@
           "properties": {
             "tags": {
               "type": "object",
-              "description": "A <em>dictionary object</em> with one or more filter condition as <em>key-value</em> pairs, the <em>key</em> being the tag to filter on, and the <em>value</em> being a boolean expression, requesting whether a message must include (<value>true</value>) or exclude (<value>false</value>) the tag. For a list of available tags, call the :ref:`messages.tags.list` method.",
+              "description": "A <em>dictionary object</em> with one or more filter condition as <em>key-value</em> pairs, the <em>key</em> being the tag to filter on, and the <em>value</em> being a boolean expression, requesting whether a message must include (<var>true</var>) or exclude (<var>false</var>) the tag. For a list of available tags, call the $(ref:messages.tags.list) method.",
               "patternProperties": {
                 ".*": {
                   "type": "boolean"
@@ -13956,7 +14029,7 @@
             {
               "type": "string",
               "name": "key",
-              "description": "Unique tag identifier (will be converted to lower case). Must not include <value>()<>{/%*\"</value> or spaces.",
+              "description": "Unique tag identifier (will be converted to lower case). Must not include <var>()<>{/%*\"</var> or spaces.",
               "pattern": "^[^ ()/{%*<>\"]+$"
             },
             {
@@ -13984,7 +14057,7 @@
             {
               "type": "string",
               "name": "key",
-              "description": "Unique tag identifier (will be converted to lower case). Must not include <value>()<>{/%*\"</value> or spaces.",
+              "description": "Unique tag identifier (will be converted to lower case). Must not include <var>()<>{/%*\"</var> or spaces.",
               "pattern": "^[^ ()/{%*<>\"]+$"
             },
             {
@@ -14018,7 +14091,7 @@
             {
               "type": "string",
               "name": "key",
-              "description": "Unique tag identifier (will be converted to lower case). Must not include <value>()<>{/%*\"</value> or spaces.",
+              "description": "Unique tag identifier (will be converted to lower case). Must not include <var>()<>{/%*\"</var> or spaces.",
               "pattern": "^[^ ()/{%*<>\"]+$"
             }
           ]
@@ -14055,7 +14128,7 @@
         {
           "name": "getTabValue",
           "type": "function",
-          "description": "Retrieve a previously stored value for a given tab, given its key. Returns <value>undefined</value> if the key does not exist.",
+          "description": "Retrieve a previously stored value for a given tab, given its key. Returns <var>undefined</var> if the key does not exist.",
           "async": "callback",
           "parameters": [
             {
@@ -14121,7 +14194,7 @@
                 }
               ],
               "optional": true,
-              "description": "Sets the background color of the badge. Can be specified as an array of four integers in the range [0,255] that make up the RGBA color of the badge. For example, opaque red is <value>[255, 0, 0, 255]</value>. Can also be a string with an HTML color name (<value>red</value>) or a HEX color value (<value>#FF0000</value> or <value>#F00</value>). Reset when set to an empty string."
+              "description": "Sets the background color of the badge. Can be specified as an array of four integers in the range [0,255] that make up the RGBA color of the badge. For example, opaque red is <var>[255, 0, 0, 255]</var>. Can also be a string with an HTML color name (<var>red</var>) or a HEX color value (<var>#FF0000</var> or <var>#F00</var>). Reset when set to an empty string."
             },
             "badgeText": {
               "type": "string",
@@ -14146,7 +14219,7 @@
               "items": {
                 "$ref": "manifest.ThemeIcons"
               },
-              "description": "Specifies dark and light icons for the button in the spaces toolbar to be used with themes: The ``light`` icons will be used on dark backgrounds and vice versa. At least the set for <em>16px</em> icons should be specified. The set for <em>32px</em> icons will be used on screens with a very high pixel density, if specified. Reset when set to an empty array."
+              "description": "Specifies dark and light icons for the button in the spaces toolbar to be used with themes: The <var>light</var> icons will be used on dark backgrounds and vice versa. At least the set for <em>16px</em> icons should be specified. The set for <em>32px</em> icons will be used on screens with a very high pixel density, if specified. Reset when set to an empty array."
             },
             "title": {
               "type": "string",
@@ -14169,17 +14242,17 @@
                 }
               ],
               "optional": "omit-key-if-missing",
-              "description": "Sets the background color of the badge. Can be specified as an array of four integers in the range [0,255] that make up the RGBA color of the badge. For example, opaque red is <value>[255, 0, 0, 255]</value>. Can also be a string with an HTML color name (<value>red</value>) or a HEX color value (<value>#FF0000</value> or <value>#F00</value>). Reset when set to <value>null</value>."
+              "description": "Sets the background color of the badge. Can be specified as an array of four integers in the range [0,255] that make up the RGBA color of the badge. For example, opaque red is <var>[255, 0, 0, 255]</var>. Can also be a string with an HTML color name (<var>red</var>) or a HEX color value (<var>#FF0000</var> or <var>#F00</var>). Reset when set to <var>null</var>."
             },
             "badgeText": {
               "type": "string",
               "optional": "omit-key-if-missing",
-              "description": "Sets the badge text for the button in the spaces toolbar. The badge is displayed on top of the icon. Any number of characters can be set, but only about four can fit in the space. Removed when set to <value>null</value>."
+              "description": "Sets the badge text for the button in the spaces toolbar. The badge is displayed on top of the icon. Any number of characters can be set, but only about four can fit in the space. Removed when set to <var>null</var>."
             },
             "defaultIcons": {
               "$ref": "manifest.IconPath",
               "optional": "omit-key-if-missing",
-              "description": "The paths to one or more icons for the button in the spaces toolbar. Reset to the extension icon, when set to <value>null</value>."
+              "description": "The paths to one or more icons for the button in the spaces toolbar. Reset to the extension icon, when set to <var>null</var>."
             },
             "themeIcons": {
               "type": "array",
@@ -14187,18 +14260,18 @@
               "items": {
                 "$ref": "manifest.ThemeIcons"
               },
-              "description": "Specifies dark and light icons for the button in the spaces toolbar to be used with themes: The ``light`` icons will be used on dark backgrounds and vice versa. At least the set for <em>16px</em> icons should be specified. The set for <em>32px</em> icons will be used on screens with a very high pixel density, if specified. Reset when set to <value>null</value>."
+              "description": "Specifies dark and light icons for the button in the spaces toolbar to be used with themes: The <var>light</var> icons will be used on dark backgrounds and vice versa. At least the set for <em>16px</em> icons should be specified. The set for <em>32px</em> icons will be used on screens with a very high pixel density, if specified. Reset when set to <var>null</var>."
             },
             "title": {
               "type": "string",
               "optional": "omit-key-if-missing",
-              "description": "The title for the button in the spaces toolbar, used in the tooltip of the button and as the displayed name in the overflow menu. Reset to the name of the extension, when set to <value>null</value>."
+              "description": "The title for the button in the spaces toolbar, used in the tooltip of the button and as the displayed name in the overflow menu. Reset to the name of the extension, when set to <var>null</var>."
             }
           }
         },
         {
           "id": "ColorArray",
-          "description": "An array of four integers in the range [0,255] that make up the RGBA color. For example, opaque red is <value>[255, 0, 0, 255]</value>.",
+          "description": "An array of four integers in the range [0,255] that make up the RGBA color. For example, opaque red is <var>[255, 0, 0, 255]</var>.",
           "type": "array",
           "items": {
             "type": "integer",
@@ -14254,7 +14327,7 @@
             {
               "name": "defaultUrl",
               "type": "string",
-              "description": "The default space url, loaded into a tab when the button in the spaces toolbar is clicked. Supported are <value>https://</value> and <value>http://</value> links, as well as links to WebExtension pages."
+              "description": "The default space url, loaded into a tab when the button in the spaces toolbar is clicked. Supported are <var>https://</var> and <var>http://</var> links, as well as links to WebExtension pages."
             },
             {
               "name": "buttonProperties",
@@ -14404,7 +14477,7 @@
             {
               "name": "defaultUrl",
               "type": "string",
-              "description": "The default space url, loaded into a tab when the button in the spaces toolbar is clicked. Supported are <value>https://</value> and <value>http://</value> links, as well as links to WebExtension pages.",
+              "description": "The default space url, loaded into a tab when the button in the spaces toolbar is clicked. Supported are <var>https://</var> and <var>http://</var> links, as well as links to WebExtension pages.",
               "optional": true
             },
             {
@@ -14479,7 +14552,7 @@
                 }
               ],
               "optional": true,
-              "description": "Sets the background color of the badge. Can be specified as an array of four integers in the range [0,255] that make up the RGBA color of the badge. For example, opaque red is <value>[255, 0, 0, 255]</value>. Can also be a string with an HTML color name (<value>red</value>) or a HEX color value (<value>#FF0000</value> or <value>#F00</value>). Reset when set to an empty string."
+              "description": "Sets the background color of the badge. Can be specified as an array of four integers in the range [0,255] that make up the RGBA color of the badge. For example, opaque red is <var>[255, 0, 0, 255]</var>. Can also be a string with an HTML color name (<var>red</var>) or a HEX color value (<var>#FF0000</var> or <var>#F00</var>). Reset when set to an empty string."
             },
             "badgeText": {
               "type": "string",
@@ -14504,7 +14577,7 @@
               "items": {
                 "$ref": "manifest.ThemeIcons"
               },
-              "description": "Specifies dark and light icons for the spaces toolbar button to be used with themes: The ``light`` icons will be used on dark backgrounds and vice versa. At least the set for <em>16px</em> icons should be specified. The set for <em>32px</em> icons will be used on screens with a very high pixel density, if specified."
+              "description": "Specifies dark and light icons for the spaces toolbar button to be used with themes: The <var>light</var> icons will be used on dark backgrounds and vice versa. At least the set for <em>16px</em> icons should be specified. The set for <em>32px</em> icons will be used on screens with a very high pixel density, if specified."
             },
             "title": {
               "type": "string",
@@ -14514,13 +14587,13 @@
             "url": {
               "type": "string",
               "optional": true,
-              "description": "The page url, loaded into a tab when the button is clicked. Supported are <value>https://</value> and <value>http://</value> links, as well as links to WebExtension pages."
+              "description": "The page url, loaded into a tab when the button is clicked. Supported are <var>https://</var> and <var>http://</var> links, as well as links to WebExtension pages."
             }
           }
         },
         {
           "id": "ColorArray",
-          "description": "An array of four integers in the range [0,255] that make up the RGBA color. For example, opaque red is <value>[255, 0, 0, 255]</value>.",
+          "description": "An array of four integers in the range [0,255] that make up the RGBA color. For example, opaque red is <var>[255, 0, 0, 255]</var>.",
           "type": "array",
           "items": {
             "type": "integer",
@@ -14535,7 +14608,7 @@
         {
           "name": "addButton",
           "type": "function",
-          "description": "Adds a new button to the spaces toolbar. Throws an exception, if the used ``id`` is not unique within the extension.",
+          "description": "Adds a new button to the spaces toolbar. Throws an exception, if the used <var>id</var> is not unique within the extension.",
           "async": "callback",
           "parameters": [
             {
@@ -14546,7 +14619,7 @@
             },
             {
               "name": "properties",
-              "description": "Properties of the new button. The ``url`` is mandatory.",
+              "description": "Properties of the new button. The <var>url</var> is mandatory.",
               "$ref": "spacesToolbar.ButtonProperties"
             },
             {
@@ -14673,7 +14746,7 @@
               "type": "integer",
               "minimum": -1,
               "optional": true,
-              "description": "The ID of the tab. Tab IDs are unique within a session. Under some circumstances a Tab may not be assigned an ID. Tab ID can also be set to :ref:`tabs.TAB_ID_NONE` for apps and devtools windows."
+              "description": "The ID of the tab. Tab IDs are unique within a session. Under some circumstances a Tab may not be assigned an ID. Tab ID can also be set to $(ref:tabs.TAB_ID_NONE) for apps and devtools windows."
             },
             "index": {
               "type": "integer",
@@ -14689,7 +14762,7 @@
             "selected": {
               "type": "boolean",
               "description": "Whether the tab is selected.",
-              "deprecated": "Please use :ref:`tabs.Tab.highlighted`.",
+              "deprecated": "Please use $(ref:tabs.Tab.highlighted).",
               "unsupported": true
             },
             "highlighted": {
@@ -14727,7 +14800,7 @@
             "status": {
               "type": "string",
               "optional": true,
-              "description": "Either <value>loading</value> or <value>complete</value>."
+              "description": "Either <var>loading</var> or <var>complete</var>."
             },
             "width": {
               "type": "integer",
@@ -14742,7 +14815,7 @@
             "cookieStoreId": {
               "type": "string",
               "optional": true,
-              "description": "The `CookieStore <|link-cookieStore|>`__ id used by the tab. Either a custom id created using the `contextualIdentities API <|link-contextualIdentity|>`__, or a built-in one: <value>firefox-default</value>, <value>firefox-container-1</value>, <value>firefox-container-2</value>, <value>firefox-container-3</value>, <value>firefox-container-4</value>, <value>firefox-container-5</value>. **Note:** The naming pattern was deliberately not changed for Thunderbird, but kept for compatibility reasons."
+              "description": "The <a href='url-cookieStore'>CookieStore</a> id used by the tab. Either a custom id created using the <a href='url-contextualIdentity'>contextualIdentities API</a>, or a built-in one: <var>firefox-default</var>, <var>firefox-container-1</var>, <var>firefox-container-2</var>, <var>firefox-container-3</var>, <var>firefox-container-4</var>, <var>firefox-container-5</var>. **Note:** The naming pattern was deliberately not changed for Thunderbird, but kept for compatibility reasons."
             },
             "type": {
               "$ref": "TabType",
@@ -14881,7 +14954,7 @@
         {
           "name": "getCurrent",
           "type": "function",
-          "description": "Gets the tab that this script call is being made from. May be <value>undefined</value> if called from a non-tab context (for example: a background page or popup view).",
+          "description": "Gets the tab that this script call is being made from. May be <var>undefined</var> if called from a non-tab context (for example: a background page or popup view).",
           "async": "callback",
           "parameters": [
             {
@@ -14902,7 +14975,7 @@
         {
           "name": "connect",
           "type": "function",
-          "description": "Connects to the content script(s) in the specified tab. The `runtime.onConnect <|link-runtime-on-connect|>`__ event is fired in each content script running in the specified tab for the current extension. For more details, see `Content Script Messaging <|link-content-scripts|>`__.",
+          "description": "Connects to the content script(s) in the specified tab. The <a href='url-runtime-on-connect'>runtime.onConnect</a> event is fired in each content script running in the specified tab for the current extension. For more details, see <a href='url-content-scripts'>Content Script Messaging</a>.",
           "parameters": [
             {
               "type": "integer",
@@ -14922,7 +14995,7 @@
                   "type": "integer",
                   "optional": true,
                   "minimum": 0,
-                  "description": "Open a port to a specific frame identified by ``frameId`` instead of all frames in the tab."
+                  "description": "Open a port to a specific frame identified by <var>frameId</var> instead of all frames in the tab."
                 }
               },
               "optional": true
@@ -14936,7 +15009,7 @@
         {
           "name": "sendMessage",
           "type": "function",
-          "description": "Sends a single message to the content script(s) in the specified tab, with an optional callback to run when a response is sent back. The `runtime.onMessage <|link-runtime-on-message|>`__ event is fired in each content script running in the specified tab for the current extension.",
+          "description": "Sends a single message to the content script(s) in the specified tab, with an optional callback to run when a response is sent back. The <a href='url-runtime-on-message'>runtime.onMessage</a> event is fired in each content script running in the specified tab for the current extension.",
           "async": "responseCallback",
           "parameters": [
             {
@@ -14956,7 +15029,7 @@
                   "type": "integer",
                   "optional": true,
                   "minimum": 0,
-                  "description": "Send a message to a specific frame identified by ``frameId`` instead of all frames in the tab."
+                  "description": "Send a message to a specific frame identified by <var>frameId</var> instead of all frames in the tab."
                 }
               },
               "optional": true
@@ -14969,7 +15042,7 @@
                 {
                   "name": "response",
                   "type": "any",
-                  "description": "The JSON response object sent by the handler of the message. If an error occurs while connecting to the specified tab, the callback will be called with no arguments and `runtime.lastError <|link-runtime-last-error|>`__ will be set to the error message."
+                  "description": "The JSON response object sent by the handler of the message. If an error occurs while connecting to the specified tab, the callback will be called with no arguments and <a href='url-runtime-last-error'>runtime.lastError</a> will be set to the error message."
                 }
               ]
             }
@@ -14978,13 +15051,13 @@
         {
           "name": "create",
           "type": "function",
-          "description": "Creates a new content tab. Use the :ref:`messageDisplay_api` to open messages. Only supported in <value>normal</value> windows. Same-site links in the loaded page are opened within Thunderbird, all other links are opened in the user's default browser. To override this behavior, add-ons have to register a `content script <https://bugzilla.mozilla.org/show_bug.cgi?id=1618828#c3>`__ , capture click events and handle them manually.",
+          "description": "Creates a new content tab. Use the $(doc:messageDisplay) to open messages. Only supported in <var>normal</var> windows. Same-site links in the loaded page are opened within Thunderbird, all other links are opened in the user's default browser. To override this behavior, add-ons have to register a <a href='url-content-script-click-capture'>content script</a> , capture click events and handle them manually.",
           "async": "callback",
           "parameters": [
             {
               "type": "object",
               "name": "createProperties",
-              "description": "Properties for the new tab. Defaults to an empty tab, if no ``url`` is provided.",
+              "description": "Properties for the new tab. Defaults to an empty tab, if no <var>url</var> is provided.",
               "properties": {
                 "windowId": {
                   "type": "integer",
@@ -15001,24 +15074,24 @@
                 "url": {
                   "type": "string",
                   "optional": true,
-                  "description": "The URL to navigate the tab to initially. If the URL points to a content page (a web page, an extension page or a registered WebExtension protocol handler page), the tab will navigate to the requested page. All other URLs will be opened externally after creating an empty tab. Fully-qualified URLs must include a scheme (i.e. <value>http://www.google.com</value>, not <value>www.google.com</value>). Relative URLs will be relative to the root of the extension. "
+                  "description": "The URL to navigate the tab to initially. If the URL points to a content page (a web page, an extension page or a registered WebExtension protocol handler page), the tab will navigate to the requested page. All other URLs will be opened externally after creating an empty tab. Fully-qualified URLs must include a scheme (i.e. <var>http://www.google.com</var>, not <var>www.google.com</var>). Relative URLs will be relative to the root of the extension. "
                 },
                 "active": {
                   "type": "boolean",
                   "optional": true,
-                  "description": "Whether the tab should become the active tab in the window. Does not affect whether the window is focused (see :ref:`windows.update`). Defaults to <value>true</value>."
+                  "description": "Whether the tab should become the active tab in the window. Does not affect whether the window is focused (see $(ref:windows.update)). Defaults to <var>true</var>."
                 },
                 "cookieStoreId": {
                   "type": "string",
                   "optional": true,
-                  "description": "The `CookieStore <|link-cookieStore|>`__ id the new tab should use. Either a custom id created using the `contextualIdentities API <|link-contextualIdentity|>`__, or a built-in one: <value>firefox-default</value>, <value>firefox-container-1</value>, <value>firefox-container-2</value>, <value>firefox-container-3</value>, <value>firefox-container-4</value>, <value>firefox-container-5</value>. **Note:** The naming pattern was deliberately not changed for Thunderbird, but kept for compatibility reasons."
+                  "description": "The <a href='url-cookieStore'>CookieStore</a> id the new tab should use. Either a custom id created using the <a href='url-contextualIdentity'>contextualIdentities API</a>, or a built-in one: <var>firefox-default</var>, <var>firefox-container-1</var>, <var>firefox-container-2</var>, <var>firefox-container-3</var>, <var>firefox-container-4</var>, <var>firefox-container-5</var>. **Note:** The naming pattern was deliberately not changed for Thunderbird, but kept for compatibility reasons."
                 },
                 "selected": {
-                  "deprecated": "Please use ``createProperties.active``.",
+                  "deprecated": "Please use <var>createProperties.active</var>.",
                   "unsupported": true,
                   "type": "boolean",
                   "optional": true,
-                  "description": "Whether the tab should become the selected tab in the window. Defaults to <value>true</value>"
+                  "description": "Whether the tab should become the selected tab in the window. Defaults to <var>true</var>"
                 }
               }
             },
@@ -15055,7 +15128,7 @@
               "parameters": [
                 {
                   "name": "tab",
-                  "description": "Details about the duplicated tab. The :ref:`tabs.Tab` object doesn't contain ``url``, ``title`` and ``favIconUrl`` if the <permission>tabs</permission> permission has not been requested.",
+                  "description": "Details about the duplicated tab. The $(ref:tabs.Tab) object doesn't contain <var>url</var>, <var>title</var> and <var>favIconUrl</var> if the <permission>tabs</permission> permission has not been requested.",
                   "$ref": "Tab"
                 }
               ]
@@ -15078,7 +15151,7 @@
                   "type": "boolean",
                   "optional": true,
                   "max_manifest_version": 2,
-                  "description": "Whether the tab is a Thunderbird 3-pane tab.  If specified, the ``queryInfo.type`` property will be ignored"
+                  "description": "Whether the tab is a Thunderbird 3-pane tab.  If specified, the <var>queryInfo.type</var> property will be ignored"
                 },
                 "spaceId": {
                   "type": "integer",
@@ -15144,13 +15217,13 @@
                     }
                   ],
                   "optional": true,
-                  "description": "Match tabs against one or more `URL Patterns <|link-match-patterns|>`__. Note that fragment identifiers are not matched."
+                  "description": "Match tabs against one or more <a href='url-match-patterns'>URL Patterns</a>. Note that fragment identifiers are not matched."
                 },
                 "windowId": {
                   "type": "integer",
                   "optional": true,
                   "minimum": -2,
-                  "description": "The ID of the parent window, or :ref:`windows.WINDOW_ID_CURRENT` for the current window."
+                  "description": "The ID of the parent window, or $(ref:windows.WINDOW_ID_CURRENT) for the current window."
                 },
                 "windowType": {
                   "$ref": "WindowType",
@@ -15176,7 +15249,7 @@
                     }
                   ],
                   "optional": true,
-                  "description": "The `CookieStore <|link-cookieStore|>`__ id(s) used by the tabs. Either custom ids created using the `contextualIdentities API <|link-contextualIdentity|>`__, or built-in ones: <value>firefox-default</value>, <value>firefox-container-1</value>, <value>firefox-container-2</value>, <value>firefox-container-3</value>, <value>firefox-container-4</value>, <value>firefox-container-5</value>. **Note:** The naming pattern was deliberately not changed for Thunderbird, but kept for compatibility reasons."
+                  "description": "The <a href='url-cookieStore'>CookieStore</a> id(s) used by the tabs. Either custom ids created using the <a href='url-contextualIdentity'>contextualIdentities API</a>, or built-in ones: <var>firefox-default</var>, <var>firefox-container-1</var>, <var>firefox-container-2</var>, <var>firefox-container-3</var>, <var>firefox-container-4</var>, <var>firefox-container-5</var>. **Note:** The naming pattern was deliberately not changed for Thunderbird, but kept for compatibility reasons."
                 }
               }
             },
@@ -15199,7 +15272,7 @@
         {
           "name": "update",
           "type": "function",
-          "description": "Modifies the properties of a tab. Properties that are not specified in ``updateProperties`` are not modified.",
+          "description": "Modifies the properties of a tab. Properties that are not specified in <var>updateProperties</var> are not modified.",
           "async": "callback",
           "parameters": [
             {
@@ -15217,12 +15290,12 @@
                 "url": {
                   "type": "string",
                   "optional": true,
-                  "description": "A URL of a page to load. If the URL points to a content page (a web page, an extension page or a registered WebExtension protocol handler page), the tab will navigate to the requested page. All other URLs will be opened externally without changing the tab. **Note:** This function will throw an error, if a content page is loaded into a non-content tab (its type must be either <value>content</value> or <value>mail</value>)."
+                  "description": "A URL of a page to load. If the URL points to a content page (a web page, an extension page or a registered WebExtension protocol handler page), the tab will navigate to the requested page. All other URLs will be opened externally without changing the tab. **Note:** This function will throw an error, if a content page is loaded into a non-content tab (its type must be either <var>content</var> or <var>mail</var>)."
                 },
                 "active": {
                   "type": "boolean",
                   "optional": true,
-                  "description": "Set this to <value>true</value>, if the tab should become active. Does not affect whether the window is focused (see :ref:`windows.update`). Setting this to <value>false</value> has no effect."
+                  "description": "Set this to <var>true</var>, if the tab should become active. Does not affect whether the window is focused (see $(ref:windows.update)). Setting this to <var>false</var> has no effect."
                 }
               }
             },
@@ -15234,7 +15307,7 @@
                 {
                   "name": "tab",
                   "$ref": "Tab",
-                  "description": "Details about the updated tab. The :ref:`tabs.Tab` object doesn't contain ``url``, ``title`` and ``favIconUrl`` if the <permission>tabs</permission> permission has not been requested."
+                  "description": "Details about the updated tab. The $(ref:tabs.Tab) object doesn't contain <var>url</var>, <var>title</var> and <var>favIconUrl</var> if the <permission>tabs</permission> permission has not been requested."
                 }
               ]
             }
@@ -15243,7 +15316,7 @@
         {
           "name": "move",
           "type": "function",
-          "description": "Moves one or more tabs to a new position within its current window, or to a different window. Note that tabs can only be moved to and from windows of type <value>normal</value>.",
+          "description": "Moves one or more tabs to a new position within its current window, or to a different window. Note that tabs can only be moved to and from windows of type <var>normal</var>.",
           "async": "callback",
           "parameters": [
             {
@@ -15276,7 +15349,7 @@
                 "index": {
                   "type": "integer",
                   "minimum": -1,
-                  "description": "The position to move the tab to. <value>-1</value> will place the tab at the end of the window."
+                  "description": "The position to move the tab to. <var>-1</var> will place the tab at the end of the window."
                 }
               }
             },
@@ -15365,7 +15438,7 @@
           "name": "executeScript",
           "type": "function",
           "max_manifest_version": 2,
-          "description": "Injects JavaScript code into a page. For details, see the `programmatic injection <|link-content-scripts|>`__ section of the content scripts doc.",
+          "description": "Injects JavaScript code into a page. For details, see the <a href='url-content-scripts'>programmatic injection</a> section of the content scripts doc.",
           "async": "callback",
           "parameters": [
             {
@@ -15403,7 +15476,7 @@
           "name": "insertCSS",
           "type": "function",
           "max_manifest_version": 2,
-          "description": "Injects CSS into a page. For details, see the `programmatic injection <|link-content-scripts|>`__ section of the content scripts doc.",
+          "description": "Injects CSS into a page. For details, see the <a href='url-content-scripts'>programmatic injection</a> section of the content scripts doc.",
           "async": "callback",
           "parameters": [
             {
@@ -15431,7 +15504,7 @@
           "name": "removeCSS",
           "type": "function",
           "max_manifest_version": 2,
-          "description": "Removes injected CSS from a page. For details, see the `programmatic injection <|link-content-scripts|>`__ section of the content scripts doc.",
+          "description": "Removes injected CSS from a page. For details, see the <a href='url-content-scripts'>programmatic injection</a> section of the content scripts doc.",
           "async": "callback",
           "parameters": [
             {
@@ -15487,7 +15560,7 @@
                 "status": {
                   "type": "string",
                   "optional": true,
-                  "description": "The status of the tab. Can be either <value>loading</value> or <value>complete</value>."
+                  "description": "The status of the tab. Can be either <var>loading</var> or <var>complete</var>."
                 },
                 "url": {
                   "type": "string",
@@ -15519,7 +15592,7 @@
         {
           "name": "onMoved",
           "type": "function",
-          "description": "Fired when a tab is moved within a window. Only one move event is fired, representing the tab the user directly moved. Move events are not fired for the other tabs that must move in response. This event is not fired when a tab is moved between windows. For that, see :ref:`tabs.onDetached`.",
+          "description": "Fired when a tab is moved within a window. Only one move event is fired, representing the tab the user directly moved. Move events are not fired for the other tabs that must move in response. This event is not fired when a tab is moved between windows. For that, see $(ref:tabs.onDetached).",
           "parameters": [
             {
               "type": "integer",
@@ -15648,7 +15721,7 @@
                 },
                 "isWindowClosing": {
                   "type": "boolean",
-                  "description": "Is <value>true</value> when the tab is being closed because its window is being closed."
+                  "description": "Is <var>true</var> when the tab is being closed because its window is being closed."
                 }
               }
             }
@@ -15669,12 +15742,12 @@
             "name": {
               "type": "string",
               "optional": true,
-              "description": "The <value>display-name</value> associated with the provided address or group, if available."
+              "description": "The <var>display-name</var> associated with the provided address or group, if available."
             },
             "email": {
               "type": "string",
               "optional": true,
-              "description": "The <value>addr-spec</value> associated with the provided address, if available."
+              "description": "The <var>addr-spec</var> associated with the provided address, if available."
             },
             "group": {
               "type": "array",
@@ -15726,7 +15799,7 @@
         {
           "name": "formatFileSize",
           "type": "function",
-          "description": "Returns the provided file size in a human readable format (e.g. <value>12 bytes</value> or <value>11,4 GB</value>).",
+          "description": "Returns the provided file size in a human readable format (e.g. <var>12 bytes</var> or <var>11,4 GB</var>).",
           "async": "callback",
           "parameters": [
             {
@@ -15755,13 +15828,13 @@
             {
               "type": "string",
               "name": "mailboxString",
-              "description": "The string to be parsed (e.g. <value>User <user@example.com>, other-user@example.com</value>)"
+              "description": "The string to be parsed (e.g. <var>User <user@example.com>, other-user@example.com</var>)"
             },
             {
               "type": "boolean",
               "name": "preserveGroups",
               "optional": true,
-              "description": "Keep grouped hierachies. Groups may be specified in a mailbox string as follows: <value>GroupName : user1 <user1@example.com>, user2@example,com ;</value>."
+              "description": "Keep grouped hierachies. Groups may be specified in a mailbox string as follows: <var>GroupName : user1 <user1@example.com>, user2@example,com ;</var>."
             },
             {
               "type": "function",
@@ -15849,11 +15922,11 @@
                 "$ref": "tabs.Tab"
               },
               "optional": true,
-              "description": "Array of :ref:`tabs.Tab` objects representing the current tabs in the window. Only included if requested by :ref:`windows.get`, :ref:`windows.getCurrent`, :ref:`windows.getAll` or :ref:`windows.getLastFocused`, and the optional :ref:`windows.GetInfo` parameter has its ``populate`` member set to <value>true</value>."
+              "description": "Array of $(ref:tabs.Tab) objects representing the current tabs in the window. Only included if requested by $(ref:windows.get), $(ref:windows.getCurrent), $(ref:windows.getAll) or $(ref:windows.getLastFocused), and the optional $(ref:windows.GetInfo) parameter has its <var>populate</var> member set to <var>true</var>."
             },
             "incognito": {
               "type": "boolean",
-              "description": "Whether the window is incognito. Since Thunderbird does not support the incognito mode, this is always <value>false</value>."
+              "description": "Whether the window is incognito. Since Thunderbird does not support the incognito mode, this is always <var>false</var>."
             },
             "type": {
               "$ref": "WindowType",
@@ -15879,7 +15952,7 @@
         {
           "id": "CreateType",
           "type": "string",
-          "description": "Specifies what type of window to create. Thunderbird does not support <value>panel</value> and <value>detached_panel</value>, they are interpreted as <value>popup</value>.",
+          "description": "Specifies what type of window to create. Thunderbird does not support <var>panel</var> and <var>detached_panel</var>, they are interpreted as <var>popup</var>.",
           "enum": [
             "normal",
             "popup",
@@ -15895,7 +15968,7 @@
             "populate": {
               "type": "boolean",
               "optional": true,
-              "description": "If true, the :ref:`windows.Window` returned will have a ``tabs`` property that contains an array of :ref:`tabs.Tab` objects representing the tabs inside the window. The :ref:`tabs.Tab` objects only contain the ``url``, ``title`` and ``favIconUrl`` properties if the extension's manifest file includes the <permission>tabs</permission> permission."
+              "description": "If true, the $(ref:windows.Window) returned will have a <var>tabs</var> property that contains an array of $(ref:tabs.Tab) objects representing the tabs inside the window. The $(ref:tabs.Tab) objects only contain the <var>url</var>, <var>title</var> and <var>favIconUrl</var> properties if the extension's manifest file includes the <permission>tabs</permission> permission."
             },
             "windowTypes": {
               "type": "array",
@@ -15903,7 +15976,7 @@
                 "$ref": "WindowType"
               },
               "optional": true,
-              "description": "If set, the :ref:`windows.Window` returned will be filtered based on its type. Supported by :ref:`windows.getAll` only, ignored in all other functions."
+              "description": "If set, the $(ref:windows.Window) returned will be filtered based on its type. Supported by $(ref:windows.getAll) only, ignored in all other functions."
             }
           }
         }
@@ -16026,7 +16099,7 @@
         {
           "name": "create",
           "type": "function",
-          "description": "Creates (opens) a new window with any optional sizing, position or default URL provided. When loading a page into a popup window, same-site links are opened within the same window, all other links are opened in the user's default browser. To override this behavior, add-ons have to register a `content script <https://bugzilla.mozilla.org/show_bug.cgi?id=1618828#c3>`__ , capture click events and handle them manually. Same-site links with targets other than <value>_self</value> are opened in a new tab in the most recent ``normal`` Thunderbird window.",
+          "description": "Creates (opens) a new window with any optional sizing, position or default URL provided. When loading a page into a popup window, same-site links are opened within the same window, all other links are opened in the user's default browser. To override this behavior, add-ons have to register a <a href='url-content-script-click-capture'>content script</a> , capture click events and handle them manually. Same-site links with targets other than <var>_self</var> are opened in a new tab in the most recent <var>normal</var> Thunderbird window.",
           "async": "callback",
           "parameters": [
             {
@@ -16036,7 +16109,7 @@
               "default": {},
               "properties": {
                 "url": {
-                  "description": "A URL to be opened in a popup window, ignored in all other window types. This may also be an array, but only the first element is used (popup windows may not have multiple tabs). If the URL points to a content page (a web page, an extension page or a registered WebExtension protocol handler page), the popup window will navigate to the requested page. All other URLs will be opened externally after creating an empty popup window. Fully-qualified URLs must include a scheme (i.e. <value>http://www.google.com</value>, not <value>www.google.com</value>). Relative URLs will be relative to the root of the extension. Defaults to the New Tab Page.",
+                  "description": "A URL to be opened in a popup window, ignored in all other window types. This may also be an array, but only the first element is used (popup windows may not have multiple tabs). If the URL points to a content page (a web page, an extension page or a registered WebExtension protocol handler page), the popup window will navigate to the requested page. All other URLs will be opened externally after creating an empty popup window. Fully-qualified URLs must include a scheme (i.e. <var>http://www.google.com</var>, not <var>www.google.com</var>). Relative URLs will be relative to the root of the extension. Defaults to the New Tab Page.",
                   "optional": true,
                   "choices": [
                     {
@@ -16094,12 +16167,12 @@
                 "type": {
                   "$ref": "CreateType",
                   "optional": true,
-                  "description": "Specifies what type of window to create. Thunderbird does not support <value>panel</value> and <value>detached_panel</value>, they are interpreted as <value>popup</value>."
+                  "description": "Specifies what type of window to create. Thunderbird does not support <var>panel</var> and <var>detached_panel</var>, they are interpreted as <var>popup</var>."
                 },
                 "state": {
                   "$ref": "WindowState",
                   "optional": true,
-                  "description": "The initial state of the window. The ``minimized``, ``maximized`` and ``fullscreen`` states cannot be combined with ``left``, ``top``, ``width`` or ``height``."
+                  "description": "The initial state of the window. The <var>minimized</var>, <var>maximized</var> and <var>fullscreen</var> states cannot be combined with <var>left</var>, <var>top</var>, <var>width</var> or <var>height</var>."
                 },
                 "allowScriptsToClose": {
                   "type": "boolean",
@@ -16177,12 +16250,12 @@
                 "drawAttention": {
                   "type": "boolean",
                   "optional": true,
-                  "description": "Setting this to <value>true</value> will cause the window to be displayed in a manner that draws the user's attention to the window, without changing the focused window. The effect lasts until the user changes focus to the window. This option has no effect if the window already has focus."
+                  "description": "Setting this to <var>true</var> will cause the window to be displayed in a manner that draws the user's attention to the window, without changing the focused window. The effect lasts until the user changes focus to the window. This option has no effect if the window already has focus."
                 },
                 "state": {
                   "$ref": "WindowState",
                   "optional": true,
-                  "description": "The new state of the window. The ``minimized``, ``maximized`` and ``fullscreen`` states cannot be combined with ``left``, ``top``, ``width`` or ``height``."
+                  "description": "The new state of the window. The <var>minimized</var>, <var>maximized</var> and <var>fullscreen</var> states cannot be combined with <var>left</var>, <var>top</var>, <var>width</var> or <var>height</var>."
                 },
                 "titlePreface": {
                   "type": "string",
@@ -16248,7 +16321,7 @@
               "items": {
                 "$ref": "WindowType"
               },
-              "description": "Conditions that the window's type being created must satisfy. By default it will satisfy <value>['app', 'normal', 'panel', 'popup']</value>, with <value>app</value> and <value>panel</value> window types limited to the extension's own windows."
+              "description": "Conditions that the window's type being created must satisfy. By default it will satisfy <var>['app', 'normal', 'panel', 'popup']</var>, with <var>app</var> and <var>panel</var> window types limited to the extension's own windows."
             }
           ],
           "parameters": [
@@ -16270,7 +16343,7 @@
               "items": {
                 "$ref": "WindowType"
               },
-              "description": "Conditions that the window's type being removed must satisfy. By default it will satisfy <value>['app', 'normal', 'panel', 'popup']</value>, with <value>app</value> and <value>panel</value> window types limited to the extension's own windows."
+              "description": "Conditions that the window's type being removed must satisfy. By default it will satisfy <var>['app', 'normal', 'panel', 'popup']</var>, with <var>app</var> and <var>panel</var> window types limited to the extension's own windows."
             }
           ],
           "parameters": [
@@ -16285,7 +16358,7 @@
         {
           "name": "onFocusChanged",
           "type": "function",
-          "description": "Fired when the currently focused window changes. Will be :ref:`windows.WINDOW_ID_NONE`, if all windows have lost focus. **Note:** On some Linux window managers, WINDOW_ID_NONE will always be sent immediately preceding a switch from one window to another.",
+          "description": "Fired when the currently focused window changes. Will be $(ref:windows.WINDOW_ID_NONE), if all windows have lost focus. **Note:** On some Linux window managers, WINDOW_ID_NONE will always be sent immediately preceding a switch from one window to another.",
           "filters": [
             {
               "name": "windowTypes",
@@ -16293,7 +16366,7 @@
               "items": {
                 "$ref": "WindowType"
               },
-              "description": "Conditions that the window's type being focused must satisfy. By default it will satisfy <value>['app', 'normal', 'panel', 'popup']</value>, with <value>app</value> and <value>panel</value> window types limited to the extension's own windows."
+              "description": "Conditions that the window's type being focused must satisfy. By default it will satisfy <var>['app', 'normal', 'panel', 'popup']</var>, with <var>app</var> and <var>panel</var> window types limited to the extension's own windows."
             }
           ],
           "parameters": [