PERFORCE change 168973 for review

Yohanes Nugroho yohanes at FreeBSD.org
Mon Sep 28 14:19:03 UTC 2009


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

Change 168973 by yohanes at econa on 2009/09/28 14:18:59

	sync

Affected files ...

.. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#3 integrate
.. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#2 integrate
.. //depot/projects/str91xx/doc/es_ES.ISO8859-1/articles/Makefile#2 integrate
.. //depot/projects/str91xx/doc/es_ES.ISO8859-1/articles/pxe/Makefile#1 branch
.. //depot/projects/str91xx/doc/es_ES.ISO8859-1/articles/pxe/article.sgml#1 branch
.. //depot/projects/str91xx/doc/es_ES.ISO8859-1/articles/pxe/dhcpd.conf#1 branch
.. //depot/projects/str91xx/doc/es_ES.ISO8859-1/articles/pxe/install.cfg#1 branch
.. //depot/projects/str91xx/doc/es_ES.ISO8859-1/articles/pxe/loader.rc#1 branch
.. //depot/projects/str91xx/doc/es_ES.ISO8859-1/articles/pxe/pkgmaker.sh#1 branch
.. //depot/projects/str91xx/doc/es_ES.ISO8859-1/articles/pxe/post#1 branch
.. //depot/projects/str91xx/doc/es_ES.ISO8859-1/articles/pxe/pre#1 branch
.. //depot/projects/str91xx/doc/hu_HU.ISO8859-2/books/handbook/disks/chapter.sgml#3 integrate
.. //depot/projects/str91xx/doc/hu_HU.ISO8859-2/books/handbook/kernelconfig/chapter.sgml#3 integrate
.. //depot/projects/str91xx/doc/mn_MN.UTF-8/books/handbook/disks/chapter.sgml#3 integrate
.. //depot/projects/str91xx/doc/mn_MN.UTF-8/books/handbook/kernelconfig/chapter.sgml#2 integrate
.. //depot/projects/str91xx/doc/nl_NL.ISO8859-1/books/handbook/disks/chapter.sgml#3 integrate
.. //depot/projects/str91xx/doc/nl_NL.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#2 integrate
.. //depot/projects/str91xx/ports/MOVED#7 integrate
.. //depot/projects/str91xx/ports/Mk/bsd.gcc.mk#5 integrate
.. //depot/projects/str91xx/ports/UPDATING#7 integrate
.. //depot/projects/str91xx/src/UPDATING#7 integrate
.. //depot/projects/str91xx/src/cddl/contrib/opensolaris/cmd/zfs/zfs.8#2 integrate
.. //depot/projects/str91xx/src/etc/mtree/BSD.usr.dist#4 integrate
.. //depot/projects/str91xx/src/etc/network.subr#5 integrate
.. //depot/projects/str91xx/src/etc/periodic/daily/400.status-disks#2 integrate
.. //depot/projects/str91xx/src/etc/periodic/security/200.chkmounts#2 integrate
.. //depot/projects/str91xx/src/etc/rc.d/defaultroute#3 integrate
.. //depot/projects/str91xx/src/etc/rc.d/ip6addrctl#3 integrate
.. //depot/projects/str91xx/src/etc/rc.d/netif#4 integrate
.. //depot/projects/str91xx/src/etc/rc.d/routing#3 integrate
.. //depot/projects/str91xx/src/etc/rc.d/rtadvd#3 integrate
.. //depot/projects/str91xx/src/lib/libc/nls/Makefile.inc#2 integrate
.. //depot/projects/str91xx/src/lib/libc/nls/gl_ES.ISO8859-1.msg#1 branch
.. //depot/projects/str91xx/src/lib/libc/stdlib/malloc.3#2 integrate
.. //depot/projects/str91xx/src/lib/libc/stdlib/malloc.c#3 integrate
.. //depot/projects/str91xx/src/lib/libthr/thread/thr_spec.c#2 integrate
.. //depot/projects/str91xx/src/libexec/rpc.rquotad/rquotad.c#2 integrate
.. //depot/projects/str91xx/src/sbin/camcontrol/camcontrol.c#5 integrate
.. //depot/projects/str91xx/src/sbin/ifconfig/ifconfig.8#4 integrate
.. //depot/projects/str91xx/src/sbin/shutdown/shutdown.c#2 integrate
.. //depot/projects/str91xx/src/share/man/man4/Makefile#5 integrate
.. //depot/projects/str91xx/src/share/man/man4/lindev.4#1 branch
.. //depot/projects/str91xx/src/share/man/man5/rc.conf.5#5 integrate
.. //depot/projects/str91xx/src/sys/amd64/acpica/acpi_machdep.c#4 integrate
.. //depot/projects/str91xx/src/sys/amd64/amd64/trap.c#4 integrate
.. //depot/projects/str91xx/src/sys/amd64/conf/NOTES#6 integrate
.. //depot/projects/str91xx/src/sys/amd64/include/apm_bios.h#1 branch
.. //depot/projects/str91xx/src/sys/amd64/pci/pci_cfgreg.c#2 integrate
.. //depot/projects/str91xx/src/sys/arm/arm/identcpu.c#2 integrate
.. //depot/projects/str91xx/src/sys/arm/include/md_var.h#2 integrate
.. //depot/projects/str91xx/src/sys/boot/forth/loader.conf#3 integrate
.. //depot/projects/str91xx/src/sys/cam/ata/ata_all.c#3 integrate
.. //depot/projects/str91xx/src/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c#3 integrate
.. //depot/projects/str91xx/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#2 integrate
.. //depot/projects/str91xx/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#4 integrate
.. //depot/projects/str91xx/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#2 integrate
.. //depot/projects/str91xx/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#4 integrate
.. //depot/projects/str91xx/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#6 integrate
.. //depot/projects/str91xx/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#3 integrate
.. //depot/projects/str91xx/src/sys/compat/x86bios/x86bios.c#2 integrate
.. //depot/projects/str91xx/src/sys/compat/x86bios/x86bios.h#2 integrate
.. //depot/projects/str91xx/src/sys/compat/x86bios/x86bios_alloc.c#2 integrate
.. //depot/projects/str91xx/src/sys/conf/files#7 integrate
.. //depot/projects/str91xx/src/sys/conf/files.amd64#5 integrate
.. //depot/projects/str91xx/src/sys/conf/files.i386#6 integrate
.. //depot/projects/str91xx/src/sys/conf/files.pc98#2 integrate
.. //depot/projects/str91xx/src/sys/dev/acpi_support/acpi_ibm.c#4 integrate
.. //depot/projects/str91xx/src/sys/dev/acpica/acpi.c#6 integrate
.. //depot/projects/str91xx/src/sys/dev/atkbdc/atkbd.c#3 integrate
.. //depot/projects/str91xx/src/sys/dev/de/if_de.c#3 integrate
.. //depot/projects/str91xx/src/sys/dev/de/if_devar.h#2 integrate
.. //depot/projects/str91xx/src/sys/dev/dpms/dpms.c#3 integrate
.. //depot/projects/str91xx/src/sys/dev/fb/vesa.c#3 integrate
.. //depot/projects/str91xx/src/sys/dev/lindev/full.c#1 branch
.. //depot/projects/str91xx/src/sys/dev/lindev/lindev.c#1 branch
.. //depot/projects/str91xx/src/sys/dev/lindev/lindev.h#1 branch
.. //depot/projects/str91xx/src/sys/dev/pci/pcireg.h#3 integrate
.. //depot/projects/str91xx/src/sys/dev/syscons/scmouse.c#2 integrate
.. //depot/projects/str91xx/src/sys/dev/syscons/scterm-teken.c#5 integrate
.. //depot/projects/str91xx/src/sys/dev/syscons/syscons.c#5 integrate
.. //depot/projects/str91xx/src/sys/dev/syscons/syscons.h#3 integrate
.. //depot/projects/str91xx/src/sys/dev/usb/controller/atmegadci.c#4 integrate
.. //depot/projects/str91xx/src/sys/dev/usb/controller/ehci.c#4 integrate
.. //depot/projects/str91xx/src/sys/dev/usb/controller/ehci_pci.c#3 integrate
.. //depot/projects/str91xx/src/sys/dev/usb/controller/usb_controller.c#5 integrate
.. //depot/projects/str91xx/src/sys/dev/usb/net/if_axe.c#4 integrate
.. //depot/projects/str91xx/src/sys/dev/usb/net/if_cdce.c#5 integrate
.. //depot/projects/str91xx/src/sys/dev/usb/net/if_cdcereg.h#3 integrate
.. //depot/projects/str91xx/src/sys/dev/usb/quirk/usb_quirk.c#4 integrate
.. //depot/projects/str91xx/src/sys/dev/usb/serial/u3g.c#4 integrate
.. //depot/projects/str91xx/src/sys/dev/usb/serial/uark.c#4 integrate
.. //depot/projects/str91xx/src/sys/dev/usb/serial/ubsa.c#4 integrate
.. //depot/projects/str91xx/src/sys/dev/usb/serial/ubser.c#4 integrate
.. //depot/projects/str91xx/src/sys/dev/usb/serial/uch341.c#1 branch
.. //depot/projects/str91xx/src/sys/dev/usb/serial/uchcom.c#4 integrate
.. //depot/projects/str91xx/src/sys/dev/usb/serial/ucycom.c#4 integrate
.. //depot/projects/str91xx/src/sys/dev/usb/serial/ufoma.c#4 integrate
.. //depot/projects/str91xx/src/sys/dev/usb/serial/uftdi.c#4 integrate
.. //depot/projects/str91xx/src/sys/dev/usb/serial/ugensa.c#4 integrate
.. //depot/projects/str91xx/src/sys/dev/usb/serial/uipaq.c#5 integrate
.. //depot/projects/str91xx/src/sys/dev/usb/serial/umct.c#4 integrate
.. //depot/projects/str91xx/src/sys/dev/usb/serial/umodem.c#4 integrate
.. //depot/projects/str91xx/src/sys/dev/usb/serial/umoscom.c#4 integrate
.. //depot/projects/str91xx/src/sys/dev/usb/serial/uplcom.c#4 integrate
.. //depot/projects/str91xx/src/sys/dev/usb/serial/usb_serial.c#4 integrate
.. //depot/projects/str91xx/src/sys/dev/usb/serial/usb_serial.h#4 integrate
.. //depot/projects/str91xx/src/sys/dev/usb/serial/uslcom.c#4 integrate
.. //depot/projects/str91xx/src/sys/dev/usb/serial/uvscom.c#4 integrate
.. //depot/projects/str91xx/src/sys/dev/usb/storage/umass.c#6 integrate
.. //depot/projects/str91xx/src/sys/dev/usb/usb.h#5 integrate
.. //depot/projects/str91xx/src/sys/dev/usb/usb_bus.h#4 integrate
.. //depot/projects/str91xx/src/sys/dev/usb/usb_cdc.h#3 integrate
.. //depot/projects/str91xx/src/sys/dev/usb/usb_device.c#5 integrate
.. //depot/projects/str91xx/src/sys/dev/usb/usb_device.h#5 integrate
.. //depot/projects/str91xx/src/sys/dev/usb/usb_hub.c#5 integrate
.. //depot/projects/str91xx/src/sys/dev/usb/usb_transfer.c#5 integrate
.. //depot/projects/str91xx/src/sys/dev/usb/usbdevs#5 integrate
.. //depot/projects/str91xx/src/sys/geom/part/g_part.c#3 integrate
.. //depot/projects/str91xx/src/sys/i386/conf/NOTES#6 integrate
.. //depot/projects/str91xx/src/sys/i386/include/apm_bios.h#2 integrate
.. //depot/projects/str91xx/src/sys/i386/pci/pci_cfgreg.c#2 integrate
.. //depot/projects/str91xx/src/sys/kern/kern_event.c#5 integrate
.. //depot/projects/str91xx/src/sys/kern/kern_umtx.c#2 integrate
.. //depot/projects/str91xx/src/sys/kern/subr_bus.c#5 integrate
.. //depot/projects/str91xx/src/sys/modules/Makefile#7 integrate
.. //depot/projects/str91xx/src/sys/modules/lindev/Makefile#1 branch
.. //depot/projects/str91xx/src/sys/modules/nfslockd/Makefile#2 integrate
.. //depot/projects/str91xx/src/sys/modules/usb/Makefile#4 integrate
.. //depot/projects/str91xx/src/sys/modules/usb/uch341/Makefile#1 branch
.. //depot/projects/str91xx/src/sys/nfsserver/nfs_serv.c#4 integrate
.. //depot/projects/str91xx/src/sys/pc98/conf/NOTES#3 integrate
.. //depot/projects/str91xx/src/sys/sparc64/conf/GENERIC#3 integrate
.. //depot/projects/str91xx/src/sys/sys/ata.h#3 integrate
.. //depot/projects/str91xx/src/sys/teken/sequences#2 integrate
.. //depot/projects/str91xx/src/sys/teken/teken.c#2 integrate
.. //depot/projects/str91xx/src/sys/teken/teken.h#2 integrate
.. //depot/projects/str91xx/src/sys/teken/teken_demo.c#2 integrate
.. //depot/projects/str91xx/src/sys/teken/teken_scs.h#2 integrate
.. //depot/projects/str91xx/src/sys/teken/teken_stress.c#2 integrate
.. //depot/projects/str91xx/src/sys/teken/teken_subr.h#2 integrate
.. //depot/projects/str91xx/src/sys/teken/teken_subr_compat.h#2 integrate
.. //depot/projects/str91xx/src/sys/vm/vm_mmap.c#4 integrate
.. //depot/projects/str91xx/src/tools/regression/mmap/Makefile#1 branch
.. //depot/projects/str91xx/src/tools/regression/mmap/mmap.c#1 branch
.. //depot/projects/str91xx/src/tools/tools/mwl/mwlstats/mwlstats.c#2 integrate
.. //depot/projects/str91xx/src/tools/tools/nanobsd/nanobsd.sh#3 integrate
.. //depot/projects/str91xx/src/usr.sbin/Makefile#5 integrate
.. //depot/projects/str91xx/src/usr.sbin/apm/Makefile#2 integrate
.. //depot/projects/str91xx/www/nl/where.sgml#2 integrate

