4 files changed, 15 insertions, 15 deletions
diff --git a/doc/manual/installation/installing-source.xml b/doc/manual/installation/installing-source.xml
index 77beff1bcc78..c261a109d6b1 100644
--- a/doc/manual/installation/installing-source.xml
+++ b/doc/manual/installation/installing-source.xml
@@ -11,7 +11,6 @@ a source distribution.</para>
 
 <xi:include href="prerequisites-source.xml" />
 <xi:include href="obtaining-source.xml" />
-<xi:include href="installing-source.xml" />
 <xi:include href="building-source.xml" />
 
-</chapter>
\ No newline at end of file
+</chapter>
diff --git a/doc/manual/installation/multi-user.xml b/doc/manual/installation/multi-user.xml
index 2eb4c258fcf7..312f5966452d 100644
--- a/doc/manual/installation/multi-user.xml
+++ b/doc/manual/installation/multi-user.xml
@@ -22,12 +22,12 @@ store (such as builds) are forwarded to a <emphasis>Nix
 daemon</emphasis> running under the owner of the Nix store/database
 that performs the operation.</para>
 
-<note>Multi-user mode has one important limitation: only
+<note><para>Multi-user mode has one important limitation: only
 <systemitem class="username">root</systemitem> can run <command
 linkend="sec-nix-pull">nix-pull</command> to register the availability
 of pre-built binaries.  However, those registrations are shared by all
 users, so they still get the benefit from <command>nix-pull</command>s
-done by <systemitem class="username">root</systemitem>.</note>
+done by <systemitem class="username">root</systemitem>.</para></note>
 
 
 <simplesect>
@@ -80,6 +80,7 @@ into the users’ login scripts.</para>
 
 </simplesect>
 
+
 <simplesect>
 
 <title>Restricting access</title>
@@ -103,4 +104,4 @@ perform Nix operations.</para>
 </simplesect>
 
 
-</section>
\ No newline at end of file
+</section>
diff --git a/doc/manual/local.mk b/doc/manual/local.mk
index 1c5a3a2ffff1..f359b3e27a8f 100644
--- a/doc/manual/local.mk
+++ b/doc/manual/local.mk
@@ -8,7 +8,7 @@ XSLTPROC = $(xsltproc) --nonet $(xmlflags) \
   --param callout.graphics.extension \'.gif\' \
   --param contrib.inline.enabled 0
 
-MANUAL_SRCS := $(wildcard $(d)/*.xml)
+MANUAL_SRCS := $(call rwildcard, $(d), *.xml)
 
 
 # Do XInclude processing / RelaxNG validation
diff --git a/doc/manual/manual.xml b/doc/manual/manual.xml
index 8fae04f6148b..513eb311cd96 100644
--- a/doc/manual/manual.xml
+++ b/doc/manual/manual.xml
@@ -1,8 +1,7 @@
 <book 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="NixManual">
+      version="5.0">
 
   <info>
 
@@ -30,13 +29,14 @@
 
   </info>
 
-<preface>
-<title>Preface</title>
-<para>This manual describes how to set up and use Nix package manager and Nix expressions.</para>
-</preface>
+  <preface>
+    <title>Preface</title>
+    <para>This manual describes how to set up and use the Nix package
+    manager.</para>
+  </preface>
 
   <xi:include href="introduction/introduction.xml" />
-  <xi:include href="quicks-start/quick-start.xml" />
+  <xi:include href="quick-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" />
@@ -47,8 +47,8 @@
   <xi:include href="glossary/glossary.xml" />
   <xi:include href="hacking.xml" />
   <xi:include href="release-notes/release-notes.xml" />
-  
-<!-- 
+
+<!--
 <appendix>
     <title>Nix Release Notes</title>
     <xi:include href="release-notes/release-notes.xml"