deprecated.diff

--- bare	2026-03-23 16:08:32.621721070 +0000
+++ manual.xml	2026-03-23 16:08:44.310775010 +0000
@@ -21665,6 +21665,12 @@
 if the pattern contains at least one upper case letter, and case
 insensitive otherwise.
 </para>
+<note><para>Before 2021-03-21, this was called $abort_noattach_regexp, $attach_keyword</para></note>
+</sect2>
+
+<sect2 id="abort-noattach-regexp">
+  <title>abort_noattach_regexp</title>
+  <note><para>Renamed to <link linkend="abort-noattach-regex">$abort_noattach_regex</link> (2021-03-21)</para></note>
 </sect2>
 
 <sect2 id="abort-nosubject">
@@ -21836,6 +21842,8 @@
 Note: This also affects the entries of the address query menu, thus
 potentially overruling the order of entries as generated by <link linkend="query-command">$query_command</link>.
 </para>
+
+<note><para>Before 2024-11-19, this was called $sort_alias</para></note>
 </sect2>
 
 <sect2 id="allow-8bit">
@@ -21916,6 +21924,7 @@
 If <emphasis>set</emphasis>, NeoMutt will prompt you for blind-carbon-copy (Bcc) recipients
 before editing an outgoing message.
 </para>
+<note><para>Before 2021-03-21, this was called $askbcc</para></note>
 </sect2>
 
 <sect2 id="ask-cc">
@@ -21927,6 +21936,12 @@
 If <emphasis>set</emphasis>, NeoMutt will prompt you for carbon-copy (Cc) recipients before
 editing the body of an outgoing message.
 </para>
+<note><para>Before 2021-03-21, this was called $askcc</para></note>
+</sect2>
+
+<sect2 id="ask-follow-up">
+  <title>ask_follow_up</title>
+  <note><para>Renamed to <link linkend="ask-followup-to">$ask_followup_to</link> (2023-01-20)</para></note>
 </sect2>
 
 <sect2 id="ask-followup-to">
@@ -21938,6 +21953,7 @@
 If set, NeoMutt will prompt you for follow-up groups before editing
 the body of an outgoing message.
 </para>
+<note><para>Before 2023-01-20, this was called $ask_follow_up</para></note>
 </sect2>
 
 <sect2 id="ask-x-comment-to">
@@ -21951,6 +21967,16 @@
 </para>
 </sect2>
 
+<sect2 id="askbcc">
+  <title>askbcc</title>
+  <note><para>Renamed to <link linkend="ask-bcc">$ask_bcc</link> (2021-03-21)</para></note>
+</sect2>
+
+<sect2 id="askcc">
+  <title>askcc</title>
+  <note><para>Renamed to <link linkend="ask-cc">$ask_cc</link> (2021-03-21)</para></note>
+</sect2>
+
 <sect2 id="assumed-charset">
 <title>assumed_charset</title>
 <literallayout>Type: string list
@@ -22066,6 +22092,11 @@
 </para>
 </sect2>
 
+<sect2 id="attach-keyword">
+  <title>attach_keyword</title>
+  <note><para>Renamed to <link linkend="abort-noattach-regex">$abort_noattach_regex</link> (2021-03-21)</para></note>
+</sect2>
+
 <sect2 id="attach-save-dir">
 <title>attach_save_dir</title>
 <literallayout>Type: path
@@ -22114,6 +22145,11 @@
 </para>
 </sect2>
 
+<sect2 id="attribution">
+  <title>attribution</title>
+  <note><para>Renamed to <link linkend="attribution-intro">$attribution_intro</link> (2023-02-20)</para></note>
+</sect2>
+
 <sect2 id="attribution-intro">
 <title>attribution_intro</title>
 <literallayout>Type: string
@@ -22128,6 +22164,7 @@
 For a full listing of defined <literal>printf(3)</literal>-like sequences see the section
 on <link linkend="index-format">$index_format</link>.  See also <link linkend="attribution-locale">$attribution_locale</link>.
 </para>
+<note><para>Before 2023-02-20, this was called $attribution</para></note>
 </sect2>
 
 <sect2 id="attribution-locale">
@@ -22166,6 +22203,8 @@
 For a full listing of defined <literal>printf(3)</literal>-like sequences see the section
 on <link linkend="index-format">$index_format</link>.  See also <link linkend="attribution-locale">$attribution_locale</link>.
 </para>
+<note><para>Before 2021-03-21, this was called $post_indent_str</para></note>
+<note><para>Before 2023-02-20, this was called $post_indent_string</para></note>
 </sect2>
 
 <sect2 id="auto-edit">
@@ -22188,6 +22227,7 @@
 <para>
 Also see <link linkend="fast-reply">$fast_reply</link>.
 </para>
+<note><para>Before 2021-03-21, this was called $autoedit</para></note>
 </sect2>
 
 <sect2 id="auto-subscribe">
@@ -22294,6 +22334,11 @@
 </para>
 </sect2>
 
+<sect2 id="autoedit">
+  <title>autoedit</title>
+  <note><para>Renamed to <link linkend="auto-edit">$auto_edit</link> (2021-03-21)</para></note>
+</sect2>
+
 <sect2 id="beep">
 <title>beep</title>
 <literallayout>Type: boolean
@@ -22419,6 +22464,8 @@
 Prefixing the value with <literal>reverse-</literal> sorts the entries in reverse order,
 e.g. <literal>set browser_sort = "reverse-date"</literal>
 </para>
+
+<note><para>Before 2024-11-20, this was called $sort_browser</para></note>
 </sect2>
 
 <sect2 id="browser-sort-dirs-first">
@@ -22736,6 +22783,7 @@
 When <emphasis>set</emphasis>, NeoMutt will prompt for confirmation when appending messages
 to an existing mailbox.
 </para>