Differences ...

==== //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#3 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml,v 1.291 2009/07/26 11:49:01 blackend Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml,v 1.292 2009/09/24 15:30:11 danger Exp $
 -->
 
 <chapter id="disks">
@@ -151,7 +151,8 @@
       <secondary>adding</secondary>
     </indexterm>
 
-    <para>Lets say we want to add a new SCSI disk to a machine that
+    <para>The following section will describe how to add a new
+      <acronym>SCSI</acronym> disk to a machine that
       currently only has a single drive.  First turn off the computer
       and install the drive in the computer following the instructions
       of the computer, controller, and drive manufacturer.  Due to the

==== //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#2 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml,v 1.192 2009/05/15 13:31:51 rwatson Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml,v 1.193 2009/09/25 14:20:40 bcr Exp $
 -->
 
 <chapter id="kernelconfig">
@@ -612,10 +612,9 @@
       the <option>-g</option> option, which enables debugging
       information when passed to &man.gcc.1;.</para>
 
-    <programlisting>options          SCHED_4BSD         # 4BSD scheduler</programlisting>
+    <programlisting>options          SCHED_ULE         # ULE scheduler</programlisting>
 
-    <para>The traditional and default system scheduler for &os;.
-      Keep this.</para>
+    <para>The default system scheduler for &os;.  Keep this.</para>
 
     <programlisting>options          PREEMPTION         # Enable kernel thread preemption</programlisting>
 

