summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormiod <miod@openbsd.org>2008-08-06 20:50:48 +0000
committermiod <miod@openbsd.org>2008-08-06 20:50:48 +0000
commitbfc61695ab6e9422d88c1663c8e2fc7c01a6c570 (patch)
tree34c6fff5d6038ae0f9cb1380a88c7e42a5bc74fc
parentOops, the new sets size computation script does not work correctly on (diff)
downloadwireguard-openbsd-bfc61695ab6e9422d88c1663c8e2fc7c01a6c570.tar.xz
wireguard-openbsd-bfc61695ab6e9422d88c1663c8e2fc7c01a6c570.zip
In the upgrade blurb, mention xetc won't be selectable as well, and mention
sysmerge can help you upgrade etc and xetc afterwards.
-rw-r--r--distrib/notes/alpha/upgrade4
-rw-r--r--distrib/notes/m4.common13
-rw-r--r--distrib/notes/mac68k/upgrade4
3 files changed, 11 insertions, 10 deletions
diff --git a/distrib/notes/alpha/upgrade b/distrib/notes/alpha/upgrade
index 26fdf562fd3..2f7455824ac 100644
--- a/distrib/notes/alpha/upgrade
+++ b/distrib/notes/alpha/upgrade
@@ -1,2 +1,2 @@
-dnl $OpenBSD: upgrade,v 1.7 2002/04/22 02:19:49 miod Exp $
-OpenBSDUpgrade({:- the CD-ROM or an installation floppy-:})
+dnl $OpenBSD: upgrade,v 1.8 2008/08/06 20:50:51 miod Exp $
+OpenBSDUpgrade({:-the CD-ROM or an installation floppy-:})
diff --git a/distrib/notes/m4.common b/distrib/notes/m4.common
index 26a16a80e8b..b9324dcc076 100644
--- a/distrib/notes/m4.common
+++ b/distrib/notes/m4.common
@@ -1,5 +1,5 @@
dnl
-dnl $OpenBSD: m4.common,v 1.79 2008/08/05 22:57:59 miod Exp $
+dnl $OpenBSD: m4.common,v 1.80 2008/08/06 20:50:48 miod Exp $
dnl
dnl Copyright (c) 2004 Todd T. Fries <todd@OpenBSD.org>
dnl
@@ -745,12 +745,13 @@ new system in. It will also use your existing network parameters.
From then, the upgrade procedure is very close to the installation
procedure described earlier in this document. Note that the upgrade
-procedure will not let you pick the ``etc{:--:}OSrev.tgz'' set, so as to
-preserve your files in `/etc' which you are likely to have customized
-since a previous installation.
+procedure will not let you pick neither the ``etc{:--:}OSrev.tgz'' nor the
+``xetc{:--:}OSrev.tgz'' sets, so as to preserve your files in `/etc' which
+you are likely to have customized since a previous installation.
-However, it is strongly advised that you unpack the etc{:--:}OSrev.tgz set in
-a temporary directory and merge changes by hand, since all components of
+However, it is strongly advised that you unpack the etc{:--:}OSrev.tgz and
+xetc{:--:}OSrev.tgz sets in a temporary directory and merge changes by hand, or
+with the help of the sysmerge(8) helper script, since all components of
your system may not function correctly until your files in `/etc' are
updated.-:})dnl
dnl
diff --git a/distrib/notes/mac68k/upgrade b/distrib/notes/mac68k/upgrade
index fdd30e66ae6..7254391a2ce 100644
--- a/distrib/notes/mac68k/upgrade
+++ b/distrib/notes/mac68k/upgrade
@@ -1,2 +1,2 @@
-dnl $OpenBSD: upgrade,v 1.15 2004/12/03 20:42:05 miod Exp $
-OpenBSDUpgrade({:- the bsd.rd kernel-:})
+dnl $OpenBSD: upgrade,v 1.16 2008/08/06 20:50:52 miod Exp $
+OpenBSDUpgrade({:-the bsd.rd kernel-:})