Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

diff --cc etc/NEWS
index 44ffbaf78f2cfa354ddbf1fd58bf020a8a82db77,a8e7d97df7ef3a1864197cf71b364b2d1b4f9a7e..39b4a35930a7a3293ebe467aaa39e060ccb725d6
--- 1/etc/NEWS
--- 2/etc/NEWS
+++ b/etc/NEWS
@@@ -567,16 -567,11 +567,21 @@@ Similarly to buffer restoration by Desk
  of the accessibility of remote files can now time out if
  'remote-file-name-access-timeout' is set to a positive number.
  
 +** Notifications
 +
 ++++
 +*** Allow to use Icon Naming Specification for app-icon
 +You can use a symbol as the value for ':app-icon' to provide icon name
 +without specifying a file, like this:
 +
 +  (notifications-notify
 +    :title "I am playing music" :app-icon 'multimedia-player)
 +
+ ** Image Dired
+ 
+ *** New user option 'image-dired-thumb-naming'.
+ You can now configure how a thumbnail is named using this option.
+ 
  \f
  * New Modes and Packages in Emacs 30.1