+<note><para>Before 2021-03-21, this was called $confirmappend</para></note>
 </sect2>
 
 <sect2 id="confirm-create">
@@ -22747,6 +22795,7 @@
 When <emphasis>set</emphasis>, NeoMutt will prompt for confirmation when saving messages to
 a mailbox which does not yet exist before creating it.
 </para>
+<note><para>Before 2021-03-21, this was called $confirmcreate</para></note>
 </sect2>
 
 <sect2 id="confirm-empty-to">
@@ -22760,6 +22809,21 @@
 </para>
 </sect2>
 
+<sect2 id="confirmappend">
+  <title>confirmappend</title>
+  <note><para>Renamed to <link linkend="confirm-append">$confirm_append</link> (2021-03-21)</para></note>
+</sect2>
+
+<sect2 id="confirmcreate">
+  <title>confirmcreate</title>
+  <note><para>Renamed to <link linkend="confirm-create">$confirm_create</link> (2021-03-21)</para></note>
+</sect2>
+
+<sect2 id="connect-timeout">
+  <title>connect_timeout</title>
+  <note><para>Renamed to <link linkend="socket-timeout">$socket_timeout</link> (2023-02-15)</para></note>
+</sect2>
+
 <sect2 id="content-type">
 <title>content_type</title>
 <literallayout>Type: string
@@ -22827,6 +22891,7 @@
 settings can be overridden by use of the smime menu instead.
 (Crypto only)
 </para>
+<note><para>Before 2021-03-21, this was called $crypt_autoencrypt, $pgp_autoencrypt</para></note>
 </sect2>
 
 <sect2 id="crypt-auto-pgp">
@@ -22840,6 +22905,7 @@
 <link linkend="crypt-reply-encrypt">$crypt_reply_encrypt</link>,
 <link linkend="crypt-auto-sign">$crypt_auto_sign</link>, <link linkend="crypt-reply-sign">$crypt_reply_sign</link> and <link linkend="smime-is-default">$smime_is_default</link>.
 </para>
+<note><para>Before 2021-03-21, this was called $crypt_autopgp</para></note>
 </sect2>
 
 <sect2 id="crypt-auto-sign">
@@ -22856,6 +22922,7 @@
 be overridden by use of the smime menu instead of the pgp menu.
 (Crypto only)
 </para>
+<note><para>Before 2021-03-21, this was called $crypt_autosign, $pgp_autosign</para></note>
 </sect2>
 
 <sect2 id="crypt-auto-smime">
@@ -22869,6 +22936,27 @@
 <link linkend="crypt-reply-encrypt">$crypt_reply_encrypt</link>,
 <link linkend="crypt-auto-sign">$crypt_auto_sign</link>, <link linkend="crypt-reply-sign">$crypt_reply_sign</link> and <link linkend="smime-is-default">$smime_is_default</link>.
 </para>
+<note><para>Before 2021-03-21, this was called $crypt_autosmime</para></note>
+</sect2>
+
+<sect2 id="crypt-autoencrypt">
+  <title>crypt_autoencrypt</title>
+  <note><para>Renamed to <link linkend="crypt-auto-encrypt">$crypt_auto_encrypt</link> (2021-03-21)</para></note>
+</sect2>
+
+<sect2 id="crypt-autopgp">
+  <title>crypt_autopgp</title>
+  <note><para>Renamed to <link linkend="crypt-auto-pgp">$crypt_auto_pgp</link> (2021-03-21)</para></note>
+</sect2>
+
+<sect2 id="crypt-autosign">
+  <title>crypt_autosign</title>
+  <note><para>Renamed to <link linkend="crypt-auto-sign">$crypt_auto_sign</link> (2021-03-21)</para></note>
+</sect2>
+
+<sect2 id="crypt-autosmime">
+  <title>crypt_autosmime</title>
+  <note><para>Renamed to <link linkend="crypt-auto-smime">$crypt_auto_smime</link> (2021-03-21)</para></note>
 </sect2>
 
 <sect2 id="crypt-chars">
@@ -22909,6 +22997,12 @@
 be presented.  This is generally considered unsafe, especially where
 typos are concerned.
 </para>
+<note><para>Before 2021-02-11, this was called $crypt_confirmhook</para></note>
+</sect2>
+
+<sect2 id="crypt-confirmhook">
+  <title>crypt_confirmhook</title>
+  <note><para>Renamed to <link linkend="crypt-confirm-hook">$crypt_confirm_hook</link> (2021-02-11)</para></note>
 </sect2>
 
 <sect2 id="crypt-encryption-info">
@@ -23087,6 +23181,7 @@
 If <emphasis>set</emphasis>, automatically PGP or OpenSSL encrypt replies to messages which
 are encrypted. (Crypto only)
 </para>
+<note><para>Before 2021-03-21, this was called $crypt_replyencrypt, $pgp_replyencrypt</para></note>
 </sect2>
 
 <sect2 id="crypt-reply-sign">
@@ -23103,6 +23198,7 @@
 <emphasis>and</emphasis> signed!
 (Crypto only)
 </para>
+<note><para>Before 2021-03-21, this was called $crypt_replysign, $pgp_replysign</para></note>
 </sect2>
 
 <sect2 id="crypt-reply-sign-encrypted">
@@ -23119,6 +23215,22 @@
 to find out whether an encrypted message is also signed.
 (Crypto only)
 </para>
