PERFORCE change 97317 for review

soc-andrew soc-andrew at FreeBSD.org
Wed May 17 04:56:17 UTC 2006


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

Change 97317 by soc-andrew at soc-andrew_serv on 2006/05/17 04:55:00

	IFC

Affected files ...

.. //depot/projects/soc2005/bsdinstaller/src/release/Makefile#47 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/README#2 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/hardware/Makefile#2 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/hardware/alpha/Makefile#2 delete
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/hardware/alpha/article.sgml#2 delete
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#4 delete
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#9 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#14 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#5 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml#5 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/share/examples/Makefile.relnotesng#2 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/share/misc/dev.archlist.txt#12 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#7 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/i386/mkisoimages.sh#3 integrate

Differences ...

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

@@ -1,4 +1,4 @@
-# $FreeBSD: src/release/Makefile,v 1.909 2006/04/29 14:03:17 nyan Exp $
+# $FreeBSD: src/release/Makefile,v 1.910 2006/05/16 14:22:37 nyan Exp $
 #
 # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \
 #     [RELEASETAG=tag]
@@ -265,9 +265,7 @@
 RND=			${RD}/release.doc
 FD=			${_R}/ftp
 CD=			${_R}/cdrom
-.if ${TARGET} != "pc98"
 CD_BOOT=		${CD}/bootonly
-.endif
 CD_DISC1=		${CD}/disc1
 CD_DISC2=		${CD}/disc2
 .if defined(SEPARATE_LIVEFS)
@@ -308,7 +306,7 @@
 EXTRAS+= iso.1
 .endif
 .if ${TARGET} == "pc98"
-BOOTABLE=
+BOOTABLE="-G"
 .else
 BOOTABLE="-b"
 .endif
@@ -1054,7 +1052,6 @@
 	@rm -f ${CD_LIVEFS}/.profile
 	@cp ${.CURDIR}/fixit.profile ${CD_LIVEFS}/.profile
 	@ln -sf /rescue ${CD_LIVEFS}/stand
-.if ${TARGET} != "pc98"
 	@echo "Setting up CDROM boot area"
 	@rm -f ${CD_LIVEFS}/boot/loader.conf
 .if defined(BSDINSTALLER)
@@ -1073,7 +1070,6 @@
 	@echo 'hint.atkbd.0.flags="0x1"' >> ${CD_LIVEFS}/boot/device.hints
 .endif
 .endif
-.endif
 	@echo "CD_VERSION = ${BUILDNAME}" > ${CD_LIVEFS}/cdrom.inf
 	touch ${.TARGET}
 

==== //depot/projects/soc2005/bsdinstaller/src/release/doc/README#2 (text+ko) ====

@@ -1,7 +1,7 @@
 -*- text -*-
 RELNOTESng README
 Bruce A. Mah <bmah at freebsd.org>
-$FreeBSD: src/release/doc/README,v 1.10 2002/03/06 07:59:18 bmah Exp $
+$FreeBSD: src/release/doc/README,v 1.11 2006/05/15 21:10:34 wilko Exp $
 
 This is the top-level directory for RELNOTESng, a re-write of
 FreeBSD's *.TXT documentation files.  They have been converted to
@@ -39,7 +39,7 @@
 	an arch= attribute are only included in the output if their
 	value is equal to the value of the &arch; entity.  In the
 	future, arch= could be a list of possible &arch; entity values
-	that match, such as "i386,alpha".
+	that match, such as "i386,sparc64".
 share/sgml/release.ent
 	Release information.  Need to update the entry definitions in
 	this file when rolling new revisions; these should take effect
@@ -97,11 +97,11 @@
 be a single word that indicates for which architecture the current
 element will be included.  For example:
 
-	<para arch="alpha">Alpha-specific text</para>
+	<para arch="sparc64">SPARC64-specific text</para>
 
-The currently-supported architectures are i386, alpha, sparc64, and
+The currently-supported architectures are i386, sparc64, and
 ia64.  An element may appear for multiple architectures by specifying
