From owner-svn-src-stable-7@FreeBSD.ORG  Tue Mar  6 14:13:24 2012
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 7EB081065670;
	Tue,  6 Mar 2012 14:13:24 +0000 (UTC)
	(envelope-from remko@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6DBE98FC12;
	Tue,  6 Mar 2012 14:13:24 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q26EDOSt043747;
	Tue, 6 Mar 2012 14:13:24 GMT (envelope-from remko@svn.freebsd.org)
Received: (from remko@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q26EDOf9043745;
	Tue, 6 Mar 2012 14:13:24 GMT (envelope-from remko@svn.freebsd.org)
Message-Id: <201203061413.q26EDOf9043745@svn.freebsd.org>
From: Remko Lodder <remko@FreeBSD.org>
Date: Tue, 6 Mar 2012 14:13:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r232607 - stable/7
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Mar 2012 14:13:24 -0000

Author: remko
Date: Tue Mar  6 14:13:23 2012
New Revision: 232607
URL: http://svn.freebsd.org/changeset/base/232607

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/7/ObsoleteFiles.inc   (contents, props changed)
Directory Properties:
  stable/7/   (props changed)

Modified: stable/7/ObsoleteFiles.inc
==============================================================================
--- stable/7/ObsoleteFiles.inc	Tue Mar  6 14:10:57 2012	(r232606)
+++ stable/7/ObsoleteFiles.inc	Tue Mar  6 14:13:23 2012	(r232607)
@@ -14,6 +14,8 @@
 # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
 #
 
+# 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