==== //depot/projects/str91xx/doc/es_ES.ISO8859-1/articles/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: doc/es_ES.ISO8859-1/articles/Makefile,v 1.12 2008/04/24 19:11:13 carvay Exp $
+# $FreeBSD: doc/es_ES.ISO8859-1/articles/Makefile,v 1.13 2009/09/27 13:06:31 gabor Exp $
 # $FreeBSDes: doc/es_ES.ISO8859-1/articles/Makefile,v 1.3 2004/10/09 02:01:17 jesusr Exp $
 
 SUBDIR =
@@ -17,6 +17,7 @@
 SUBDIR+= nanobsd
 SUBDIR+= p4-primer
 SUBDIR+= problem-reports
+SUBDIR+= pxe
 SUBDIR+= releng
 SUBDIR+= version-guide
 SUBDIR+= zip-drive

==== //depot/projects/str91xx/doc/hu_HU.ISO8859-2/books/handbook/disks/chapter.sgml#3 (text+ko) ====

@@ -1,13 +1,13 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/hu_HU.ISO8859-2/books/handbook/disks/chapter.sgml,v 1.8 2009/07/30 07:08:32 pgj Exp $
+     $FreeBSD: doc/hu_HU.ISO8859-2/books/handbook/disks/chapter.sgml,v 1.9 2009/09/27 18:26:11 pgj Exp $
 -->
 
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: PALI, Gabor <pgj at FreeBSD.org>
      %SOURCE%	en_US.ISO8859-1/books/handbook/disks/chapter.sgml
-     %SRCID%	1.291
+     %SRCID%	1.292
 -->
 
 <chapter id="disks" lang="hu">
@@ -190,19 +190,19 @@
       <secondary>hozz&aacute;ad&aacute;s</secondary>
     </indexterm>
 
-    <para>Tegy&uuml;k fel, hogy a jelenleg egyetlen meghajt&oacute;t
-      tartalmaz&oacute; rendszer&uuml;nket szeretn&eacute;nk
-      b&#245;v&iacute;teni egy &uacute;j SCSI-lemez
-      hozz&aacute;ad&aacute;s&aacute;val.  Ehhez els&#245;k&eacute;nt
-      kapcsoljuk ki a sz&aacute;m&iacute;t&oacute;g&eacute;p&uuml;nket
-      &eacute;s szerelj&uuml;k be a hely&eacute;re az &uacute;j
-      meghajt&oacute;t a sz&aacute;m&iacute;t&oacute;g&eacute;p, a
-      lemezvez&eacute;rl&#245; &eacute;s a meghajt&oacute;
-      gy&aacute;rt&oacute;j&aacute;nak utas&iacute;t&aacute;sai
-      alapj&aacute;n.  Mivel ezt a m&#251;veletet rengeteg m&oacute;don
-      lehet elv&eacute;gezni, ez&eacute;rt ennek pontos
-      r&eacute;szleteivel ez a le&iacute;r&aacute;s most nem
-      foglalkozik.</para>
+    <para>Ebben a szakaszban arr&oacute;l lesz sz&oacute;, hogy a
+      jelenleg egyetlen meghajt&oacute;t tartalmaz&oacute;
+      rendszer&uuml;nket hogyan tudjuk b&#245;v&iacute;teni egy
+      &uacute;j SCSI-lemez hozz&aacute;ad&aacute;s&aacute;val.  Ehhez
+      els&#245;k&eacute;nt kapcsoljuk ki a
+      sz&aacute;m&iacute;t&oacute;g&eacute;p&uuml;nket &eacute;s
+      szerelj&uuml;k be a hely&eacute;re az &uacute;j meghajt&oacute;t a
+      sz&aacute;m&iacute;t&oacute;g&eacute;p, a lemezvez&eacute;rl&#245;
+      &eacute;s a meghajt&oacute; gy&aacute;rt&oacute;j&aacute;nak
+      utas&iacute;t&aacute;sai alapj&aacute;n.  Mivel ezt a
+      m&#251;veletet rengeteg m&oacute;don lehet elv&eacute;gezni,
+      ez&eacute;rt ennek pontos r&eacute;szleteivel ez a
+      le&iacute;r&aacute;s most nem foglalkozik.</para>
 
     <para>Jelentkezz&uuml;nk be <username>root</username>
       felhaszn&aacute;l&oacute;k&eacute;nt.  Miut&aacute;n

