From owner-cvs-src@FreeBSD.ORG  Tue Jun  6 11:18:57 2006
Return-Path: <owner-cvs-src@FreeBSD.ORG>
X-Original-To: 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 9B20816A4F2;
	Tue,  6 Jun 2006 11:18:57 +0000 (UTC) (envelope-from flz@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 61FFC43D49;
	Tue,  6 Jun 2006 11:18:57 +0000 (GMT) (envelope-from flz@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k56BH98e051921;
	Tue, 6 Jun 2006 11:17:09 GMT (envelope-from flz@repoman.freebsd.org)
Received: (from flz@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k56BH9Rs051920;
	Tue, 6 Jun 2006 11:17:09 GMT (envelope-from flz)
Message-Id: <200606061117.k56BH9Rs051920@repoman.freebsd.org>
From: Florent Thoumie <flz@FreeBSD.org>
Date: Tue, 6 Jun 2006 11:17:09 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: RELENG_6
Cc: 
Subject: cvs commit: src/etc/rc.d ntpd src/share/man/man5 rc.conf.5
 src/etc/defaults rc.conf
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.5
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: Tue, 06 Jun 2006 11:18:58 -0000

flz         2006-06-06 11:17:09 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_6)
    etc/rc.d             ntpd 
    share/man/man5       rc.conf.5 
    etc/defaults         rc.conf 
  Log:
  MFC:
  
    - Add new ntpd_config variable so that people can override it in rc.conf.
    - Add default value in /etc/defaults/rc.conf.
    - Add documentation bits to rc.conf(5).
  
        src/etc/rc.d/ntpd: rev 1.12 -> 1.13
        src/share/man/man5/rc.conf.5: rev 1.292 -> 1.293
        src/etc/defaults/rc.conf: rev 1.280 -> 1.281
  
  Revision    Changes    Path
  1.252.2.20  +1 -0      src/etc/defaults/rc.conf
  1.11.2.2    +7 -3      src/etc/rc.d/ntpd
  1.256.2.22  +8 -1      src/share/man/man5/rc.conf.5