Merge from head

This commit is contained in:
Simon J. Gerraty
2013-09-05 20:18:59 +00:00
11559 changed files with 2455420 additions and 612210 deletions
+1 -1
View File
@@ -421,7 +421,7 @@ mtoliver:ht=1:ha=00DD00FE1600:tc=.default:
.Ed
.Sh FILES
.Bl -tag -width /etc/bootptab -compact
.It /etc/bootptab
.It Pa /etc/bootptab
.El
.Sh "SEE ALSO"
.Xr bootpd 8 ,