diff options
| author | reed <reed@NetBSD.org> | 2008-03-17 14:46:54 +0000 |
|---|---|---|
| committer | reed <reed@NetBSD.org> | 2008-03-17 14:46:54 +0000 |
| commit | 9b88c4e54ad35df2d77fece0ebd6905abf3d376b (patch) | |
| tree | 17ad72eedeba145d1483fe518687506af8eb19e1 /usr.sbin/etcupdate | |
| parent | de0b597e7c89963b810934145fcd162df9ceef11 (diff) | |
Document some about being able to view differences and
toggling the different diff formats/tools.
Diffstat (limited to 'usr.sbin/etcupdate')
| -rw-r--r-- | usr.sbin/etcupdate/etcupdate.8 | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/usr.sbin/etcupdate/etcupdate.8 b/usr.sbin/etcupdate/etcupdate.8 index 8982f151bf8..723c95a363e 100644 --- a/usr.sbin/etcupdate/etcupdate.8 +++ b/usr.sbin/etcupdate/etcupdate.8 @@ -1,4 +1,4 @@ -.\" $NetBSD: etcupdate.8,v 1.13 2007/03/26 18:11:03 apb Exp $ +.\" $NetBSD: etcupdate.8,v 1.14 2008/03/17 14:46:54 reed Exp $ .\" .\" Copyright (c) 2001 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -34,7 +34,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd March 25, 2007 +.Dd March 17, 2008 .Dt ETCUPDATE 8 .Os .Sh NAME @@ -71,6 +71,15 @@ to update to the latest configuration and startup files. compares the new configuration files against the currently installed files. The user is given the option of installing, merging or deleting each modified or missing file. +The user can also view the differences between the files. +By default, it shows the differences in the unified diff format. +The default format can be toggled to show the differences +in unified, context, or side by side formats or an user-defined +command may be used to view differences. +(And if +.Nm wdiff +is installed, it can also show differences on a word by word basis.) +.Pp .Nm also detects if the user installs certain special files and performs corresponding tasks like remaking device nodes or rebuilding a database |