+<note><para>Before 2021-03-21, this was called $crypt_replysignencrypted, $pgp_replysignencrypted</para></note>
+</sect2>
+
+<sect2 id="crypt-replyencrypt">
+  <title>crypt_replyencrypt</title>
+  <note><para>Renamed to <link linkend="crypt-reply-encrypt">$crypt_reply_encrypt</link> (2021-03-21)</para></note>
+</sect2>
+
+<sect2 id="crypt-replysign">
+  <title>crypt_replysign</title>
+  <note><para>Renamed to <link linkend="crypt-reply-sign">$crypt_reply_sign</link> (2021-03-21)</para></note>
+</sect2>
+
+<sect2 id="crypt-replysignencrypted">
+  <title>crypt_replysignencrypted</title>
+  <note><para>Renamed to <link linkend="crypt-reply-sign-encrypted">$crypt_reply_sign_encrypted</link> (2021-03-21)</para></note>
 </sect2>
 
 <sect2 id="crypt-timestamp">
@@ -23175,6 +23287,12 @@
 If <emphasis>"no"</emphasis>, never attempt to verify cryptographic signatures.
 (Crypto only)
 </para>
+<note><para>Before 2002-01-24, this was called $pgp_verify_sig</para></note>
+</sect2>
+
+<sect2 id="cursor-overlay">
+  <title>cursor_overlay</title>
+  <note><para>Deprecated, since 2020-07-20</para></note>
 </sect2>
 
 <sect2 id="date-format">
@@ -23429,6 +23547,11 @@
 </para>
 </sect2>
 
+<sect2 id="edit-hdrs">
+  <title>edit_hdrs</title>
+  <note><para>Renamed to <link linkend="edit-headers">$edit_headers</link> (2021-03-21)</para></note>
+</sect2>
+
 <sect2 id="edit-headers">
 <title>edit_headers</title>
 <literallayout>Type: boolean
@@ -23450,6 +23573,7 @@
 <emphasis role="bold">Note</emphasis> that changes made to the References: and Date: headers are
 ignored for interoperability reasons.
 </para>
+<note><para>Before 2021-03-21, this was called $edit_hdrs</para></note>
 </sect2>
 
 <sect2 id="editor">
@@ -23515,6 +23639,11 @@
 </para>
 </sect2>
 
+<sect2 id="envelope-from">
+  <title>envelope_from</title>
+  <note><para>Renamed to <link linkend="use-envelope-from">$use_envelope_from</link> (2021-03-21)</para></note>
+</sect2>
+
 <sect2 id="envelope-from-address">
 <title>envelope_from_address</title>
 <literallayout>Type: e-mail address
@@ -23526,6 +23655,11 @@
 </para>
 </sect2>
 
+<sect2 id="escape">
+  <title>escape</title>
+  <note><para>Deprecated, since 2021-03-18</para></note>
+</sect2>
+
 <sect2 id="external-search-command">
 <title>external_search_command</title>
 <literallayout>Type: command
@@ -23838,6 +23972,26 @@
 </para>
 </sect2>
 
+<sect2 id="forw-decode">
+  <title>forw_decode</title>
+  <note><para>Renamed to <link linkend="forward-decode">$forward_decode</link> (2021-03-21)</para></note>
+</sect2>
+
+<sect2 id="forw-decrypt">
+  <title>forw_decrypt</title>
+  <note><para>Renamed to <link linkend="forward-decrypt">$forward_decrypt</link> (2021-03-21)</para></note>
+</sect2>
+
+<sect2 id="forw-format">
+  <title>forw_format</title>
+  <note><para>Renamed to <link linkend="forward-format">$forward_format</link> (2021-03-21)</para></note>
+</sect2>
+
+<sect2 id="forw-quote">
+  <title>forw_quote</title>
+  <note><para>Renamed to <link linkend="forward-quote">$forward_quote</link> (2021-03-21)</para></note>
+</sect2>
+
 <sect2 id="forward-attachments">
 <title>forward_attachments</title>
 <literallayout>Type: quadoption
@@ -23889,6 +24043,7 @@
 This variable is only used, if <link linkend="mime-forward">$mime_forward</link> is <emphasis>unset</emphasis>,
 otherwise <link linkend="mime-forward-decode">$mime_forward_decode</link> is used instead.
 </para>
+<note><para>Before 2021-03-21, this was called $forw_decode</para></note>
 </sect2>
 
 <sect2 id="forward-decrypt">
@@ -23902,6 +24057,7 @@
 variable is only used if <link linkend="mime-forward">$mime_forward</link> is <emphasis>set</emphasis> and
 <link linkend="mime-forward-decode">$mime_forward_decode</link> is <emphasis>unset</emphasis>.
 </para>
+<note><para>Before 2021-03-21, this was called $forw_decrypt</para></note>
 </sect2>
 
 <sect2 id="forward-edit">
@@ -23925,6 +24081,7 @@
 This variable controls the default subject when forwarding a message.
 It uses the same format sequences as the <link linkend="index-format">$index_format</link> variable.
 </para>
+<note><para>Before 2021-03-21, this was called $forw_format</para></note>
 </sect2>
 
 <sect2 id="forward-quote">
@@ -23937,6 +24094,7 @@
 message (when <link linkend="mime-forward">$mime_forward</link> is <emphasis>unset</emphasis>) will be quoted using
 <link linkend="indent-string">$indent_string</link>.
 </para>
+<note><para>Before 2021-03-21, this was called $forw_quote</para></note>
 </sect2>
 
 <sect2 id="forward-references">
@@ -24103,6 +24261,11 @@
 </entry></row></tbody></tgroup></informaltable>
 </sect2>
 
+<sect2 id="hdr-format">
+  <title>hdr_format</title>
+  <note><para>Renamed to <link linkend="index-format">$index_format</link> (2021-03-21)</para></note>
+</sect2>
+
 <sect2 id="hdrs">
 <title>hdrs</title>
 <literallayout>Type: boolean
@@ -24159,6 +24322,11 @@
 </para>
 </sect2>
 
