diff options
| author | mbr <mbr@FreeBSD.org> | 2004-07-06 13:16:49 +0000 |
|---|---|---|
| committer | mbr <mbr@FreeBSD.org> | 2004-07-06 13:16:49 +0000 |
| commit | f86bd4438348a45ae26eb8365fb8ffacad95cbac (patch) | |
| tree | 10313fb55a48b5a446a0e0f09956b5f55af7b430 /contrib/amd/hlfsd/hlfsd.8 | |
| parent | fdcc83dc591340586aa12b852098f8331b918783 (diff) | |
| download | FreeBSD-src-f86bd4438348a45ae26eb8365fb8ffacad95cbac.zip FreeBSD-src-f86bd4438348a45ae26eb8365fb8ffacad95cbac.tar.gz | |
Resolve conflicts for am-utils-6.0-10p1 (am-utils-6.0-20040513)
import:
- Fix typo in amd/nfs_prot_svc.c
- Manpage change in scripts/amd.conf.5
- Remove unneeded configure files
- Remove unneeded m4/macros
Diffstat (limited to 'contrib/amd/hlfsd/hlfsd.8')
| -rw-r--r-- | contrib/amd/hlfsd/hlfsd.8 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/amd/hlfsd/hlfsd.8 b/contrib/amd/hlfsd/hlfsd.8 index b7a0f0b..8db06d2 100644 --- a/contrib/amd/hlfsd/hlfsd.8 +++ b/contrib/amd/hlfsd/hlfsd.8 @@ -1,5 +1,5 @@ .\" -.\" Copyright (c) 1997-2003 Erez Zadok +.\" Copyright (c) 1997-2004 Erez Zadok .\" Copyright (c) 1989 Jan-Simon Pendry .\" Copyright (c) 1989 Imperial College of Science, Technology & Medicine .\" Copyright (c) 1989 The Regents of the University of California. @@ -36,7 +36,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: hlfsd.8,v 1.3.2.4 2003/03/16 01:47:00 ezk Exp $ +.\" $Id: hlfsd.8,v 1.3.2.5 2004/01/06 03:15:23 ezk Exp $ .\" $FreeBSD$ .\" .\" HLFSD was written at Columbia University Computer Science Department, by |
