diff options
-rw-r--r-- | doc/manual/Makefile.am | 3 | ||||
-rw-r--r-- | doc/manual/manual.xml | 68 | ||||
-rw-r--r-- | doc/manual/nix-build.xml | 3 | ||||
-rw-r--r-- | doc/manual/nix-channel.xml | 3 | ||||
-rw-r--r-- | doc/manual/nix-collect-garbage.xml | 3 | ||||
-rw-r--r-- | doc/manual/nix-copy-closure.xml | 3 | ||||
-rw-r--r-- | doc/manual/nix-env.xml | 3 | ||||
-rw-r--r-- | doc/manual/nix-hash.xml | 3 | ||||
-rw-r--r-- | doc/manual/nix-install-package.xml | 3 | ||||
-rw-r--r-- | doc/manual/nix-instantiate.xml | 3 | ||||
-rw-r--r-- | doc/manual/nix-prefetch-url.xml | 3 | ||||
-rw-r--r-- | doc/manual/nix-pull.xml | 3 | ||||
-rw-r--r-- | doc/manual/nix-push.xml | 3 | ||||
-rw-r--r-- | doc/manual/nix-store.xml | 3 | ||||
-rw-r--r-- | doc/manual/nix-worker.xml | 3 | ||||
-rw-r--r-- | doc/manual/package-management.xml | 2 |
16 files changed, 44 insertions, 68 deletions
diff --git a/doc/manual/Makefile.am b/doc/manual/Makefile.am index 3a41e24fc1..8dbc196f7e 100644 --- a/doc/manual/Makefile.am +++ b/doc/manual/Makefile.am @@ -6,7 +6,8 @@ XSLTPROC = $(xsltproc) $(xmlflags) \ --param xref.with.number.and.title 1 \ --param toc.section.depth 3 \ --param admon.style \'\' \ - --param callout.graphics.extension \'.gif\' + --param callout.graphics.extension \'.gif\' \ + --param contrib.inline.enabled 0 dblatex_opts = \ -P doc.collab.show=0 \ diff --git a/doc/manual/manual.xml b/doc/manual/manual.xml index 7d140ca6f7..2e70e90d04 100644 --- a/doc/manual/manual.xml +++ b/doc/manual/manual.xml @@ -17,6 +17,7 @@ <orgname>Delft University of Technology</orgname> <orgdiv>Department of Software Technology</orgdiv> </affiliation> + <contrib>Author</contrib> </author> <copyright> @@ -49,64 +50,25 @@ <section> <title>Main commands</title> - <section xml:id="sec-nix-env"> - <title>nix-env</title> - <xi:include href="nix-env.xml" /> - </section> - <section xml:id="sec-nix-instantiate"> - <title>nix-instantiate</title> - <xi:include href="nix-instantiate.xml" /> - </section> - <section xml:id="sec-nix-store"> - <title>nix-store</title> - <xi:include href="nix-store.xml" /> - </section> + <xi:include href="nix-env.xml" /> + <xi:include href="nix-instantiate.xml" /> + <xi:include href="nix-store.xml" /> </section> <section> <title>Utilities</title> - <section xml:id="sec-nix-build"> - <title>nix-build</title> - <xi:include href="nix-build.xml" /> - </section> - <section xml:id="sec-nix-channel"> - <title>nix-channel</title> - <xi:include href="nix-channel.xml" /> - </section> - <section xml:id="sec-nix-collect-garbage"> - <title>nix-collect-garbage</title> - <xi:include href="nix-collect-garbage.xml" /> - </section> - <section xml:id="sec-nix-copy-closure"> - <title>nix-copy-closure</title> - <xi:include href="nix-copy-closure.xml" /> - </section> - <section xml:id="sec-nix-hash"> - <title>nix-hash</title> - <xi:include href="nix-hash.xml" /> - </section> - <section xml:id="sec-nix-install-package"> - <title>nix-install-package</title> - <xi:include href="nix-install-package.xml" /> - </section> - <section xml:id="sec-nix-prefetch-url"> - <title>nix-prefetch-url</title> - <xi:include href="nix-prefetch-url.xml" /> - </section> - <section xml:id="sec-nix-pull"> - <title>nix-pull</title> - <xi:include href="nix-pull.xml" /> - </section> - <section xml:id="sec-nix-push"> - <title>nix-push</title> - <xi:include href="nix-push.xml" /> - </section> - <section xml:id="sec-nix-worker"> - <title>nix-worker</title> - <xi:include href="nix-worker.xml" /> - </section> + <xi:include href="nix-build.xml" /> + <xi:include href="nix-channel.xml" /> + <xi:include href="nix-collect-garbage.xml" /> + <xi:include href="nix-copy-closure.xml" /> + <xi:include href="nix-hash.xml" /> + <xi:include href="nix-install-package.xml" /> + <xi:include href="nix-prefetch-url.xml" /> + <xi:include href="nix-pull.xml" /> + <xi:include href="nix-push.xml" /> + <xi:include href="nix-worker.xml" /> </section> - + </appendix> <xi:include href="troubleshooting.xml" /> diff --git a/doc/manual/nix-build.xml b/doc/manual/nix-build.xml index 695ddcf46b..23c0b23041 100644 --- a/doc/manual/nix-build.xml +++ b/doc/manual/nix-build.xml @@ -1,6 +1,7 @@ <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude"> + xmlns:xi="http://www.w3.org/2001/XInclude" + xml:id="sec-nix-build"> <refmeta> <refentrytitle>nix-build</refentrytitle> diff --git a/doc/manual/nix-channel.xml b/doc/manual/nix-channel.xml index 14021067cb..024add8601 100644 --- a/doc/manual/nix-channel.xml +++ b/doc/manual/nix-channel.xml @@ -1,6 +1,7 @@ <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude"> + xmlns:xi="http://www.w3.org/2001/XInclude" + xml:id="sec-nix-channel"> <refmeta> <refentrytitle>nix-channel</refentrytitle> diff --git a/doc/manual/nix-collect-garbage.xml b/doc/manual/nix-collect-garbage.xml index 53cffe2ffd..14cf97932a 100644 --- a/doc/manual/nix-collect-garbage.xml +++ b/doc/manual/nix-collect-garbage.xml @@ -1,6 +1,7 @@ <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude"> + xmlns:xi="http://www.w3.org/2001/XInclude" + xml:id="sec-nix-collect-garbage"> <refmeta> <refentrytitle>nix-collect-garbage</refentrytitle> diff --git a/doc/manual/nix-copy-closure.xml b/doc/manual/nix-copy-closure.xml index ddbd8e6944..584e713f14 100644 --- a/doc/manual/nix-copy-closure.xml +++ b/doc/manual/nix-copy-closure.xml @@ -1,6 +1,7 @@ <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude"> + xmlns:xi="http://www.w3.org/2001/XInclude" + xml:id="sec-nix-copy-closure"> <refmeta> <refentrytitle>nix-copy-closure</refentrytitle> diff --git a/doc/manual/nix-env.xml b/doc/manual/nix-env.xml index 6bf0513ac2..403ab26782 100644 --- a/doc/manual/nix-env.xml +++ b/doc/manual/nix-env.xml @@ -1,6 +1,7 @@ <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude"> + xmlns:xi="http://www.w3.org/2001/XInclude" + xml:id="sec-nix-env"> <refmeta> <refentrytitle>nix-env</refentrytitle> diff --git a/doc/manual/nix-hash.xml b/doc/manual/nix-hash.xml index dcf01d3a2c..007fc54100 100644 --- a/doc/manual/nix-hash.xml +++ b/doc/manual/nix-hash.xml @@ -1,6 +1,7 @@ <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude"> + xmlns:xi="http://www.w3.org/2001/XInclude" + xml:id="sec-nix-hash"> <refmeta> <refentrytitle>nix-hash</refentrytitle> diff --git a/doc/manual/nix-install-package.xml b/doc/manual/nix-install-package.xml index f0eab5df87..5a081cd9a6 100644 --- a/doc/manual/nix-install-package.xml +++ b/doc/manual/nix-install-package.xml @@ -1,6 +1,7 @@ <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude"> + xmlns:xi="http://www.w3.org/2001/XInclude" + xml:id="sec-nix-install-package"> <refmeta> <refentrytitle>nix-install-package</refentrytitle> diff --git a/doc/manual/nix-instantiate.xml b/doc/manual/nix-instantiate.xml index d61d6d59de..ba89af4255 100644 --- a/doc/manual/nix-instantiate.xml +++ b/doc/manual/nix-instantiate.xml @@ -1,6 +1,7 @@ <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude"> + xmlns:xi="http://www.w3.org/2001/XInclude" + xml:id="sec-nix-instantiate"> <refmeta> <refentrytitle>nix-instantiate</refentrytitle> diff --git a/doc/manual/nix-prefetch-url.xml b/doc/manual/nix-prefetch-url.xml index 777bbe140b..b31b699af0 100644 --- a/doc/manual/nix-prefetch-url.xml +++ b/doc/manual/nix-prefetch-url.xml @@ -1,6 +1,7 @@ <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude"> + xmlns:xi="http://www.w3.org/2001/XInclude" + xml:id="sec-nix-prefetch-url"> <refmeta> <refentrytitle>nix-prefetch-url</refentrytitle> diff --git a/doc/manual/nix-pull.xml b/doc/manual/nix-pull.xml index 37ca88fcce..8e4a505e1d 100644 --- a/doc/manual/nix-pull.xml +++ b/doc/manual/nix-pull.xml @@ -1,6 +1,7 @@ <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude"> + xmlns:xi="http://www.w3.org/2001/XInclude" + xml:id="sec-nix-pull"> <refmeta> <refentrytitle>nix-pull</refentrytitle> diff --git a/doc/manual/nix-push.xml b/doc/manual/nix-push.xml index f439af563d..1435c55949 100644 --- a/doc/manual/nix-push.xml +++ b/doc/manual/nix-push.xml @@ -1,6 +1,7 @@ <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude"> + xmlns:xi="http://www.w3.org/2001/XInclude" + xml:id="sec-nix-push"> <refmeta> <refentrytitle>nix-push</refentrytitle> diff --git a/doc/manual/nix-store.xml b/doc/manual/nix-store.xml index db5f8c3446..9079fa3398 100644 --- a/doc/manual/nix-store.xml +++ b/doc/manual/nix-store.xml @@ -1,6 +1,7 @@ <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude"> + xmlns:xi="http://www.w3.org/2001/XInclude" + xml:id="sec-nix-store"> <refmeta> <refentrytitle>nix-store</refentrytitle> diff --git a/doc/manual/nix-worker.xml b/doc/manual/nix-worker.xml index a14ee574e0..5ae9d59bdd 100644 --- a/doc/manual/nix-worker.xml +++ b/doc/manual/nix-worker.xml @@ -1,6 +1,7 @@ <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude"> + xmlns:xi="http://www.w3.org/2001/XInclude" + xml:id="sec-nix-worker"> <refmeta> <refentrytitle>nix-worker</refentrytitle> diff --git a/doc/manual/package-management.xml b/doc/manual/package-management.xml index c22273ebe3..387258e697 100644 --- a/doc/manual/package-management.xml +++ b/doc/manual/package-management.xml @@ -331,7 +331,7 @@ default profile, respectively. If the profile doesn’t exist, it will be created automatically. You should be careful about storing a profile in another location than the <filename>profiles</filename> directory, since otherwise it might not be used as a root of the -garbage collector (see section <xref linkend='sec-garbage-collection' +garbage collector (see <xref linkend='sec-garbage-collection' />).</para> <para>All <command>nix-env</command> operations work on the profile |