On Thursday 04 April 2013 15:10:13 Stuart Henderson wrote: > On 2013/04/04 14:52, Remco wrote: > > Does this make sense ? > > > > Take the first paragraph in section "Final steps": > > - remove the last two words "sysmerge(8) process." which seem > > out-of-place - mentions both the etc53.tgz and xetc53.tgz sets > > - Move the whole thing into step 1 as the first paragraph since this text > > only seems to apply to this step. > > Makes sense to me... > > It might also be worth recommending that people use a fairly wide terminal > window if possible (before starting sysmerge), it makes sdiff much easier > to use.
Not being familiar with sdiff I incorporated your suggestion as-is: (not sure if more specific info is needed, like a suggestion for a usable width) Index: upgrade53.html =================================================================== RCS file: /cvs/www/faq/upgrade53.html,v retrieving revision 1.3 diff -u -r1.3 upgrade53.html --- upgrade53.html 28 Mar 2013 00:12:27 -0000 1.3 +++ upgrade53.html 4 Apr 2013 14:48:45 -0000 @@ -84,7 +84,7 @@ <li><a href="#upgrade">The upgrade process</a> <li><a href="#final">Final steps</a> <ul> - <li><a href="#sysmerge">Merging locally changed files via sysmerge(8)</a> + <li><a href="#sysmerge">Merging changed files via sysmerge(8)</a> <li><a href="#RmFiles">Files to delete</a> <li><a href="#Kernchk">Checking the kernel</a> <li><a href="#Pkgup">Upgrading packages</a> @@ -368,20 +368,19 @@ <a name="final"></a> <h2>Final steps</h2> -Whether you upgrade by using an install kernel and doing a formal -"upgrade" process, or do a "in-place" binary upgrade, you need to update -the system configuration files which are included in the <tt>etc53.tgz</tt> -which have not been dealt with so far. -<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=sysmerge&sektion=8";>sysmerge(8)</a> -process. - <p> <a name="sysmerge"></a> -<h3>1. Merging locally changed files via sysmerge(8)</h3> +<h3>1. Merging changed files via sysmerge(8)</h3> <blockquote> <p> +Whether you upgrade by using an install kernel and doing a formal +"upgrade" process, or do a "in-place" binary upgrade, you need to update +the system configuration files which are included in the <tt>etc53.tgz</tt> +and <tt>xetc53.tgz</tt> sets which have not been dealt with so far. + +<p> The <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=sysmerge&sektion=8";>sysmerge(8)</a> utility will compare the files that are actually on your system with @@ -410,7 +409,8 @@ <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=sdiff&sektion=1";>sdiff(1)</a> and even review <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=more&sektion=1";>more(1)</a> -manual pages before continuing. +manual pages before continuing. If possible, setting up a fairly wide +terminal window before starting sysmerge makes sdiff much easier to use. <p> Assuming the <tt>etc53.tgz</tt> and <tt>xetc53.tgz</tt> files exists in
