summary refs log tree commit diff
path: root/nixos/doc
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2014-02-18 17:05:34 +0100
committerEelco Dolstra <eelco.dolstra@logicblox.com>2014-02-18 19:13:07 +0100
commitca70ccb5c1c19dd945419e8c5b2e319570585f7e (patch)
tree196eca6bf8ae4a98fe80b05f805b409a80103bec /nixos/doc
parentd2aa2ac494fc7eda18ce1316201015c6603e23b6 (diff)
downloadnixpkgs-ca70ccb5c1c19dd945419e8c5b2e319570585f7e.tar
nixpkgs-ca70ccb5c1c19dd945419e8c5b2e319570585f7e.tar.gz
nixpkgs-ca70ccb5c1c19dd945419e8c5b2e319570585f7e.tar.bz2
nixpkgs-ca70ccb5c1c19dd945419e8c5b2e319570585f7e.tar.lz
nixpkgs-ca70ccb5c1c19dd945419e8c5b2e319570585f7e.tar.xz
nixpkgs-ca70ccb5c1c19dd945419e8c5b2e319570585f7e.tar.zst
nixpkgs-ca70ccb5c1c19dd945419e8c5b2e319570585f7e.zip
Start of 14.02 release notes
Diffstat (limited to 'nixos/doc')
-rw-r--r--nixos/doc/manual/installation.xml19
-rw-r--r--nixos/doc/manual/manual.xml7
2 files changed, 15 insertions, 11 deletions
diff --git a/nixos/doc/manual/installation.xml b/nixos/doc/manual/installation.xml
index 92e7625555b..6ccb12b115e 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 6e13281cbd9..f9775f4f017 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>