Merge pull request #47688 from grahamc/doc-breakout-functions

nixpkgs docs: breakout functions
NixOS · Oct 4, 2018 · f2b3bbe · f2b3bbe
2 parents 932833f + c07ba7c
commit f2b3bbe
Show file tree

Hide file tree

Showing 11 changed files with 1,102 additions and 1,065 deletions.
diff --git a/doc/Makefile b/doc/Makefile
@@ -69,7 +69,7 @@ highlightjs:
 	cp -r "$$HIGHLIGHTJS/loader.js" highlightjs/
 
 
-manual-full.xml: ${MD_TARGETS} .version *.xml
+manual-full.xml: ${MD_TARGETS} .version *.xml **/*.xml
 	xmllint --nonet --xinclude --noxincludenode manual.xml --output manual-full.xml
 
 .version:

diff --git a/doc/cross-compilation.xml b/doc/cross-compilation.xml
@@ -47,9 +47,10 @@
 
    <para>
     In Nixpkgs, these three platforms are defined as attribute sets under the
-    names <literal>buildPlatform</literal>, <literal>hostPlatform</literal>, and
-    <literal>targetPlatform</literal>. They are always defined as attributes in
-    the standard environment. That means one can access them like:
+    names <literal>buildPlatform</literal>, <literal>hostPlatform</literal>,
+    and <literal>targetPlatform</literal>. They are always defined as
+    attributes in the standard environment. That means one can access them
+    like:
 <programlisting>{ stdenv, fooDep, barDep, .. }: ...stdenv.buildPlatform...</programlisting>
     .
    </para>