3 files changed, 42 insertions, 3 deletions
diff --git a/doc/manual/Makefile.am b/doc/manual/Makefile.am
index 8f382c3f3468..65f1f3f44134 100644
--- a/doc/manual/Makefile.am
+++ b/doc/manual/Makefile.am
@@ -10,9 +10,9 @@ book.is-valid: $(SOURCES)
 	nsgmls -wxml -c $(XML) -c $(DOCBOOK_DTD)/docbook.cat -ges $<
 	touch $@
 
-man1_MANS = nix.1
+man1_MANS = nix.1 fix.1
 
-man nix.1: $(SOURCES) book.is-valid
+man nix.1 fix.1: $(SOURCES) book.is-valid
 	xsltproc $(DOCBOOK_XSL)/manpages/docbook.xsl book.xml
 
 book.html: $(SOURCES) book.is-valid
@@ -24,4 +24,4 @@ install-data-local: book.html
 	$(INSTALL) -d $(datadir)/nix/manual
 	$(INSTALL_DATA) book.html $(datadir)/nix/manual
 
-EXTRA_DIST = $(SOURCES) book.html nix.1 book.is-valid
+EXTRA_DIST = $(SOURCES) book.html nix.1 fix.1 book.is-valid
diff --git a/doc/manual/book.xml b/doc/manual/book.xml
index 63aaa8a076c8..1f54d4efdaed 100644
--- a/doc/manual/book.xml
+++ b/doc/manual/book.xml
@@ -4,6 +4,7 @@
 <!ENTITY introduction SYSTEM "introduction.xml">
 <!ENTITY installation SYSTEM "installation.xml">
 <!ENTITY nix-reference SYSTEM "nix-reference.xml">
+<!ENTITY fix-reference SYSTEM "fix-reference.xml">
 <!ENTITY troubleshooting SYSTEM "troubleshooting.xml">
 <!ENTITY bugs SYSTEM "bugs.xml">
 ]>
@@ -52,6 +53,7 @@
   <appendix>
     <title>Command Reference</title>
     &nix-reference;
+    &fix-reference;
   </appendix>
 
   &troubleshooting;
diff --git a/doc/manual/fix-reference.xml b/doc/manual/fix-reference.xml
new file mode 100644
index 000000000000..aac1be64828b
--- /dev/null
+++ b/doc/manual/fix-reference.xml
@@ -0,0 +1,37 @@
+<refentry>
+  <refnamediv>
+    <refname>fix</refname>
+    <refpurpose>generate Nix expressions from a high-level description</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <cmdsynopsis>
+      <command>fix</command>
+      <group choice='opt' rep='repeat'>
+	<arg><option>--verbose</option></arg>
+	<arg><option>-v</option></arg>
+      </group>
+      <arg rep='repeat'><replaceable>files</replaceable></arg>
+    </cmdsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1>
+    <title>Description</title>
+
+    <para>
+      The command <command>fix</command> generates Nix expressions from
+      expressions is Fix's own high-level language.  While Nix expressions are
+      very primitive and not intended to be written directly, Fix expressions
+      are quite easy to write.
+    </para>
+
+  </refsect1>
+
+</refentry>
+
+
+<!--
+local variables:
+sgml-parent-document: ("book.xml" "refentry")
+end:
+-->