==== //depot/projects/str91xx/doc/hu_HU.ISO8859-2/books/handbook/kernelconfig/chapter.sgml#3 (text+ko) ====

@@ -1,12 +1,12 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/hu_HU.ISO8859-2/books/handbook/kernelconfig/chapter.sgml,v 1.8 2009/06/19 11:36:05 pgj Exp $
+     $FreeBSD: doc/hu_HU.ISO8859-2/books/handbook/kernelconfig/chapter.sgml,v 1.9 2009/09/27 18:26:11 pgj Exp $
 -->
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: PALI, Gabor <pgj at FreeBSD.org>
      %SOURCE%	en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml
-     %SRCID%	1.192
+     %SRCID%	1.193
 -->
 
 <chapter id="kernelconfig" lang="hu">
@@ -856,10 +856,10 @@
       inform&aacute;ci&oacute;kat tudunk &aacute;tadni a &man.gcc.1;
       ford&iacute;t&oacute;nak.</para>
 
-    <programlisting>options          SCHED_4BSD         # 4BSD &uuml;temez&#245;</programlisting>
+    <programlisting>options          SCHED_ULE          # ULE &uuml;temez&#245;</programlisting>
 
-    <para>A &os; tradicion&aacute;lis &eacute;s alap&eacute;rtelmezett
-      rendszer&uuml;temez&#245;je.  Ne v&aacute;ltoztassuk meg!</para>
+    <para>A &os; alap&eacute;rtelmezett rendszer&uuml;temez&#245;je.  Ne
+      v&aacute;ltoztassuk meg!</para>
 
     <programlisting>options          PREEMPTION         # a rendszersz&aacute;lak megszak&iacute;that&oacute;s&aacute;g&aacute;nak enged&eacute;lyez&eacute;se</programlisting>
 

==== //depot/projects/str91xx/doc/mn_MN.UTF-8/books/handbook/disks/chapter.sgml#3 (text+ko) ====

@@ -1,9 +1,9 @@
 <!--
      The FreeBSD Mongolian Documentation Project
 
-     Original revision 1.291
+     Original revision 1.292
 
-     $FreeBSD: doc/mn_MN.UTF-8/books/handbook/disks/chapter.sgml,v 1.18 2009/07/26 14:09:46 ganbold Exp $
+     $FreeBSD: doc/mn_MN.UTF-8/books/handbook/disks/chapter.sgml,v 1.19 2009/09/25 16:48:59 ganbold Exp $
 -->
 
 <chapter id="disks">
@@ -159,8 +159,8 @@
       <secondary>нэмэх нь</secondary>
     </indexterm>
 
-    <para>Бид шинэ SCSI дискийг одоогоор зөвхөн нэг хөтөчтэй байгаа машин дээр 
-	нэмэхийг хүсэж байна гэж бодъё. Эхлээд компьютераа унтраагаад хөтчийг 
+    <para>Дараах хэсэг зөвхөн нэг хөтөчтэй машинд шинэ <acronym>SCSI</acronym> диск хэрхэн 
+        нэмэх талаар тайлбарлах болно. Эхлээд компьютераа унтраагаад хөтчийг 
 	компьютер, хянагч болон хөтчийн үйлдвэрлэгчийн заавруудын дагуу суулгана. 
 	Үүнийг хийх маш олон төрлийн процедуруудаас болоод энэ тухай дэлгэрэнгүй 
 	мэдээлэл нь энэ баримтын хамрах хүрээнээс гадна юм.</para>

==== //depot/projects/str91xx/doc/mn_MN.UTF-8/books/handbook/kernelconfig/chapter.sgml#2 (text+ko) ====

@@ -1,9 +1,9 @@
 <!--
      The FreeBSD Mongolian Documentation Project
 
-     Original revision 1.192
+     Original revision 1.193
 
-     $FreeBSD: doc/mn_MN.UTF-8/books/handbook/kernelconfig/chapter.sgml,v 1.17 2009/05/19 15:06:28 ganbold Exp $
+     $FreeBSD: doc/mn_MN.UTF-8/books/handbook/kernelconfig/chapter.sgml,v 1.18 2009/09/25 16:48:59 ganbold Exp $
 -->
 
 <chapter id="kernelconfig">
@@ -591,9 +591,9 @@
 	бөгөөд цөмийг бүтээх үед <option>-g</option> тохируулгыг &man.gcc.1; 
 	уруу өгснөөр дибаг (debug) хийх мэдээлэл идэвхждэг.</para>
 
-    <programlisting>options          SCHED_4BSD         # 4BSD scheduler</programlisting>
+    <programlisting>options          SCHED_ULE         # ULE scheduler</programlisting>
 
-    <para>&os; -ийн уламжлалт, анхдагч системийн төлөвлөгч/хуваарилагч.  Үүнийг үлдээ.</para>
+    <para>&os; -ийн анхдагч системийн төлөвлөгч/хуваарилагч.  Үүнийг үлдээ.</para>
 
     <programlisting>options          PREEMPTION         # Enable kernel thread preemption</programlisting>
 

==== //depot/projects/str91xx/doc/nl_NL.ISO8859-1/books/handbook/disks/chapter.sgml#3 (text+ko) ====

@@ -1,10 +1,10 @@
 <!--
      The FreeBSD Dutch Documentation Project
 
