diff options
| author | obrien <obrien@FreeBSD.org> | 1999-09-15 05:45:17 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 1999-09-15 05:45:17 +0000 |
| commit | 5c1a3647e5e952726219b96156a3eebfa5789118 (patch) | |
| tree | a1a7d61cd30dc7bc80b9778e62052c5eee5e3d67 /contrib/amd/scripts | |
| parent | e2c605abd09c68a264a51f01f9362d297976ea63 (diff) | |
| download | FreeBSD-src-5c1a3647e5e952726219b96156a3eebfa5789118.zip FreeBSD-src-5c1a3647e5e952726219b96156a3eebfa5789118.tar.gz | |
Fix conflicts.
Diffstat (limited to 'contrib/amd/scripts')
| -rw-r--r-- | contrib/amd/scripts/amd.conf.5 | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/contrib/amd/scripts/amd.conf.5 b/contrib/amd/scripts/amd.conf.5 index b835009..2142622 100644 --- a/contrib/amd/scripts/amd.conf.5 +++ b/contrib/amd/scripts/amd.conf.5 @@ -1,5 +1,5 @@ .\" -.\" Copyright (c) 1997-1998 Erez Zadok +.\" Copyright (c) 1997-1999 Erez Zadok .\" Copyright (c) 1990 Jan-Simon Pendry .\" Copyright (c) 1990 Imperial College of Science, Technology & Medicine .\" Copyright (c) 1990 The Regents of the University of California. @@ -38,7 +38,8 @@ .\" .\" %W% (Berkeley) %G% .\" -.\" $Id: amd.conf.5,v 1.7 1999/08/14 21:37:28 chris Exp $ +.\" $Id: amd.conf.5,v 1.3 1999/03/30 17:23:08 ezk Exp $ +.\" $FreeBSD$ .\" .Dd April 7, 1997 .Dt AMD.CONF 5 @@ -588,7 +589,7 @@ runs. .Po This is accomplished by returning non-zero values to the .Xr statfs 2 .Pc system call . -.It Nm unmount_on_exist (boolean, default=no) +.It Nm unmount_on_exit (boolean, default=no) If .Dq yes , then |
