[src/netbsd-3]: src/usr.sbin/etcupdate Pull up following revision(s) (request...

[riz <riz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6b9ee00748c6
branches:  netbsd-3
changeset: 577860:6b9ee00748c6
user:      riz <riz%NetBSD.org@localhost>
date:      Wed Mar 01 03:55:18 2006 +0000

description:
Pull up following revision(s) (requested by apb in ticket #1184):
        usr.sbin/etcupdate/etcupdate: revision 1.25
Wording changes to clarify some the options presented after
a file is merged.

diffstat:

 usr.sbin/etcupdate/etcupdate |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (29 lines):

diff -r 556862e41b58 -r 6b9ee00748c6 usr.sbin/etcupdate/etcupdate
--- a/usr.sbin/etcupdate/etcupdate      Wed Mar 01 03:54:27 2006 +0000
+++ b/usr.sbin/etcupdate/etcupdate      Wed Mar 01 03:55:18 2006 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: etcupdate,v 1.21.6.3 2006/03/01 03:54:27 riz Exp $
+# $NetBSD: etcupdate,v 1.21.6.4 2006/03/01 03:55:18 riz Exp $
 #
 # Copyright (c) 2001 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -286,12 +286,12 @@
 EOF
                else
                        cat << EOF
-  d  Don't install the new file
-  i  Install the new file (overwrites your modifications!)
-  m  Merge again the currently installed and new files
-  s  Show the differences between the currently installed and new files
+  d  Don't install the merged file (keep your old file)
+  i  Install the merged file (overwrites your old file)
+  m  Merge again (your old file against the result from the previous merge)
+  s  Show the differences between the currently installed and new merged files
 ${DIFF_EXTRA_OPTIONS}
-  u  Undo merge and restore the temporary file from backup
+  u  Undo merge (start again with the original version of the new file)
   v  Show the merged file
 
 EOF