PERFORCE change 98123 for review
soc-andrew
soc-andrew at FreeBSD.org
Tue May 30 04:32:52 PDT 2006
http://perforce.freebsd.org/chv.cgi?CH=98123
Change 98123 by soc-andrew at soc-andrew_serv on 2006/05/30 11:30:56
IFC
Affected files ...
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#16 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/pc98/fixit-small_crunch.conf#2 integrate
Differences ...
==== //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#16 (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.935 2006/05/22 20:18:04 bmah Exp $</pubdate>
+ <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.936 2006/05/27 14:26:49 bmah Exp $</pubdate>
<copyright>
<year>2000</year>
@@ -443,7 +443,7 @@
<para arch="i386">Support has been improved for
so-called <quote>legacy-free</quote> hardware, in particular,
i386 systems without AT-style keyboard controllers such as the
- Macbook Pro.</para>
+ Macbook Pro. &merged;</para>
<sect4 id="mm">
<title>Multimedia Support</title>
@@ -1043,8 +1043,8 @@
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.jail.8; program now supports a <option>-s</option>
+ option to specify a jail's securelevel. &merged;</para>
<para>The &man.kdump.1; utility now supports a <option>-H</option>
flag, which causes kdump to print an additional field holding
@@ -1098,7 +1098,7 @@
<para>The &man.ls.1; utility now supports
an <option>-U</option> flag to use the file creation
- time for sorting.</para>
+ time for sorting. &merged;</para>
<para>A new &man.malloc.3; implementation has been introduced.
This implementation, sometimes referred to
@@ -1566,7 +1566,7 @@
<para>The manual pages for <application>NTP</application>
have been updated to 4.2.0, to match the version of
- code actually included in &os;.</para>
+ code actually included in &os;. &merged;</para>
</sect2>
</sect1>
==== //depot/projects/soc2005/bsdinstaller/src/release/pc98/fixit-small_crunch.conf#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/release/pc98/fixit-small_crunch.conf,v 1.7 2004/10/01 07:54:37 ru Exp $
+# $FreeBSD: src/release/pc98/fixit-small_crunch.conf,v 1.8 2006/05/29 12:55:36 nyan Exp $
buildopts -DRELEASE_CRUNCH
@@ -41,7 +41,6 @@
srcdirs /usr/src/usr.bin
progs ee
progs ftp
-progs telnet
ln ee edit
srcdirs /usr/src/usr.sbin
More information about the p4-projects
mailing list