diff options
Diffstat (limited to 'doc/manual')
-rw-r--r-- | doc/manual/Makefile.am | 5 | ||||
-rw-r--r-- | doc/manual/book.xml | 16 | ||||
-rw-r--r-- | doc/manual/nix-instantiate.xml (renamed from doc/manual/nix-instantiate-reference.xml) | 0 | ||||
-rw-r--r-- | doc/manual/nix-store.xml (renamed from doc/manual/nix-store-reference.xml) | 0 |
4 files changed, 14 insertions, 7 deletions
diff --git a/doc/manual/Makefile.am b/doc/manual/Makefile.am index 34039ba36..46c79ae3b 100644 --- a/doc/manual/Makefile.am +++ b/doc/manual/Makefile.am @@ -6,9 +6,8 @@ XSLTPROC = $(ENV) $(xsltproc) $(xmlflags) --catalogs \ --param section.label.includes.component.label 1 \ --param html.stylesheet \'style.css\' -SOURCES = book.xml introduction.xml installation.xml \ - overview.xml \ - nix-store-reference.xml nix-instantiate-reference.xml \ +SOURCES = book.xml introduction.xml installation.xml overview.xml \ + common-options.xml nix-store.xml nix-instantiate.xml \ troubleshooting.xml bugs.xml \ style.css diff --git a/doc/manual/book.xml b/doc/manual/book.xml index 7248e5e18..e8896b073 100644 --- a/doc/manual/book.xml +++ b/doc/manual/book.xml @@ -6,8 +6,9 @@ <!ENTITY introduction SYSTEM "introduction.xml"> <!ENTITY installation SYSTEM "installation.xml"> <!ENTITY overview SYSTEM "overview.xml"> -<!ENTITY nix-store-reference SYSTEM "nix-store-reference.xml"> -<!ENTITY nix-instantiate-reference SYSTEM "nix-instantiate-reference.xml"> +<!ENTITY common-options SYSTEM "common-options.xml"> +<!ENTITY nix-store SYSTEM "nix-store.xml"> +<!ENTITY nix-instantiate SYSTEM "nix-instantiate.xml"> <!ENTITY troubleshooting SYSTEM "troubleshooting.xml"> <!ENTITY bugs SYSTEM "bugs.xml"> ]> @@ -32,8 +33,15 @@ <appendix> <title>Command Reference</title> - &nix-store-reference; - &nix-instantiate-reference; + &common-options; + <sect1> + <title>nix-store</title> + &nix-store; + </sect1> + <sect1> + <title>nix-instantiate</title> + &nix-instantiate; + </sect1> </appendix> &troubleshooting; diff --git a/doc/manual/nix-instantiate-reference.xml b/doc/manual/nix-instantiate.xml index 2e2749e43..2e2749e43 100644 --- a/doc/manual/nix-instantiate-reference.xml +++ b/doc/manual/nix-instantiate.xml diff --git a/doc/manual/nix-store-reference.xml b/doc/manual/nix-store.xml index 686fe4c15..686fe4c15 100644 --- a/doc/manual/nix-store-reference.xml +++ b/doc/manual/nix-store.xml |