From 2b74354e5226cda44aa23e8868aaecba6f6250d8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 24 Nov 2014 14:53:50 +0100
Subject: [PATCH] Combine introduction / quick start parts

---
 doc/manual/introduction/introduction.xml        |  1 +
 .../quick-start.xml}                            |  9 ++++++---
 doc/manual/manual.xml                           |  3 ++-
 doc/manual/quick-start/quick-start.xml          | 17 -----------------
 4 files changed, 9 insertions(+), 21 deletions(-)
 rename doc/manual/{quick-start/getting-started.xml => introduction/quick-start.xml} (92%)
 delete mode 100644 doc/manual/quick-start/quick-start.xml

diff --git a/doc/manual/introduction/introduction.xml b/doc/manual/introduction/introduction.xml
index 665fef2fb..12b2cc761 100644
--- a/doc/manual/introduction/introduction.xml
+++ b/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>
diff --git a/doc/manual/quick-start/getting-started.xml b/doc/manual/introduction/quick-start.xml
similarity index 92%
rename from doc/manual/quick-start/getting-started.xml
rename to doc/manual/introduction/quick-start.xml
index 3dc79b9b5..396b7b167 100644
--- a/doc/manual/quick-start/getting-started.xml
+++ b/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:
diff --git a/doc/manual/manual.xml b/doc/manual/manual.xml
index 4522f8190..5c46f303a 100644
--- a/doc/manual/manual.xml
+++ b/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" />
diff --git a/doc/manual/quick-start/quick-start.xml b/doc/manual/quick-start/quick-start.xml
deleted file mode 100644
index b4757cb22..000000000
--- a/doc/manual/quick-start/quick-start.xml
+++ /dev/null
@@ -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>