From owner-freebsd-stable@FreeBSD.ORG  Sun May  1 13:50:45 2005
Return-Path: <owner-freebsd-stable@FreeBSD.ORG>
Delivered-To: freebsd-stable@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 18E8216A4CE
	for <stable@freebsd.org>; Sun,  1 May 2005 13:50:45 +0000 (GMT)
Received: from mail.efacilitas.de (efacilitas.de [213.133.110.227])
	by mx1.FreeBSD.org (Postfix) with ESMTP id C6B6043D1F
	for <stable@freebsd.org>; Sun,  1 May 2005 13:50:44 +0000 (GMT)
	(envelope-from bkoenig@cs.tu-berlin.de)
Received: from eurystheus.local (port-212-202-39-77.dynamic.qsc.de
	[212.202.39.77])
	by mail.efacilitas.de (Postfix) with ESMTP id 9917C123AEA
	for <stable@freebsd.org>; Sun,  1 May 2005 15:49:33 +0200 (CEST)
Received: from localhost (eurystheus.local [192.168.1.67])
	by eurystheus.local (Postfix) with ESMTP id ECC4312B227
	for <stable@freebsd.org>; Sun,  1 May 2005 15:50:36 +0200 (CEST)
Received: from eurystheus.local ([192.168.1.67])
 by localhost (eurystheus.locaL [192.168.1.67]) (amavisd-new, port 10024)
 with ESMTP id 41407-10 for <stable@freebsd.org>;
 Sun,  1 May 2005 15:50:32 +0200 (CEST)
Received: from [192.168.1.67] (eurystheus.local [192.168.1.67])
	by eurystheus.local (Postfix) with ESMTP id CD9A012B0B2
	for <stable@freebsd.org>; Sun,  1 May 2005 15:50:32 +0200 (CEST)
Message-ID: <4274DEA8.4050301@cs.tu-berlin.de>
Date: Sun, 01 May 2005 15:50:32 +0200
From: =?ISO-8859-1?Q?Bj=F6rn_K=F6nig?= <bkoenig@cs.tu-berlin.de>
User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.7.7) Gecko/20050425
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: stable@freebsd.org
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 8bit
X-Virus-Scanned: amavisd-new at example.com
Subject: merging src/etc/rc.d/ppp-user 1.7 to -stable
X-BeenThere: freebsd-stable@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Production branch of FreeBSD source code
	<freebsd-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>,
	<mailto:freebsd-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-stable>
List-Post: <mailto:freebsd-stable@freebsd.org>
List-Help: <mailto:freebsd-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>,
	<mailto:freebsd-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 01 May 2005 13:50:45 -0000

Hello,

how much time does it take until the changes of src/etc/rc.d/ppp-user 
1.7 will merged into -stable? It's annoying for me to patch it manually 
in order that '/etc/rc.d/ppp-user stop' will work properly. What are 
guidelines for merging code from -current to -stable in general?

Thanks
Björn