+<sect2 id="header-cache-compress">
+  <title>header_cache_compress</title>
+  <note><para>Deprecated, since 2020-03-25</para></note>
+</sect2>
+
 <sect2 id="header-cache-compress-level">
 <title>header_cache_compress_level</title>
 <literallayout>Type: number
@@ -24182,6 +24350,11 @@
 </para>
 </sect2>
 
+<sect2 id="header-cache-pagesize">
+  <title>header_cache_pagesize</title>
+  <note><para>Deprecated, since 2020-03-25</para></note>
+</sect2>
+
 <sect2 id="header-color-partial">
 <title>header_color_partial</title>
 <literallayout>Type: boolean
@@ -24449,6 +24622,11 @@
 </para>
 </sect2>
 
+<sect2 id="ignore-linear-white-space">
+  <title>ignore_linear_white_space</title>
+  <note><para>Deprecated, since 2021-03-18</para></note>
+</sect2>
+
 <sect2 id="ignore-list-reply-to">
 <title>ignore_list_reply_to</title>
 <literallayout>Type: boolean
@@ -24616,6 +24794,12 @@
 violated every now and then. Reduce this number if you find yourself
 getting disconnected from your IMAP server due to inactivity.
 </para>
+<note><para>Before 2023-05-31, this was called $imap_keepalive</para></note>
+</sect2>
+
+<sect2 id="imap-keepalive">
+  <title>imap_keepalive</title>
+  <note><para>Renamed to <link linkend="imap-keep-alive">$imap_keep_alive</link> (2023-05-31)</para></note>
 </sect2>
 
 <sect2 id="imap-list-subscribed">
@@ -24784,6 +24968,12 @@
 server which are out of the users' hands, you may wish to suppress
 them at some point.
 </para>
+<note><para>Before 2021-02-11, this was called $imap_servernoise</para></note>
+</sect2>
+
+<sect2 id="imap-servernoise">
+  <title>imap_servernoise</title>
+  <note><para>Renamed to <link linkend="imap-server-noise">$imap_server_noise</link> (2021-02-11)</para></note>
 </sect2>
 
 <sect2 id="imap-user">
@@ -24811,6 +25001,12 @@
 have an internal viewer defined for. If such an entry is found, NeoMutt will
 use the viewer defined in that entry to convert the body part to text form.
 </para>
+<note><para>Before 2023-01-25, this was called $implicit_autoview</para></note>
+</sect2>
+
+<sect2 id="implicit-autoview">
+  <title>implicit_autoview</title>
+  <note><para>Renamed to <link linkend="implicit-auto-view">$implicit_auto_view</link> (2023-01-25)</para></note>
 </sect2>
 
 <sect2 id="include">
@@ -24850,6 +25046,17 @@
 Controls whether or not NeoMutt includes only the first attachment
 of the message you are replying.
 </para>
+<note><para>Before 2021-03-21, this was called $include_onlyfirst</para></note>
+</sect2>
+
+<sect2 id="include-onlyfirst">
+  <title>include_onlyfirst</title>
+  <note><para>Renamed to <link linkend="include-only-first">$include_only_first</link> (2021-03-21)</para></note>
+</sect2>
+
+<sect2 id="indent-str">
+  <title>indent_str</title>
+  <note><para>Renamed to <link linkend="indent-string">$indent_string</link> (2021-03-21)</para></note>
 </sect2>
 
 <sect2 id="indent-string">
@@ -24870,6 +25077,7 @@
 This option is a format string, please see the description of
 <link linkend="index-format">$index_format</link> for supported <literal>printf(3)</literal>-style sequences.
 </para>
+<note><para>Before 2021-03-21, this was called $indent_str</para></note>
 </sect2>
 
 <sect2 id="index-format">
@@ -25061,6 +25269,12 @@
 Note that these expandos are supported in
 "<link linkend="save-hook">save-hook</link>", "<link linkend="fcc-hook">fcc-hook</link>" and "<link linkend="fcc-save-hook">fcc-save-hook</link>", too.
 </para>
+<note><para>Before 2021-03-21, this was called $hdr_format</para></note>
+</sect2>
+
+<sect2 id="inews">
+  <title>inews</title>
+  <note><para>Renamed to <link linkend="inews-command">$inews_command</link> (2025-12-15)</para></note>
 </sect2>
 
 <sect2 id="inews-command">
@@ -25098,7 +25312,10 @@
 
 <screen>
 set inews_command="/usr/local/bin/inews -hS"
-</screen></sect2>
+</screen>
+
+<note><para>Before 2025-12-15, this was called $inews</para></note>
+</sect2>
 
 <sect2 id="ispell">
 <title>ispell</title>
@@ -25388,6 +25605,7 @@
 If <emphasis>unset</emphasis>, NeoMutt will remove your address (see the "<link linkend="alternates">alternates</link>"
 command) from the list of recipients when replying to a message.
 </para>
+<note><para>Before 2021-03-21, this was called $metoo</para></note>
 </sect2>
 
 <sect2 id="menu-context">
@@ -25456,6 +25674,12 @@
 <para>
 Also see the <link linkend="message-cache-clean">$message_cache_clean</link> variable.
 </para>
+<note><para>Before 2023-01-25, this was called message_cachedir</para></note>
+</sect2>
+
+<sect2 id="message-cachedir">
+  <title>message_cachedir</title>
+  <note><para>Renamed to <link linkend="message-cache-dir">$message_cache_dir</link> (2023-01-25)</para></note>
 </sect2>
 
 <sect2 id="message-format">
@@ -25468,6 +25692,7 @@
 attachments of type <literal>message/rfc822</literal>.  For a full listing of defined
 <literal>printf(3)</literal>-like sequences see the section on <link linkend="index-format">$index_format</link>.
 </para>
