@@ -41,14 +41,10 @@
4141 <para>
4242 From the master branch run:
4343 </para>
44− </listitem>
45− </orderedlist>
46−
4744<programlisting>
4845git checkout -b release-19.09
4946</programlisting>
50−
51− <orderedlist>
47+ </listitem>
5248 <listitem>
5349 <para>
5450 <link xlink:href="https://github.com/NixOS/nixpkgs/commit/10e61bf5be57736035ec7a804cb0bf3d083bf2cf#diff-9c798092bac0caeb5c52d509be0ca263R69">Bump the <literal>system.defaultChannel</literal> attribute in <literal>nixos/modules/misc/version.nix</literal></link>
@@ -79,12 +75,10 @@ git rev-list --count release-19.09
7975 <para>
8076 Get all new NixOS modules:
8177 </para>
82− </listitem>
83− </itemizedlist>
8478<programlisting>
8579git diff release-19.03..release-19.09 nixos/modules/module-list.nix | grep ^+
8680</programlisting>
87− <itemizedlist>
81+ </listitem>
8882 <listitem>
8983 <para>
9084 Note systemd, kernel, glibc, desktop environment, and Nix upgrades.
@@ -96,27 +90,19 @@ git diff release-19.03..release-19.09 nixos/modules/module-list.nix | grep ^+
9690 <para>
9791 Tag the release:
9892 </para>
99− </listitem>
100− </orderedlist>
101−
10293<programlisting>
10394git tag --annotate --message="Release 19.09-beta" 19.09-beta
10495git push upstream 19.09-beta
10596</programlisting>
106−
107− <orderedlist>
97+ </listitem>
10898 <listitem>
10999 <para>
110100 <link xlink:href="https://github.com/NixOS/nixpkgs/commit/01268fda85b7eee4e462c873d8654f975067731f#diff-2bc0e46110b507d6d5a344264ef15adaR1">On the <literal>master</literal> branch, increment the <literal>.version</literal> file</link>
111101 </para>
112− </listitem>
113− </orderedlist>
114−
115102<programlisting>
116103echo -n "20.03" > .version
117104</programlisting>
118−
119− <orderedlist>
105+ </listitem>
120106 <listitem>
121107 <para>
122108 <link xlink:href="https://github.com/NixOS/nixpkgs/commit/01268fda85b7eee4e462c873d8654f975067731f#diff-03f3d41b68f62079c55001f1a1c55c1dR137">Update <literal>codeName</literal> in <literal>lib/trivial.nix</literal></link> This will be the name for the next release.
@@ -195,7 +181,7 @@ echo -n "20.03" > .version
195181 <orderedlist>
196182 <listitem>
197183 <para>
198− Update <quote>Chapter 4. Upgrading NixOS</quote> section of the manual to match new stable release version.
184+ Update <xref linkend="sec-upgrading" /> section of the manual to match new stable release version.
199185 </para>
200186 </listitem>
201187 <listitem>
@@ -207,15 +193,11 @@ echo -n "20.03" > .version
207193 <para>
208194 Tag the final release
209195 </para>
210− </listitem>
211− </orderedlist>
212−
213196<programlisting>
214197git tag --annotate --message="Release 19.09" 19.09
215198git push upstream 19.09
216199</programlisting>
217−
218− <orderedlist>
200+ </listitem>
219201 <listitem>
220202 <para>
221203 Update <link xlink:href="https://github.com/NixOS/nixos-homepage">nixos-homepage</link> for the release.
@@ -261,20 +243,27 @@ git push upstream 19.09
261243 </orderedlist>
262244
263245 <para>
264− You should include the following information: - Number of commits for the release: <literal>bash git log release-19.03..release-19.09 --format=%an | wc -l</literal>
246+ You should include the following information:
265247 </para>
266248
267249 <itemizedlist>
268250 <listitem>
269251 <para>
270− Commits by contributor:
252+ Number of commits for the release:
271253 </para>
254+<programlisting>
255+bash git log release-19.03..release-19.09 --format=%an | wc -l
256+</programlisting>
272257 </listitem>
273− </itemizedlist>
274−
258+ <listitem>
259+ <para>
260+ Commits by contributor:
261+ </para>
275262<programlisting>
276263git shortlog --summary --numbered release-19.03..release-19.09
277264</programlisting>
265+ </listitem>
266+ </itemizedlist>
278267
279268 <para>
280269 Best to check how the previous post was formulated to see what needs to be included.