diff --git a/options.html b/options.html
index b22cecf54..5067d037d 100644
--- a/options.html
+++ b/options.html
@@ -833,7 +833,7 @@ are symbolic links to the files of the source directory.</p><p><span class="emph
 is non-null then this option will automatically point to a file
 containing that text.</p><p><span class="emphasis"><em>Type:</em></span> path</p><p><span class="emphasis"><em>Declared by:</em></span></p><table border="0" summary="Simple list" class="simplelist"><tr><td><code class="filename"><a class="filename" href="https://github.com/nix-community/home-manager/blob/master/modules/files.nix#blob-path" target="_top">
                     &lt;home-manager/modules/files.nix&gt;
-                </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-home.file._name_.target"></a><a class="term" href="options.html#opt-home.file._name_.target"><code class="option">home.file.&lt;name&gt;.target</code></a></span></dt><dd><p>Path to target file relative to <code class="envar">HOME</code>.</p><p><span class="emphasis"><em>Type:</em></span> string</p><p><span class="emphasis"><em>Default:</em></span> <code class="literal">&lt;name&gt;</code></p><p><span class="emphasis"><em>Declared by:</em></span></p><table border="0" summary="Simple list" class="simplelist"><tr><td><code class="filename"><a class="filename" href="https://github.com/nix-community/home-manager/blob/master/modules/files.nix#blob-path" target="_top">
+                </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-home.file._name_.target"></a><a class="term" href="options.html#opt-home.file._name_.target"><code class="option">home.file.&lt;name&gt;.target</code></a></span></dt><dd><p>Path to target file relative to <code class="envar">HOME</code>.</p><p><span class="emphasis"><em>Type:</em></span> string</p><p><span class="emphasis"><em>Default:</em></span> <code class="literal">name</code></p><p><span class="emphasis"><em>Declared by:</em></span></p><table border="0" summary="Simple list" class="simplelist"><tr><td><code class="filename"><a class="filename" href="https://github.com/nix-community/home-manager/blob/master/modules/files.nix#blob-path" target="_top">
                     &lt;home-manager/modules/files.nix&gt;
                 </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-home.file._name_.text"></a><a class="term" href="options.html#opt-home.file._name_.text"><code class="option">home.file.&lt;name&gt;.text</code></a></span></dt><dd><p>Text of the file. If this option is null then
 <a class="xref" href="options.html#opt-home.file._name_.source"><code class="option">home.file.&lt;name&gt;.source</code></a>
@@ -10085,14 +10085,14 @@ directory structure matching the source's but whose leafs
 are symbolic links to the files of the source directory.</p><p><span class="emphasis"><em>Type:</em></span> boolean</p><p><span class="emphasis"><em>Default:</em></span> <code class="literal">false</code></p><p><span class="emphasis"><em>Declared by:</em></span></p><table border="0" summary="Simple list" class="simplelist"><tr><td><code class="filename"><a class="filename" href="https://github.com/nix-community/home-manager/blob/master/modules/misc/xdg.nix#blob-path" target="_top">
                     &lt;home-manager/modules/misc/xdg.nix&gt;
                 </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-xdg.configFile._name_.source"></a><a class="term" href="options.html#opt-xdg.configFile._name_.source"><code class="option">xdg.configFile.&lt;name&gt;.source</code></a></span></dt><dd><p>Path of the source file or directory. If
-<a class="xref" href="options.html#opt-home.file._name_.text"><code class="option">home.file.&lt;name&gt;.text</code></a>
+<a class="xref" href="options.html#opt-xdg.configFile._name_.text"><code class="option">xdg.configFile.&lt;name&gt;.text</code></a>
 is non-null then this option will automatically point to a file
 containing that text.</p><p><span class="emphasis"><em>Type:</em></span> path</p><p><span class="emphasis"><em>Declared by:</em></span></p><table border="0" summary="Simple list" class="simplelist"><tr><td><code class="filename"><a class="filename" href="https://github.com/nix-community/home-manager/blob/master/modules/misc/xdg.nix#blob-path" target="_top">
                     &lt;home-manager/modules/misc/xdg.nix&gt;
-                </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-xdg.configFile._name_.target"></a><a class="term" href="options.html#opt-xdg.configFile._name_.target"><code class="option">xdg.configFile.&lt;name&gt;.target</code></a></span></dt><dd><p>Path to target file relative to <code class="varname">xdg.configHome</code>.</p><p><span class="emphasis"><em>Type:</em></span> string</p><p><span class="emphasis"><em>Default:</em></span> <code class="literal">&lt;name&gt;</code></p><p><span class="emphasis"><em>Declared by:</em></span></p><table border="0" summary="Simple list" class="simplelist"><tr><td><code class="filename"><a class="filename" href="https://github.com/nix-community/home-manager/blob/master/modules/misc/xdg.nix#blob-path" target="_top">
+                </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-xdg.configFile._name_.target"></a><a class="term" href="options.html#opt-xdg.configFile._name_.target"><code class="option">xdg.configFile.&lt;name&gt;.target</code></a></span></dt><dd><p>Path to target file relative to <code class="varname">xdg.configHome</code>.</p><p><span class="emphasis"><em>Type:</em></span> string</p><p><span class="emphasis"><em>Default:</em></span> <code class="literal">name</code></p><p><span class="emphasis"><em>Declared by:</em></span></p><table border="0" summary="Simple list" class="simplelist"><tr><td><code class="filename"><a class="filename" href="https://github.com/nix-community/home-manager/blob/master/modules/misc/xdg.nix#blob-path" target="_top">
                     &lt;home-manager/modules/misc/xdg.nix&gt;
                 </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-xdg.configFile._name_.text"></a><a class="term" href="options.html#opt-xdg.configFile._name_.text"><code class="option">xdg.configFile.&lt;name&gt;.text</code></a></span></dt><dd><p>Text of the file. If this option is null then
-<a class="xref" href="options.html#opt-home.file._name_.source"><code class="option">home.file.&lt;name&gt;.source</code></a>
+<a class="xref" href="options.html#opt-xdg.configFile._name_.source"><code class="option">xdg.configFile.&lt;name&gt;.source</code></a>
 must be set.</p><p><span class="emphasis"><em>Type:</em></span> null or strings concatenated with "\n"</p><p><span class="emphasis"><em>Default:</em></span> <code class="literal">null</code></p><p><span class="emphasis"><em>Declared by:</em></span></p><table border="0" summary="Simple list" class="simplelist"><tr><td><code class="filename"><a class="filename" href="https://github.com/nix-community/home-manager/blob/master/modules/misc/xdg.nix#blob-path" target="_top">
                     &lt;home-manager/modules/misc/xdg.nix&gt;
                 </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-xdg.configHome"></a><a class="term" href="options.html#opt-xdg.configHome"><code class="option">xdg.configHome</code></a></span></dt><dd><p>Absolute path to directory holding application configurations.</p><p><span class="emphasis"><em>Type:</em></span> path</p><p><span class="emphasis"><em>Default:</em></span> <code class="literal">"~/.config"</code></p><p><span class="emphasis"><em>Declared by:</em></span></p><table border="0" summary="Simple list" class="simplelist"><tr><td><code class="filename"><a class="filename" href="https://github.com/nix-community/home-manager/blob/master/modules/misc/xdg.nix#blob-path" target="_top">
@@ -10127,14 +10127,14 @@ directory structure matching the source's but whose leafs
 are symbolic links to the files of the source directory.</p><p><span class="emphasis"><em>Type:</em></span> boolean</p><p><span class="emphasis"><em>Default:</em></span> <code class="literal">false</code></p><p><span class="emphasis"><em>Declared by:</em></span></p><table border="0" summary="Simple list" class="simplelist"><tr><td><code class="filename"><a class="filename" href="https://github.com/nix-community/home-manager/blob/master/modules/misc/xdg.nix#blob-path" target="_top">
                     &lt;home-manager/modules/misc/xdg.nix&gt;
                 </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-xdg.dataFile._name_.source"></a><a class="term" href="options.html#opt-xdg.dataFile._name_.source"><code class="option">xdg.dataFile.&lt;name&gt;.source</code></a></span></dt><dd><p>Path of the source file or directory. If
