Based on push to refs/heads/release by phw

en/config/options_metadata.html

@@ -226,15 +226,19 @@ <h1><span class="target" id="index-0"></span>Metadata Options<a class="headerlin
 right single quotation marks are converted to ASCII apostrophes (‘), and horizontal ellipses are converted to three
 full stops (…).</p>
 </div></blockquote>
+<p><strong>Use track and release relationships</strong></p>
+<blockquote>
+<div><p>Check to write track-level relationships (e.g.: composer, lyricist, performer, or remixer) to your files.</p>
+<div class="admonition note">
+<p class="admonition-title">Note</p>
+<p>Enabling this option also automatically enables the “Use release relationships” option, and that option cannot be disabled.</p>
+</div>
+</div></blockquote>
 <p><strong>Use release relationships</strong></p>
 <blockquote>
 <div><p>Check to retrieve and write release-level relationships (e.g.: URLs, composer, lyricist, performer, conductor, or DJ mixer)
 to your files. You must have this enabled to use Picard to retrieve cover art.</p>
 </div></blockquote>
-<p><strong>Use track relationships</strong></p>
-<blockquote>
-<div><p>Check to write track-level relationships (e.g.: composer, lyricist, performer, or remixer) to your files.</p>
-</div></blockquote>
 <p><strong>Guess track number and title from filename if empty</strong></p>
 <blockquote>
 <div><p>If checked, Picard will try to guess a file’s track number or title from the filename if the <code class="docutils literal notranslate"><span class="pre">tracknumber</span></code>

en/genindex.html

@@ -828,7 +828,7 @@ <h2 id="I">I</h2>
     identifier
 
       <ul>
-        <li><a href="variables/tags_basic.html#index-1">musicbrainz</a>
+        <li><a href="variables/tags_advanced.html#index-1">musicbrainz</a>, <a href="variables/tags_basic.html#index-1">[1]</a>, <a href="variables/variables_advanced.html#index-1">[2]</a>, <a href="variables/variables_basic.html#index-1">[3]</a>
 </li>
       </ul></li>
       <li>
@@ -908,7 +908,7 @@ <h2 id="M">M</h2>
   <td style="width: 33%; vertical-align: top;"><ul>
       <li><a href="usage/match.html#index-0">matching files to tracks</a>
 </li>
-      <li><a href="variables/tags_basic.html#index-1">mbid</a>
+      <li><a href="variables/tags_advanced.html#index-1">mbid</a>, <a href="variables/tags_basic.html#index-1">[1]</a>, <a href="variables/variables_advanced.html#index-1">[2]</a>, <a href="variables/variables_basic.html#index-1">[3]</a>
 
       <ul>
         <li>
@@ -1185,7 +1185,7 @@ <h2 id="T">T</h2>
 </li>
         <li><a href="faq/faq_file_formats.html#index-1">editing</a>
 </li>
-        <li><a href="variables/tags_advanced.html#index-1">genre</a>
+        <li><a href="variables/tags_advanced.html#index-2">genre</a>
 </li>
         <li><a href="appendices/tag_mapping.html#index-0">mapping</a>
 </li>

en/pdf.html

@@ -236,15 +236,24 @@ <h1>MusicBrainz Picard<a class="headerlink" href="#musicbrainz-picard" title="Pe
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="variables/variables.html">Tags &amp; Variables</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="variables/tags_basic.html">Basic Tags</a></li>
+<li class="toctree-l2"><a class="reference internal" href="variables/tags_basic.html">Basic Tags</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="variables/tags_basic.html#tags-provided-from-musicbrainz-data">Tags Provided from MusicBrainz Data</a></li>
+<li class="toctree-l3"><a class="reference internal" href="variables/tags_basic.html#tags-not-provided-from-musicbrainz-data">Tags Not Provided from MusicBrainz Data</a></li>
+<li class="toctree-l3"><a class="reference internal" href="variables/tags_basic.html#itunes-specific-tags">iTunes-Specific Tags</a></li>
+</ul>
+</li>
 <li class="toctree-l2"><a class="reference internal" href="variables/tags_advanced.html">Advanced Tags</a><ul>
 <li class="toctree-l3"><a class="reference internal" href="variables/tags_advanced.html#track-relationship-tags">Track Relationship Tags</a></li>
 <li class="toctree-l3"><a class="reference internal" href="variables/tags_advanced.html#genre-tags">Genre Tags</a></li>
 </ul>
 </li>
 <li class="toctree-l2"><a class="reference internal" href="variables/variables_basic.html">Basic Variables</a></li>
 <li class="toctree-l2"><a class="reference internal" href="variables/variables_file.html">File Variables</a></li>
