From 59da778009eaabacc2c648bfd00c395b0112c123 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20M=C3=BCller?= <wolf@oriole.systems>
Date: Sun, 13 Feb 2022 15:22:11 +0100
Subject: [PATCH 1/2] doc/user.rst: Clarify how MPD reads metadata

The writing and reading of metadata involves lots of different programs
and libraries. Therefore it is prudent to point out how exactly MPD
receives metadata. Ideally this helps to point users to the right place
if their tags are not picked up correctly.
---
 doc/user.rst | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/doc/user.rst b/doc/user.rst
index a273def79..dc5af8f5a 100644
--- a/doc/user.rst
+++ b/doc/user.rst
@@ -1103,6 +1103,15 @@ See :ref:`tags` for a list of supported tags.
 The :ref:`metadata_to_use <metadata_to_use>` setting can be used to
 enable or disable certain tags.
 
+Note that :program:`MPD` may not necessarily read metadata itself,
+instead relying on data reported by the decoder that was used to read
+a file. For example, this is the case for the FFmpeg decoder: both
+:program:`MPD` and FFmpeg need to support a given metadata format in
+order for metadata to be picked up correctly.
+
+Only if a decoder does not have metadata support will :program:`MPD`
+attempt to parse a song's metadata itself.
+
 The queue
 ---------
 

From 233184568cd21c69510a46583de78936323c7f86 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@musicpd.org>
Date: Mon, 14 Feb 2022 08:55:47 +0100
Subject: [PATCH 2/2] doc/protocol.rst: describe the FILTER argument to
 playlist{find,search}

---
 doc/protocol.rst | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/doc/protocol.rst b/doc/protocol.rst
index 24f9fb80f..aa62e3afb 100644
--- a/doc/protocol.rst
+++ b/doc/protocol.rst
@@ -773,8 +773,8 @@ Whenever possible, ids should be used.
 .. _command_playlistfind:
 
 :command:`playlistfind {FILTER}`
-    Finds songs in the queue with strict
-    matching.
+    Search the queue for songs matching
+    ``FILTER`` (see :ref:`Filters <filter_syntax>`).
 
 .. _command_playlistid:
 
@@ -794,8 +794,10 @@ Whenever possible, ids should be used.
 .. _command_playlistsearch:
 
 :command:`playlistsearch {FILTER}`
-    Searches case-insensitively for partial matches in the
-    queue.
+    Search the queue for songs matching
+    ``FILTER`` (see :ref:`Filters <filter_syntax>`).
+    Parameters have the same meaning as for :ref:`find
+    <command_playlistfind>`, except that search is not case sensitive.
 
 .. _command_plchanges: