diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-01-26 16:46:43 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-01-26 16:46:43 +0200 |
| commit | 6a11ebfae93708d8156b11847d3bae6315d5cd4a (patch) | |
| tree | 0cead5fe37f5d0f9be2cf8c95710b72f9cfc7808 /doc/multiple-output.xml | |
| parent | 18300172897169e62d6140c34f5949a7a2232375 (diff) | |
| parent | 4a2f7a73cc2bfde778194fafb8efb0c16de366bb (diff) | |
| download | nixlib-6a11ebfae93708d8156b11847d3bae6315d5cd4a.tar nixlib-6a11ebfae93708d8156b11847d3bae6315d5cd4a.tar.gz nixlib-6a11ebfae93708d8156b11847d3bae6315d5cd4a.tar.bz2 nixlib-6a11ebfae93708d8156b11847d3bae6315d5cd4a.tar.lz nixlib-6a11ebfae93708d8156b11847d3bae6315d5cd4a.tar.xz nixlib-6a11ebfae93708d8156b11847d3bae6315d5cd4a.tar.zst nixlib-6a11ebfae93708d8156b11847d3bae6315d5cd4a.zip | |
Merge remote-tracking branch 'upstream/master' into gcc-7
Conflicts: pkgs/development/compilers/gcc/7/default.nix pkgs/development/libraries/SDL2/default.nix pkgs/top-level/all-packages.nix
Diffstat (limited to 'doc/multiple-output.xml')
| -rw-r--r-- | doc/multiple-output.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/multiple-output.xml b/doc/multiple-output.xml index a2acc91e55a2..2f23da8df01e 100644 --- a/doc/multiple-output.xml +++ b/doc/multiple-output.xml @@ -68,7 +68,7 @@ <varlistentry><term><varname> $outputDevdoc</varname></term><listitem><para> - is for <emphasis>developer</emphasis> documentation. Currently we count gtk-doc in there. It goes to <varname>devdoc</varname> or is removed (!) by default. This is because e.g. gtk-doc tends to be rather large and completely unused by nixpkgs users. + is for <emphasis>developer</emphasis> documentation. Currently we count gtk-doc and devhelp books in there. It goes to <varname>devdoc</varname> or is removed (!) by default. This is because e.g. gtk-doc tends to be rather large and completely unused by nixpkgs users. </para></listitem></varlistentry> <varlistentry><term><varname> |