-<li class="toctree-l2"><a class="reference internal" href="variables/variables_advanced.html">Advanced Variables</a></li>
+<li class="toctree-l2"><a class="reference internal" href="variables/variables_advanced.html">Advanced Variables</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="variables/variables_advanced.html#release-relationship-variables">Release Relationship Variables</a></li>
+<li class="toctree-l3"><a class="reference internal" href="variables/variables_advanced.html#track-relationship-variables">Track Relationship Variables</a></li>
+</ul>
+</li>
 <li class="toctree-l2"><a class="reference internal" href="variables/variables_classical.html">Classical Music Tags</a></li>
 <li class="toctree-l2"><a class="reference internal" href="variables/variables_plugins.html">Tags from Plugins</a><ul>
 <li class="toctree-l3"><a class="reference internal" href="variables/variables_plugins.html#last-fm-plugin">Last.fm Plugin</a></li>

en/troubleshooting/troubleshooting.html

@@ -159,7 +159,7 @@ <h1><span class="target" id="index-0"></span>General Troubleshooting<a class="he
 <h2>Getting Help<a class="headerlink" href="#getting-help" title="Permalink to this headline"></a></h2>
 <p>If you have problems using Picard, please first check the following resources:</p>
 <ul class="simple">
-<li><p>For general usage information see the <a class="reference internal" href="../usage/using.html"><span class="doc">Using Picard</span></a> documentation and the <a class="reference external" href="https://picard.musicbrainz.org/docs/guide/">illustrated quick start guide</a>.</p></li>
+<li><p>For general usage information see the <a class="reference internal" href="../usage/using.html"><span class="doc">Using Picard</span></a> documentation and the <a class="reference external" href="https://picard.musicbrainz.org/quick-start/">illustrated quick start guide</a>.</p></li>
 <li><p>Read the <a class="reference internal" href="../faq/faq.html"><span class="doc">FAQ section</span></a> for common questions and problems.</p></li>
 <li><p>Consult the <a class="reference external" href="https://community.metabrainz.org/c/picard">community forums</a>.</p></li>
 <li><p>Check the <a class="reference external" href="https://picard.musicbrainz.org/downloads/">download page</a> for a newer version of Picard which might

en/variables/tags_advanced.html

@@ -159,24 +159,22 @@
 
   <div class="section" id="advanced-tags">
 <h1><span class="target" id="index-0"></span>Advanced Tags<a class="headerlink" href="#advanced-tags" title="Permalink to this headline"></a></h1>
-<p>You can make additional tags available by enabling the <a class="reference internal" href="../config/options_metadata.html"><span class="doc">Use track relationships</span></a> and the
-<a class="reference internal" href="../config/options_genres.html"><span class="doc">Use genres from MusicBrainz</span></a> settings in Picard.</p>
+<p>You can make additional tags available by enabling the <a class="reference internal" href="../config/options_metadata.html"><span class="doc">Use track relationships</span></a> and/or the <a class="reference internal" href="../config/options_genres.html"><span class="doc">Use genres from MusicBrainz</span></a> settings in Picard.</p>
+<p>Some tags provide the <span class="target" id="index-1"></span>MusicBrainz Identifier (MBID) of the entity. The MBID is a 32-character identifier assigned to an entity (e.g.: artist, album, track or work) to uniquely identify the entity. For more information about MBIDs, please see the <a class="reference external" href="https://musicbrainz.org/doc/MusicBrainz_Identifier">MusicBrainz Identifier</a> page in the MusicBrainz documentation.</p>
 <div class="admonition note">
 <p class="admonition-title">Note</p>
