svn commit: r232606 - stable/8

[Remko Lodder]

Author: remko
Date: Tue Mar  6 14:10:57 2012
New Revision: 232606
URL: http://svn.freebsd.org/changeset/base/232606

Log:
  Merge r238821
  
  Add sticky.8 to the obsolete files since it had been
  moved to sticky.7
  
  Submitted by:	maxim and pluknet
  
  With help from:	dim (because of awkward merge conflicts)

Modified:
  stable/8/ObsoleteFiles.inc   (contents, props changed)
Directory Properties:
  stable/8/   (props changed)

Modified: stable/8/ObsoleteFiles.inc
==============================================================================
--- stable/8/ObsoleteFiles.inc	Tue Mar  6 13:57:28 2012	(r232605)
+++ stable/8/ObsoleteFiles.inc	Tue Mar  6 14:10:57 2012	(r232606)
@@ -19,6 +19,8 @@ OLD_FILES+=usr/share/man/man4/cc.4.gz
 OLD_FILES+=usr/share/man/man9/cc.9.gz
 # 20101123: removed subblock.h from liblzma
 OLD_FILES+=usr/include/lzma/subblock.h
+# 20110224: sticky.8 -> sticky.7
+OLD_FILES+=usr/share/man/man8/sticky.8.gz
 # 20101114: Remove long-obsolete MAKEDEV.8
 OLD_FILES+=usr/share/man/man8/MAKEDEV.8.gz
 # 20101112: vgonel(9) has gone to private API a while ago