Combine introduction / quick start parts

doc/manual/introduction/introduction.xml

@@ -7,5 +7,6 @@
 <title>Introduction</title>
 
 <xi:include href="about-nix.xml" />
+<xi:include href="quick-start.xml" />
 
 </part>

doc/manual/introduction/quick-start.xml

@@ -2,11 +2,14 @@
       xmlns:xlink="http://www.w3.org/1999/xlink"
       xmlns:xi="http://www.w3.org/2001/XInclude"
       version="5.0"
-      xml:id="ch-getting-started-nix"> 
+      xml:id="chap-quick-start">
 
-<title>Getting Started with Nix</title>
+<title>Quick Start</title>
+
+<para>This chapter is for impatient people who don't like reading
+documentation.  For more in-depth information you are kindly referred
+to subsequent chapters.</para>
 
-<para>This tutorial takes you through the basic tasks you might perform when you start using Nix.</para>
 <procedure>
 
 <step><para>Install single-user Nix by running the following:

doc/manual/manual.xml

@@ -29,14 +29,15 @@
 
   </info>
 
+  <!--
   <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="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" />

doc/manual/quick-start/quick-start.xml

@@ -1,17 +0,0 @@
-<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-quick-start">
-
-<title>Quick-Start</title>
-
-<partintro>
-<para>This section is for impatient people who don't like reading
-documentation.  For more in-depth information you are kindly referred
-to subsequent chapters.</para>
-</partintro>
-
-<xi:include href="getting-started.xml" />
-
-</part>