; Merge NEWS.29.

(cherry picked from commit ce836aafaa581e5b713eb289071dbeed73166c99)

diff --git a/etc/NEWS.29 b/etc/NEWS.29
index 333699f1015d2dff1fc769015c236c594853573f..817534ee3aef15f82624f23c2e7e13b6a0e67236 100644 (file)
--- a/etc/NEWS.29
+++ b/etc/NEWS.29
@@ -15,11 +15,32 @@ in older Emacs versions.
 You can narrow news to a specific version by calling 'view-emacs-news'
 with a prefix argument or by typing 'C-u C-h C-n'.
 
-Temporary note:
-+++ indicates that all relevant manuals in doc/ have been updated.
---- means no change in the manuals is needed.
-When you add a new item, use the appropriate mark if you are sure it
-applies, and please also update docstrings as needed.
+\f
+* Installation Changes in Emacs 29.3
+
+\f
+* Startup Changes in Emacs 29.3
+
+\f
+* Changes in Emacs 29.3
+
+\f
+* Editing Changes in Emacs 29.3
+
+\f
+* Changes in Specialized Modes and Packages in Emacs 29.3
+
+\f
+* New Modes and Packages in Emacs 29.3
+
+\f
+* Incompatible Lisp Changes in Emacs 29.3
+
+\f
+* Lisp Changes in Emacs 29.3
+
+\f
+* Changes in Emacs 29.3 on Non-Free Operating Systems
 
 \f
 * Installation Changes in Emacs 29.2
@@ -43,36 +64,24 @@ more details.
 \f
 * Changes in Emacs 29.2
 
-\f
-* Editing Changes in Emacs 29.2
+This is a bug-fix release with no new features.
 
 \f
 * Changes in Specialized Modes and Packages in Emacs 29.2
 
 ** Tramp
 
-+++
 *** New user option 'tramp-show-ad-hoc-proxies'.
 When non-nil, ad-hoc definitions are kept in remote file names instead
 of showing the shortcuts.
 
-\f
-* New Modes and Packages in Emacs 29.2
-
 \f
 * Incompatible Lisp Changes in Emacs 29.2
 
-+++
 ** 'with-sqlite-transaction' rolls back changes if its BODY fails.
 If the BODY of the macro signals an error, or committing the results
 of the transaction fails, the changes will now be rolled back.
 
-\f
-* Lisp Changes in Emacs 29.2
-
-\f
-* Changes in Emacs 29.2 on Non-Free Operating Systems
-
 \f
 * Installation Changes in Emacs 29.1