On 04/04/13 10:36, Remco wrote:
On Thursday 04 April 2013 14:56:05 you wrote:
On 2013-04-04 8:52 AM, Remco wrote:
Does this make sense ?
<p>
<a name="sysmerge"></a>
<h3>1. Merging locally changed files via sysmerge(8)</h3>
I'm not speaking for the group, but maybe it's where it is because it
also merges
files that were upgraded in etc.tar.gz whether you have locally modified
them or not.
Additionally remove the word "locally" from the "Merging locally changed files
via sysmerge(8)" heading as it might be interpreted as sysmerge only handling
changes that were made outside the upgrade/installation process.
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:30:33 -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>
This, I like.
<li><a href="#RmFiles">Files to delete</a>
<li><a href="#Kernchk">Checking the kernel</a>
<li><a href="#Pkgup">Upgrading packages</a>
@@ -368,18 +368,17 @@
<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.
This:
-<a
href="http://www.openbsd.org/cgi-bin/man.cgi?query=sysmerge&sektion=8";>sysmerge(8)</a>
-process.
...yes, that was a edit-o.
-
<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.
This, I do not like.
This paragraph is intended to be an intro to the entire rest of the
upgrade process. Your point that it sucks is noted and correct, but I
prefer it be fixed into a general intro. There should be a reminder to
say "no matter what you did above, resume following these directions here".
I've simplified this a bit, incorporated your headline change, and added
Stuart's wise hint about sdiff (I'll admit my first thought to that was,
"really? tell people when they need to enlarge their window?". My
second thought was, "hm. *I* needed that advice a few times and didn't
think to do it first", so in it goes. :)
Nick.
