Module Name: src
Committed By: sborrill
Date: Fri Oct 16 14:56:45 UTC 2009
Modified Files:
src/usr.bin/pwhash [netbsd-5]: pwhash.1
Log Message:
Pull up the following revisions(s) (requested by hubertf in ticket #1097):
usr.bin/pwhash/pwhash.1: revision 1.6
Make the format for -k flag clearer.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.5.34.1 src/usr.bin/pwhash/pwhash.1
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/pwhash/pwhash.1
diff -u src/usr.bin/pwhash/pwhash.1:1.5 src/usr.bin/pwhash/pwhash.1:1.5.34.1
--- src/usr.bin/pwhash/pwhash.1:1.5 Wed Nov 17 14:57:48 2004
+++ src/usr.bin/pwhash/pwhash.1 Fri Oct 16 14:56:45 2009
@@ -1,4 +1,4 @@
-.\" $NetBSD: pwhash.1,v 1.5 2004/11/17 14:57:48 wiz Exp $
+.\" $NetBSD: pwhash.1,v 1.5.34.1 2009/10/16 14:56:45 sborrill Exp $
.\" $OpenBSD: encrypt.1,v 1.16 2000/11/09 17:52:07 aaron Exp $
.\"
.\" Copyright (c) 1996, Jason Downs. All rights reserved.
@@ -24,7 +24,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd October 12, 2004
+.Dd October 16, 2009
.Dt PWHASH 1
.Os
.Sh NAME
@@ -52,8 +52,9 @@
.It Fl k
Run in
.Xr makekey 8
-compatible mode; a single combined key and salt are read from standard
-input and the DES encrypted result is written to standard output without a
+compatible mode.
+A single combined key (eight chars) and salt (two chars) with no intermediate space
+are read from standard input and the DES encrypted result is written to standard output without a
terminating newline.
.It Fl m
Encrypt the string using MD5.
