Move release notes to an appendix and a separate chunk

+35 -36
+2 -2
nixos/doc/manual/default.nix
··· 65 65 '' 66 66 <toc role="chunk-toc"> 67 67 <d:tocentry xmlns:d="http://docbook.org/ns/docbook" linkend="book-nixos-manual"><?dbhtml filename="index.html"?> 68 - <d:tocentry linkend="ch-options"><?dbhtml filename="options.html"?> 69 - </d:tocentry> 68 + <d:tocentry linkend="ch-options"><?dbhtml filename="options.html"?></d:tocentry> 69 + <d:tocentry linkend="ch-release-notes"><?dbhtml filename="release-notes.html"?></d:tocentry> 70 70 </d:tocentry> 71 71 </toc> 72 72 '';
+2 -1
nixos/doc/manual/manual.xml
··· 33 33 <xi:include href="administration/running.xml" /> 34 34 <!-- <xi:include href="userconfiguration.xml" /> --> 35 35 <xi:include href="development/development.xml" /> 36 - <xi:include href="release-notes/release-notes.xml" /> 37 36 38 37 <appendix xml:id="ch-options"> 39 38 <title>Configuration Options</title> 40 39 <xi:include href="options-db.xml" /> 41 40 </appendix> 41 + 42 + <xi:include href="release-notes/release-notes.xml" /> 42 43 43 44 </book>
+6 -8
nixos/doc/manual/release-notes/release-notes.xml
··· 1 - <part xmlns="http://docbook.org/ns/docbook" 2 - xmlns:xlink="http://www.w3.org/1999/xlink" 3 - xmlns:xi="http://www.w3.org/2001/XInclude" 4 - version="5.0" 5 - xml:id="ch-release-notes"> 1 + <appendix xmlns="http://docbook.org/ns/docbook" 2 + xmlns:xlink="http://www.w3.org/1999/xlink" 3 + xmlns:xi="http://www.w3.org/2001/XInclude" 4 + version="5.0" 5 + xml:id="ch-release-notes"> 6 6 7 7 <title>Release Notes</title> 8 8 9 - <partintro> 10 9 <para>This section lists the release notes for each stable version of NixOS 11 10 and current unstable revision.</para> 12 - </partintro> 13 11 14 12 <xi:include href="rl-unstable.xml" /> 15 13 <xi:include href="rl-1412.xml" /> 16 14 <xi:include href="rl-1404.xml" /> 17 15 <xi:include href="rl-1310.xml" /> 18 16 19 - </part> 17 + </appendix>
+6 -6
nixos/doc/manual/release-notes/rl-1310.xml
··· 1 - <chapter xmlns="http://docbook.org/ns/docbook" 2 - xmlns:xlink="http://www.w3.org/1999/xlink" 3 - xmlns:xi="http://www.w3.org/2001/XInclude" 4 - version="5.0" 5 - xml:id="sec-release-13.10"> 1 + <section xmlns="http://docbook.org/ns/docbook" 2 + xmlns:xlink="http://www.w3.org/1999/xlink" 3 + xmlns:xi="http://www.w3.org/2001/XInclude" 4 + version="5.0" 5 + xml:id="sec-release-13.10"> 6 6 7 7 <title>Release 13.10 (“Aardvark”, 2013/10/31)</title> 8 8 9 9 <para>This is the first stable release branch of NixOS.</para> 10 10 11 - </chapter> 11 + </section>
+6 -6
nixos/doc/manual/release-notes/rl-1404.xml
··· 1 - <chapter xmlns="http://docbook.org/ns/docbook" 2 - xmlns:xlink="http://www.w3.org/1999/xlink" 3 - xmlns:xi="http://www.w3.org/2001/XInclude" 4 - version="5.0" 5 - xml:id="sec-release-14.04"> 1 + <section xmlns="http://docbook.org/ns/docbook" 2 + xmlns:xlink="http://www.w3.org/1999/xlink" 3 + xmlns:xi="http://www.w3.org/2001/XInclude" 4 + version="5.0" 5 + xml:id="sec-release-14.04"> 6 6 7 7 <title>Release 14.04 (“Baboon”, 2014/04/30)</title> 8 8 ··· 157 157 158 158 </para> 159 159 160 - </chapter> 160 + </section>
+6 -6
nixos/doc/manual/release-notes/rl-1412.xml
··· 1 - <chapter xmlns="http://docbook.org/ns/docbook" 2 - xmlns:xlink="http://www.w3.org/1999/xlink" 3 - xmlns:xi="http://www.w3.org/2001/XInclude" 4 - version="5.0" 5 - xml:id="sec-release-14.12"> 1 + <section xmlns="http://docbook.org/ns/docbook" 2 + xmlns:xlink="http://www.w3.org/1999/xlink" 3 + xmlns:xi="http://www.w3.org/2001/XInclude" 4 + version="5.0" 5 + xml:id="sec-release-14.12"> 6 6 7 7 <title>Release 14.12 (“Caterpillar”, 2014/12/30)</title> 8 8 ··· 174 174 175 175 </para> 176 176 177 - </chapter> 177 + </section>
+7 -7
nixos/doc/manual/release-notes/rl-unstable.xml
··· 1 - <chapter xmlns="http://docbook.org/ns/docbook" 2 - xmlns:xlink="http://www.w3.org/1999/xlink" 3 - xmlns:xi="http://www.w3.org/2001/XInclude" 4 - version="5.0" 5 - xml:id="sec-release-unstable"> 1 + <section xmlns="http://docbook.org/ns/docbook" 2 + xmlns:xlink="http://www.w3.org/1999/xlink" 3 + xmlns:xi="http://www.w3.org/2001/XInclude" 4 + version="5.0" 5 + xml:id="sec-release-unstable"> 6 6 7 - <title>Unstable revision</title> 7 + <title>Release 15.07 (“Dingo”, 2015/07/??)</title> 8 8 9 9 <para>In addition to numerous new and upgraded packages, this release has the following highlights: 10 10 ··· 164 164 </itemizedlist> 165 165 </para> 166 166 167 - </chapter> 167 + </section>