diff options
| author | obrien <obrien@FreeBSD.org> | 1998-11-14 03:13:33 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 1998-11-14 03:13:33 +0000 |
| commit | f3f64ef024d63360298245ec26ebf66eb395bd71 (patch) | |
| tree | d7c98193482b80a21d31de21be70e8f70eb820f1 /contrib/amd/conf | |
| parent | d9a3e6b7f346909cb3bf355119d588c1c35beb53 (diff) | |
| download | FreeBSD-src-f3f64ef024d63360298245ec26ebf66eb395bd71.zip FreeBSD-src-f3f64ef024d63360298245ec26ebf66eb395bd71.tar.gz | |
Clean up conflicts.
Diffstat (limited to 'contrib/amd/conf')
| -rw-r--r-- | contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h b/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h index 0c319d3..ebc82e5 100644 --- a/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h +++ b/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: nfs_prot_freebsd3.h,v 1.2 1998/08/27 07:33:23 obrien Exp $ + * $Id: nfs_prot_freebsd3.h,v 1.3 1998/09/09 16:11:01 obrien Exp $ * */ @@ -153,13 +153,14 @@ typedef writeargs nfswriteargs; /* * - * FreeBSD 3.0 has NFS V3, but you need to regenrate the rpcsc header files - * as follows: + * FreeBSD 3.0 pre-release has NFS V3, but you need to regenrate the rpcsc + * header files as follows: * cd /usr/local/rpcsvc * rpcgen -DWANT_NFS3 mount.x * rpcgen -DWANT_NFS3 nfs_prot.x * But that's not expected of everyone, plus there are additional things - * needed so I define everything that's neede for NFS V3 here. + * needed so I define everything that's needed for NFS V3 here. + * The problem is fixed in FreeBSD-3.0-RELEASE hence this code is off. */ #ifdef NFSMNT_NFSV3 |
