I think moving the 1a heading up a bit makes sense. We then have a paragraph of intro then sysmerge is in 1a and the patch section in 1b.
ok/comments? -lum Index: upgrade49.html =================================================================== RCS file: /cvs/www/faq/upgrade49.html,v retrieving revision 1.12 diff -u -p -r1.12 upgrade49.html --- upgrade49.html 3 May 2011 01:44:20 -0000 1.12 +++ upgrade49.html 11 Jun 2011 05:58:00 -0000 @@ -273,13 +273,16 @@ file was copied to /dev by the installat 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>etc49.tgz</tt> -which we have not been dealt with so far. +which have not been dealt with so far. There are two processes we provide for you -- manually copying over some files and patching others, or using the <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=sysmerge&sektion=8";>sysmerge(8)</a> process. <p> +<a name="sysmerge"></a> +<h3>1a. Merging locally changed files via sysmerge(8)</h3> + <b>Who should use sysmerge(8):</b><br> People running highly modified systems or systems that didn't start out at the previous release (for example, a snapshot part way between @@ -310,9 +313,7 @@ files. Rest assured, later runs of sysmerge will be far less painful, and often completely effortless. - -<a name="sysmerge"></a> -<h3>1a. Merging locally changed files via sysmerge(8)</h3> +<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
