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/introduction/introduction.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/introduction/introduction.xml')
| -rw-r--r-- | doc/manual/introduction/introduction.xml | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/doc/manual/introduction/introduction.xml b/doc/manual/introduction/introduction.xml new file mode 100644 index 000000000000..f7f0b012d3fd --- /dev/null +++ b/doc/manual/introduction/introduction.xml @@ -0,0 +1,16 @@ +<part xmlns="http://docbook.org/ns/docbook" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:xi="http://www.w3.org/2001/XInclude" + version="5.0" + xml:id="chap-introduction"> + +<title>Introduction</title> + +<partintro> +<para>This section describes the main features of Nix and the license under which you can use Nix.</para> +</partintro> + +<xi:include href="about-nix.xml" /> +<xi:include href="nix-license.xml" /> + +</part> |