-     $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/disks/chapter.sgml,v 1.13 2009/08/03 14:10:16 rene Exp $
+     $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/disks/chapter.sgml,v 1.14 2009/09/25 19:25:40 rene Exp $
 
      %SOURCE%	en_US.ISO8859-1/books/handbook/disks/chapter.sgml
-     %SRCID%	1.291
+     %SRCID%	1.292
 -->
 
 <chapter id="disks">
@@ -207,9 +207,9 @@
       <secondary>toevoegen</secondary>
     </indexterm>
 
-    <para>Stel dat het gewenst is om een nieuwe SCSI-schijf aan een
-      machine toe te voegen die slechts een enkele drive heeft.  Ten
-      eerste dient de computer uitgeschakeld te worden en dient de
+    <para>De volgende sectie beschrijft hoe een nieuwe <acronym>SCSI</acronym>
+      schijf aan een machine toe te voegen die slechts een enkele drive heeft.
+      Ten eerste dient de computer uitgeschakeld te worden en dient de
       schijf volgens de instructies van de computer, controller en
       schijffabrikant ge&iuml;nstalleerd te worden.  Wegens de grote
       vari&eacute;teiten om dit soort procedures uit te voeren, vallen

==== //depot/projects/str91xx/doc/nl_NL.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#2 (text+ko) ====

@@ -1,11 +1,10 @@
 <!--
      The FreeBSD Dutch Documentation Project
 
-     $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/kernelconfig/chapter.sgml,v 1.15 2009/05/17 17:12:22 rene Exp $
-     $FreeBSDnl: doc/nl_NL.ISO8859-1/books/handbook/kernelconfig/chapter.sgml,v 1.25 2006/01/05 21:13:22 siebrand Exp $
+     $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/kernelconfig/chapter.sgml,v 1.16 2009/09/25 19:25:40 rene Exp $
 
      %SOURCE%	en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml
-     %SRCID%	1.192
+     %SRCID%	1.193
 -->
 
 <chapter id="kernelconfig">
@@ -677,10 +676,9 @@
       wanneer de kernel met de optie <option>-g</option> gebouwd wordt,
       wat debuginformatie doorgeeft aan &man.gcc.1;.</para>
 
-    <programlisting>options   SCHED_4BSD    # 4BSD taakplanner</programlisting>
+    <programlisting>options   SCHED_ULE    # ULE taakplanner</programlisting>
 
-    <para>De traditionele en standaard taakplanner voor &os;.  Laat dit
-      staan.</para>
+    <para>De standaard taakplanner voor &os;.  Laat dit staan.</para>
 
     <programlisting>options   PREEMPTION # Zet kernelthreadpre&euml;mptie aan</programlisting>
 

==== //depot/projects/str91xx/ports/MOVED#7 (text+ko) ====

@@ -1,7 +1,7 @@
 #
 # MOVED - a list of (recently) moved or removed ports
 #
-# $FreeBSD: ports/MOVED,v 1.1990 2009/09/23 19:44:02 glarkin Exp $
+# $FreeBSD: ports/MOVED,v 1.1991 2009/09/24 20:56:23 miwi Exp $
 #
 # Each entry consists of a single line containing the following four
 # fields in the order named, separated with the pipe (`|') character:
@@ -4171,3 +4171,11 @@
 systutils/uptimec||2009-09-23|Project is gone since 2007
 www/cakephp||2009-09-23|Repomoved to www/cakephp11
 www/cakephp-devel||2009-09-23|Repomoved to www/cakephp12
+audio/gmpccaa||2009-09-24|Unmaintained upstream
+audio/gmpc-osd||2009-09-24|Unmaintained upstream
+audio/gmpc-qosd||2009-09-24|Unmaintained upstream
+audio/gmpc-random-playlist||2009-09-24|Unmaintained upstream
+audio/gmpc-serverstats||2009-09-24|Unmaintained upstream
+audio/gmpc-favorites||2009-09-24|Unmaintained upstream
+audio/gmpc-autoplaylist||2009-09-24|Unmaintained upstream
+audio/gmpc-stopbutton||2009-09-24|Unmaintained upstream

==== //depot/projects/str91xx/ports/Mk/bsd.gcc.mk#5 (text+ko) ====

@@ -30,7 +30,7 @@
 # If you are wondering what your port exactly does, use "make test-gcc"
 # to see some debugging.
 #
-# $FreeBSD: ports/Mk/bsd.gcc.mk,v 1.33 2009/09/23 21:13:07 gerald Exp $
+# $FreeBSD: ports/Mk/bsd.gcc.mk,v 1.34 2009/09/26 01:02:01 gerald Exp $
 #
 
 GCC_Include_MAINTAINER=		gerald at FreeBSD.org
@@ -72,6 +72,8 @@
 F77:=	gfortran44
 CC:=	gcc44
 CXX:=	g++44
+CFLAGS+=	-Wl,-rpath=${PREFIX}/lib/gcc44
+LDFLAGS+=	-Wl,-rpath=${PREFIX}/lib/gcc44
 
 # Intel Fortran compiler from lang/ifc.
 . elif ${USE_FORTRAN} == ifort

==== //depot/projects/str91xx/ports/UPDATING#7 (text+ko) ====

@@ -5,6 +5,23 @@
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20090921
+  AFFECTS: users of archivers/lzmautils, archivers/lzmautils-devel
+  AUTHOR: Christian Weisgerber <naddy at FreeBSD.org>
+
+  The XZ Utils distribution has superseded LZMA Utils, so the xz
+  port has been added and the lzmautils ports have been removed.
+  To perform the move, run one of the following commands:
+
+  If using portupgrade:
+  # portupgrade -o archivers/xz lzmautils\*
+
+  If using portmaster:
+  # portmaster -o archivers/xz archivers/lzmautils
+  or
+  # portmaster -o archivers/xz archivers/lzmautils-devel
+  as applicable.
+
 20090919:
   AFFECTS: users of mail/postfix-postfwd
   AUTHOR: Sahil Tandon <sahil at tandon.net>
@@ -8522,4 +8539,4 @@
   2) Update all p5-* modules:
 	portupgrade -f p5-\*
 
-$FreeBSD: ports/UPDATING,v 1.863 2009/09/19 17:00:07 miwi Exp $
+$FreeBSD: ports/UPDATING,v 1.864 2009/09/25 14:24:49 naddy Exp $

