4 files changed, 45 insertions, 30 deletions

diff --git a/docs/API b/docs/API
index 074e82bbbc..bd2eb22204 100644
--- a/docs/API
+++ b/docs/API
@@ -197,14 +197,6 @@ Memory allocation
      each and returns a pointer to the allocated memory. The memory is set to
      zero.
 
-ID3
-
-  #include <id3.h>
-  bool mp3info(mp3entry *entry, char *filename);
-
-     Return FALSE if successful. The given mp3entry is then filled in with
-     whatever id3 info it could find about the given file.
-
 Various
 
   #include <kernel.h>
diff --git a/docs/CREDITS b/docs/CREDITS
index fba9aed0d3..a4b23cd412 100644
--- a/docs/CREDITS
+++ b/docs/CREDITS
@@ -720,6 +720,14 @@ JJ Style
 Jerry Chapman
 Leander Lismond
 Eren Akpolat
+Pierluigi Vicinanza
+Matteo Italia
+Evan Kenny
+Medu Hedan
+Uwe Schächterle
+Hoseok Seo
+Paul Sauro
+Dmitry Prozorov
 
 The libmad team
 The wavpack team
@@ -761,3 +769,5 @@ The bsdiff team
 The libtomcrypt team
 The microtar team (rxi and others)
 The UnifontEX and GNU Unifont teams
+The xrick team
+The Terminus Font team
diff --git a/docs/MAINTAINERS b/docs/MAINTAINERS
index 07ab71c7bc..51df883aa8 100644
--- a/docs/MAINTAINERS
+++ b/docs/MAINTAINERS
@@ -11,7 +11,7 @@ Rockbox Maintainers
 This file lists the people maintaining the different parts of the
 Rockbox project.
 
-Note that there as of 2024-06, this file is pretty out of date.  There
+Note that there as of 2024-07, this file is pretty out of date.  There
 are only a handful of active contributors that try to maintain
 everything, and the best way to reach them is via the #rockbox IRC
 channel on libera.chat.
@@ -27,11 +27,13 @@ NOTE: Port maintainers are simply developers who use a particular
 target on a daily basis and are therefore able to report issues
 specific to that target.
 
-:AGPTek Rocker:Solomon Peachy
+:AGPTek Rocker: Solomon Peachy
 :Creative Zen Vision:
 :Creative Zen Vision:M: Maurus Cuelenaere
 :Creative Zen Vision:M 60GB:
-:Eros Q / K:Solomon Peachy
+:Eros Q / K (hosted): Solomon Peachy
+:Eros Q / K (native): Dana Conrad
+:FiiO M3K: Aidan MacDonald
 :Iriver H100/H115: Linus Nielsen Feltzing
 :Iriver H120/H140: Miika Pekkarinen, Linus Nielsen Feltzing
 :Iriver H320/H340: Peter D'Hoye
@@ -41,6 +43,7 @@ specific to that target.
 :Ipod 4th Gen Grayscale:
 :Ipod Color/Photo: Dave Chapman
 :Ipod Video:
+:Ipod Classic:
 :Ipod Mini 1st Gen:
 :Ipod Mini 2nd Gen: Jens Arnold
 :Ipod Nano 1st Gen: Thom Johansen
@@ -51,6 +54,7 @@ specific to that target.
 :Iaudio M5: Marianne Arnold
 :Iaudio M3: Jens Arnold
 :Onda VX747: Maurus Cuelenaere
+:Shanling Q1: Aidan MacDonald
 :Sansa E200: Michael Sevakis, Barry Wardell
 :Sansa E200R:
 :Sansa C200:
@@ -67,7 +71,7 @@ Core code (low-level)
 :LCD drivers: Michael Sevakis, Jens Arnold
 :Button drivers: Michael Sevakis
 :Rolo:
-:ATA driver: Michael Sevakis
+:ATA driver: Solomon Peachy
 :MMC driver: Jens Arnold
 :SD driver: Barry Wardell
 :FAT driver: Linus Nielsen Feltzing
@@ -90,23 +94,23 @@ Core code (Mid-level)
 :Profiling:
 :Screens API and GUI widgets: Kévin Ferrare
 :Settings API: Jonathan Gordon
-:Language API:
+:Language API: Solomon Peachy
 :Menu API: Jonathan Gordon
-:Button actions: Jonathan Gordon
+:Button actions: William Wilgus, Jonathan Gordon
 
 
 Core code (high-level)
 ----------------------
 
 :Bookmarks: Magnus Holmgren
-:Cuesheet support: Nicolas Pennequin
+:Cuesheet support: William Wilgus, Nicolas Pennequin
 :Database: Miika Pekkarinen
 :Playlists:
 :Radio UI:
 :Recording UI: Peter D'Hoye
-:Voice UI: Stéphane Doyon
+:Voice UI: Solomon Peachy
 :WPS: Nicolas Pennequin
