PERFORCE change 106659 for review

[soc-andrew]

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

Change 106659 by soc-andrew at soc-andrew_serv on 2006/09/25 12:39:37

	IFC

Affected files ...

.. //depot/projects/soc2005/bsdinstaller/src/release/Makefile#52 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#19 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/picobsd/bridge/PICOBSD#3 integrate

Differences ...

==== //depot/projects/soc2005/bsdinstaller/src/release/Makefile#52 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/release/Makefile,v 1.913 2006/09/08 19:54:36 ru Exp $
+# $FreeBSD: src/release/Makefile,v 1.914 2006/09/11 13:15:09 ru Exp $
 #
 # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \
 #     [RELEASETAG=tag]
@@ -592,7 +592,7 @@
 
 # Install the system into the various distributions.
 release.2:
-	cd ${.CURDIR}/.. && make distrib-dirs DESTDIR=${RD}/trees/base
+	cd ${.CURDIR}/.. && ${CROSSMAKE} distrib-dirs DESTDIR=${RD}/trees/base
 	cd ${.CURDIR}/.. && ${CROSSMAKE} ${WORLD_FLAGS} distributeworld \
 	    DISTDIR=${RD}/trees
 	touch ${.TARGET}

==== //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#19 (text+ko) ====

@@ -3,7 +3,7 @@
 
   <corpauthor>The &os; Project</corpauthor>
 
-  <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.974 2006/09/07 23:49:26 bmah Exp $</pubdate>
+  <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.975 2006/09/16 03:58:07 bmah Exp $</pubdate>
 
   <copyright>
     <year>2000</year>
@@ -1023,7 +1023,7 @@
         disk.  Note that the encryption algorithm is now specified to
         the &man.geli.8; control program using the <option>-e</option>
         option; the <option>-a</option> option is now used to specify
-        the authentication algorithm</para>
+        the authentication algorithm. &merged;</para>
 
       <para>The &man.umass.4; driver now supports
 	<literal>PLAY_MSF</literal>,
@@ -1329,7 +1329,7 @@
       <literal>late</literal> keyword in &man.fstab.5;, along with a
       corresponding <option>-l</option> command-line option to specify
       that these <quote>late</quote> file systems should be
-      mounted.</para>
+      mounted. &merged;</para>
 
     <para>The &man.moused.8; daemon now supports an <option>-H</option> flag
       to enable horizontal virtual scrolling similar to the

==== //depot/projects/soc2005/bsdinstaller/src/release/picobsd/bridge/PICOBSD#3 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/release/picobsd/bridge/PICOBSD,v 1.18 2005/09/27 18:10:43 mlaier Exp $
+# $FreeBSD: src/release/picobsd/bridge/PICOBSD,v 1.19 2006/09/18 06:34:51 marck Exp $
 #
 # Line starting with #PicoBSD contains PicoBSD build parameters
 #marker         def_sz  init    MFS_inodes      floppy_inodes
@@ -41,7 +41,6 @@
 options		DUMMYNET
 device		if_bridge
 options		HZ=1000
-#options		NMBCLUSTERS=4096
 
 device		isa
 device		pci