From owner-p4-projects@FreeBSD.ORG  Sun Oct 30 13:52:58 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7A91D16A422; Sun, 30 Oct 2005 13:52:58 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 4D7CA16A41F
	for <perforce@freebsd.org>; Sun, 30 Oct 2005 13:52:58 +0000 (GMT)
	(envelope-from soc-saturnero@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 02C5E43D46
	for <perforce@freebsd.org>; Sun, 30 Oct 2005 13:52:58 +0000 (GMT)
	(envelope-from soc-saturnero@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 j9UDqv22041255
	for <perforce@freebsd.org>; Sun, 30 Oct 2005 13:52:57 GMT
	(envelope-from soc-saturnero@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9UDqvKe041252
	for perforce@freebsd.org; Sun, 30 Oct 2005 13:52:57 GMT
	(envelope-from soc-saturnero@freebsd.org)
Date: Sun, 30 Oct 2005 13:52:57 GMT
Message-Id: <200510301352.j9UDqvKe041252@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	soc-saturnero@freebsd.org using -f
From: soc-saturnero <soc-saturnero@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 86067 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 30 Oct 2005 13:52:59 -0000

http://perforce.freebsd.org/chv.cgi?CH=86067

Change 86067 by soc-saturnero@soc-saturnero_sberta on 2005/10/30 13:52:25

	Merge from FreeSBIE CVS: comment fixes

Affected files ...

.. //depot/projects/soc2005/freesbie/conf/freesbie.defaults.conf#14 edit
.. //depot/projects/soc2005/freesbie/scripts/launch.sh#9 edit

Differences ...

==== //depot/projects/soc2005/freesbie/conf/freesbie.defaults.conf#14 (text+ko) ====

@@ -7,9 +7,11 @@
 # See COPYING for license terms.
 #
 # $FreeBSD$
-# $Id$
+# $Id: freesbie.defaults.conf,v 1.4 2005/10/30 13:53:53 saturnero Exp $
 #
-# Don't modify it, create your own freesbie.conf instead.
+# Don't modify it, create your own conf/freesbie.conf instead, or set
+# an environment variable called FREESBIE_CONF to the absolute path of
+# your configuration file.
 
 # Variables
 

==== //depot/projects/soc2005/freesbie/scripts/launch.sh#9 (text+ko) ====

@@ -7,7 +7,7 @@
 # See COPYING for license terms.
 #
 # $FreeBSD$
-# $Id$
+# $Id: launch.sh,v 1.3 2005/10/29 18:46:07 drizzt Exp $
 #
 # Usage: launch.sh ${TARGET} [ ${LOGFILE} ]
 
@@ -60,7 +60,7 @@
 #  - scripts/custom/${ARCH}/${TARGET}.sh
 #  - scripts/custom/${TARGET}.sh
 #  - scripts/${ARCH}/${TARGET}.sh
-#  - scripts/custom/${ARCH}/${TARGET}.sh
+#  - scripts/${TARGET}.sh
 
 if [ -f "${LOCALDIR}/scripts/custom/${ARCH}/${TARGET}.sh" ]; then
     . ${LOCALDIR}/scripts/custom/${ARCH}/${TARGET}.sh