diff options
| author | dougb <dougb@FreeBSD.org> | 2002-05-04 22:53:03 +0000 |
|---|---|---|
| committer | dougb <dougb@FreeBSD.org> | 2002-05-04 22:53:03 +0000 |
| commit | d22630f48dcb5fb5e74f1654dc68921101861f52 (patch) | |
| tree | b187b613cea6568281fc7d43cb8e6f4a859a222c /usr.sbin/mergemaster | |
| parent | 2ce981504c799a2f4a4f784422760e528e45e410 (diff) | |
| download | FreeBSD-src-d22630f48dcb5fb5e74f1654dc68921101861f52.zip FreeBSD-src-d22630f48dcb5fb5e74f1654dc68921101861f52.tar.gz | |
* Fix a small typo, thanks to olgeni
* Document the COMP_CONFS variable in the .mergemasterrc example
Diffstat (limited to 'usr.sbin/mergemaster')
| -rw-r--r-- | usr.sbin/mergemaster/mergemaster.8 | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/usr.sbin/mergemaster/mergemaster.8 b/usr.sbin/mergemaster/mergemaster.8 index 66ac81d..3bb7558 100644 --- a/usr.sbin/mergemaster/mergemaster.8 +++ b/usr.sbin/mergemaster/mergemaster.8 @@ -187,7 +187,7 @@ Automatically install any files that do not exist in the destination directory. .It Fl p Pre-buildworld mode. -Compares only files known to be essential to the sucess of +Compares only files known to be essential to the success of {build|install}world, including .Pa /etc/make.conf . @@ -306,6 +306,9 @@ with all values commented out: # Automatically install files that do not exist on the system already #AUTO_INSTALL= # +# Compare /etc/rc.conf[.local] to /etc/defaults/rc.conf +#COMP_CONFS=yes +# # Sourcedir is the directory to do the 'make' in (where the new files are) #SOURCEDIR='/usr/src/etc' # |
