From owner-cvs-src@FreeBSD.ORG  Wed Dec 22 09:09:38 2004
Return-Path: <owner-cvs-src@FreeBSD.ORG>
Delivered-To: cvs-src@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 0C87D16A4D3; Wed, 22 Dec 2004 09:09:38 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id D8D3343D53; Wed, 22 Dec 2004 09:09:37 +0000 (GMT)
	(envelope-from rwatson@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBM99bOG030779;
	Wed, 22 Dec 2004 09:09:37 GMT
	(envelope-from rwatson@repoman.freebsd.org)
Received: (from rwatson@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBM99bAn030778;
	Wed, 22 Dec 2004 09:09:37 GMT
	(envelope-from rwatson)
Message-Id: <200412220909.iBM99bAn030778@repoman.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Wed, 22 Dec 2004 09:09:37 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: RELENG_5
Subject: cvs commit: src/bin/ps ps.1
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 22 Dec 2004 09:09:38 -0000

rwatson     2004-12-22 09:09:37 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_5)
    bin/ps               ps.1 
  Log:
  Merge ps.1:1.80 and ps.1:1.81 from HEAD to RELENG_5:
  
    date: 2004/12/22 09:04:47;  author: rwatson;  state: Exp;  lines: +0 -1
    Remove single line containing the word "KLD" ommitted in ps.1:1.80.
  
    Pointed out by: ru (some time ago)
  
    date: 2004/11/29 12:00:24;  author: rwatson;  state: Exp;  lines: +4 -5
    Point at the mac(4) man page when describing the -Z option.
    Remove reference to /dev/lomac, which is no longer used by mac_lomac(4).
  
    MFC after:      3 days
  
  Revision  Changes    Path
  1.79.2.1  +4 -6      src/bin/ps/ps.1