==== //depot/projects/str91xx/src/UPDATING#7 (text+ko) ====

@@ -22,10 +22,61 @@
 	machines to maximize performance.  (To disable malloc debugging, run
 	ln -s aj /etc/malloc.conf.)
 
+20090926:
+	The rc.d/network_ipv6, IPv6 configuration script has been integrated
+	into rc.d/netif.  The changes are the following:
+
+	1. To use IPv6, simply define $ifconfig_IF_ipv6 like $ifconfig_IF
+	   for IPv4.  For aliases, $ifconfig_IF_aliasN should be used.
+	   Note that both variables need the "inet6" keyword at the head.
+
+	   Do not set $ipv6_network_interfaces manually if you do not
+	   understand what you are doing.  It is not needed in most cases. 
+
+	   $ipv6_ifconfig_IF and $ipv6_ifconfig_IF_aliasN still work, but
+	   they are obsolete.
+
+	2. $ipv6_enable is obsolete.  Use $ipv6_prefer and
+	   "inet6 accept_rtadv" keyword in ifconfig(8) instead.
+
+	   If you define $ipv6_enable=YES, it means $ipv6_prefer=YES and
+	   all configured interfaces have "inet6 accept_rtadv" in the
+	   $ifconfig_IF_ipv6.  These are for backward compatibility.
+
+	3. A new variable $ipv6_prefer has been added.  If NO, IPv6
+	   functionality of interfaces with no corresponding
+	   $ifconfig_IF_ipv6 is disabled by using "inet6 ifdisabled" flag,
+	   and the default address selection policy of ip6addrctl(8) 
+	   is the IPv4-preferred one (see rc.d/ip6addrctl for more details).
+	   Note that if you want to configure IPv6 functionality on the
+	   disabled interfaces after boot, first you need to clear the flag by
+	   using ifconfig(8) like:
+
+		ifconfig em0 inet6 -ifdisabled
+
+	   If YES, the default address selection policy is set as
+	   IPv6-preferred.
+
+	   The default value of $ipv6_prefer is NO.
+
+	4. If your system need to receive Router Advertisement messages,
+	   define "inet6 accept_rtadv" in $ifconfig_IF_ipv6.  The rc(8)
+	   scripts automatically invoke rtsol(8) when the interface becomes
+	   UP.  The Router Advertisement messages are used for SLAAC
+	   (State-Less Address AutoConfiguration).
+
 20090922:
 	802.11s D3.03 support was committed. This is incompatible with the
 	previous code, which was based on D3.0.
 
+20090912:
+	A sysctl variable net.inet6.ip6.accept_rtadv now sets the default value
+	of a per-interface flag ND6_IFF_ACCEPT_RTADV, not a global knob to
+	control whether accepting Router Advertisement messages or not.
+	Also, a per-interface flag ND6_IFF_AUTO_LINKLOCAL has been added and
+	a sysctl variable net.inet6.ip6.auto_linklocal is its default value.
+	The ifconfig(8) utility now supports these flags.
+
 20090910:
 	ZFS snapshots are now mounted with MNT_IGNORE flag. Use -v option for
 	mount(8) and -a option for df(1) to see them.
@@ -979,4 +1030,4 @@
 Contact Warner Losh if you have any questions about your use of
 this document.
 
-$FreeBSD: src/UPDATING,v 1.640 2009/09/22 18:19:18 rpaulo Exp $
+$FreeBSD: src/UPDATING,v 1.641 2009/09/26 18:59:00 hrs Exp $

==== //depot/projects/str91xx/src/cddl/contrib/opensolaris/cmd/zfs/zfs.8#2 (text+ko) ====

@@ -535,7 +535,7 @@
 .ad
 .sp .6
 .RS 4n
-Controls the checksum used to verify data integrity. The default value is "on", which automatically selects an appropriate algorithm (currently, \fIfletcher2\fR, but this may change in future releases). The value "off" disables integrity
+Controls the checksum used to verify data integrity. The default value is "on", which automatically selects an appropriate algorithm (currently, \fIfletcher4\fR, but this may change in future releases). The value "off" disables integrity
 checking on user data. Disabling checksums is NOT a recommended practice.
 .RE
 

==== //depot/projects/str91xx/src/etc/mtree/BSD.usr.dist#4 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.338 2009/09/03 16:25:25 ache Exp $
+# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.339 2009/09/27 21:27:11 gabor Exp $
 #
 # Please see the file src/etc/mtree/README before making changes to this file.
 #
@@ -1031,6 +1031,8 @@
             ..
             fr_FR.UTF-8
             ..
+            gl_ES.ISO8859-1
+            ..
             he_IL.UTF-8
             ..
             hi_IN.ISCII-DEV

==== //depot/projects/str91xx/src/etc/network.subr#5 (text+ko) ====

@@ -22,7 +22,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD: src/etc/network.subr,v 1.201 2009/09/12 23:01:36 hrs Exp $
+# $FreeBSD: src/etc/network.subr,v 1.202 2009/09/26 18:59:00 hrs Exp $
 #
 
 #
@@ -97,15 +97,26 @@
 	if afexists inet6; then
 		if ipv6if $1; then
 			if checkyesno ipv6_gateway_enable; then
-				_ipv6_opts="-accept_rtadv auto_linklocal"
+				_ipv6_opts="-accept_rtadv"
+			fi
+		else
+			if checkyesno ipv6_prefer; then
+				_ipv6_opts="-ifdisabled"
 			else
-				_ipv6_opts="auto_linklocal"
+				_ipv6_opts="ifdisabled"
 			fi
-		else
-			_ipv6_opts="-auto_linklocal ifdisabled"
+
+			# backward compatibility: $ipv6_enable
+			case $ipv6_enable in
+			[Yy][Ee][Ss])
+				_ipv6_opts="${_ipv6_opts} accept_rtadv"
+				;;
+			esac
 		fi
 
-		ifconfig $1 inet6 ${_ipv6_opts}
+		if [ -n "${_ipv6_opts}" ]; then
+			ifconfig $1 inet6 ${_ipv6_opts}
+		fi
 
 		# ifconfig_IF_ipv6
 		ifconfig_args=`ifconfig_getargs $1 ipv6`