+<note><para>Before 2021-03-21, this was called $msg_format</para></note>
 </sect2>
 
 <sect2 id="message-id-format">
@@ -25553,6 +25778,11 @@
 </para>
 </sect2>
 
+<sect2 id="metoo">
+  <title>metoo</title>
+  <note><para>Renamed to <link linkend="me-too">$me_too</link> (2021-03-21)</para></note>
+</sect2>
+
 <sect2 id="mh-purge">
 <title>mh_purge</title>
 <literallayout>Type: boolean
@@ -25616,6 +25846,7 @@
 <para>
 Also see <link linkend="forward-decode">$forward_decode</link> and <link linkend="mime-forward-decode">$mime_forward_decode</link>.
 </para>
+<note><para>Before 2021-03-21, this was called $mime_fwd</para></note>
 </sect2>
 
 <sect2 id="mime-forward-decode">
@@ -25642,6 +25873,16 @@
 </para>
 </sect2>
 
+<sect2 id="mime-fwd">
+  <title>mime_fwd</title>
+  <note><para>Renamed to <link linkend="mime-forward">$mime_forward</link> (2021-03-21)</para></note>
+</sect2>
+
+<sect2 id="mime-subject">
+  <title>mime_subject</title>
+  <note><para>Deprecated, since 2021-03-24</para></note>
+</sect2>
+
 <sect2 id="mime-type-query-command">
 <title>mime_type_query_command</title>
 <literallayout>Type: command
@@ -25681,6 +25922,16 @@
 </para>
 </sect2>
 
+<sect2 id="mix-entry-format">
+  <title>mix_entry_format</title>
+  <note><para>Deprecated, since 2024-05-30</para></note>
+</sect2>
+
+<sect2 id="mixmaster">
+  <title>mixmaster</title>
+  <note><para>Deprecated, since 2024-05-30</para></note>
+</sect2>
+
 <sect2 id="move">
 <title>move</title>
 <literallayout>Type: quadoption
@@ -25696,6 +25947,11 @@
 </para>
 </sect2>
 
+<sect2 id="msg-format">
+  <title>msg_format</title>
+  <note><para>Renamed to <link linkend="message-format">$message_format</link> (2021-03-21)</para></note>
+</sect2>
+
 <sect2 id="narrow-tree">
 <title>narrow_tree</title>
 <literallayout>Type: boolean
@@ -25836,6 +26092,11 @@
 </para>
 </sect2>
 
+<sect2 id="nm-default-uri">
+  <title>nm_default_uri</title>
+  <note><para>Renamed to <link linkend="nm-default-url">$nm_default_url</link> (2021-02-11)</para></note>
+</sect2>
+
 <sect2 id="nm-default-url">
 <title>nm_default_url</title>
 <literallayout>Type: string
@@ -25845,6 +26106,7 @@
 This variable specifies the default Notmuch database in format
 notmuch://&lt;absolute path&gt;.
 </para>
+<note><para>Before 2021-02-11, this was called $nm_default_uri</para></note>
 </sect2>
 
 <sect2 id="nm-exclude-tags">
@@ -26210,6 +26472,7 @@
 are displayed. If the previous quote is shorter the whole quote is
 displayed.
 </para>
+<note><para>Before 2021-06-18, this was called $skip_quoted_offset</para></note>
 </sect2>
 
 <sect2 id="pager-stop">
@@ -26298,6 +26561,27 @@
 <emphasis role="bold">deprecated</emphasis>.
 (PGP only)
 </para>
+<note><para>Before 2004-04-12, this was called $pgp_create_traditional, $pgp_autoinline</para></note>
+</sect2>
+
+<sect2 id="pgp-auto-traditional">
+  <title>pgp_auto_traditional</title>
+  <note><para>Renamed to <link linkend="pgp-reply-inline">$pgp_reply_inline</link> (2021-03-21)</para></note>
+</sect2>
+
+<sect2 id="pgp-autoencrypt">
+  <title>pgp_autoencrypt</title>
+  <note><para>Renamed to <link linkend="crypt-auto-encrypt">$crypt_auto_encrypt</link> (2021-03-21)</para></note>
+</sect2>
+
+<sect2 id="pgp-autoinline">
+  <title>pgp_autoinline</title>
+  <note><para>Renamed to <link linkend="pgp-auto-inline">$pgp_auto_inline</link> (2021-02-11)</para></note>
+</sect2>
+
+<sect2 id="pgp-autosign">
+  <title>pgp_autosign</title>
+  <note><para>Renamed to <link linkend="crypt-auto-sign">$crypt_auto_sign</link> (2021-03-21)</para></note>
 </sect2>
 
 <sect2 id="pgp-check-exit">
@@ -26350,6 +26634,17 @@
 one or more quoted values such as email address, name, or keyid.
 (PGP only)
 </para>
+<note><para>Before 2021-02-11, this was called $pgp_clearsign_command</para></note>
+</sect2>
+
+<sect2 id="pgp-clearsign-command">
+  <title>pgp_clearsign_command</title>
+  <note><para>Renamed to <link linkend="pgp-clear-sign-command">$pgp_clear_sign_command</link> (2021-02-11)</para></note>
+</sect2>
+
+<sect2 id="pgp-create-traditional">
+  <title>pgp_create_traditional</title>
+  <note><para>Renamed to <link linkend="pgp-auto-inline">$pgp_auto_inline</link> (2004-04-12)</para></note>
 </sect2>
 
 <sect2 id="pgp-decode-command">
@@ -26472,6 +26767,11 @@
 </para>
 </sect2>
 