-<p>Tags will not be created and will not be available as variables if there was no value retrieved for the tag
-from the MusicBrainz database.</p>
+<p>Tags will not be created and will not be available as variables if there was no value retrieved for the tag from the MusicBrainz database.</p>
 </div>
 <div class="admonition note">
 <p class="admonition-title">Note</p>
-<p>Some of these tags are only supported for certain file types or tag formats.  Please see the <a class="reference internal" href="../appendices/tag_mapping.html"><span class="doc">Picard Tag Mapping</span></a> section for details.</p>
+<p>Some of these tags are only supported for certain file types or tag formats. Please see the <a class="reference internal" href="../appendices/tag_mapping.html"><span class="doc">Picard Tag Mapping</span></a> section for details.</p>
 </div>
 <div class="section" id="track-relationship-tags">
 <span id="advanced-relationships"></span><h2>Track Relationship Tags<a class="headerlink" href="#track-relationship-tags" title="Permalink to this headline"></a></h2>
-<p>If you enable tagging with “Use track relationships”, you get these extra tags:</p>
+<p>If you enable “Use track relationships” in the Option settings, you get these extra tags:</p>
 <p><strong>arranger</strong></p>
 <blockquote>
-<div><p>The names of the arrangers associated with the track.  These can include the instrument and orchestra arrangers,
-and could be associated with the release, recording or work. (<em>since Picard 0.10</em>)</p>
+<div><p>The names of the arrangers associated with the track. These can include the instrument and orchestra arrangers, and could be associated with the release, recording or work. (<em>since Picard 0.10</em>)</p>
 </div></blockquote>
 <p><strong>composer</strong></p>
 <blockquote>
@@ -188,12 +186,11 @@ <h1><span class="target" id="index-0"></span>Advanced Tags<a class="headerlink"
 </div></blockquote>
 <p><strong>conductor</strong></p>
 <blockquote>
-<div><p>Tha names of the conductors associated with the track.  These can include the conductor and chorus master, and could
-be associated with the release or recording.</p>
+<div><p>The names of the conductors associated with the track. These can include the conductor and chorus master, and could be associated with the release or recording.</p>
 </div></blockquote>
 <p><strong>director</strong></p>
 <blockquote>
-<div><p>The director of a track as provided by the Video Director or Audio Director relationship in MusicBrainz.  (<em>Since Picard 2.6, updated in Picard 2.9</em>)</p>
+<div><p>The director of a track as provided by the <em>Video Director</em> or <em>Audio Director</em> relationship in MusicBrainz. (<em>Since Picard 2.6, updated in Picard 2.9</em>)</p>
 </div></blockquote>
 <p><strong>djmixer</strong></p>
 <blockquote>
@@ -203,6 +200,10 @@ <h1><span class="target" id="index-0"></span>Advanced Tags<a class="headerlink"
 <blockquote>
 <div><p>The names of the engineers associated with the track.</p>
 </div></blockquote>
+<p><strong>language</strong></p>
+<blockquote>
+<div><p>Work lyric language as per <a class="reference external" href="https://en.wikipedia.org/wiki/ISO_639-3">ISO 639-3</a> if a related work exists. (<em>since Picard 0.10</em>)</p>
+</div></blockquote>
 <p><strong>license</strong></p>
 <blockquote>
 <div><p>The licenses associated with the track, either through the release or recording relationships. (<em>since Picard 1.0</em>)</p>
@@ -213,27 +214,25 @@ <h1><span class="target" id="index-0"></span>Advanced Tags<a class="headerlink"
 </div></blockquote>
 <p><strong>mixer</strong></p>
 <blockquote>