-:User interface: Jonathan Gordon
+:User interface: William Wilgus, Jonathan Gordon
 
 
 Metadata parsing
@@ -116,7 +120,7 @@ NOTE: Format-specific container format parsing is maintained by the
 relevant codec maintainer.
 
 :General:
-:ID3v1/v2: Linus Nielsen Feltzing
+:ID3v1/v2: William Wilgus, Linus Nielsen Feltzing
 :Vorbis Comments:
 :APEv2:
 
@@ -128,6 +132,7 @@ the person(s) named next to "General".
 
 :General: Solomon Peachy
 :German: Wilfried Winkler
+:Italian: Alessio Lenzi
 :Polish: Adam Rak
 
 Plugins
@@ -139,8 +144,11 @@ Plugins
 :XLCD library:
 
 :alpine_cdc:
+:announce_status: William Wilgus
+:amaze: Solomon Peachy
 :battery_bench:
 :blackjack:
+:boomshine: William Wilgus
 :bounce: Daniel Stenberg
 :brickmania:
 :bubbles:
@@ -154,6 +162,7 @@ Plugins
 :credits:
 :cube:
 :demystify: Kévin Ferrare
+:db_commit: William Wilgus
 :dice:
 :dict:
 :disktidy:
@@ -172,18 +181,24 @@ Plugins
 :jewels: Antoine Cellerier
 :jpeg:
 :keybox: Nils Wallménius
+:keyremap: William Wilgus
+:lastfm_scrobbler: William Wilgus
 :logo:
+:lua: William Wilgus
 :mandelbrot: Jens Arnold
 :maze:
 :mazezam:
 :metronome:
 :midi2wav: Stepan Moskovchenko (though it's deprecated in favor of midiplay)
 :midiplay: Stepan Moskovchenko
+:mikmod: Solomon Peachy
 :minesweeper: Antoine Cellerier
 :mosaique:
 :mp3_encoder:
 :mpegplayer: Michael Sevakis
+:multiboot_select:
 :nim:
+:open_plugins: William Wilgus
 :oscilloscope: Jens Arnold
 :pacbox: Dave Chapman
 :plasma:
@@ -196,6 +211,7 @@ Plugins
 :rockboy:
 :rocklife: Antoine Cellerier
 :rockpaint: Antoine Cellerier
+:sdl: Franklin Wei
 :search: Linus Nielsen Feltzing
 :sliding_puzzle:
 :snake:
@@ -227,6 +243,7 @@ Plugins
 :wavview: Peter D'Hoye
 :wormlet:
 :xobox: Antoine Cellerier
+:xrick: Solomon Peachy
 :zxbox:
 
 
@@ -245,6 +262,7 @@ Codecs (Playback)
 :Musepack: Thom Johansen
 :NSF:
 :Ogg Vorbis:
+:Opus:
 :Shorten:
 :SID:
 :SPC: Michael Sevakis
@@ -267,12 +285,14 @@ Codecs (Recording)
 Bootloaders
 -----------
 
+:HibyOS: Solomon Peachy
 :Iriver H1xx/H3xx: Miika Pekkarinen, Linus Nielsen Feltzing
 :Iaudio X5/M5: Linus Nielsen Feltzing
 :PortalPlayer (not ipod): Barry Wardell
 :Ipod: Dave Chapman
 :Gigabeat F/X: Barry Wardell
-
+:xDuoo X3: Solomon Peachy
+:x1000: Aidan MacDonald
 
 Build Tools
 -----------
@@ -288,12 +308,13 @@ Build Tools
 :codepages:
 :uclpack:
 :wavtrim: Linus Nielsen Feltzing
-:voicefont:
+:voicefont: Solomon Peachy
 :scramble: Linus Nielsen Feltzing
 :descramble: Linus Nielsen Feltzing
 :mkinfo: Daniel Stenberg
 :voice.pl: Solomon Peachy
-:genlang/updatelang: Solomon Peachy
+:genlang: Solomon Peachy
+:updatelang: Solomon Peachy
 
 Install Tools
 -------------
@@ -303,11 +324,10 @@ Install Tools
 :sansapatcher: Dave Chapman, Barry Wardell
 :e200rpatcher: Dave Chapman
 
-
 Manual
 ------
 
-:Manual build system:
+:Manual build system: Solomon Peachy
 [What to put here - maintainers for chapters?]
 
 Utilities
diff --git a/docs/PLUGIN_API b/docs/PLUGIN_API
index 29a7829b32..4760ecede2 100644
--- a/docs/PLUGIN_API
+++ b/docs/PLUGIN_API
@@ -1324,13 +1324,6 @@ time_t mktime(struct tm *t)
     \return
     \description
 
-bool mp3info(struct mp3entry *entry, const char *filename)
-    \group misc
-    \param entry
-    \param filename
-    \return FALSE if successfull
-    \description The given =entry= is filled in with whatever id3 info it could find about the given =filename=
-
 void mutex_init(struct mutex *m)
     \group kernel/ system
     \param m