+<sect2 id="pgp-encrypt-self">
+  <title>pgp_encrypt_self</title>
+  <note><para>Deprecated, since 2019-09-09</para></note>
+</sect2>
+
 <sect2 id="pgp-encrypt-sign-command">
 <title>pgp_encrypt_sign_command</title>
 <literallayout>Type: command
@@ -26570,6 +26870,12 @@
 possible <literal>printf(3)</literal>-like sequences.
 (PGP only)
 </para>
+<note><para>Before 2021-02-11, this was called $pgp_getkeys_command</para></note>
+</sect2>
+
+<sect2 id="pgp-getkeys-command">
+  <title>pgp_getkeys_command</title>
+  <note><para>Renamed to <link linkend="pgp-get-keys-command">$pgp_get_keys_command</link> (2021-02-11)</para></note>
 </sect2>
 
 <sect2 id="pgp-get-keys-command">
@@ -26661,6 +26967,8 @@
 <para>
 (PGP only)
 </para>
+
+<note><para>Before 2024-11-20, this was called $pgp_sort_keys</para></note>
 </sect2>
 
 <sect2 id="pgp-list-pubring-command">
@@ -26771,6 +27079,27 @@
 <emphasis role="bold">deprecated</emphasis>.
 (PGP only)
 </para>
+<note><para>Before 2021-03-21, this was called $pgp_auto_traditional, $pgp_replyinline</para></note>
+</sect2>
+
+<sect2 id="pgp-replyencrypt">
+  <title>pgp_replyencrypt</title>
+  <note><para>Renamed to <link linkend="crypt-reply-encrypt">$crypt_reply_encrypt</link> (2021-03-21)</para></note>
+</sect2>
+
+<sect2 id="pgp-replyinline">
+  <title>pgp_replyinline</title>
+  <note><para>Renamed to <link linkend="pgp-reply-inline">$pgp_reply_inline</link> (2021-03-21)</para></note>
+</sect2>
+
+<sect2 id="pgp-replysign">
+  <title>pgp_replysign</title>
+  <note><para>Renamed to <link linkend="crypt-reply-sign">$crypt_reply_sign</link> (2021-03-21)</para></note>
+</sect2>
+
+<sect2 id="pgp-replysignencrypted">
+  <title>pgp_replysignencrypted</title>
+  <note><para>Renamed to <link linkend="crypt-reply-sign-encrypted">$crypt_reply_sign_encrypted</link> (2021-03-21)</para></note>
 </sect2>
 
 <sect2 id="pgp-retainable-sigs">
@@ -26802,6 +27131,11 @@
 </para>
 </sect2>
 
+<sect2 id="pgp-self-encrypt-as">
+  <title>pgp_self_encrypt_as</title>
+  <note><para>Renamed to <link linkend="pgp-default-key">$pgp_default_key</link> (2018-01-11)</para></note>
+</sect2>
+
 <sect2 id="pgp-show-unusable">
 <title>pgp_show_unusable</title>
 <literallayout>Type: boolean
@@ -26845,6 +27179,11 @@
 </para>
 </sect2>
 
+<sect2 id="pgp-sort-keys">
+  <title>pgp_sort_keys</title>
+  <note><para>Renamed to <link linkend="pgp-key-sort">$pgp_key_sort</link>(2024-11-20)</para></note>
+</sect2>
+
 <sect2 id="pgp-strict-enc">
 <title>pgp_strict_enc</title>
 <literallayout>Type: boolean
@@ -26930,6 +27269,11 @@
 </para>
 </sect2>
 
+<sect2 id="pgp-verify-sig">
+  <title>pgp_verify_sig</title>
+  <note><para>Renamed to <link linkend="crypt-verify-sig">$crypt_verify_sig</link> (2002-01-24)</para></note>
+</sect2>
+
 <sect2 id="pipe-decode">
 <title>pipe_decode</title>
 <literallayout>Type: boolean
@@ -27028,6 +27372,12 @@
 This variable configures how often (in seconds) NeoMutt should look for
 new mail in the currently selected mailbox if it is a POP mailbox.
 </para>
+<note><para>Before 2021-02-11, this was called $pop_checkinterval</para></note>
+</sect2>
+
+<sect2 id="pop-checkinterval">
+  <title>pop_checkinterval</title>
+  <note><para>Renamed to <link linkend="pop-check-interval">$pop_check_interval</link> (2021-02-11)</para></note>
 </sect2>
 
 <sect2 id="pop-delete">
@@ -27125,6 +27475,16 @@
 </para>
 </sect2>
 
+<sect2 id="post-indent-str">
+  <title>post_indent_str</title>
+  <note><para>Renamed to <link linkend="attribution-trailer">$attribution_trailer</link> (2021-03-21)</para></note>
+</sect2>
+
+<sect2 id="post-indent-string">
+  <title>post_indent_string</title>
+  <note><para>Renamed to <link linkend="attribution-trailer">$attribution_trailer</link> (2023-02-20)</para></note>
+</sect2>
+
 <sect2 id="post-moderated">
 <title>post_moderated</title>
 <literallayout>Type: quadoption
@@ -27248,6 +27608,11 @@
 </para>
 </sect2>
 
+<sect2 id="print-cmd">
+  <title>print_cmd</title>
+  <note><para>Renamed to <link linkend="print-command">$print_command</link> (2021-03-21)</para></note>
+</sect2>
+
 <sect2 id="print-command">
 <title>print_command</title>
 <literallayout>Type: command
@@ -27256,6 +27621,7 @@
 <para>
 This specifies the command pipe that should be used to print messages.
 </para>
+<note><para>Before 2021-03-21, this was called $print_cmd</para></note>
 </sect2>
 
 <sect2 id="print-decode">
@@ -27433,6 +27799,12 @@
 <para>
 Match detection may be overridden by the <link linkend="smileys">$smileys</link> regular expression.
 </para>
