diff options
| author | Max Kellermann <max@duempel.org> | 2012-08-14 23:58:54 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2012-08-14 23:58:54 +0200 |
| commit | 7d27d2ea5e8b622a288c80518bc0daec53dbbc93 (patch) | |
| tree | b1b9e98369919d66869b3ff1626372bf16a38c23 /doc | |
| parent | 5cc3338267214eb050e39bc509d8b4258cec6afd (diff) | |
| parent | dc22846d58264bfae3b4516e2de1614b3b97a5ca (diff) | |
| download | mpd-7d27d2ea5e8b622a288c80518bc0daec53dbbc93.tar.gz mpd-7d27d2ea5e8b622a288c80518bc0daec53dbbc93.tar.xz mpd-7d27d2ea5e8b622a288c80518bc0daec53dbbc93.zip | |
Merge branch 'v0.17.x'
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/mpd.conf.5 | 11 | ||||
| -rw-r--r-- | doc/mpdconf.example | 7 |
2 files changed, 9 insertions, 9 deletions
diff --git a/doc/mpd.conf.5 b/doc/mpd.conf.5 index d15d0fdab..d502e0564 100644 --- a/doc/mpd.conf.5 +++ b/doc/mpd.conf.5 @@ -252,11 +252,12 @@ when saving playlists. The default is "no". This specifies the tag types that will be scanned for and made available to clients. Note that you must recreate (not update) your database for changes to this parameter to take effect. Possible values are artist, album, title, -track, name, genre, date, composer, performer, comment, and disc. Multiple -tags may be specified as a comma separated list. An example value is -"artist,album,title,track". The special value "none" may be used alone to -disable all metadata. The default is to use all known tag types except for -comments. +track, name, genre, date, composer, performer, comment, disc, +musicbrainz_artistid, musicbrainz_albumid, musicbrainz_albumartistid, +musicbrainz_trackid. Multiple tags may be specified as a comma separated list. +An example value is "artist,album,title,track". The special value "none" may +be used alone to disable all metadata. The default is to use all known tag +types except for comments and those starting with "musicbrainz". .TP .B auto_update <yes or no> This specifies the wheter to support automatic update of music database when diff --git a/doc/mpdconf.example b/doc/mpdconf.example index 0045d31ab..8cae72e94 100644 --- a/doc/mpdconf.example +++ b/doc/mpdconf.example @@ -113,10 +113,9 @@ # #save_absolute_paths_in_playlists "no" # -# This setting defines a list of tag types that will be extracted during the -# audio file discovery process. Optionally, 'comment' can be added to this -# list. -# +# This setting defines a list of tag types that will be extracted during the +# audio file discovery process. The complete list of possible values can be +# found in the mpd.conf man page. #metadata_to_use "artist,album,title,track,name,genre,date,composer,performer,disc" # # This setting enables automatic update of MPD's database when files in |