diff options
| author | kris <kris@FreeBSD.org> | 2000-04-10 11:18:54 +0000 |
|---|---|---|
| committer | kris <kris@FreeBSD.org> | 2000-04-10 11:18:54 +0000 |
| commit | 7833f1a4d21cf18a1fbc9f0d8d484a5e44693cdf (patch) | |
| tree | 18a7928b588cb4975327cce357578a508637e6c8 /contrib/opie/opiekeys.5 | |
| parent | 73aab674279668f1f9d49a4464286d6e8d1444ca (diff) | |
| download | FreeBSD-src-7833f1a4d21cf18a1fbc9f0d8d484a5e44693cdf.zip FreeBSD-src-7833f1a4d21cf18a1fbc9f0d8d484a5e44693cdf.tar.gz | |
Resolve conflicts
Diffstat (limited to 'contrib/opie/opiekeys.5')
| -rw-r--r-- | contrib/opie/opiekeys.5 | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/contrib/opie/opiekeys.5 b/contrib/opie/opiekeys.5 index 09af0889..26f08ed 100644 --- a/contrib/opie/opiekeys.5 +++ b/contrib/opie/opiekeys.5 @@ -1,4 +1,4 @@ -.\" opieaccess.5: Manual page describing the /etc/opiekeys file. +.\" opiekeys.5: Manual page describing the /etc/opiekeys file. .\" .\" Portions of this software are Copyright 1995 by Randall Atkinson and Dan .\" McDonald, All Rights Reserved. All Rights under this copyright are assigned @@ -7,11 +7,14 @@ .\" .\" History: .\" +.\" Modified by cmetz for OPIE 2.32. This is opiekeys.5, not opiekeys.1 or +.\" opieaccess.5. .\" Written at NRL for OPIE 2.0. .\" .ll 6i .pl 10.5i .\" @(#)opiekeys.5 2.0 (NRL) 1/10/95 +.\" $FreeBSD$ .\" .lt 6.0i .TH OPIEKEYS 5 "January 10, 1995" |