-a comma-separated list of architectures (i.e. arch="alpha,ia64").
+a comma-separated list of architectures (i.e. arch="sparc64,ia64").
 
 When creating a translation, make a new directory under this
 directory with a language code (paralleling the DocProj directory

==== //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/hardware/Makefile#2 (text+ko) ====

@@ -1,9 +1,8 @@
-# $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/Makefile,v 1.6 2003/06/27 03:50:35 bmah Exp $
+# $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/Makefile,v 1.7 2006/05/15 21:12:12 wilko Exp $
 
 RELN_ROOT?= ${.CURDIR}/../..
 
-SUBDIR = alpha
-SUBDIR+= amd64
+SUBDIR= amd64
 SUBDIR+= ia64
 SUBDIR+= i386
 SUBDIR+= pc98

==== //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#9 (text+ko) ====

@@ -29,7 +29,7 @@
 
 <sect1 id="support">
   <sect1info>
-    <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.300 2006/04/28 10:45:27 brueffer Exp $</pubdate>
+    <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.301 2006/05/14 01:55:06 simon Exp $</pubdate>
   </sect1info>
 
   <title>Supported Devices</title>
@@ -248,8 +248,6 @@
 
     &hwlist.lge;
 
-    &hwlist.lnc;
-
     &hwlist.my;
 
     &hwlist.myri10ge;

==== //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#14 (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.926 2006/05/11 19:17:17 bmah Exp $</pubdate>
+  <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.930 2006/05/14 21:02:25 brueffer Exp $</pubdate>
 
   <copyright>
     <year>2000</year>
@@ -349,6 +349,12 @@
       <para>The &man.acpi.thermal.4; driver now supports
 	passive cooling. &merged;</para>
 
+<!-- The following note should remain MI (i.e. don't set arch="alpha") --
+  -- because the alpha docs will be disappearing at some point before --
+  -- 7.0-RELEASE. -->
+    <para>Support for the alpha architecture has been removed.  Alpha
+      support will remain on the RELENG_5 and RELENG_6 codelines.</para>
+
       <para>The &man.cardbus.4; driver now supports
 	<filename>/dev/cardbus<replaceable>%d</replaceable>.cis</filename>.</para>
 
@@ -356,6 +362,9 @@
 	which supports Cronyx Tau-PCI/32 adapters, has been added.
 	&merged;</para>
 
+      <para>The <literal>est</literal> &man.cpufreq.4; driver now supports
+        frequency control for the VIA C7-M family of processors.</para> 
+
       <para>Support for the PadLock Security Co-processor in VIA C3
 	processors has been added to the &man.crypto.9; subsystem.
 	&merged;</para>
@@ -502,8 +511,8 @@
 	<para>The &man.em.4; driver now includes
 	  initial support for suspend and resume features.</para>
 
-	<para>The &man.em.4; driver has been improved on
-	  its performance by using a fast interrupt handler and taskqueue
+	<para>The performance of the &man.em.4; driver has been improved
+	  by using a fast interrupt handler and taskqueue
 	  instead of ithread handler.  This change can be disabled
 	  by defining <literal>NO_EM_FASTINTR</literal> kernel option
 	  for debugging purpose.</para>
@@ -520,6 +529,10 @@
 
 	<para>The &man.lge.4; driver is now MPSAFE. &merged;</para>
 
+	<para>The lnc(4) driver has been removed.  The &man.le.4; and
+	  &man.pcn.4; drivers support all devices that were supported
+	  by lnc(4).</para>
+
 	<para>The &man.my.4; driver is now MPSAFE. &merged;</para>
 
 	<para arch="i386,amd64">The &man.myri10ge.4; driver,
@@ -532,7 +545,7 @@
 
 	<para>The &man.pcn.4; driver is now MPSAFE. &merged;</para>
 
-	<para>The &man.re.4; driver now supports D-Link DGE-528(T)
+	<para>The &man.re.4; driver now supports the D-Link DGE-528(T)
 	  Gigabit Ethernet card.</para>
 
 	<para>The &man.sf.4; driver is now MPSAFE. &merged;</para>
@@ -575,8 +588,8 @@
 	to suppress logging of attempts to modify
 	permanent ARP entries.  &merged;</para>
 
-      <para>The &man.arp.8; utility now allows <option>-i</option>
-	option with <option>-d</option> and <option>-a</option> options
+      <para>The &man.arp.8; utility now allows the <option>-i</option>
+	option together with the <option>-d</option> and <option>-a</option> options
 	to allow all entries for a given interface to be removed.</para>
 
       <para arch="amd64,i386,pc98">An experimental BPF Just-In-Time compiler
@@ -590,14 +603,14 @@
 	&man.if.bridge.4;.</para>
 
       <para>The &man.gre.4; driver, which is for GRE encapsulation
-	found in RFC 1701 and RFC 1702 now supports IPv6 over GRE.</para>
+	found in RFC 1701 and RFC 1702, now supports IPv6 over GRE.</para>
 
-      <para>The &man.if.bridge.4; bridge driver now supports
+      <para>The &man.if.bridge.4; driver now supports
 	creating span ports, which transmit a copy of every frame
 	received by the bridge.  This feature can be enabled
 	by using &man.ifconfig.8;.  &merged;</para>
 
-      <para>The &man.if.bridge.4; bridge driver now supports
+      <para>The &man.if.bridge.4; driver now supports
 	RFC 3378 EtherIP.  This change makes it possible to
 	add &man.gif.4; interfaces to bridges, which will then
 	send and receive IP protocol 97 packets.
@@ -633,6 +646,10 @@
 table 1 add x.x.x.y 4000
 pipe tablearg ip from table(1) to any</programlisting>
 
+      <para>The ip6fw(8) packet filter has been removed.  Since &man.ipfw.4; has gained
+        IPv6 support, it should be used instead.  Please note that some rules might need
+        to be adjusted.</para>
+
       <para>The &man.natm.4;, Native Mode ATM protocol layer is now MPSAFE.</para>
 
       <para>The &man.ng.bpf.4; Netgraph node now supports BPF Just-In-Time compiler.
@@ -647,13 +664,13 @@
 	when the server sent a FIN.  This problem had occurred
 	with Solaris NFS servers.  &merged;</para>
 
-      <para>The sysctl variable <varname>net.inet.ip.portrange.reservedhigh</varname>
+      <para>The sysctl variables <varname>net.inet.ip.portrange.reservedhigh</varname>
 	and <varname>net.inet.ip.portrange.reservedlow</varname>
 	can be used with IPv6 now.</para>
 
       <para>A new sysctl variable <varname>net.inet.icmp.reply_from_interface</varname>
 	has been added.  This allows the &man.icmp.4;
-	reply to non-local packets generated with
+	reply to non-local packets to be generated with
 	the IP address the packet came through in.
 	This is useful for routers to show in &man.traceroute.8;
 	the actual path a packet has taken instead of
@@ -708,38 +725,38 @@
       <para>The &man.aac.4; driver now supports the Adaptec 2610SA SATA-RAID
 	controller in some Hewlett-Packard machines.</para>
 
-      <para>The &man.amr.4; driver has been improved on its performance
-	and now supports full 64-bit DMA.  While this feature is
+      <para>The performance of the &man.amr.4; driver has been improved;
+	it also now supports full 64-bit DMA.  While this feature is
 	enabled by default, this can be forced off by setting the
 	<varname>hw.amr.force_sg32</varname> loader tunable for
 	debugging purpose.
 	&merged;</para>
 
-      <para>The &man.amr.4; driver now supports &man.ioctl.2; requests
-	necessary for Linux LSI MegaRaid tools on &os;'s Linux emulation
+      <para>The &man.amr.4; driver now supports the &man.ioctl.2; requests
+	necessary for the Linux LSI MegaRaid tools in &os;'s Linux emulation
 	environment.
 	&merged;</para>
 
       <para>The &man.ata.4; driver now supports a workaround
 	for some controllers whose DMA does not work properly
-	in 48bit mode.  For the suspicious controllers
-	the PIO mode will be used for access to over 137GB areas.
+	in 48bit mode.  For affected controllers,
+	PIO mode will be used for access to areas beyond 137GB.
 	&merged;</para>
 
       <para>The &man.ata.4; driver now supports the ITE IT8211F IDE controller,
-	and Promise PDC40718 and PDC40719 chip found in Promise
+	and the Promise PDC40718 and PDC40719 chip found in Promise
 	Fasttrak TX4300.
 	&merged;</para>
 
-      <para>The &man.ata.4; driver now supports DMA for kernel crash dump
-	and crash dumping to &man.ataraid.4; device.
+      <para>The &man.ata.4; driver now supports DMA for kernel crash dumps
+	and crash dumping to an &man.ataraid.4; device.
 	&merged;</para>
 
       <para>The &man.ata.4; driver now supports USB mass storage class
 	devices.  To enable it, a line <literal>device atausb</literal>
 	in the kernel configuration file or loading the
 	<filename>atausb</filename> kernel module is needed.
-	Note that this conflicts &man.umass.4; and cannot coexist with
+	Note that this conflicts with &man.umass.4; and cannot coexist with
 	each other.</para>
 
       <para>The &man.ataraid.4; driver now supports
@@ -749,7 +766,7 @@
 	Ext2FS, NTFS, and ReiserFS.  &merged;</para>
 
       <para>The <literal>GEOM_MIRROR</literal> class now supports
-	kernel crash dump to the GEOM providers.
+	kernel crash dumps to the GEOM providers.
 	&merged;</para>
 
       <para>The <literal>GEOM_MIRROR</literal> and <literal>GEOM_RAID3</literal>
@@ -761,7 +778,7 @@
 	The default value is <literal>1</literal> to preserve the current
 	behavior, and if it is set to <literal>0</literal> such components
 	are not disconnected and the kernel will try to still use them
-	(only first error will be logged).
+	(only the first error will be logged).
 	This is helpful for the case of multiple broken components (in
 	different places), so actually all data is available.
 	The broken components will be visible in <command>gmirror list</command>
@@ -784,8 +801,8 @@
 	&merged;</para>
 
       <para>A new GEOM class <literal>GEOM_ZERO</literal> has been added.
-	It creates very huge provider (41PB) <filename>/dev/gzero</filename>
-	and mainly for performance testing.
+	It creates a very huge provider (41PB) <filename>/dev/gzero</filename>
+	and is mainly useful for performance testing.
 	On <literal>BIO_READ</literal> request it zero-fills
 	<varname>bio_data</varname> and on <literal>BIO_WRITE</literal>
 	it does nothing.
@@ -820,7 +837,7 @@
 	and supports different cryptographic algorithms.  See &man.geli.8; for
 	more information. &merged;</para>
 
-      <para>The &man.geli.8; now supports loading keyfiles before root
+      <para>The &man.geli.8; now supports loading keyfiles before the root
 	file system is mounted.  &merged;
 	For example, the following entries
 	can be used in <filename>/boot/loader.conf</filename> to enable
@@ -846,7 +863,7 @@
 	<literal>PLAY_TRACK_REL</literal>,
 	<literal>PAUSE</literal>,
 	<literal>PLAY_12</literal> commands so that
-	the &man.cdcontrol.1; utility can handle USB CD drive.</para>
+	the &man.cdcontrol.1; utility can handle a USB CD drive.</para>
     </sect3>
 
     <sect3 id="fs">
@@ -855,7 +872,7 @@
       <para>A part of the FreeBSD NFS subsystem (the interface with
 	the protocol stack and callouts) is now MPSAFE.</para>
 
-      <para>An initial support of SGI's XFS filesystem has been
+      <para>Initial support for SGI's XFS filesystem has been
 	added.</para>
     </sect3>
 
@@ -868,7 +885,7 @@
       <para><application>DRM</application> has
 	been updated to a snapshot from DRI CVS as of 20051202.  &merged;</para>
 
-      <para>TrustedBSD <application>OpenBSM</application> distribution,
+      <para>TrustedBSD <application>OpenBSM</application>,
 	version 1.0 alpha 5, an implementation of the documented Sun Basic
 	Security Module (BSM) Audit API and file format, as well as local
 	extensions to support the Mac OS X and FreeBSD operating systems
@@ -887,14 +904,14 @@
     <para>Padding of <varname>ai_addrlen</varname>
       in <varname>struct addrinfo</varname> has been removed,
       which was originally for the ABI compatibility.
-      For example, this change break the ABI compatibility of
+      For example, this change breaks the ABI compatibility of the
       &man.getaddrinfo.3; function on 64-bit architecture including
       &os;/alpha, &os;/amd64, &os;/ia64, and &os;/sparc64.</para>
 
-    <para>OpenBSM userland tools including &man.audit.8;,
+    <para>The OpenBSM userland tools, including &man.audit.8;,
       &man.auditd.8;,
-      &man.auditreduce.1;,
-      &man.praudit.1; have been added.</para>
+      &man.auditreduce.1;, and
+      &man.praudit.1;, have been added.</para>
 
     <para>The &man.bsdiff.1; and &man.bspatch.1; utilities
       have been added.  These are tools for constructing and
@@ -921,8 +938,8 @@
       &merged;</para>
 
     <para>The csup(1) utility has been imported.
-      This is an implementation of CVSup-compatible client written
-      in C language.  Note that it currently supports checkout mode
+      This is an implementation of a CVSup-compatible client written
+      in the C language.  Note that it currently supports checkout mode
       only.</para>
 
     <para>The &man.dhclient.8; program now sends the host's name in
@@ -994,12 +1011,15 @@
       also specified, no output is made for disks with no
       activity.</para>
 
-    <para>The &man.jail.8; utility pports a <option>-J
+    <para>The &man.jail.8; utility supports a <option>-J
 	<replaceable>jid_file</replaceable></option> option to
       write out a JidFile, similar to a PidFile, containing
       the jailid, path, hostname, IP and the command used to start
       the jail.  &merged;</para>
 
+    <para>The &man.jail.8; program now support a <option>-s</option>
+      option to specify a jail's securelevel.</para>
+
     <para>The &man.kdump.1; utility now supports a <option>-H</option>
       flag, which causes kdump to print an additional field holding
       the threadid.  &merged;</para>
@@ -1010,7 +1030,7 @@
     <para>The &man.kenv.1; utility now supports a <option>-q</option>
       flag to suppress warnings.</para>
 
-    <para>The &man.kgdb.1; now supports a <option>-w</option>
+    <para>&man.kgdb.1; now supports a <option>-w</option>
       option to open kmem-based targets in read-write mode.
       This allows one to use kgdb on <filename>/dev/mem</filename>
       and be able to patch memory on a live system.</para>
@@ -1084,7 +1104,7 @@
     <para>The &man.mount.8; <literal>nodev</literal> option has
       been removed.</para>
 
-    <para>The &man.mount.8; now supports &man.mqueuefs.5;.</para>
+    <para>&man.mount.8; now supports &man.mqueuefs.5;.</para>
 
     <para>The &man.moused.8; daemon now supports an <option>-H</option> flag
       to enable horizontal virtual scrolling similar to a
@@ -1112,7 +1132,7 @@
       pidfiles handling, has been implemented in
       <filename>libutil</filename>.  &merged;</para>
 
-    <para>The &man.ping.8; utility now supports <quote>a sweeping
+    <para>The &man.ping.8; utility now supports a <quote>sweeping
 	ping</quote> in which &man.icmp.4; payload of
       packets being sent is increased with given step.
       This is useful for testing problematic channels, MTU issues
@@ -1137,7 +1157,7 @@
     <para>The DNS resolver library in &os;'s <application>libc</application>
       has been updated to BIND9's one.</para>
 
-    <para>The &man.rfcomm.sppd.1; now supports service name
+    <para>The &man.rfcomm.sppd.1; program now supports service names
       in addition to <option>-c</option> option with channel number.
       The supported names are: DUN (Dial-Up Networking), FAX (Fax),
       LAN (LAN Access Using PPP), and SP (Serial Port).  &merged;</para>
@@ -1166,6 +1186,11 @@
     <para>The &man.sysctl.8; utility now supports a <option>-q</option>
       flag to suppress a limited set of warnings and errors.</para>
 
+    <para>The &man.traceroute.8; utility now supports
+      a <option>-e</option> option, which sets a fixed destination
+      port for probe packets.  This can be useful for tracing behind
+      packet-filtering firewalls.</para>
+
     <para>The &man.truss.1; utility now supports an <option>-s</option>
       flag for the same functionality as the strace utility
       (<filename role="package">devel/strace</filename>).</para>
@@ -1180,7 +1205,7 @@
       flag which makes the command execution when the standard input
       does not contain any non-whitespace-characters.  &merged;</para>
 
-    <para>The shared library version number of all libraries have
+    <para>The shared library version number of all libraries has
       been updated due to some possible ABI changes.  The libraries
       include: snmp_*, libdialog, libg2c, libobjc,
       libreadline, libregex, libstdc++, libkrb5, libalias, libarchive,
@@ -1250,13 +1275,13 @@
 
       <programlisting>ipv4_addrs_ed0="192.168.0.1/24 192.168.1.1-5/28"</programlisting>
 
-      <para>The <filename>rcconf.sh</filename> in <filename>/etc/rc.d</filename>
+      <para>The <filename>rcconf.sh</filename> script in <filename>/etc/rc.d</filename>
 	has been removed and a variable <varname>early_late_divider</varname>,
 	which designates the script to separate the early and late stages
 	of the boot process, has been added.</para>
 
-      <para>The <filename>rc.initdiskless</filename> now uses &man.tar.1;
-	instead of &man.pax.1; because the &man.pax.1; needs a writable
+      <para>The <filename>rc.initdiskless</filename> script now uses &man.tar.1;
+	instead of &man.pax.1; because &man.pax.1; needs a writable
 	temporary directory.</para>
 
       <para>The <filename>pccard</filename> script has been removed
@@ -1309,7 +1334,7 @@
 
     <para>The timezone database has been updated from the
       <application>tzdata2005l</application> release to the
-      <application>tzdata2005r</application> release. &merged;</para>
+      <application>tzdata2006g</application> release. &merged;</para>
 
     <para><application>WPA Supplicant</application>
       has been updated from version 0.3.9 to version 0.4.8.
@@ -1322,7 +1347,7 @@
   <sect2 id="ports">
     <title>Ports/Packages Collection Infrastructure</title>
 
-    <para>The &man.pkg.add.1; now supports an <option>-F</option>
+    <para>&man.pkg.add.1; now supports an <option>-F</option>
       flag to disable checking whether the same package is already
       installed or not.</para>
 
@@ -1376,7 +1401,7 @@
 
     <para>The <command>@cwd</command> command in
       <filename>pkg-plist</filename> now allows
-      no directory argument.  If no
+      the case where no directory argument is given.  If no
       directory argument is given, it will set current
       working directory to the first prefix given by the
       <command>@cwd</command> command.  &merged;</para>

==== //depot/projects/soc2005/bsdinstaller/src/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#5 (text+ko) ====

@@ -26,13 +26,13 @@
 	this file to fix "missed" conversions are likely to break the
 	build.
 
-        $FreeBSD: src/release/doc/ja_JP.eucJP/hardware/common/dev.sgml,v 1.31 2006/01/26 09:37:24 brd Exp $
+        $FreeBSD: src/release/doc/ja_JP.eucJP/hardware/common/dev.sgml,v 1.32 2006/05/14 20:31:32 brueffer Exp $
         Original revision: 1.282
 -->
 
 <sect1 id="support">
   <sect1info>
-    <pubdate>$FreeBSD: src/release/doc/ja_JP.eucJP/hardware/common/dev.sgml,v 1.31 2006/01/26 09:37:24 brd Exp $</pubdate>
+    <pubdate>$FreeBSD: src/release/doc/ja_JP.eucJP/hardware/common/dev.sgml,v 1.32 2006/05/14 20:31:32 brueffer Exp $</pubdate>
   </sect1info>
 
   <title>Âбþ¥Ï¡¼¥É¥¦¥§¥¢</title>
@@ -216,8 +216,6 @@
 
     &hwlist.pcn;
 
-    &hwlist.lnc;
-
     <para arch="i386,pc98,amd64">SMC 83c17x (EPIC) ¥Ù¡¼¥¹¤Î Ethernet NIC
       (&man.tx.4; ¥É¥é¥¤¥Ð)</para>
     

==== //depot/projects/soc2005/bsdinstaller/src/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml#5 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSD: src/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml,v 1.16 2006/01/26 09:37:24 brd Exp $
+     $FreeBSD: src/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml,v 1.17 2006/05/14 20:31:32 brueffer Exp $
      $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml,v 1.18 2005/06/30 11:12:31 den Exp $
 
      Original revision: 1.282
@@ -37,7 +37,7 @@
 
 <sect1 id="support">
   <sect1info>
-    <pubdate>$FreeBSD: src/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml,v 1.16 2006/01/26 09:37:24 brd Exp $</pubdate>
+    <pubdate>$FreeBSD: src/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml,v 1.17 2006/05/14 20:31:32 brueffer Exp $</pubdate>
   </sect1info>
 
   <title>ðÏÄÄÅÒÖÉ×ÁÅÍÙÅ ÕÓÔÒÏÊÓÔ×Á</title>
@@ -219,8 +219,6 @@
 
     &hwlist.pcn;
 
-    &hwlist.lnc;
-
     <para arch="i386,pc98,amd64">SMC 83c17x (EPIC) Ethernet ÓÅÔÅ×ÙÅ ËÁÒÔÙ
       (ÄÒÁÊ×ÅÒ &man.tx.4;)
     </para>

==== //depot/projects/soc2005/bsdinstaller/src/release/doc/share/examples/Makefile.relnotesng#2 (text+ko) ====

@@ -1,12 +1,12 @@
 # -*- makefile -*-
 #
-# $FreeBSD: src/release/doc/share/examples/Makefile.relnotesng,v 1.11 2005/03/20 17:59:17 bmah Exp $
+# $FreeBSD: src/release/doc/share/examples/Makefile.relnotesng,v 1.12 2006/05/16 16:12:45 bmah Exp $
 #
 # Sample makefile for rendering and uploading RELNOTESng files outside
 # the build tree.
 #
 
-ARCHS=		alpha amd64 ia64 i386 pc98 sparc64
+ARCHS=		amd64 ia64 i386 pc98 sparc64
 MULTITEXTS=	installation relnotes hardware
 UNITEXTS=	readme errata
 

==== //depot/projects/soc2005/bsdinstaller/src/release/doc/share/misc/dev.archlist.txt#12 (text+ko) ====

@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.83 2006/04/28 10:45:28 brueffer Exp $
+# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.84 2006/05/14 01:55:06 simon Exp $
 #
 
 #
@@ -81,7 +81,6 @@
 ixgb	i386,amd64
 kue	i386,pc98,ia64,amd64
 lge	i386,pc98,amd64
-lnc	i386,pc98
 mfi	i386,alpha,ia64,amd64
 mlx	i386,alpha,ia64,amd64
 mly	i386,ia64,amd64

==== //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#7 (text+ko) ====

@@ -35,7 +35,7 @@
 
 <sect1 id="support">
   <sect1info>
-    <pubdate>$FreeBSD: src/release/doc/zh_CN.GB2312/hardware/common/dev.sgml,v 1.8 2006/04/15 05:32:12 delphij Exp $</pubdate>
+    <pubdate>$FreeBSD: src/release/doc/zh_CN.GB2312/hardware/common/dev.sgml,v 1.9 2006/05/14 20:31:32 brueffer Exp $</pubdate>
   </sect1info>
 
   <title>Ö§³ÖµÄÓ²¼þ</title>
@@ -242,8 +242,6 @@
 
     &hwlist.lge;
 
-    &hwlist.lnc;
-
     &hwlist.my;
 
     &hwlist.myri10ge;

==== //depot/projects/soc2005/bsdinstaller/src/release/i386/mkisoimages.sh#3 (text+ko) ====

@@ -4,7 +4,7 @@
 # Author: Jordan K Hubbard
 # Date:   22 June 2001
 #
-# $FreeBSD: src/release/i386/mkisoimages.sh,v 1.13 2005/01/30 21:10:51 kensmith Exp $
+# $FreeBSD: src/release/i386/mkisoimages.sh,v 1.14 2006/05/16 14:22:37 nyan Exp $
 #
 # This script is used by release/Makefile to build the (optional) ISO images
 # for a FreeBSD release.  It is considered architecture dependent since each
@@ -28,12 +28,15 @@
 if [ "x$1" = "x-b" ]; then
 	bootable="-b boot/cdboot -no-emul-boot"
 	shift
+elif [ "x$1" = "x-G" ]; then
+	bootable="-G /R/cdrom/bootonly/boot/cdboot"
+	shift
 else
 	bootable=""
 fi
 
 if [ $# -lt 3 ]; then
-	echo Usage: $0 '[-b] image-label image-name base-bits-dir [extra-bits-dir]'
+	echo Usage: $0 '[-bG] image-label image-name base-bits-dir [extra-bits-dir]'
 	exit 1
 fi
 


More information about the p4-projects mailing list