diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-09-16T12·13+0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-09-16T12·13+0200 |
| commit | f0ef6b74b93344798e44c6dc527f88a78b75a32f (patch) | |
| tree | 8975a82b25a4410e2fc36e80cc042d74675396d7 /doc/manual/manual.xml | |
| parent | 67e5dd3ce9f46f810c06e16671e98f8e56b4e25c (diff) | |
| parent | 8901acc97664aa8ebf687ee904428aa57a5192be (diff) | |
Merge branch 'master' of github.com:thatdocslady/nix
Conflicts: doc/manual/release-notes.xml doc/manual/writing-nix-expressions.xml
Diffstat (limited to 'doc/manual/manual.xml')
| -rw-r--r-- | doc/manual/manual.xml | 75 |
1 files changed, 25 insertions, 50 deletions
diff --git a/doc/manual/manual.xml b/doc/manual/manual.xml index 6593d13987ab..8fae04f6148b 100644 --- a/doc/manual/manual.xml +++ b/doc/manual/manual.xml @@ -1,9 +1,12 @@ <book xmlns="http://docbook.org/ns/docbook" - xmlns:xi="http://www.w3.org/2001/XInclude"> + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:xi="http://www.w3.org/2001/XInclude" + version="5.0" + xml:id="NixManual"> <info> - <title>Nix User's Guide</title> + <title>Nix Package Manager Guide</title> <edition>Version <xi:include href="version.txt" parse="text" /></edition> @@ -27,58 +30,30 @@ </info> - - <xi:include href="introduction.xml" /> - <xi:include href="quick-start.xml" /> - <xi:include href="installation.xml" /> - <xi:include href="package-management.xml" /> - <xi:include href="writing-nix-expressions.xml" /> - <xi:include href="build-farm.xml" /> - - - <appendix> - <title>Command Reference</title> - <xi:include href="opt-common.xml" /> - <xi:include href="env-common.xml" /> - - <section> - <title>Main commands</title> - <xi:include href="nix-env.xml" /> - <xi:include href="nix-build.xml" /> - <xi:include href="nix-shell.xml" /> - <xi:include href="nix-store.xml" /> - </section> - - <section> - <title>Utilities</title> - <xi:include href="nix-channel.xml" /> - <xi:include href="nix-collect-garbage.xml" /> - <xi:include href="nix-copy-closure.xml" /> - <xi:include href="nix-daemon.xml" /> - <xi:include href="nix-hash.xml" /> - <xi:include href="nix-install-package.xml" /> - <xi:include href="nix-instantiate.xml" /> - <xi:include href="nix-prefetch-url.xml" /> - <xi:include href="nix-pull.xml" /> - <xi:include href="nix-push.xml" /> - </section> - - <section> - <title>Files</title> - <xi:include href="conf-file.xml" /> - </section> - - </appendix> - - <xi:include href="troubleshooting.xml" /> +<preface> +<title>Preface</title> +<para>This manual describes how to set up and use Nix package manager and Nix expressions.</para> +</preface> + + <xi:include href="introduction/introduction.xml" /> + <xi:include href="quicks-start/quick-start.xml" /> + <xi:include href="installation/installation.xml" /> + <xi:include href="packages/package-management.xml" /> + <xi:include href="expressions/writing-nix-expressions.xml" /> + <xi:include href="builds/build-farm.xml" /> + <xi:include href="command-ref/command-ref.xml" /> + <xi:include href="troubleshooting/troubleshooting.xml" /> <!-- <xi:include href="bugs.xml" /> --> - <xi:include href="glossary.xml" /> + <xi:include href="glossary/glossary.xml" /> <xi:include href="hacking.xml" /> - - <appendix> + <xi:include href="release-notes/release-notes.xml" /> + +<!-- +<appendix> <title>Nix Release Notes</title> - <xi:include href="release-notes.xml" + <xi:include href="release-notes/release-notes.xml" xpointer="xmlns(x=http://docbook.org/ns/docbook)xpointer(x:article/x:section)" /> </appendix> +--> </book> |