@@ -382,7 +393,7 @@
 #	1 otherwise.
 ipv6if()
 {
-	local _if i
+	local _if _tmpargs i
 	_if=$1
 
 	if ! afexists inet6; then
@@ -396,6 +407,18 @@
 		;;
 	esac
 
+	# True if $ifconfig_IF_ipv6 is defined.
+	_tmpargs=`_ifconfig_getargs $_if ipv6`
+	if [ -n "${_tmpargs}" ]; then
+		return 0
+	fi
+
+	# backward compatibility: True if $ipv6_ifconfig_IF is defined.
+	_tmpargs=`get_if_var $_if ipv6_ifconfig_IF`
+	if [ -n "${_tmpargs}" ]; then
+		return 0
+	fi
+
 	case "${ipv6_network_interfaces}" in
 	[Aa][Uu][Tt][Oo])
 		return 0
@@ -431,17 +454,30 @@
 	if checkyesno ipv6_gateway_enable; then
 		return 1
 	fi
+	_tmpargs=`get_if_var $_if ipv6_prefix_IF`
+	if [ -n "${_tmpargs}" ]; then
+		return 1
+	fi
 
 	case $_if in
 	lo0|\
 	stf[0-9]*|\
 	faith[0-9]*|\
 	lp[0-9]*|\
-	sl[0-9]*)
+	sl[0-9]*|\
+	pflog[0-9]*|\
+	pfsync[0-9]*)
 		return 1
 		;;
 	esac
 
+	# backward compatibility: $ipv6_enable
+	case $ipv6_enable in
+	[Yy][Ee][Ss])
+		return 0
+		;;
+	esac
+
 	_tmpargs=`_ifconfig_getargs $_if ipv6`
 	for _arg in $_tmpargs; do
 		case $_arg in
@@ -451,6 +487,16 @@
 		esac
 	done
 
+	# backward compatibility: $ipv6_ifconfig_IF
+	_tmpargs=`get_if_var $_if ipv6_ifconfig_IF`
+	for _arg in $_tmpargs; do
+		case $_arg in
+		accept_rtadv)
+			return 0
+			;;
+		esac
+	done
+
 	return 1
 }
 
@@ -691,7 +737,7 @@
 			;;
 		*)
 			ifconfig $1 inet6 ${ifconfig_args} alias && _ret=0
-			warn "\$ipv6_ifconfig_$1_alias${alias} is obsolete."
+			warn "\$ipv6_ifconfig_$1_alias${alias} is obsolete." \
 			    "  Use ifconfig_$1_aliasN instead."
 			;;
 		esac
@@ -773,6 +819,7 @@
 	done
 
 	# backward compatibility: ipv6_ifconfig_IF_aliasN.
+	alias=0
 	while : ; do
 		ifconfig_args=`get_if_var $1 ipv6_ifconfig_IF_alias${alias}`
 		case "${ifconfig_args}" in
@@ -780,13 +827,12 @@
 			break
 			;;
 		*)
-			ifconfig $1 inet6 ${ifconfig_args} -alias
-			alias=$((${alias} + 1))
-			warn "\$ipv6_ifconfig_$1_alias${alias} is obsolete."
+			ifconfig $1 inet6 ${ifconfig_args} -alias && _ret=0
+			warn "\$ipv6_ifconfig_$1_alias${alias} is obsolete." \
 			    "  Use ifconfig_$1_aliasN instead."
-			_ret=0
 			;;
 		esac
+		alias=$((${alias} + 1))
 	done
 
 	return $_ret

==== //depot/projects/str91xx/src/etc/periodic/daily/400.status-disks#2 (text+ko) ====

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: src/etc/periodic/daily/400.status-disks,v 1.6 2002/02/13 19:10:07 brian Exp $
+# $FreeBSD: src/etc/periodic/daily/400.status-disks,v 1.7 2009/09/28 03:32:35 cperciva Exp $
 #
 
 # If there is a global system configuration file, suck it in.
@@ -19,6 +19,9 @@
 	df $daily_status_disks_df_flags && rc=1 || rc=3
 
 	# display which filesystems need backing up
+	if ! [ -f /etc/fstab ]; then
+		export PATH_FSTAB=/dev/null
+	fi
 
 	echo ""
 	dump W || rc=3;;

==== //depot/projects/str91xx/src/etc/periodic/security/200.chkmounts#2 (text+ko) ====

@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD: src/etc/periodic/security/200.chkmounts,v 1.6 2008/10/25 18:45:40 ed Exp $
+# $FreeBSD: src/etc/periodic/security/200.chkmounts,v 1.7 2009/09/28 03:32:35 cperciva Exp $
 #
 
 # Show changes in the way filesystems are mounted
@@ -50,6 +50,9 @@
 		ignore="${ignore}|^amd:"
 	esac
 	[ -n "$ignore" ] && cmd="egrep -v ${ignore#|}" || cmd=cat
+	if ! [ -f /etc/fstab ]; then
+		export PATH_FSTAB=/dev/null
+	fi
 	mount -p | sort | ${cmd} |
 	  check_diff mount - "${host} changes in mounted filesystems:"
 	rc=$?;;

==== //depot/projects/str91xx/src/etc/rc.d/defaultroute#3 (text+ko) ====

@@ -2,11 +2,11 @@
 #
 # Wait for the default route to be up
 #
-# $FreeBSD: src/etc/rc.d/defaultroute,v 1.7 2009/09/12 22:13:41 hrs Exp $
+# $FreeBSD: src/etc/rc.d/defaultroute,v 1.8 2009/09/26 19:00:20 hrs Exp $
 #
 
 # PROVIDE: defaultroute
-# REQUIRE: devd netif
+# REQUIRE: devd faith netif stf
 # KEYWORD: nojail
 
 . /etc/rc.subr

==== //depot/projects/str91xx/src/etc/rc.d/ip6addrctl#3 (text+ko) ====

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: src/etc/rc.d/ip6addrctl,v 1.6 2009/09/12 22:13:41 hrs Exp $
+# $FreeBSD: src/etc/rc.d/ip6addrctl,v 1.7 2009/09/26 18:59:00 hrs Exp $
 #
 
 # PROVIDE: ip6addrctl
@@ -19,6 +19,8 @@
 prefer_ipv6_cmd="ip6addrctl_prefer_ipv6"
 prefer_ipv4_cmd="ip6addrctl_prefer_ipv4"
 
