On Fri, Dec 18, 2009 at 06:55:15PM +0000, Xin LI wrote: > Author: delphij > Date: Fri Dec 18 18:55:15 2009 > New Revision: 200677 > URL: http://svn.freebsd.org/changeset/base/200677 > > Log: > MFC r199463: > > rc.early(8) was removed as of 20090530 so remove manual page reference > to it. > > Modified: > stable/8/ObsoleteFiles.inc (contents, props changed) > stable/8/share/man/man8/Makefile > stable/8/share/man/man8/rc.8 > Directory Properties: > stable/8/share/man/man8/ (props changed) > > Modified: stable/8/ObsoleteFiles.inc > ============================================================================== > --- stable/8/ObsoleteFiles.inc Fri Dec 18 18:45:36 2009 > (r200676) > +++ stable/8/ObsoleteFiles.inc Fri Dec 18 18:55:15 2009 > (r200677) > @@ -14,6 +14,16 @@ > # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. > # > > +# 20091218: removal of rc.early(8) link > +OLD_FILES+=usr/share/man/man8/rc.early.8.gz > +# 20091027: pselect.3 implemented as syscall > +OLD_FILES+=usr/share/man/man3/pselect.3.gz > +# 20091005: fusword.9 and susword.9 removed > +OLD_FILES+=usr/share/man/man9/fusword.9.gz > +OLD_FILES+=usr/share/man/man9/susword.9.gz > +# 20090909: vesa and dpms promoted to be i386/amd64 common > +OLD_FILES+=usr/include/machine/pc/vesa.h > +OLD_FILES+=usr/share/man/man4/i386/dpms.4.gz > # 20090904: remove lukemftpd > OLD_FILES+=usr/libexec/lukemftpd > OLD_FILES+=usr/share/man/man5/ftpd.conf.5.gz
This is not only a merge of r199463. You also merged several others unrelated revisions to ObsoleteFiles.inc. At least addition of pselect.3 removal is wrong for stable/8, I still not merged r198508 (but plan to do it really soon). I am not sure about other additions.
pgpvIUWyBiu6T.pgp
Description: PGP signature