+<note><para>Before 2021-03-21, this was called $quote_regexp</para></note>
+</sect2>
+
+<sect2 id="quote-regexp">
+  <title>quote_regexp</title>
+  <note><para>Renamed to <link linkend="quote-regex">$quote_regex</link> (2021-03-21)</para></note>
 </sect2>
 
 <sect2 id="read-inc">
@@ -27479,6 +27851,12 @@
 If not specified, then the user's "real name" will be read from
 <literal>/etc/passwd</literal>. This option will not be used, if "<link linkend="from">$from</link>" is set.
 </para>
+<note><para>Before 2021-03-21, this was called $realname</para></note>
+</sect2>
+
+<sect2 id="realname">
+  <title>realname</title>
+  <note><para>Renamed to <link linkend="real-name">$real_name</link> (2021-03-21)</para></note>
 </sect2>
 
 <sect2 id="recall">
@@ -27617,6 +27995,12 @@
 problem, then once the variable is set to your liking, remove
 your stale header cache files and turn the header cache back on.
 </para>
+<note><para>Before 2021-03-21, this was called $reply_regexp</para></note>
+</sect2>
+
+<sect2 id="reply-regexp">
+  <title>reply_regexp</title>
+  <note><para>Renamed to <link linkend="reply-regex">$reply_regex</link> (2021-03-21)</para></note>
 </sect2>
 
 <sect2 id="reply-self">
@@ -27788,6 +28172,12 @@
 In either case, a missing real name will be filled in afterwards
 using the value of <link linkend="real-name">$real_name</link>.
 </para>
+<note><para>Before 2021-03-21, this was called $reverse_realname</para></note>
+</sect2>
+
+<sect2 id="reverse-realname">
+  <title>reverse_realname</title>
+  <note><para>Renamed to <link linkend="reverse-real-name">$reverse_real_name</link> (2021-03-21)</para></note>
 </sect2>
 
 <sect2 id="rfc2047-parameters">
@@ -28373,6 +28763,13 @@
 
 <para>
 </para>
+
+<note><para>Before 2024-11-20, this was called $sidebar_sort_method</para></note>
+</sect2>
+
+<sect2 id="sidebar-sort-method">
+  <title>sidebar_sort_method</title>
+  <note><para>Renamed to <link linkend="sidebar-sort">$sidebar_sort</link>(2024-11-20)</para></note>
 </sect2>
 
 <sect2 id="sidebar-visible">
@@ -28509,6 +28906,11 @@
 </para>
 </sect2>
 
+<sect2 id="skip-quoted-offset">
+  <title>skip_quoted_offset</title>
+  <note><para>Renamed to <link linkend="pager-skip-quoted-context">$pager_skip_quoted_context</link> (2021-06-18)</para></note>
+</sect2>
+
 <sect2 id="sleep-time">
 <title>sleep_time</title>
 <literallayout>Type: number
@@ -28674,6 +29076,7 @@
 <para>
 (S/MIME only)
 </para>
+<note><para>Before 2018-01-11, this was called $smime_self_encrypt_as</para></note>
 </sect2>
 
 <sect2 id="smime-encrypt-command">
@@ -28695,6 +29098,11 @@
 </para>
 </sect2>
 
+<sect2 id="smime-encrypt-self">
+  <title>smime_encrypt_self</title>
+  <note><para>Deprecated, since 2019-09-09</para></note>
+</sect2>
+
 <sect2 id="smime-encrypt-with">
 <title>smime_encrypt_with</title>
 <literallayout>Type: string
@@ -28830,6 +29238,11 @@
 </para>
 </sect2>
 
+<sect2 id="smime-self-encrypt-as">
+  <title>smime_self_encrypt_as</title>
+  <note><para>Renamed to <link linkend="smime-default-key">$smime_default_key</link> (2018-01-11)</para></note>
+</sect2>
+
 <sect2 id="smime-sign-as">
 <title>smime_sign_as</title>
 <literallayout>Type: string
@@ -29102,6 +29515,11 @@
 </para>
 </sect2>
 
+<sect2 id="sort-alias">
+  <title>sort_alias</title>
+  <note><para>Renamed to <link linkend="alias-sort">$alias_sort</link>(2024-11-19)</para></note>
+</sect2>
+
 <sect2 id="sort-aux">
 <title>sort_aux</title>
 <literallayout>Type: sort order
@@ -29135,6 +29553,11 @@
 </para>
 </sect2>
 
+<sect2 id="sort-browser">
+  <title>sort_browser</title>
+  <note><para>Renamed to <link linkend="browser-sort">$browser_sort</link>(2024-11-20)</para></note>
+</sect2>
+
 <sect2 id="sort-re">
 <title>sort_re</title>
 <literallayout>Type: boolean
@@ -29180,6 +29603,12 @@
 If not specified, then the environment variables <literal>$MAIL</literal> and
 <literal>$MAILDIR</literal> will be checked.
 </para>
+<note><para>Before 2021-03-21, this was called $spoolfile</para></note>
+</sect2>
+
+<sect2 id="spoolfile">
+  <title>spoolfile</title>
+  <note><para>Renamed to <link linkend="spool-file">$spool_file</link> (2021-03-21)</para></note>
 </sect2>
 
 <sect2 id="ssl-ca-certificates-file">
@@ -29273,6 +29702,16 @@
 </para>
 </sect2>
 
+<sect2 id="ssl-use-sslv2">
+  <title>ssl_use_sslv2</title>
+  <note><para>Deprecated, since 2025-12-07</para></note>
+</sect2>
+
+<sect2 id="ssl-use-sslv3">
+  <title>ssl_use_sslv3</title>
+  <note><para>Deprecated, since 2025-12-07</para></note>
+</sect2>
+
 <sect2 id="ssl-use-system-certs">
 <title>ssl_use_system_certs</title>
 <literallayout>Type: boolean
