merge

[plan9front.git] / sys / man / 1 / derp

diff --git a/sys/man/1/derp b/sys/man/1/derp
index 91467238d5f945135bed20e00cce4b684d0c1ddd..a138828fe752ce313b052649c2bbf58e00cd9aa0 100644 (file)
--- a/sys/man/1/derp
+++ b/sys/man/1/derp
@@ -22,8 +22,10 @@ using a third common backup directory
 .I oldfile
 as reference. The changes found are printed
 to standard output, one per line, with the file
-status describing either side followed by tabulator
-and the relative file path.
+status describing either sides actions followed
+by tabulator and the relative file path which might
+be empty in case when the changed files refers to the
+ones given at program arguments.
 .LP
 The possible status codes:
 .TP
@@ -78,14 +80,14 @@ Errors are printed to standard error unless
 option is specified. The program is terminated
 when errors are encountered unless the
 .B -c
-option is given. This can be usefull if files
+option is given. This can be useful if files
 are not accessible due to file permission or
 media corruption.
 .PP
 The
 .B -u
 option will consider changes of file owner and group.
-When omited, file ownership is ignored.
+When omitted, file ownership is ignored.
 .PP
 The
 .B -p
@@ -98,11 +100,11 @@ When modification times are comparable then the
 .B -t
 option can be used to quickly find changes. If specified,
 files are considered unchanged if the name, file size and
-the modification time matches. This is usefull when
+the modification time matches. This is useful when
 comparing /n/dump archives on the same fileserver.
 .PP
 Files are considered the same if they are from the
-same mount and ther
+same mount and their
 .B qid
 (see
 .IR stat (5))
@@ -129,4 +131,7 @@ option.
 .IR hgfs (4)
 .SH DIAGNOSTICS
 The exit status is set to 'errors' when
-errors where encountered.
+errors were encountered.
+.SH HISTORY
+.I Derp
+first appeared in 9front (November, 2012).