From ca70ccb5c1c19dd945419e8c5b2e319570585f7e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 18 Feb 2014 17:05:34 +0100
Subject: [PATCH] Start of 14.02 release notes

---
 nixos/doc/manual/installation.xml | 19 ++++++++++---------
 nixos/doc/manual/manual.xml       |  7 +++++--
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/nixos/doc/manual/installation.xml b/nixos/doc/manual/installation.xml
index 92e7625555b0..6ccb12b115e7 100644
--- a/nixos/doc/manual/installation.xml
+++ b/nixos/doc/manual/installation.xml
@@ -295,7 +295,7 @@ $ reboot</screen>
 }</screen>
 </example>
 
-<section>
+<section xml:id="sec-uefi-installation">
 
 <title>UEFI Installation</title>
 
@@ -305,14 +305,15 @@ changes:
 
 <itemizedlist>
   <listitem>
-    <para>You should boot the livecd in UEFI mode (consult your specific
-    hardware's documentation for instructions how).</para>
+    <para>You should boot the live CD in UEFI mode (consult your
+    specific hardware's documentation for instructions).</para>
   </listitem>
   <listitem>
-    <para>Instead of <command>fdisk</command>, you should use <command>
-    gdisk</command> to partition your disks. You will need to have a
-    separate partition for <filename>/boot</filename> with partition code
-    EF00, and it should be formatted with a vfat filesystem.</para>
+    <para>Instead of <command>fdisk</command>, you should use
+    <command>gdisk</command> to partition your disks. You will need to
+    have a separate partition for <filename>/boot</filename> with
+    partition code EF00, and it should be formatted as a
+    <literal>vfat</literal> filesystem.</para>
   </listitem>
   <listitem>
     <para>You must set <option>boot.loader.gummiboot.enable</option> to
@@ -327,8 +328,8 @@ changes:
     as well.</para>
   </listitem>
   <listitem>
-    <para>To see console messages during early boot, put <literal>"fbcon"</literal>
-    in your <option>boot.initrd.kernelModules</option></para>
+    <para>To see console messages during early boot, add <literal>"fbcon"</literal>
+    to your <option>boot.initrd.kernelModules</option>.</para>
   </listitem>
 </itemizedlist>
 </para>
diff --git a/nixos/doc/manual/manual.xml b/nixos/doc/manual/manual.xml
index 6e13281cbd94..f9775f4f0170 100644
--- a/nixos/doc/manual/manual.xml
+++ b/nixos/doc/manual/manual.xml
@@ -55,9 +55,12 @@
   <!-- <xi:include href="userconfiguration.xml" /> -->
   <xi:include href="troubleshooting.xml" />
   <xi:include href="development.xml" />
-  <chapter xml:id="ch-options">
+
+  <xi:include href="release-notes.xml" />
+
+  <appendix xml:id="ch-options">
     <title>List of options</title>
     <xi:include href="options-db.xml" />
-  </chapter>
+  </appendix>
 
 </book>