-<a class="xref" href="options.html#opt-home.file._name_.text"><code class="option">home.file.&lt;name&gt;.text</code></a>
+<a class="xref" href="options.html#opt-xdg.dataFile._name_.text"><code class="option">xdg.dataFile.&lt;name&gt;.text</code></a>
 is non-null then this option will automatically point to a file
 containing that text.</p><p><span class="emphasis"><em>Type:</em></span> path</p><p><span class="emphasis"><em>Declared by:</em></span></p><table border="0" summary="Simple list" class="simplelist"><tr><td><code class="filename"><a class="filename" href="https://github.com/nix-community/home-manager/blob/master/modules/misc/xdg.nix#blob-path" target="_top">
                     &lt;home-manager/modules/misc/xdg.nix&gt;
-                </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-xdg.dataFile._name_.target"></a><a class="term" href="options.html#opt-xdg.dataFile._name_.target"><code class="option">xdg.dataFile.&lt;name&gt;.target</code></a></span></dt><dd><p>Path to target file relative to <code class="varname">xdg.dataHome</code>.</p><p><span class="emphasis"><em>Type:</em></span> string</p><p><span class="emphasis"><em>Default:</em></span> <code class="literal">&lt;name&gt;</code></p><p><span class="emphasis"><em>Declared by:</em></span></p><table border="0" summary="Simple list" class="simplelist"><tr><td><code class="filename"><a class="filename" href="https://github.com/nix-community/home-manager/blob/master/modules/misc/xdg.nix#blob-path" target="_top">
+                </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-xdg.dataFile._name_.target"></a><a class="term" href="options.html#opt-xdg.dataFile._name_.target"><code class="option">xdg.dataFile.&lt;name&gt;.target</code></a></span></dt><dd><p>Path to target file relative to <code class="varname">xdg.dataHome</code>.</p><p><span class="emphasis"><em>Type:</em></span> string</p><p><span class="emphasis"><em>Default:</em></span> <code class="literal">name</code></p><p><span class="emphasis"><em>Declared by:</em></span></p><table border="0" summary="Simple list" class="simplelist"><tr><td><code class="filename"><a class="filename" href="https://github.com/nix-community/home-manager/blob/master/modules/misc/xdg.nix#blob-path" target="_top">
                     &lt;home-manager/modules/misc/xdg.nix&gt;
                 </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-xdg.dataFile._name_.text"></a><a class="term" href="options.html#opt-xdg.dataFile._name_.text"><code class="option">xdg.dataFile.&lt;name&gt;.text</code></a></span></dt><dd><p>Text of the file. If this option is null then
-<a class="xref" href="options.html#opt-home.file._name_.source"><code class="option">home.file.&lt;name&gt;.source</code></a>
+<a class="xref" href="options.html#opt-xdg.dataFile._name_.source"><code class="option">xdg.dataFile.&lt;name&gt;.source</code></a>
 must be set.</p><p><span class="emphasis"><em>Type:</em></span> null or strings concatenated with "\n"</p><p><span class="emphasis"><em>Default:</em></span> <code class="literal">null</code></p><p><span class="emphasis"><em>Declared by:</em></span></p><table border="0" summary="Simple list" class="simplelist"><tr><td><code class="filename"><a class="filename" href="https://github.com/nix-community/home-manager/blob/master/modules/misc/xdg.nix#blob-path" target="_top">
                     &lt;home-manager/modules/misc/xdg.nix&gt;
                 </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-xdg.dataHome"></a><a class="term" href="options.html#opt-xdg.dataHome"><code class="option">xdg.dataHome</code></a></span></dt><dd><p>Absolute path to directory holding application data.</p><p><span class="emphasis"><em>Type:</em></span> path</p><p><span class="emphasis"><em>Default:</em></span> <code class="literal">"~/.local/share"</code></p><p><span class="emphasis"><em>Declared by:</em></span></p><table border="0" summary="Simple list" class="simplelist"><tr><td><code class="filename"><a class="filename" href="https://github.com/nix-community/home-manager/blob/master/modules/misc/xdg.nix#blob-path" target="_top">