+set_rcvar_obsolete ipv6_enable ipv6_prefer
+
 ip6addrctl_prefer_ipv6()
 {
 	ip6addrctl flush >/dev/null 2>&1

==== //depot/projects/str91xx/src/etc/rc.d/netif#4 (text+ko) ====

@@ -22,7 +22,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-# $FreeBSD: src/etc/rc.d/netif,v 1.33 2009/09/12 22:13:41 hrs Exp $
+# $FreeBSD: src/etc/rc.d/netif,v 1.34 2009/09/26 18:59:00 hrs Exp $
 #
 
 # PROVIDE: netif
@@ -41,7 +41,7 @@
 extra_commands="cloneup clonedown"
 cmdifn=
 
-set_rcvar_obsolete ipv6_enable
+set_rcvar_obsolete ipv6_enable ipv6_prefer
 
 network_start()
 {

==== //depot/projects/str91xx/src/etc/rc.d/routing#3 (text+ko) ====

@@ -2,11 +2,11 @@
 #
 # Configure routing and miscellaneous network tunables
 #
-# $FreeBSD: src/etc/rc.d/routing,v 1.148 2009/09/13 20:19:02 bz Exp $
+# $FreeBSD: src/etc/rc.d/routing,v 1.149 2009/09/26 19:00:20 hrs Exp $
 #
 
 # PROVIDE: routing
-# REQUIRE: netif ppp
+# REQUIRE: faith netif ppp stf
 # KEYWORD: nojail
 
 . /etc/rc.subr

==== //depot/projects/str91xx/src/etc/rc.d/rtadvd#3 (text+ko) ====

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: src/etc/rc.d/rtadvd,v 1.14 2009/09/12 23:00:01 hrs Exp $
+# $FreeBSD: src/etc/rc.d/rtadvd,v 1.15 2009/09/26 19:00:47 hrs Exp $
 #
 
 # PROVIDE: rtadvd
@@ -43,7 +43,10 @@
 	case ${rtadvd_interfaces} in
 	[Aa][Uu][Tt][Oo]|'')
 		for i in `ifconfig -l` ; do
-			if is_wired_interface $1; then
+			case $i in
+			lo0)	continue ;;
+			esac
+			if ipv6if $i; then
 				rtadvd_interfaces="${rtadvd_interfaces} ${i}"
 			fi
 		done

==== //depot/projects/str91xx/src/lib/libc/nls/Makefile.inc#2 (text+ko) ====

@@ -1,5 +1,5 @@
 #	from $NetBSD: Makefile.inc,v 1.7 1995/02/27 13:06:20 cgd Exp $
-# $FreeBSD: src/lib/libc/nls/Makefile.inc,v 1.17 2009/03/24 23:31:41 gabor Exp $
+# $FreeBSD: src/lib/libc/nls/Makefile.inc,v 1.18 2009/09/27 13:16:38 gabor Exp $
 
 .PATH: ${.CURDIR}/nls
 
@@ -20,6 +20,7 @@
 NLS+=	es_ES.ISO8859-1
 NLS+=	fi_FI.ISO8859-1
 NLS+=	fr_FR.ISO8859-1
+NLS+=	gl_ES.ISO8859-1
 NLS+=	hu_HU.ISO8859-2
 NLS+=	it_IT.ISO8859-15
 NLS+=	ko_KR.UTF-8

==== //depot/projects/str91xx/src/lib/libc/stdlib/malloc.3#2 (text+ko) ====

@@ -30,9 +30,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)malloc.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: src/lib/libc/stdlib/malloc.3,v 1.80 2008/11/03 21:17:18 jasone Exp $
+.\" $FreeBSD: src/lib/libc/stdlib/malloc.3,v 1.81 2009/09/26 18:20:40 alc Exp $
 .\"
-.Dd August 26, 2008
+.Dd September 26, 2009
 .Dt MALLOC 3
 .Os
 .Sh NAME
@@ -245,7 +245,8 @@
 This is intended for debugging and will impact performance negatively.
 .It K
 Double/halve the virtual memory chunk size.
-The default chunk size is 1 MB.
+The default chunk size is the maximum of 1 MB and the largest
+page size that is less than or equal to 4 MB.
 .It M
 Use
 .Xr mmap 2
@@ -561,6 +562,7 @@
 .Xr alloca 3 ,
 .Xr atexit 3 ,
 .Xr getpagesize 3 ,
+.Xr getpagesizes 3 ,
 .Xr memory 3 ,
 .Xr posix_memalign 3
 .Sh STANDARDS

==== //depot/projects/str91xx/src/lib/libc/stdlib/malloc.c#3 (text+ko) ====

@@ -156,7 +156,7 @@
 #define	MALLOC_DSS
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.184 2009/09/05 13:32:05 kib Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.185 2009/09/26 18:20:40 alc Exp $");
 
 #include "libc_private.h"
 #ifdef MALLOC_DEBUG
@@ -4795,6 +4795,21 @@
 		}
 	}
 
+	/*
+	 * Increase the chunk size to the largest page size that is greater
+	 * than the default chunk size and less than or equal to 4MB.
+	 */
+	{
+		size_t pagesizes[MAXPAGESIZES];
+		int k, nsizes;
+
+		nsizes = getpagesizes(pagesizes, MAXPAGESIZES);
+		for (k = 0; k < nsizes; k++)
+			if (pagesizes[k] <= (1LU << 22))
+				while ((1LU << opt_chunk_2pow) < pagesizes[k])
+					opt_chunk_2pow++;
+	}
+
 	for (i = 0; i < 3; i++) {
 		unsigned j;
 

==== //depot/projects/str91xx/src/lib/libthr/thread/thr_spec.c#2 (text+ko) ====

@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/lib/libthr/thread/thr_spec.c,v 1.7 2007/11/06 21:50:43 marius Exp $
+ * $FreeBSD: src/lib/libthr/thread/thr_spec.c,v 1.8 2009/09/25 00:15:30 davidxu Exp $
  */
 
 #include "namespace.h"
@@ -131,9 +131,19 @@
 				curthread->specific[key].data = NULL;
 				curthread->specific_data_count--;
 			}
+			else if (curthread->specific[key].data != NULL) {
+				/* 
+				 * This can happen if the key is deleted via
+				 * pthread_key_delete without first setting the value
+				 * to NULL in all threads.  POSIX says that the
+				 * destructor is not invoked in this case.
+				 */

>>> TRUNCATED FOR MAIL (1000 lines) <<<


More information about the p4-projects mailing list