PERFORCE change 60873 for review
Peter Wemm
peter at FreeBSD.org
Thu Sep 2 12:43:00 PDT 2004
http://perforce.freebsd.org/chv.cgi?CH=60873
Change 60873 by peter at peter_daintree on 2004/09/02 19:42:05
IFC @60871
Affected files ...
.. //depot/projects/hammer/UPDATING#52 integrate
.. //depot/projects/hammer/contrib/pf/pflogd/pflogd.c#4 integrate
.. //depot/projects/hammer/etc/devd.conf#12 integrate
.. //depot/projects/hammer/etc/rc.d/pflog#2 integrate
.. //depot/projects/hammer/gnu/lib/libstdc++/Makefile#20 integrate
.. //depot/projects/hammer/lib/libarchive/Makefile#12 integrate
.. //depot/projects/hammer/lib/libautofs/Makefile#1 branch
.. //depot/projects/hammer/lib/libautofs/libautofs.3#1 branch
.. //depot/projects/hammer/lib/libautofs/libautofs.c#1 branch
.. //depot/projects/hammer/lib/libautofs/libautofs.h#1 branch
.. //depot/projects/hammer/lib/libc/gen/glob.3#7 integrate
.. //depot/projects/hammer/release/Makefile.inc.docports#11 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/sparc64/proc-sparc64.sgml#3 integrate
.. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml#3 integrate
.. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/hardware/sparc64/proc-sparc64.sgml#2 integrate
.. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/installation/common/install.sgml#4 integrate
.. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/installation/common/layout.sgml#3 integrate
.. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/installation/common/trouble.sgml#2 integrate
.. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/readme/article.sgml#4 integrate
.. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/relnotes/common/new.sgml#4 integrate
.. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/relnotes/i386/Makefile#2 integrate
.. //depot/projects/hammer/release/fixit.profile#2 integrate
.. //depot/projects/hammer/sbin/fsck_ffs/Makefile#6 integrate
.. //depot/projects/hammer/sbin/fsck_ffs/dir.c#6 integrate
.. //depot/projects/hammer/sbin/fsck_ffs/fsck.h#7 integrate
.. //depot/projects/hammer/sbin/fsck_ffs/inode.c#4 integrate
.. //depot/projects/hammer/sbin/fsck_ffs/pass1.c#9 integrate
.. //depot/projects/hammer/sbin/fsck_ffs/pass2.c#6 integrate
.. //depot/projects/hammer/sbin/ifconfig/ifconfig.c#20 integrate
.. //depot/projects/hammer/sbin/mount_autofs/Makefile#1 branch
.. //depot/projects/hammer/sbin/mount_autofs/mount_autofs.8#1 branch
.. //depot/projects/hammer/sbin/mount_autofs/mount_autofs.c#1 branch
.. //depot/projects/hammer/sbin/mount_msdosfs/mount_msdosfs.c#7 integrate
.. //depot/projects/hammer/share/examples/autofs/driver/Makefile#1 branch
.. //depot/projects/hammer/share/examples/autofs/driver/autodriver.c#1 branch
.. //depot/projects/hammer/share/examples/autofs/driver/autotab#1 branch
.. //depot/projects/hammer/share/man/man5/autofs.5#1 branch
.. //depot/projects/hammer/sys/alpha/alpha/trap.c#13 integrate
.. //depot/projects/hammer/sys/alpha/include/param.h#9 integrate
.. //depot/projects/hammer/sys/alpha/linux/linux_machdep.c#9 integrate
.. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#71 integrate
.. //depot/projects/hammer/sys/amd64/amd64/trap.c#53 integrate
.. //depot/projects/hammer/sys/amd64/ia32/ia32_syscall.c#10 integrate
.. //depot/projects/hammer/sys/amd64/include/param.h#24 integrate
.. //depot/projects/hammer/sys/amd64/linux32/linux32_machdep.c#3 integrate
.. //depot/projects/hammer/sys/coda/cnode.h#5 integrate
.. //depot/projects/hammer/sys/coda/coda_fbsd.c#13 integrate
.. //depot/projects/hammer/sys/coda/coda_psdev.c#10 integrate
.. //depot/projects/hammer/sys/coda/coda_vfsops.c#11 integrate
.. //depot/projects/hammer/sys/conf/NOTES#64 integrate
.. //depot/projects/hammer/sys/conf/majors#24 integrate
.. //depot/projects/hammer/sys/conf/options#57 integrate
.. //depot/projects/hammer/sys/dev/acpica/Osd/OsdDebug.c#6 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_pci_link.c#19 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#42 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-disk.c#22 integrate
.. //depot/projects/hammer/sys/dev/bfe/if_bfe.c#10 integrate
.. //depot/projects/hammer/sys/dev/bfe/if_bfereg.h#4 integrate
.. //depot/projects/hammer/sys/dev/em/if_em.c#28 integrate
.. //depot/projects/hammer/sys/dev/em/if_em.h#18 integrate
.. //depot/projects/hammer/sys/dev/em/if_em_hw.c#12 integrate
.. //depot/projects/hammer/sys/dev/em/if_em_hw.h#12 integrate
.. //depot/projects/hammer/sys/dev/fdc/fdc_isa.c#7 integrate
.. //depot/projects/hammer/sys/dev/tga/tga_pci.c#8 integrate
.. //depot/projects/hammer/sys/fs/autofs/autofs.h#1 branch
.. //depot/projects/hammer/sys/fs/autofs/autofs_util.c#1 branch
.. //depot/projects/hammer/sys/fs/autofs/autofs_vfsops.c#1 branch
.. //depot/projects/hammer/sys/fs/autofs/autofs_vnops.c#1 branch
.. //depot/projects/hammer/sys/fs/pseudofs/pseudofs_vnops.c#12 integrate
.. //depot/projects/hammer/sys/i386/bios/mca_machdep.c#4 integrate
.. //depot/projects/hammer/sys/i386/bios/vpd.c#5 integrate
.. //depot/projects/hammer/sys/i386/i386/mp_machdep.c#33 integrate
.. //depot/projects/hammer/sys/i386/i386/pmap.c#52 integrate
.. //depot/projects/hammer/sys/i386/i386/trap.c#28 integrate
.. //depot/projects/hammer/sys/i386/include/param.h#10 integrate
.. //depot/projects/hammer/sys/i386/linux/linux_machdep.c#13 integrate
.. //depot/projects/hammer/sys/ia64/conf/GENERIC#18 integrate
.. //depot/projects/hammer/sys/ia64/ia64/trap.c#27 integrate
.. //depot/projects/hammer/sys/kern/init_main.c#26 integrate
.. //depot/projects/hammer/sys/kern/kern_fork.c#39 integrate
.. //depot/projects/hammer/sys/kern/kern_idle.c#14 integrate
.. //depot/projects/hammer/sys/kern/kern_intr.c#29 integrate
.. //depot/projects/hammer/sys/kern/kern_kse.c#10 integrate
.. //depot/projects/hammer/sys/kern/kern_kthread.c#8 integrate
.. //depot/projects/hammer/sys/kern/kern_mutex.c#25 integrate
.. //depot/projects/hammer/sys/kern/kern_prot.c#18 integrate
.. //depot/projects/hammer/sys/kern/kern_shutdown.c#25 integrate
.. //depot/projects/hammer/sys/kern/kern_sig.c#47 integrate
.. //depot/projects/hammer/sys/kern/kern_switch.c#24 integrate
.. //depot/projects/hammer/sys/kern/kern_thr.c#21 integrate
.. //depot/projects/hammer/sys/kern/sched_4bsd.c#26 integrate
.. //depot/projects/hammer/sys/kern/sched_ule.c#46 integrate
.. //depot/projects/hammer/sys/kern/subr_smp.c#22 integrate
.. //depot/projects/hammer/sys/kern/subr_trap.c#25 integrate
.. //depot/projects/hammer/sys/kern/subr_turnstile.c#12 integrate
.. //depot/projects/hammer/sys/modules/autofs/Makefile#1 branch
.. //depot/projects/hammer/sys/modules/coda/Makefile#3 integrate
.. //depot/projects/hammer/sys/modules/coda5/Makefile#2 integrate
.. //depot/projects/hammer/sys/modules/cp/Makefile#2 integrate
.. //depot/projects/hammer/sys/modules/ctau/Makefile#3 integrate
.. //depot/projects/hammer/sys/modules/cx/Makefile#4 integrate
.. //depot/projects/hammer/sys/modules/if_ppp/Makefile#2 integrate
.. //depot/projects/hammer/sys/modules/if_tap/Makefile#2 integrate
.. //depot/projects/hammer/sys/modules/pf/Makefile#5 integrate
.. //depot/projects/hammer/sys/net/if.c#28 integrate
.. //depot/projects/hammer/sys/net/if.h#14 integrate
.. //depot/projects/hammer/sys/pc98/conf/NOTES#33 integrate
.. //depot/projects/hammer/sys/powerpc/powerpc/trap.c#11 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/trap.c#15 integrate
.. //depot/projects/hammer/sys/sys/proc.h#62 integrate
.. //depot/projects/hammer/sys/sys/sched.h#12 integrate
.. //depot/projects/hammer/sys/sys/smp.h#9 integrate
.. //depot/projects/hammer/sys/sys/ucred.h#6 integrate
.. //depot/projects/hammer/sys/vm/vm_fault.c#23 integrate
.. //depot/projects/hammer/sys/vm/vm_mmap.c#26 integrate
.. //depot/projects/hammer/sys/vm/vm_zeroidle.c#14 integrate
.. //depot/projects/hammer/usr.sbin/kgzip/kgzcmp.c#4 integrate
Differences ...
==== //depot/projects/hammer/UPDATING#52 (text+ko) ====
@@ -23,11 +23,28 @@
developers choose to disable these features on build machines
to maximize performance.
+20040902:
+ The ifi_epoch change has been reverted because the ABI breakage
+ was too extensive. If you are running with a kernel/userland
+ containing the initial change (20040830), you should heed the
+ warning about ifconfig incompatibility when upgrading again.
+ With this change, 5.3 and 6.0 ifconfigs and kernels are once
+ again interoperable.
+
20040830:
A new variable, ifi_epoch, has been added to struct if_data
which is part if struct ifnet. This means all network drivers
and network monitoring applications need to be recompiled.
+ WARNING WARNING WARNING WARNING WARNING WARNING WARNING
+
+ This also breaks ifconfig compatibility. An old ifconfig will
+ not work with the new kernel and a new ifconfig will not work
+ with the old. It is strongly recommended that you make a copy
+ of your old ifconfig before installworld. If you are installing
+ remotely, you must copy over a new ifconfig before rebooting in
+ to the new kernel.
+
20040828:
The default configuration for the network stack has been changed
such that it now runs without the Giant lock unless configured
@@ -1821,4 +1838,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: src/UPDATING,v 1.352 2004/08/30 06:29:25 brooks Exp $
+$FreeBSD: src/UPDATING,v 1.354 2004/09/02 05:07:29 brooks Exp $
==== //depot/projects/hammer/contrib/pf/pflogd/pflogd.c#4 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/contrib/pf/pflogd/pflogd.c,v 1.5 2004/06/16 23:39:32 mlaier Exp $");
+__FBSDID("$FreeBSD: src/contrib/pf/pflogd/pflogd.c,v 1.6 2004/08/31 18:04:34 mlaier Exp $");
#include <sys/types.h>
#include <sys/ioctl.h>
@@ -325,7 +325,11 @@
scan_dump(FILE *fp, off_t size)
{
struct pcap_file_header hdr;
+#ifdef __FreeBSD__
+ struct pcap_sf_pkthdr ph;
+#else
struct pcap_pkthdr ph;
+#endif
off_t pos;
/*
@@ -395,17 +399,34 @@
dump_packet_nobuf(u_char *user, const struct pcap_pkthdr *h, const u_char *sp)
{
FILE *f = (FILE *)user;
+#ifdef __FreeBSD__
+ struct pcap_sf_pkthdr sh;
+#endif
if (suspended) {
packets_dropped++;
return;
}
+#ifdef __FreeBSD__
+ sh.ts.tv_sec = (bpf_int32)h->ts.tv_sec;
+ sh.ts.tv_usec = (bpf_int32)h->ts.tv_usec;
+ sh.caplen = h->caplen;
+ sh.len = h->len;
+
+ if (fwrite((char *)&sh, sizeof(sh), 1, f) != 1) {
+#else
if (fwrite((char *)h, sizeof(*h), 1, f) != 1) {
+#endif
/* try to undo header to prevent corruption */
off_t pos = ftello(f);
+#ifdef __FreeBSD__
+ if (pos < sizeof(sh) ||
+ ftruncate(fileno(f), pos - sizeof(sh))) {
+#else
if (pos < sizeof(*h) ||
ftruncate(fileno(f), pos - sizeof(*h))) {
+#endif
logmsg(LOG_ERR, "Write failed, corrupted logfile!");
set_suspended(1);
gotsig_close = 1;
@@ -474,7 +495,12 @@
dump_packet(u_char *user, const struct pcap_pkthdr *h, const u_char *sp)
{
FILE *f = (FILE *)user;
+#ifdef __FreeBSD__
+ struct pcap_sf_pkthdr sh;
+ size_t len = sizeof(sh) + h->caplen;
+#else
size_t len = sizeof(*h) + h->caplen;
+#endif
if (len < sizeof(*h) || h->caplen > (size_t)cur_snaplen) {
logmsg(LOG_NOTICE, "invalid size %u (%u/%u), packet dropped",
@@ -502,8 +528,18 @@
}
append:
+#ifdef __FreeBSD__
+ sh.ts.tv_sec = (bpf_int32)h->ts.tv_sec;
+ sh.ts.tv_usec = (bpf_int32)h->ts.tv_usec;
+ sh.caplen = h->caplen;
+ sh.len = h->len;
+
+ memcpy(bufpos, &sh, sizeof(sh));
+ memcpy(bufpos + sizeof(sh), sp, h->caplen);
+#else
memcpy(bufpos, h, sizeof(*h));
memcpy(bufpos + sizeof(*h), sp, h->caplen);
+#endif
bufpos += len;
bufleft -= len;
==== //depot/projects/hammer/etc/devd.conf#12 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/devd.conf,v 1.14 2004/07/05 20:16:30 imp Exp $
+# $FreeBSD: src/etc/devd.conf,v 1.15 2004/09/01 00:08:15 brooks Exp $
#
# Refer to devd.conf(5) and devd(8) man pages for the details on how to
# run and configure devd.
@@ -55,6 +55,16 @@
device-name "ed50";
};
+# When a USB keyboard arrives, attach it as the console keyboard
+attach 100 {
+ device-name "ukbd0";
+ action "test -c /dev/kbd1 && kbdcontrol -k /dev/kbd1 < /dev/console";
+};
+detach 100 {
+ device-name "ukbd0";
+ action "kbdcontrol -k /dev/kbd0 < /dev/console";
+};
+
#
# Rescan scsi device-names on attach, but not detach.
#
==== //depot/projects/hammer/etc/rc.d/pflog#2 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/pflog,v 1.1 2004/04/02 19:25:27 mlaier Exp $
+# $FreeBSD: src/etc/rc.d/pflog,v 1.2 2004/08/31 14:23:51 mlaier Exp $
#
# PROVIDE: pflog
@@ -27,7 +27,7 @@
{
# load pflog kernel module if needed
if ! kldstat -v | grep -q pflog\$; then
- if kldload pflog; then
+ if kldload pf; then
info 'pflog module loaded.'
else
err 1 'pflog module failed to load.'
@@ -39,7 +39,7 @@
warn 'pflog: COULD NOT SET UP pflog0'
fi
- # check for pf rules
+ # check for pflogd binary
if [ ! -x "${pflog_program:-/sbin/pflogd}" ]
then
warn 'pflog: NO PFLOGD BINARY FOUND'
==== //depot/projects/hammer/gnu/lib/libstdc++/Makefile#20 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/lib/libstdc++/Makefile,v 1.51 2004/07/28 05:27:18 kan Exp $
+# $FreeBSD: src/gnu/lib/libstdc++/Makefile,v 1.52 2004/09/01 08:17:20 ru Exp $
GCCDIR= ${.CURDIR}/../../../contrib/gcc
SRCDIR= ${.CURDIR}/../../../contrib/libstdc++
@@ -71,6 +71,7 @@
atomicity.cc: ${ATOMICITY_H}
ln -sf ${.ALLSRC} ${.TARGET}
+CLEANFILES+= atomicity.cc
INCSGROUPS= BITSHDRS BKWHDRS EXTHDRS BASEHDRS BASEXHDRS STDHDRS \
TARGETHDRS THRHDRS DEBUGHDRS
==== //depot/projects/hammer/lib/libarchive/Makefile#12 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libarchive/Makefile,v 1.20 2004/08/14 03:45:45 kientzle Exp $
+# $FreeBSD: src/lib/libarchive/Makefile,v 1.22 2004/09/01 05:07:17 kientzle Exp $
#
# Use "make distfile" to build a conventional tar.gz archive
@@ -27,7 +27,9 @@
INCS= archive.h archive_entry.h
-SRCS= archive_check_magic.c \
+# Note: archive.h does need to be listed here, since it's built
+SRCS= archive.h \
+ archive_check_magic.c \
archive_entry.c \
archive_read.c \
archive_read_data_into_buffer.c \
@@ -166,20 +168,6 @@
MLINKS+= archive_write.3 archive_write_set_format_ustar.3
MLINKS+= libarchive.3 archive.3
-#
-# archive.h is built dynamically, which has a number of implications...
-#
-
-# Ensure archive.h gets built before we compute dependencies.
-beforedepend: archive.h
-afterdepend:
- echo "archive.h: Makefile" >> ${DEPENDFILE}
-# Ensure archive.h gets built before we compile anything.
-${SRCS:S/.c$/.o/}: archive.h
-
-# archive.h needs to be cleaned
-CLEANFILES+= archive.h
-
# Build archive.h from archive.h.in
archive.h: archive.h.in Makefile
cat ${.CURDIR}/archive.h.in | \
@@ -187,8 +175,16 @@
sed 's/@ARCHIVE_API_FEATURE@/${ARCHIVE_API_FEATURE}/' | \
cat > archive.h
+# archive.h needs to be cleaned
+CLEANFILES+= archive.h
+
+#
+# Voodoo for building a distfile that uses autoconf/automake/etc.
+#
+
# Files that just get copied to the distfile build directory
DIST_WORK_DIR= ${.OBJDIR}/lib${LIB}-${VERSION}
+CLEANDIRS+= ${DIST_WORK_DIR}
DISTFILE= lib${LIB}-${VERSION}.tar.gz
DIST_FILES= ${SRCS}
DIST_FILES+= ${MAN}
@@ -197,8 +193,6 @@
DIST_FILES+= archive_private.h archive_string.h
DIST_FILES+= Makefile.am
-CLEANDIRS+= ${DIST_WORK_DIR}
-
distfile:
rm -rf ${DIST_WORK_DIR}
mkdir ${DIST_WORK_DIR}
==== //depot/projects/hammer/lib/libc/gen/glob.3#7 (text+ko) ====
@@ -32,9 +32,9 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)glob.3 8.3 (Berkeley) 4/16/94
-.\" $FreeBSD: src/lib/libc/gen/glob.3,v 1.28 2004/08/23 12:10:44 tjr Exp $
+.\" $FreeBSD: src/lib/libc/gen/glob.3,v 1.30 2004/09/01 23:28:27 tjr Exp $
.\"
-.Dd August 23, 2004
+.Dd September 1, 2004
.Dt GLOB 3
.Os
.Sh NAME
@@ -197,9 +197,9 @@
.Dv GLOB_NOESCAPE
is set, backslash escaping is disabled.
.It Dv GLOB_NOSORT
-By default, the pathnames are sorted in ascending order
-according to the current setting of
-.Ev LC_COLLATE ;
+By default, the pathnames are sorted in ascending
+.Tn ASCII
+order;
this flag prevents that sorting (speeding up
.Fn glob ) .
.El
==== //depot/projects/hammer/release/Makefile.inc.docports#11 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/release/Makefile.inc.docports,v 1.25 2004/08/30 06:19:34 ru Exp $
+# $FreeBSD: src/release/Makefile.inc.docports,v 1.26 2004/09/01 14:36:48 ru Exp $
#
# List of (dependent) ports that are minimally required to be
# checked out from CVS in order to get ${DOCPORTS} built and
@@ -15,46 +15,33 @@
# Get __FreeBSD_version
.if !defined(OSVERSION)
-.if exists(/sbin/sysctl)
OSVERSION!= /sbin/sysctl -n kern.osreldate
-.else
-OSVERSION!= /usr/sbin/sysctl -n kern.osreldate
-.endif
.endif
MINIMALDOCPORTS= \
ports/Mk \
ports/Templates \
- ports/Tools \
+ ports/Tools
+
+MINIMALDOCPORTS+= \
ports/archivers/unzip \
ports/converters/libiconv \
ports/devel/gettext \
ports/devel/gmake \
- ports/devel/imake-4 \
ports/devel/libtool13 \
ports/devel/libtool15 \
- ports/devel/p5-File-Spec \
- ports/devel/p5-File-Temp \
ports/devel/pkgconfig \
ports/graphics/gd \
ports/graphics/jbigkit \
ports/graphics/jpeg \
ports/graphics/netpbm \
- ports/graphics/peps \
ports/graphics/png \
ports/graphics/scr2png \
ports/graphics/tiff \
- ports/lang/perl5 \
- ports/lang/perl5.8 \
ports/print/freetype2 \
ports/print/ghostscript-gnu \
ports/print/ghostscript-gnu-nox11 \
ports/print/gsfonts \
- ports/textproc/docbook \
- ports/textproc/docbook-241 \
- ports/textproc/docbook-300 \
- ports/textproc/docbook-310 \
- ports/textproc/docbook-400 \
ports/textproc/docbook-410 \
ports/textproc/docbook-xml \
ports/textproc/docbook-xsl \
@@ -68,17 +55,29 @@
ports/textproc/linuxdoc \
ports/textproc/scr2txt \
ports/textproc/sdocbook-xml \
- ports/textproc/sgmlformat \
ports/textproc/xhtml \
ports/textproc/xmlcatmgr \
ports/www/links1 \
ports/www/tidy
-.if ${OSVERSION} < 460101 || ( ${OSVERSION} >= 500000 && ${OSVERSION} < 500036 )
-MINIMALDOCPORTS+= ports/textproc/sed_inplace
-.endif
+
.if ${MACHINE_ARCH} != "i386"
MINIMALDOCPORTS+= ports/textproc/openjade \
ports/textproc/opensp
.else
MINIMALDOCPORTS+= ports/textproc/jade
.endif
+
+.if ${OSVERSION} < 500000
+MINIMALDOCPORTS+= \
+ ports/converters/p5-MIME-Base64 \
+ ports/devel/p5-File-Spec \
+ ports/devel/p5-File-Temp \
+ ports/devel/p5-Test-Harness \
+ ports/devel/p5-Test-Simple \
+ ports/security/p5-Digest \
+ ports/security/p5-Digest-MD5 \
+ ports/textproc/p5-PodParser
+.else
+MINIMALDOCPORTS+= \
+ ports/lang/perl5.8
+.endif
==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/sparc64/proc-sparc64.sgml#3 (text+ko) ====
@@ -1,5 +1,5 @@
<!--
- $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/sparc64/proc-sparc64.sgml,v 1.11 2003/01/26 06:09:32 jake Exp $
+ $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/sparc64/proc-sparc64.sgml,v 1.12 2004/08/31 19:00:20 hrs Exp $
-->
<sect1 id="support-sys">
<title>Supported Systems</title>
@@ -76,6 +76,12 @@
<para>SPARCEngine Ultra AXmp</para>
</listitem>
<listitem>
+ <para>Ultra 1E</para>
+ </listitem>
+ <listitem>
+ <para>Ultra 2</para>
+ </listitem>
+ <listitem>
<para>Ultra 5</para>
</listitem>
<listitem>
@@ -106,12 +112,6 @@
<listitem>
<para>Enterprise 4500</para>
</listitem>
- <listitem>
- <para>Ultra 1 Enterprise (1E for short)</para>
- </listitem>
- <listitem>
- <para>Ultra 2</para>
- </listitem>
</itemizedlist>
</sect2>
==== //depot/projects/hammer/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml#3 (text+ko) ====
@@ -1,10 +1,10 @@
<!--
The FreeBSD Russian Documentation Project
- $FreeBSD: src/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml,v 1.2 2004/08/11 10:25:20 den Exp $
- $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml,v 1.3 2004/08/11 10:21:31 den Exp $
+ $FreeBSD: src/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml,v 1.3 2004/09/01 13:14:46 den Exp $
+ $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml,v 1.5 2004/09/01 13:10:46 den Exp $
- Original revision: 1.226
+ Original revision: 1.238
-->
<!--
@@ -37,7 +37,7 @@
<sect1 id="support">
<sect1info>
- <pubdate>$FreeBSD: src/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml,v 1.2 2004/08/11 10:25:20 den Exp $</pubdate>
+ <pubdate>$FreeBSD: src/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml,v 1.3 2004/09/01 13:14:46 den Exp $</pubdate>
</sect1info>
<title>ðÏÄÄÅÒÖÉ×ÁÅÍÙÅ ÕÓÔÒÏÊÓÔ×Á</title>
@@ -55,11 +55,10 @@
ÓÐÒÁ×ÏÞÎÉËÁ.</para>
<note>
- <para>óÐÉÓÏË ÓÐÅÃÉÆÉÞÎÙÈ ÐÏÄÄÅÒÖÉ×ÁÅÍÙÈ ÕÓÔÒÏÊÓÔ× ÐÏÓÔÅÐÅÎÎÏ ÂÕÄÅÔ ÕÄÁÌÅÎ
- ÉÚ ÜÔÏÇÏ ÄÏËÕÍÅÎÔÁ ÄÌÑ ÕÍÅÎØÛÅÎÉÑ ÏÂßÅÍÁ ÄÕÂÌÉÒÏ×ÁÎÎÏÊ (É ÐÏÔÅÎÃÉÁÌØÎÏ
- ÕÓÔÁÒÅ×ÛÅÊ) ÉÎÆÏÒÍÁÃÉÉ. ðÏÓÌÅ ÚÁ×ÅÒÛÅÎÉÑ ÜÔÏÇÏ ÐÒÏÃÅÓÓÁ × ÓÔÒÁÎÉÃÅ
- ÓÐÒÁ×ÏÞÎÉËÁ ËÁÖÄÏÇÏ ÄÒÁÊ×ÅÒÁ ÄÏÌÖÅÎ ÎÁÈÏÄÉÔØÓÑ ÐÏÌÎÙÊ ÓÐÉÓÏË ÕÓÔÒÏÊÓÔ×,
- ÐÏÄÄÅÒÖÉ×ÁÅÍÙÈ ÄÁÎÎÙÍ ÄÒÁÊ×ÅÒÏÍ.</para>
+ <para>óÐÉÓÏË ÕÓÔÒÏÊÓÔ× × ÜÔÏÍ ÄÏËÕÍÅÎÔÅ ÇÅÎÅÒÉÒÕÅÔÓÑ Á×ÔÏÍÁÔÉÞÅÓËÉ ÉÚ
+ ÓÔÒÁÎÉà ÓÐÒÁ×ÏÞÎÏÊ ÓÉÓÔÅÍÙ &os;. üÔÏ ÏÚÎÁÞÁÅÔ, ÞÔÏ ÎÅËÏÔÏÒÙÅ
+ ÕÓÔÒÏÊÓÔ×Á, ÐÏÄÄÅÒÖÉ×ÁÅÍÙÅ ÎÅÓËÏÌØËÉÍÉ ÄÒÁÊ×ÅÒÁÍÉ, ÍÏÇÕÔ
+ ÐÏÑ×ÌÑÔØÓÑ ÎÅÓËÏÌØËÏ ÒÁÚ.</para>
</note>
<sect2 id="disk">
@@ -245,10 +244,9 @@
&hwlist.twa;
- <para arch="i386,pc98,alpha,sparc64,amd64">LSI/Symbios (ÂÙ×ÛÉÅ NCR)
- 53C8<replaceable>XX</replaceable> É 53C10<replaceable>XX</replaceable> PCI
- SCSI ËÏÎÔÒÏÌÌÅÒÙ, ×ÓÔÒÏÅÎÎÙÅ × ÍÁÔÅÒÉÎÓËÕÀ ÐÌÁÔÕ ÉÌÉ × ×ÉÄÅ ÄÏÐÏÌÎÉÔÅÌØÎÙÈ
- ÐÌÁÔ (ÄÒÁÊ×ÅÒÙ &man.ncr.4; É &man.sym.4;)</para>
+ &hwlist.ncr;
+
+ &hwlist.sym;
&hwlist.ncv;
@@ -256,9 +254,6 @@
&hwlist.isp;
- <para arch="i386,amd64">DTC 3290 EISA SCSI ËÏÎÔÒÏÌÌÅÒ × ÒÅÖÉÍÅ ÜÍÕÌÑÃÉÉ
- 1542.</para>
-
&hwlist.amd;
&hwlist.nsp;
@@ -279,13 +274,10 @@
&hwlist.ips;
- <para arch="i386,alpha,pc98,sparc64,ia64,amd64">LSI Logic Fusion/MP
- architecture Fiber Channel ËÏÎÔÒÏÌÌÅÒÙ (ÄÒÁÊ×ÅÒ &man.mpt.4;)</para>
+ &hwlist.mpt;
+
+ &hwlist.trm;
- <para arch="i386,amd64">PCI SCSI ÈÏÓÔ ÁÄÁÐÔÅÒÙ, ÉÓÐÏÌØÚÕÀÝÉÅ Tekram
- TRM-S1040 SCSI ÞÉÐÓÅÔ (ÄÒÁÊ×ÅÒ &man.trm.4;)
- </para>
-
<para>óÏ ×ÓÅÍÉ ÐÏÄÄÅÒÖÉ×ÁÅÍÙÍÉ SCSI ËÏÎÔÒÏÌÌÅÒÁÍÉ, ÐÒÅÄÏÓÔÁ×ÌÅÎÁ ÐÏÌÎÁÑ
ÐÏÄÄÅÒÖËÁ ÐÅÒÉÆÅÒÉÉ SCSI-I, SCSI-II É SCSI-III, ×ËÌÀÞÁÑ ÖÅÓÔËÉÅ ÄÉÓËÉ,
ÏÐÔÉÞÅÓËÉÅ ÄÉÓËÉ, ÌÅÎÔÏÞÎÙÅ ÎÁËÏÐÉÔÅÌÉ (×ËÌÀÞÁÑ DAT, 8mm
@@ -338,12 +330,6 @@
</para>
</listitem>
<listitem arch="i386">
- <para>Seagate ST01/02 SCSI ËÏÎÔÒÏÌÌÅÒÙ</para>
- </listitem>
- <listitem arch="i386">
- <para>Future Domain 8xx/950 series SCSI ËÏÎÔÒÏÌÌÅÒÙ</para>
- </listitem>
- <listitem arch="i386">
<para>WD7000 SCSI ËÏÎÔÒÏÌÌÅÒ</para>
</listitem>
</itemizedlist>
@@ -362,9 +348,7 @@
<sect2 id="ethernet">
<title>Ethernet ÉÎÔÅÒÆÅÊÓÙ</title>
- <para arch="i386,pc98,alpha,amd64">Adaptec Duralink PCI Fast Ethernet
- ÁÄÁÐÔÅÒÙ, ÏÓÎÏ×ÁÎÎÙÅ ÎÁ Adaptec
- AIC-6915 Fast Ethernet ËÏÎÔÒÏÌÌÅÒÅ (ÄÒÁÊ×ÅÒ &man.sf.4;)</para>
+ &hwlist.sf;
<para arch="i386,pc98,amd64">Alteon Networks PCI Gigabit Ethernet ÓÅÔÅ×ÙÅ ËÁÒÔÙ ÎÁ
ÞÉÐÓÅÔÁÈ Tigon 1 É Tigon 2 (ÄÒÁÊ×ÅÒ &man.ti.4;)</para>
@@ -649,17 +633,13 @@
</itemizedlist>
</para>
- <para arch="i386,pc98,alpha,sparc64,amd64">RealTek 8129/8139 Fast Ethernet
- ÓÅÔÅ×ÙÅ ËÁÒÔÙ (ÄÒÁÊ×ÅÒ &man.rl.4;)
- </para>
+ &hwlist.rl;
<para arch="i386,pc98,alpha,amd64">Winbond W89C840F Fast Ethernet ÓÅÔÅ×ÙÅ ËÁÒÔÙ
(ÄÒÁÊ×ÅÒ &man.wb.4;)
</para>
- <para arch="i386,pc98,alpha,amd64">VIA Technologies VT3043 <quote>Rhine I</quote>, VT86C100A
- <quote>Rhine II</quote>, É VT6105/VT6105M <quote>Rhine III</quote> Fast
- Ethernet ÓÅÔÅ×ÙÅ ËÁÒÔÙ (ÄÒÁÊ×ÅÒ &man.vr.4;)</para>
+ &hwlist.vr;
<para arch="i386,pc98,alpha,amd64">Silicon Integrated Systems SiS 900 É SiS 7016 PCI Fast
Ethernet ÓÅÔÅ×ÙÅ ËÁÒÔÙ (ÄÒÁÊ×ÅÒ &man.sis.4;)
@@ -677,35 +657,26 @@
(ÄÒÁÊ×ÅÒ &man.ste.4;)
</para>
- <para arch="i386,pc98,alpha,amd64">SysKonnect SK-984x PCI Gigabit Ethernet
- ËÁÒÔÙ (ÄÒÁÊ×ÅÒ &man.sk.4;)
- </para>
+ &hwlist.sk;
<para arch="i386,pc98,alpha,amd64">Texas Instruments ThunderLAN PCI ÓÅÔÅ×ÙÅ ËÁÒÔÙ
(ÄÒÁÊ×ÅÒ &man.tl.4;)</para>
- <para arch="i386,pc98,alpha,sparc64,amd64">DEC/Intel 21143 Fast Ethernet
- ÓÅÔÅ×ÙÅ ËÁÒÔÙ É ËÌÏÎÙ ÄÌÑ PCI, MiniPCI, É CardBus (ÄÒÁÊ×ÅÒ &man.dc.4;)</para>
+ &hwlist.dc;
&hwlist.aue;
- <para arch="i386,pc98,amd64">CATC USB-EL1210A USB Ethernet ÓÅÔÅ×ÙÅ ËÁÒÔÙ
- (ÄÒÁÊ×ÅÒ &man.cue.4;)</para>
+ &hwlist.cue;
- <para arch="i386,pc98,amd64">Kawasaki LSI KU5KUSB101B USB Ethernet ÓÅÔÅ×ÙÅ ËÁÒÔÙ
- (ÄÒÁÊ×ÅÒ &man.kue.4;)</para>
+ &hwlist.kue;
- <para arch="i386,pc98,amd64">ASIX Electronics AX88172 USB Ethernet ÓÅÔÅ×ÙÅ ËÁÒÔÙ
- (ÄÒÁÊ×ÅÒ &man.axe.4;)</para>
+ &hwlist.axe;
- <para arch="i386,pc98,amd64">RealTek RTL8150 USB Ethernet ÓÅÔÅ×ÙÅ ËÁÒÔÙ
- (ÄÒÁÊ×ÅÒ &man.rue.4;)</para>
+ &hwlist.rue;
&hwlist.udav;
- <para arch="i386,pc98,alpha,amd64">DEC DC21040, DC21041, DC21140, DC21141,
- DC21142, É DC21143 ÓÅÔÅ×ÙÅ ËÁÒÔÙ (ÄÒÁÊ×ÅÒ &man.de.4;)
- </para>
+ &hwlist.de;
&hwlist.fe;
@@ -724,8 +695,7 @@
&hwlist.xl;
- <para arch="i386,pc98,amd64">3Com 3C59X series ÓÅÔÅ×ÙÅ ËÁÒÔÙ (ÄÒÁÊ×ÅÒ &man.vx.4;)
- </para>
+ &hwlist.vx;
<para arch="i386,amd64">Crystal Semiconductor CS89x0 ÓÅÔÅ×ÙÅ ËÁÒÔÙ
(ÄÒÁÊ×ÅÒ &man.cs.4;)
@@ -748,9 +718,7 @@
</itemizedlist>
</para>
- <para arch="i386,pc98,amd64">Gigabit Ethernet ËÁÒÔÙ, ÏÓÎÏ×ÁÎÎÙÅ ÎÁ Level 1
- LXT1001 NetCellerator ËÏÎÔÒÏÌÌÅÒÅ (ÄÒÁÊ×ÅÒ &man.lge.4;)
- </para>
+ &hwlist.lge;
&hwlist.txp;
@@ -765,8 +733,7 @@
&hwlist.hme;
- <para arch="sparc64">Sun GEM (Gigabit Ethernet) É ERI (Fast
- Ethernet) ÓÅÔÅ×ÙÅ ËÁÒÔÙ (ÄÒÁÊ×ÅÒ &man.gem.4;)</para>
+ &hwlist.gem;
&hwlist.my;
@@ -777,6 +744,8 @@
RTL8110S based PCI Fast Ethernet É Gigabit Ethernet
ËÏÎÔÒÏÌÌÅÒÙ (ÄÒÁÊ×ÅÒ &man.re.4;)</para>
+ &hwlist.ixgb;
+
</sect2>
<sect2 id="fddi">
@@ -825,9 +794,7 @@
&hwlist.awi;
- <para arch="i386">Atheros AR5210, AR5211, É AR5212
- 802.11a/b/g ÓÅÔÅ×ÙÅ ÉÎÔÅÒÆÅÊÓÙ (ÄÒÁÊ×ÅÒ &man.ath.4;)
- </para>
+ &hwlist.ath;
</sect2>
@@ -1184,6 +1151,10 @@
<sect2 id="audio">
<title>áÕÄÉÏ ÕÓÔÒÏÊÓÔ×Á</title>
+ &hwlist.snd.ad1816;
+ &hwlist.snd.cs4281;
+ &hwlist.snd.solo;
+
<para arch="i386,amd64">Advance (ÄÒÁÊ×ÅÒ &man.sbc.4;)
<itemizedlist>
<listitem>
@@ -1195,13 +1166,7 @@
</itemizedlist>
</para>
- <para arch="i386,amd64">CMedia sound chips
- <itemizedlist>
- <listitem>
- <para>CMI8338/CMI8738</para>
- </listitem>
- </itemizedlist>
- </para>
+ &hwlist.snd.cmi;
<para arch="i386,amd64">Crystal Semiconductor (ÄÒÁÊ×ÅÒ &man.csa.4;)
<itemizedlist>
@@ -1214,13 +1179,7 @@
</itemizedlist>
</para>
- <para arch="i386,amd64">ENSONIQ (ÄÒÁÊ×ÅÒ &man.pcm.4;)
- <itemizedlist>
- <listitem>
- <para>AudioPCI ES1370/1371</para>
- </listitem>
- </itemizedlist>
- </para>
+ &hwlist.snd.es137x;
<para arch="i386,alpha,amd64">ESS
<itemizedlist>
@@ -1292,23 +1251,13 @@
</itemizedlist>
</para>
- <para arch="i386,amd64">Creative Technologies Sound Blaster Live! series
- (ÄÒÁÊ×ÅÒ emu10k1)</para>
+ &hwlist.snd.emu10k1;
<para arch="i386,amd64">Trident 4DWave DX/NX (ÄÒÁÊ×ÅÒ &man.pcm.4;)</para>
<para arch="i386,amd64">VIA Technologies VT82C686A</para>
- <para arch="i386,amd64">Yamaha
- <itemizedlist>
- <listitem>
- <para>DS1</para>
- </listitem>
- <listitem>
- <para>DS1e</para>
- </listitem>
- </itemizedlist>
- </para>
+ &hwlist.snd.ds1;
<para arch="pc98">NEC PC-9801-73, 86 É ÓÏ×ÍÅÓÔÉÍÙÅ (ÄÒÁÊ×ÅÒ nss)
<itemizedlist>
@@ -1398,19 +1347,9 @@
</listitem>
</itemizedlist>
</para>
- <para arch="i386,pc98,amd64">íÏÄÅÍÙ (ÄÒÁÊ×ÅÒ &man.umodem.4;)
- <itemizedlist>
- <listitem>
- <para>3Com 5605</para>
- </listitem>
- <listitem>
- <para>Metricom Ricochet GS USB ÂÅÓÐÒÏ×ÏÄÎÙÊ ÍÏÄÅÍ</para>
- </listitem>
- <listitem>
- <para>Yamaha Broadband Wireless Router RTW65b</para>
- </listitem>
- </itemizedlist>
- </para>
+
+ &hwlist.umodem;
+
<para arch="i386,pc98,alpha,amd64">íÙÛØ (ÄÒÁÊ×ÅÒ &man.ums.4;)
</para>
<para arch="i386,pc98,alpha,amd64">ðÒÉÎÔÅÒÙ É ÐÅÒÅÈÏÄÎÙÅ ËÁÂÅÌÉ Ë
@@ -1446,9 +1385,9 @@
&man.ubser.4;,
&man.uftdi.4;, É &man.uplcom.4;)
</para>
- <para arch="i386,pc98,amd64">óËÁÎÅÒÙ (ÞÅÒÅÚ
- <application>SANE</application>) (ÄÒÁÊ×ÅÒ &man.uscanner.4;)
- </para>
+
+ &hwlist.uscanner;
+
<para arch="i386,pc98,alpha,amd64">èÒÁÎÅÎÉÅ ÄÁÎÎÙÈ (ÄÒÁÊ×ÅÒ &man.umass.4;)
<itemizedlist>
<listitem>
==== //depot/projects/hammer/release/doc/ru_RU.KOI8-R/hardware/sparc64/proc-sparc64.sgml#2 (text+ko) ====
@@ -1,10 +1,10 @@
<!--
The FreeBSD Russian Documentation Project
- $FreeBSD: src/release/doc/ru_RU.KOI8-R/hardware/sparc64/proc-sparc64.sgml,v 1.1 2004/05/31 11:43:25 den Exp $
- $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/sparc64/proc-sparc64.sgml,v 1.1 2004/05/27 06:09:43 den Exp $
+ $FreeBSD: src/release/doc/ru_RU.KOI8-R/hardware/sparc64/proc-sparc64.sgml,v 1.2 2004/09/01 13:14:46 den Exp $
+ $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/sparc64/proc-sparc64.sgml,v 1.2 2004/09/01 12:23:40 den Exp $
- Original revision: 1.11
+ Original revision: 1.12
-->
<sect1 id="support-sys">
@@ -84,6 +84,12 @@
<para>SPARCEngine Ultra AXmp</para>
</listitem>
<listitem>
+ <para>Ultra 1E</para>
+ </listitem>
+ <listitem>
+ <para>Ultra 2</para>
+ </listitem>
+ <listitem>
<para>Ultra 5</para>
</listitem>
<listitem>
@@ -114,12 +120,6 @@
<listitem>
<para>Enterprise 4500</para>
</listitem>
- <listitem>
- <para>Ultra 1 Enterprise (1E ÄÌÑ ËÒÁÔËÏÓÔÉ)</para>
- </listitem>
- <listitem>
- <para>Ultra 2</para>
- </listitem>
</itemizedlist>
</sect2>
==== //depot/projects/hammer/release/doc/ru_RU.KOI8-R/installation/common/install.sgml#4 (text+ko) ====
@@ -1,10 +1,10 @@
<!--
The FreeBSD Russian Documentation Project
-$FreeBSD: src/release/doc/ru_RU.KOI8-R/installation/common/install.sgml,v 1.3 2004/08/03 13:12:10 den Exp $
-$FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/common/install.sgml,v 1.3 2004/08/03 12:53:40 den Exp $
+$FreeBSD: src/release/doc/ru_RU.KOI8-R/installation/common/install.sgml,v 1.4 2004/09/01 13:14:46 den Exp $
+$FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/common/install.sgml,v 1.4 2004/09/01 12:23:40 den Exp $
-Original revision: 1.26
+Original revision: 1.27
install.sgml
@@ -75,11 +75,12 @@
<!-- i386/pc98 text starts here -->
- <para arch="i386,pc98">&os; ÄÌÑ &arch.print; ÄÌÑ ÒÁÂÏÔÙ ÔÒÅÂÕÅÔÓÑ
- 386 ÐÒÏÃÅÓÓÏÒ ÉÌÉ ×ÙÛÅ (Ë ÓÏÖÁÌÅÎÉÀ, ÐÏÄÄÅÒÖËÉ 286 ÐÒÏÃÅÓÓÏÒÏ× ÎÅÔ),
- ËÁË ÍÉÎÉÍÕÍ 5 ÍÅÇÁÂÁÊÔ ÏÐÅÒÁÔÉ×ÎÏÊ ÐÁÍÑÔÉ ÄÌÑ ÕÓÔÁÎÏ×ËÉ É
- 4 ÍÅÇÁÂÁÊÔÁ ÏÐÅÒÁÔÉ×ÎÏÊ ÐÁÍÑÔÉ ÄÌÑ ÚÁÐÕÓËÁ. ÷ÁÍ ÐÏÔÒÅÂÕÅÔÓÑ ËÁË
- ÍÉÎÉÍÕÍ 100MB Ó×ÏÂÏÄÎÏÇÏ ÍÅÓÔÁ ÎÁ ÖÅÓÔËÏÍ ÄÉÓËÅ ÄÌÑ ÍÉÎÉÍÁÌØÎÏÊ
+ <para arch="i386,pc98">&os; ÄÌÑ &arch.print; ÄÌÑ ÕÓÔÁÎÏ×ËÉ É ÒÁÂÏÔÙ
+ ÔÒÅÂÕÅÔÓÑ 486 ÐÒÏÃÅÓÓÏÒ ÉÌÉ ×ÙÛÅ (ÈÏÔÑ Ó ÄÒÕÇÉÍ ÑÄÒÏÍ &os; ÍÏÖÅÔ
+ ÒÁÂÏÔÁÔØ ÎÁ ÐÒÏÃÅÓÓÏÒÁÈ 386), ËÁË ÍÉÎÉÍÕÍ 8 ÍÅÇÁÂÁÊÔ ÏÐÅÒÁÔÉ×ÎÏÊ
+ ÐÁÍÑÔÉ ÄÌÑ ÕÓÔÁÎÏ×ËÉ É
+ 7 ÍÅÇÁÂÁÊÔÁ ÄÌÑ ÚÁÐÕÓËÁ. ÷ÁÍ ÐÏÔÒÅÂÕÅÔÓÑ ËÁË
+ ÍÉÎÉÍÕÍ 150MB Ó×ÏÂÏÄÎÏÇÏ ÍÅÓÔÁ ÎÁ ÖÅÓÔËÏÍ ÄÉÓËÅ ÄÌÑ ÍÉÎÉÍÁÌØÎÏÊ
ÕÓÔÁÎÏ×ËÉ. îÉÖÅ ÄÁÎÁ ÉÎÆÏÒÍÁÃÉÑ ÐÏ ÕÒÅÚÁÎÉÀ ÓÕÝÅÓÔ×ÕÀÝÅÇÏ
ÒÁÚÄÅÌÁ DOS ÄÌÑ ÕÓÔÁÎÏ×ËÉ &os;.</para>
@@ -134,7 +135,7 @@
<title>éÎÓÔÒÕËÃÉÉ ÐÏ ÓÏÚÄÁÎÉÀ ÄÉÓËÅÔ</title>
<para arch="i386,alpha,pc98">÷ ÚÁ×ÉÓÉÍÏÓÔÉ ÏÔ ÓÐÏÓÏÂÁ ÕÓÔÁÎÏ×ËÉ &os;,
- ×ÁÍ ÍÏÖÅÔ ÐÏÔÒÅÂÏ×ÁÔØÓÑ ÓÏÚÄÁÎÉÅ ÎÁÂÏÒÁ ÄÉÓËÅÔ (ÏÂÙÞÎÏ Ä×ÕÈ)
+ ×ÁÍ ÍÏÖÅÔ ÐÏÔÒÅÂÏ×ÁÔØÓÑ ÓÏÚÄÁÎÉÅ ÎÁÂÏÒÁ ÄÉÓËÅÔ (ÏÂÙÞÎÏ ÔÒÅÈ)
ÄÌÑ ÎÁÞÁÌÁ ÐÒÏÃÅÓÓÁ ÕÓÔÁÎÏ×ËÉ. üÔÏÔ ÒÁÚÄÅÌ ËÒÁÔËÏ ÏÐÉÓÙ×ÁÅÔ
ËÁË ÓÏÚÄÁÔØ ÜÔÉ ÄÉÓËÉ Ó ÕÓÔÁÎÏ×ÏÞÎÏÇÏ CDROM ÉÌÉ ÉÚ ÉÎÔÅÒÎÅÔ.
ïÂÒÁÔÉÔÅ ×ÎÉÍÁÎÉÅ, ÞÔÏ × ÏÂÝÅÍ ÓÌÕÞÁÅ ÕÓÔÁÎÏ×ËÉ &os; Ó CDROM
@@ -143,34 +144,31 @@
<para arch="i386,alpha">äÌÑ ÂÏÌØÛÉÎÓÔ×Á ÕÓÔÁÎÏ×ÏË Ó CDROM ÉÌÉ ÐÏ ÓÅÔÉ,
×ÁÍ ÐÏÔÒÅÂÕÀÔÓÑ ÓËÏÐÉÒÏ×ÁÔØ ÏÂÒÁÚÙ ÄÉÓËÅÔ
- <filename>kern.flp</filename> É <filename>mfsroot.flp</filename>
- ÉÚ ËÁÔÁÌÏÇÁ <filename>floppies/</filename> (ÄÌÑ 1.44MB ÄÉÓËÅÔ).
- ÷ ÚÁ×ÉÓÉÍÏÓÔÉ ÏÔ ÉÍÅÀÝÅÇÏÓÑ ÏÂÏÒÕÄÏ×ÁÎÉÑ, ×ÁÍ ÍÏÖÅÔ ÔÁËÖÅ ÐÏÔÒÅÂÏ×ÁÔØÓÑ
- ÔÒÅÔØÑ ÄÉÓËÅÔÁ, <filename>drivers.flp</filename>, ÎÁ ËÏÔÏÒÏÊ
- ÎÁÈÏÄÑÔÓÑ ÄÒÁÊ×ÅÒÁ ÕÓÔÒÏÊÓÔ×.</para>
+ <filename>boot.flp</filename> É <filename>kernX.flp</filename>
+ ÉÚ ËÁÔÁÌÏÇÁ <filename>floppies/</filename> (ÄÌÑ 1.44MB ÄÉÓËÅÔ).</para>
<para arch="pc98">äÌÑ ÏÂÙÞÎÏÊ ÕÓÔÁÎÏ×ËÉ Ó CDROM ÉÌÉ ÐÏ ÓÅÔÉ, ×ÁÍ
- ÐÏÔÒÅÂÕÅÔÓÑ ÓËÏÐÉÒÏ×ÁÔØ ÏÂÒÁÚÙ ÄÉÓËÅÔ <filename>kern.flp</filename>
- É <filename>mfsroot.flp</filename> ÉÚ ËÁÔÁÌÏÇÁ
+ ÐÏÔÒÅÂÕÅÔÓÑ ÓËÏÐÉÒÏ×ÁÔØ ÏÂÒÁÚÙ ÄÉÓËÅÔ <filename>boot.flp</filename>
+ É <filename>kernX.flp</filename> ÉÚ ËÁÔÁÌÏÇÁ
<filename>floppies/</filename> (ÄÌÑ 1.44MB ÄÉÓËÅÔ) ÉÌÉ
- <filename>kern-small.flp</filename> É
- <filename>mfsroot-small.flp</filename> (ÄÌÑ 1.2MB ÄÉÓËÅÔ).</para>
+ <filename>boot-small.flp</filename> É
+ <filename>kern-small.flp</filename> (ÄÌÑ 1.2MB ÄÉÓËÅÔ).</para>
<para arch="i386,alpha,pc98">ðÏÌÕÞÉÔØ ÜÔÉ ÏÂÒÁÚÙ ÐÏ ÓÅÔÉ ÐÒÏÓÔÏ.
úÁÇÒÕÚÉÔÅ
- <replaceable>release</replaceable><filename>/floppies/kern.flp</filename>,
- <replaceable>release</replaceable><filename>/floppies/mfsroot.flp</filename>,
- É
- <replaceable>release</replaceable><filename>/floppies/drivers.flp</filename>
+ <replaceable>release</replaceable><filename>/floppies/boot.flp</filename>
+ É ×ÓÅ
+ <replaceable>release</replaceable><filename>/floppies/kernX.flp</filename>
Ó <ulink url="&release.url;"></ulink> ÉÌÉ Ó ÏÄÎÏÇÏ ÉÚ ÚÅÒËÁÌ,
ÐÅÒÅÞÉÓÌÅÎÎÙÈ × ÒÁÚÄÅÌÅ <ulink
url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/mirrors-ftp.html">FTP
ÚÅÒËÁÌÁ</ulink> òÕËÏ×ÏÄÓÔ×Á ÉÌÉ, ÉÌÉ ÎÁ ÓÔÒÁÎÉÃÁÈ
<ulink url="http://mirrorlist.FreeBSD.org/"></ulink>.</para>
- <para arch="i386,alpha">÷ÏÚØÍÉÔÅ Ä×Å ÞÉÓÔÙÅ, ÔÏÌØËÏ ÞÔÏ ÏÔÆÏÒÍÁÔÉÒÏ×ÁÎÎÙÅ
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list