@@ -29283,6 +29722,17 @@
 system-wide certificate store when checking if a server certificate
 is signed by a trusted CA. (OpenSSL only)
 </para>
+<note><para>Before 2021-02-11, this was called $ssl_usesystemcerts</para></note>
+</sect2>
+
+<sect2 id="ssl-use-tlsv1">
+  <title>ssl_use_tlsv1</title>
+  <note><para>Deprecated, since 2025-12-07</para></note>
+</sect2>
+
+<sect2 id="ssl-use-tlsv1-1">
+  <title>ssl_use_tlsv1_1</title>
+  <note><para>Deprecated, since 2025-12-07</para></note>
 </sect2>
 
 <sect2 id="ssl-use-tlsv1-2">
@@ -29307,6 +29757,11 @@
 </para>
 </sect2>
 
+<sect2 id="ssl-usesystemcerts">
+  <title>ssl_usesystemcerts</title>
+  <note><para>Renamed to <link linkend="ssl-use-system-certs">$ssl_use_system_certs</link> (2021-02-11)</para></note>
+</sect2>
+
 <sect2 id="ssl-verify-dates">
 <title>ssl_verify_dates</title>
 <literallayout>Type: boolean
@@ -29685,6 +30140,12 @@
 If this variable is not set, the environment variable <literal>$TMPDIR</literal> is
 used.  Failing that, then "<literal>/tmp</literal>" is used.
 </para>
+<note><para>Before 2023-01-25, this was called $tmpdir</para></note>
+</sect2>
+
+<sect2 id="tmpdir">
+  <title>tmpdir</title>
+  <note><para>Renamed to <link linkend="tmp-dir">$tmp_dir</link> (2023-01-25)</para></note>
 </sect2>
 
 <sect2 id="tmp-draft-dir">
@@ -29775,6 +30236,7 @@
 Controls whether NeoMutt tries to set the terminal status line and icon name.
 Most terminal emulators emulate the status line in the window title.
 </para>
+<note><para>Before 2021-03-21, this was called $xterm_set_titles</para></note>
 </sect2>
 
 <sect2 id="ts-icon-format">
@@ -29787,6 +30249,7 @@
 This string is identical in formatting to the one used by
 "<link linkend="status-format">$status_format</link>".
 </para>
+<note><para>Before 2021-03-21, this was called $xterm_icon</para></note>
 </sect2>
 
 <sect2 id="ts-status-format">
@@ -29799,6 +30262,7 @@
 provided that "<link linkend="ts-enabled">$ts_enabled</link>" has been set. This string is identical in
 formatting to the one used by "<link linkend="status-format">$status_format</link>".
 </para>
+<note><para>Before 2021-03-21, this was called $xterm_title</para></note>
 </sect2>
 
 <sect2 id="tunnel">
@@ -29885,6 +30349,12 @@
 When <emphasis>set</emphasis>, NeoMutt will invoke <link linkend="sendmail">$sendmail</link> with the <literal>-B8BITMIME</literal>
 flag when sending 8-bit messages to enable ESMTP negotiation.
 </para>
+<note><para>Before 2021-03-21, this was called $use_8bitmime</para></note>
+</sect2>
+
+<sect2 id="use-8bitmime">
+  <title>use_8bitmime</title>
+  <note><para>Renamed to <link linkend="use-8bit-mime">$use_8bit_mime</link> (2021-03-21)</para></note>
 </sect2>
 
 <sect2 id="use-domain">
@@ -29916,6 +30386,7 @@
 if the <link linkend="sendmail">$sendmail</link> variable already contains <literal>-f</literal> or if the
 executable pointed to by <link linkend="sendmail">$sendmail</link> doesn't support the <literal>-f</literal> switch.
 </para>
+<note><para>Before 2021-03-21, this was called $envelope_from</para></note>
 </sect2>
 
 <sect2 id="use-from">
@@ -29990,6 +30461,11 @@
 </para>
 </sect2>
 
+<sect2 id="vfolder-format">
+  <title>vfolder_format</title>
+  <note><para>Deprecated, since 2018-11-01</para></note>
+</sect2>
+
 <sect2 id="virtual-spool-file">
 <title>virtual_spool_file</title>
 <literallayout>Type: boolean
@@ -30001,6 +30477,16 @@
 </para>
 </sect2>
 
+<sect2 id="virtual-spoolfile">
+  <title>virtual_spoolfile</title>
+  <note><para>Renamed to <link linkend="virtual-spool-file">$virtual_spool_file</link> (2021-02-11)</para></note>
+</sect2>
+
+<sect2 id="visual">
+  <title>visual</title>
+  <note><para>Deprecated, since 2021-03-18</para></note>
+</sect2>
+
 <sect2 id="wait-key">
 <title>wait_key</title>
 <literallayout>Type: boolean
@@ -30135,6 +30621,21 @@
 </para>
 </sect2>
 
+<sect2 id="xterm-icon">
+  <title>xterm_icon</title>
+  <note><para>Renamed to <link linkend="ts-icon-format">$ts_icon_format</link> (2021-03-21)</para></note>
+</sect2>
+
+<sect2 id="xterm-set-titles">
+  <title>xterm_set_titles</title>
+  <note><para>Renamed to <link linkend="ts-enabled">$ts_enabled</link> (2021-03-21)</para></note>
+</sect2>
+
+<sect2 id="xterm-title">
+  <title>xterm_title</title>
+  <note><para>Renamed to <link linkend="ts-status-format">$ts_status_format</link> (2021-03-21)</para></note>
+</sect2>
+
     </sect1>
 
     <sect1 id="functions">