summary refs log tree commit diff
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2019-10-20 13:34:32 +0200
committerFrederik Rietdijk <fridh@fridh.nl>2019-10-20 13:35:04 +0200
commit16d733bbe58baa9e4dfd1912d13d7fdc59268212 (patch)
tree2f3c7c8da037ea2cb2fdaea101b62b947abb61cb
parentefb55d2a42e1b047c65b1d125cc955df84f8e0af (diff)
downloadnixpkgs-16d733bbe58baa9e4dfd1912d13d7fdc59268212.tar
nixpkgs-16d733bbe58baa9e4dfd1912d13d7fdc59268212.tar.gz
nixpkgs-16d733bbe58baa9e4dfd1912d13d7fdc59268212.tar.bz2
nixpkgs-16d733bbe58baa9e4dfd1912d13d7fdc59268212.tar.lz
nixpkgs-16d733bbe58baa9e4dfd1912d13d7fdc59268212.tar.xz
nixpkgs-16d733bbe58baa9e4dfd1912d13d7fdc59268212.tar.zst
nixpkgs-16d733bbe58baa9e4dfd1912d13d7fdc59268212.zip
doc: move fetchers and trivial builders under builders
-rw-r--r--doc/builders/fetchers.xml (renamed from doc/functions/fetchers.xml)8
-rw-r--r--doc/builders/trivial-builders.xml (renamed from doc/functions/trivial-builders.xml)6
-rw-r--r--doc/functions.xml2
-rw-r--r--doc/manual.xml4
4 files changed, 10 insertions, 10 deletions
diff --git a/doc/functions/fetchers.xml b/doc/builders/fetchers.xml
index 369c1fb153e..6f8990e8d16 100644
--- a/doc/functions/fetchers.xml
+++ b/doc/builders/fetchers.xml
@@ -1,8 +1,8 @@
-<section xmlns="http://docbook.org/ns/docbook"
+<chapter xmlns="http://docbook.org/ns/docbook"
          xmlns:xlink="http://www.w3.org/1999/xlink"
          xmlns:xi="http://www.w3.org/2001/XInclude"
-         xml:id="sec-pkgs-fetchers">
- <title>Fetcher functions</title>
+         xml:id="chap-pkgs-fetchers">
+ <title>Fetchers</title>
 
  <para>
   When using Nix, you will frequently need to download source code and other files from the internet. Nixpkgs comes with a few helper functions that allow you to fetch fixed-output derivations in a structured way.
@@ -145,4 +145,4 @@ stdenv.mkDerivation {
    </listitem>
   </varlistentry>
  </variablelist>
-</section>
+</chapter>
diff --git a/doc/functions/trivial-builders.xml b/doc/builders/trivial-builders.xml
index ae9f3a1b255..c99425620b1 100644
--- a/doc/functions/trivial-builders.xml
+++ b/doc/builders/trivial-builders.xml
@@ -1,7 +1,7 @@
-<section xmlns="http://docbook.org/ns/docbook"
+<chapter xmlns="http://docbook.org/ns/docbook"
          xmlns:xlink="http://www.w3.org/1999/xlink"
          xmlns:xi="http://www.w3.org/2001/XInclude"
-         xml:id="sec-trivial-builders">
+         xml:id="chap-trivial-builders">
  <title>Trivial builders</title>
 
  <para>
@@ -76,4 +76,4 @@
    </listitem>
   </varlistentry>
  </variablelist>
-</section>
+</chapter>
diff --git a/doc/functions.xml b/doc/functions.xml
index 3e126e6b139..81aef5f3a83 100644
--- a/doc/functions.xml
+++ b/doc/functions.xml
@@ -10,8 +10,6 @@
  <xi:include href="functions/overrides.xml" />
  <xi:include href="functions/generators.xml" />
  <xi:include href="functions/debug.xml" />
- <xi:include href="functions/fetchers.xml" />
- <xi:include href="functions/trivial-builders.xml" />
  <xi:include href="functions/fhs-environments.xml" />
  <xi:include href="functions/shell.xml" />
  <xi:include href="functions/dockertools.xml" />
diff --git a/doc/manual.xml b/doc/manual.xml
index 001a5f3eca5..d0ded1e2e16 100644
--- a/doc/manual.xml
+++ b/doc/manual.xml
@@ -21,7 +21,9 @@
   <xi:include href="platform-notes.xml" />
  </part>
  <part>
-  <title>Languages, frameworks and packages</title>
+  <title>Builders</title>
+  <xi:include href="builders/fetchers.xml" />
+  <xi:include href="builders/trivial-builders.xml" />
   <xi:include href="languages-frameworks/index.xml" />
   <xi:include href="packages/index.xml" />
  </part>