diff options
author | Jason McIntyre <jmc@cvs.openbsd.org> | 2008-07-04 10:23:57 +0000 |
---|---|---|
committer | Jason McIntyre <jmc@cvs.openbsd.org> | 2008-07-04 10:23:57 +0000 |
commit | f77f243a8feb8c249af9b216cdd159a45d30cd27 (patch) | |
tree | 4f3375b37de2abf9b370fd31fa05d5f94d041048 /usr.sbin | |
parent | 7f8164a20615b60ff970f203f4a54d48f9b4ce48 (diff) |
some small text improvements; ok ajacoutot
Diffstat (limited to 'usr.sbin')
-rw-r--r-- | usr.sbin/sysmerge/sysmerge.8 | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/usr.sbin/sysmerge/sysmerge.8 b/usr.sbin/sysmerge/sysmerge.8 index 64078fd2926..55a8eaf746c 100644 --- a/usr.sbin/sysmerge/sysmerge.8 +++ b/usr.sbin/sysmerge/sysmerge.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: sysmerge.8,v 1.8 2008/06/13 00:46:57 ajacoutot Exp $ +.\" $OpenBSD: sysmerge.8,v 1.9 2008/07/04 10:23:56 jmc Exp $ .\" .\" Copyright (c) 2008 Antoine Jacoutot <ajacoutot@openbsd.org> .\" @@ -14,7 +14,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: June 13 2008 $ +.Dd $Mdocdate: July 4 2008 $ .Dt SYSMERGE 8 .Os .Sh NAME @@ -49,7 +49,7 @@ directory before running this script. .Pp .Nm works by comparing a temporary reference root directory -against locally installed files. +against currently installed files. The reference files are created from a .Xr cvs 1 source tree or a @@ -58,12 +58,6 @@ release or snapshot file. The default, if no source is specified on the command line, is to use .Pa /usr/src . -To make sure configuration files are in sync with the actual binaries, -use the same source as was used to upgrade the system: -.Pa /usr/src -when upgrading from source and -.Pa etcXX.tgz -when upgrading from binary sets. All work is done under .Pa ${TMPDIR}/sysmerge.XXXXX (known as the @@ -75,6 +69,15 @@ Each modified and/or replaced file is saved under the .Pa backup directory inside the work directory. .Pp +To make sure configuration files are in sync with the actual binaries, +use the same source as was used to upgrade the system: +.Pa /usr/src +when upgrading from source; +.Pa etcXX.tgz +and +.Pa xetcXX.tgz +when upgrading from binary sets. +.Pp When run in .Em automatic mode |