-<div><p>The names of the “Mixed By” engineers associated with the track. (<em>since Picard 0.9</em>)</p>
+<div><p>The names of the “<em>Mixed By</em>” engineers associated with the track. (<em>since Picard 0.9</em>)</p>
+</div></blockquote>
+<p><strong>musicbrainz_workid</strong></p>
+<blockquote>
+<div><p>The MBID for the Work if a related work exists.</p>
 </div></blockquote>
 <p><strong>performer:&lt;type&gt;</strong></p>
 <blockquote>
-<div><p>The names of the performers for the specified type.  These types include:</p>
+<div><p>The names of the performers for the specified type. These types include:</p>
 <ul class="simple">
-<li><p>vocals or instruments for the associated release or recording, where &lt;type&gt; can be “vocal”, “guest guitar”, “solo violin”, etc.</p></li>
-<li><p>the orchestra for the associated release or recording, where &lt;type&gt; is “orchestra”</p></li>
-<li><p>the concert master for the associated release or recording, where &lt;type&gt; is “concertmaster”</p></li>
+<li><p>vocals or instruments for the associated release or recording, where &lt;type&gt; can be “<em>vocal</em>”, “<em>guest guitar</em>”, “<em>solo violin</em>”, etc.</p></li>
+<li><p>the orchestra for the associated release or recording, where &lt;type&gt; is “<em>orchestra</em>”</p></li>
+<li><p>the concert master for the associated release or recording, where &lt;type&gt; is “<em>concertmaster</em>”</p></li>
 </ul>
 </div></blockquote>
 <p><strong>producer</strong></p>
 <blockquote>
 <div><p>The names of the producers for the associated release or recording.</p>
 </div></blockquote>
-<p><strong>releasedate</strong></p>
-<blockquote>
-<div><p>Explicit tag for the release date (<em>since Picard 2.9</em>).  This tag exists for specific use in scripts and plugins,
-but is not filled by default.  In most cases it is recommended to use the <code class="docutils literal notranslate"><span class="pre">date</span></code> tag instead for compatibility
-with existing software.</p>
-</div></blockquote>
 <p><strong>remixer</strong></p>
 <blockquote>
 <div><p>The names of the remixer engineers associated with the track.</p>
@@ -244,19 +243,22 @@ <h1><span class="target" id="index-0"></span>Advanced Tags<a class="headerlink"
 </div></blockquote>
 <p><strong>writer</strong></p>
 <blockquote>
-<div><p>The names of the writers associated with the related work. (<em>since Picard 1.0</em>). This is not written to most file formats automatically.
-You can merge this with composers with a script like:</p>
+<div><p>A multi-value tag containing the names of the writers associated with the related work. (<em>since Picard 1.0</em>). This is not written to most file formats automatically. You can merge this with composers with a script like:</p>
 <div class="highlight-taggerscript notranslate"><div class="highlight"><pre><span></span><span class="k">$copymerge(</span>composer, writer<span class="k">)</span>
 </pre></div>
 </div>
 </div></blockquote>
+<div class="admonition note">
+<p class="admonition-title">Note</p>
+<p>Some tags such as <strong>performer</strong> are available as both track and release level relationships, and the values may be different depending on which relationship options are enabled.</p>
+</div>
 </div>
 <div class="section" id="genre-tags">
-<span id="genre-settings"></span><h2><span class="target" id="index-1"></span>Genre Tags<a class="headerlink" href="#genre-tags" title="Permalink to this headline"></a></h2>
+<span id="genre-settings"></span><h2><span class="target" id="index-2"></span>Genre Tags<a class="headerlink" href="#genre-tags" title="Permalink to this headline"></a></h2>
 <p>If you enable “Use genres from MusicBrainz”, you get:</p>
 <p><strong>genre</strong></p>
 <blockquote>
-<div><p>Genre information from MusicBrainz (<em>since Picard 2.1, earlier versions used folksonomy tags</em>)</p>
+<div><p>A multi-value tag containing the specified genre information from MusicBrainz (<em>since Picard 2.1, earlier versions used folksonomy tags</em>)</p>
 </div></blockquote>
 </div>
 </div>