From owner-p4-projects@FreeBSD.ORG Sun May 15 03:10:18 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7438E1065673; Sun, 15 May 2011 03:10:18 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2C69C106566C for ; Sun, 15 May 2011 03:10:18 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 196B58FC14 for ; Sun, 15 May 2011 03:10:18 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p4F3AHnW010391 for ; Sun, 15 May 2011 03:10:17 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p4F3AHUB010387 for perforce@freebsd.org; Sun, 15 May 2011 03:10:17 GMT (envelope-from rene@FreeBSD.org) Date: Sun, 15 May 2011 03:10:17 GMT Message-Id: <201105150310.p4F3AHUB010387@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 193163 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 May 2011 03:10:18 -0000 http://p4web.freebsd.org/@@193163?ac=10 Change 193163 by rene@rene_acer on 2011/05/15 03:10:00 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/committers-guide/article.sgml#39 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.conf.default#3 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/pr-guidelines/article.sgml#7 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/faq/book.sgml#35 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml#21 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#106 integrate .. //depot/projects/docproj_nl/share/pgpkeys/gioria.key#2 delete .. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#54 integrate .. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#51 integrate .. //depot/projects/docproj_nl/www/en/gnome/docs/halfaq.sgml#6 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/committers-guide/article.sgml#39 (text+ko) ==== @@ -9,7 +9,7 @@ The &os; Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.298 2011/03/24 20:09:24 cperciva Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.299 2011/05/14 20:44:31 hrs Exp $ 1999 @@ -2413,8 +2413,7 @@ old. It should be integrated into the FreeBSD documentation. - Current Tier 2 platforms are ARM, PowerPC, ia64, Sparc64 and - sun4v. + Current Tier 2 platforms are ARM, PowerPC, ia64, and Sparc64. ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.conf.default#3 (text+ko) ==== @@ -1,7 +1,7 @@ # This file: stage_1.conf.default, sourced by stage_1.sh. # # $Id: stage_1.conf.default,v 1.2 2004/01/03 13:55:06 toor Exp toor $ -# $FreeBSD: doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.conf.default,v 1.4 2008/12/03 21:59:51 schweikh Exp $ +# $FreeBSD: doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.conf.default,v 1.5 2011/05/14 20:44:31 hrs Exp $ # Root mount point where you create the new system. Because it is only # used as a mount point, no space will be used on that file system as all @@ -20,7 +20,7 @@ # Your target architecture as used for make buildworld TARGET=... # If you did not specify a TARGET when building world, it defaulted # to the build architecture (run "uname -m" to find out if you are unsure). -TARGET="i386" # amd64 arm i386 ia64 mips pc98 powerpc sparc64 sun4v +TARGET="i386" # amd64 arm i386 ia64 mips pc98 powerpc sparc64 # Available time zones are those under /usr/share/zoneinfo. TIMEZONE="Europe/Berlin" ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/pr-guidelines/article.sgml#7 (text+ko) ==== @@ -15,7 +15,7 @@ Problem Report Handling Guidelines - $FreeBSD: doc/en_US.ISO8859-1/articles/pr-guidelines/article.sgml,v 1.36 2011/04/10 11:20:01 gavin Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/pr-guidelines/article.sgml,v 1.37 2011/05/14 20:44:31 hrs Exp $ &tm-attrib.freebsd; @@ -292,7 +292,7 @@ architecture-specific - alpha, amd64, arm, i386, ia64, powerpc, sparc64, sun4v + alpha, amd64, arm, i386, ia64, powerpc, sparc64 freebsd-arch ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/faq/book.sgml#35 (text+ko) ==== @@ -12,7 +12,7 @@ The &os; Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.1134 2011/03/21 17:42:38 chinsan Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.1135 2011/05/14 20:44:31 hrs Exp $ 1995 @@ -2232,7 +2232,7 @@ Yes. &os; currently runs on the Intel x86 and the AMD64 architectures. The Intel EM64T, IA-64, &arm;, - &powerpc;, sun4v and &sparc64; architectures are also + &powerpc;, and &sparc64; architectures are also supported. Upcoming platforms are &mips; and &s390;, join the &a.mips; for more information about ongoing work on the &mips; platform. For general discussion on new ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml#21 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -503,11 +503,6 @@ - &a.sun4v.name; - Porting FreeBSD to &ultrasparc; T1 based systems - - - &a.sysinstall.name; &man.sysinstall.8; development ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#106 (text+ko) ==== @@ -1,7 +1,7 @@ The COMMENT variable should immediately follow the MAINTAINER variable in the Makefile. - Please try to keep the COMMENT line less than 60 + Please try to keep the COMMENT value at no longer than 70 characters, as this line will be used by the &man.pkg.info.1; utility to display a one-line summary of the port. @@ -14124,6 +14124,12 @@ 9.0-CURRENT after the removal of libobjc and Objective-C support from the base system. + + 900037 + May 13, 2011 + 9.0-CURRENT after importing the libprocstat(3) + library and fuser(1) utility to the base system. + ==== //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#54 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -481,11 +481,6 @@ &pgpkey.danger; - - &a.gioria; - &pgpkey.gioria; - - &a.pgollucci; &pgpkey.pgollucci; ==== //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#51 (text+ko) ==== @@ -1,5 +1,5 @@ - + @@ -117,7 +117,6 @@ - ==== //depot/projects/docproj_nl/www/en/gnome/docs/halfaq.sgml#6 (text+ko) ==== @@ -1,6 +1,6 @@ - + ]> @@ -116,7 +116,13 @@

NOTE: Volumes that you wish to manage using hal should NOT be listed in /etc/fstab. This is especially true for CD devices and floppy disk - devices.

+ devices. If you try to dynamically mount a volume using hal + that is listed in /etc/fstab you will see the + following error:

+ + 
+mount_cd9660: /dev/acd0: Operation not permitted
+

If you are a GNOME user be aware that prior to GNOME 2.22, gnome-volume-manager was responsible for From owner-p4-projects@FreeBSD.ORG Sun May 15 03:48:43 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 271251065675; Sun, 15 May 2011 03:48:43 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DDE401065673 for ; Sun, 15 May 2011 03:48:42 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id CC5C18FC1A for ; Sun, 15 May 2011 03:48:42 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p4F3mg7Q018997 for ; Sun, 15 May 2011 03:48:42 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p4F3mgnq018994 for perforce@freebsd.org; Sun, 15 May 2011 03:48:42 GMT (envelope-from rene@FreeBSD.org) Date: Sun, 15 May 2011 03:48:42 GMT Message-Id: <201105150348.p4F3mgnq018994@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 193165 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 May 2011 03:48:43 -0000 http://p4web.freebsd.org/@@193165?ac=10 Change 193165 by rene@rene_acer on 2011/05/15 03:48:42 MFC website: administration.sgml 1.41 -> 1.42 Affected files ... .. //depot/projects/docproj_nl/www/nl/administration.sgml#29 edit Differences ... ==== //depot/projects/docproj_nl/www/nl/administration.sgml#29 (text+ko) ==== @@ -7,7 +7,7 @@ &header; @@ -128,6 +128,7 @@

  • &a.tabthorpe; <tabthorpe@FreeBSD.org>
  • &a.marcus; <marcus@FreeBSD.org>
    • +
  • &a.bapt; <bapt@FreeBSD.org>
  • &a.erwin; <erwin@FreeBSD.org>
  • &a.linimon; <linimon@FreeBSD.org>
  • &a.pav; <pav@FreeBSD.org>
    • From owner-p4-projects@FreeBSD.ORG Sun May 15 03:49:49 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4903D1065672; Sun, 15 May 2011 03:49:49 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0B77E106566C for ; Sun, 15 May 2011 03:49:49 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id ED2FF8FC14 for ; Sun, 15 May 2011 03:49:48 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p4F3nmsL019028 for ; Sun, 15 May 2011 03:49:48 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p4F3nmkm019025 for perforce@freebsd.org; Sun, 15 May 2011 03:49:48 GMT (envelope-from rene@FreeBSD.org) Date: Sun, 15 May 2011 03:49:48 GMT Message-Id: <201105150349.p4F3nmkm019025@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 193166 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 May 2011 03:49:49 -0000 http://p4web.freebsd.org/@@193166?ac=10 Change 193166 by rene@rene_acer on 2011/05/15 03:49:41 MFC handbook: eresources 1.206 -> 1.207 install 1.420 -> 1.425 Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/eresources/chapter.sgml#35 edit .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/install/chapter.sgml#23 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/eresources/chapter.sgml#35 (text+ko) ==== @@ -5,7 +5,7 @@ Vertaald door: Siebrand Mazeland %SOURCE% en_US.ISO8859-1/books/handbook/eresources/chapter.sgml - %SRCID% 1.206 + %SRCID% 1.207 --> @@ -609,13 +609,6 @@ - &a.sun4v.name; - - Het porteren van &os; naar &ultrasparc; - T1-gebaseerde systemen. - - - &a.sysinstall.name; Ontwikkeling van &man.sysinstall.8; ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/install/chapter.sgml#23 (text+ko) ==== @@ -4,7 +4,7 @@ $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/install/chapter.sgml,v 1.22 2011/02/23 06:04:59 remko Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/install/chapter.sgml - %SRCID% 1.420 + %SRCID% 1.425 --> @@ -755,10 +755,10 @@ Bemachtig de images voor opstartdiskettes - Merk op dat met ingang van &os; 8.0 floppy-images niet - langer beschikbaar zijn. Zie de bovenstaande instructies voor - hoe &os; met behulp van een USB-geheugenstick te installeren, of - gebruik een CD-ROM of DVD. + Merk op dat met ingang van &os; 8.X + floppy-images niet langer beschikbaar zijn. Zie de bovenstaande + instructies voor hoe &os; met behulp van een USB-geheugenstick te + installeren, of gebruik een CD-ROM of DVD. De opstartschijven zijn beschikbaar op de @@ -954,7 +954,7 @@ - Voor &os; 7.3 en eerdere versies zijn + Voor &os; 7.X zijn installatiediskettes beschikbaar en ze kunnen worden klaargemaakt zoals beschreven in . Eén van deze is de @@ -3211,8 +3211,9 @@ Dit gedeelte is alleen van toepassing op installaties van - &os; 7.X, als u &os; 8.X installeert wordt dit scherm niet - getoond. + &os; 7.X, als u + &os; 8.X installeert wordt dit scherm + niet getoond. User Confirmation Requested @@ -4618,10 +4619,10 @@ Gebruik &man.tar.1; om alle bestanden uit te pakken van het installatie-ISO-image, bijvoorbeeld - &os;-8.1-RELEASE-i386-disc1.iso: + &os;-&rel.current;-RELEASE-i386-disc1.iso: &prompt.root; mkdir /pad/naar/headless-iso -&prompt.root; tar -C /pad/naar/headless-iso -pxvf &os;-8.1-RELEASE-i386-disc1.iso +&prompt.root; tar -C /pad/naar/headless-iso -pxvf &os;-&rel.current;-RELEASE-i386-disc1.iso Nu moet het installatiemedium worden ingesteld om in een seriële console op te starten. Aan het bestand @@ -4638,7 +4639,7 @@ gebruikt: &prompt.root; mkisofs -v -b boot/cdboot -no-emul-boot -r -J -V "Headless_installatie" \ - -o Headless-&os;-8.1-RELEASEi386-disc1.iso /pad/naar/headless-iso + -o Headless-&os;-&rel.current;-RELEASEi386-disc1.iso /pad/naar/headless-iso Nu het ISO-image correct is geconfigureerd, kan het met uw favoriete brandprogramma op een CD-R worden gebrandt. @@ -4677,7 +4678,8 @@ &prompt.root; cu -l /dev/cuau0 - Gebruik op &os; 7.X het volgende commando: + Gebruik op &os; 7.X het volgende + commando: &prompt.root; cu -l /dev/cuad0 @@ -4811,8 +4813,8 @@ Het ondersteunt ook het opstarten in een livefs gebaseerde reddingsmodus. De documentatiepakketten worden geleverd, echter geen andere - pakketten. Dit image is niet beschikbaar voor &os; 7.3 - en eerder. + pakketten. Dit image is niet beschikbaar voor + &os; 7.X. @@ -4827,7 +4829,7 @@ Een CD-image met zoveel mogelijk pakketten van derde partijen als er op de schijf passen. Dit image is niet - beschikbaar voor &os; 8.0 en hoger. + beschikbaar voor &os; 8.X. @@ -4857,14 +4859,14 @@ - Uitgaven van &os; 7.X voor &os; 7.3 en uitgaven van - &os; 8.X voor &os; 8.1 gebruikten een andere + Uitgaven van &os; 7.X voor + &os; 7.3 en uitgaven van &os; 8.0 gebruikten een andere naamconventie. Voor de namen van hun ISO-images staat geen &os;-. U moet òof het - bootonly image downloaden (indien beschikbaar), + bootonly image downloaden, òf het image van disc1. Download ze niet allebei, aangezien het image disc1 alles bevat wat het bootonly image bevat. From owner-p4-projects@FreeBSD.ORG Mon May 16 03:41:49 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9A6041065673; Mon, 16 May 2011 03:41:49 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5C8B5106566C for ; Mon, 16 May 2011 03:41:49 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 48EDF8FC16 for ; Mon, 16 May 2011 03:41:49 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p4G3fnA1007329 for ; Mon, 16 May 2011 03:41:49 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p4G3fm5X007326 for perforce@freebsd.org; Mon, 16 May 2011 03:41:48 GMT (envelope-from mjacob@freebsd.org) Date: Mon, 16 May 2011 03:41:48 GMT Message-Id: <201105160341.p4G3fm5X007326@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 193219 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 May 2011 03:41:49 -0000 http://p4web.freebsd.org/@@193219?ac=10 Change 193219 by mjacob@mjacob-sandbox on 2011/05/16 03:41:41 IFC Affected files ... .. //depot/projects/mjacob-dev/MAINTAINERS#4 integrate .. //depot/projects/mjacob-dev/bin/sh/eval.c#5 integrate .. //depot/projects/mjacob-dev/bin/sh/miscbltin.c#2 integrate .. //depot/projects/mjacob-dev/bin/sh/var.c#5 integrate .. //depot/projects/mjacob-dev/games/fortune/datfiles/fortunes#3 integrate .. //depot/projects/mjacob-dev/games/fortune/datfiles/fortunes-o.real#3 integrate .. //depot/projects/mjacob-dev/games/fortune/datfiles/fortunes-o.sp.ok#2 integrate .. //depot/projects/mjacob-dev/games/fortune/datfiles/fortunes.sp.ok#2 integrate .. //depot/projects/mjacob-dev/games/fortune/datfiles/freebsd-tips.sp.ok#2 integrate .. //depot/projects/mjacob-dev/games/fortune/datfiles/gerrold.limerick#2 integrate .. //depot/projects/mjacob-dev/games/fortune/datfiles/limerick#2 integrate .. //depot/projects/mjacob-dev/games/fortune/datfiles/limerick.sp.ok#2 integrate .. //depot/projects/mjacob-dev/games/fortune/datfiles/startrek.sp.ok#2 integrate .. //depot/projects/mjacob-dev/games/fortune/datfiles/zippy.sp.ok#2 integrate .. //depot/projects/mjacob-dev/games/morse/morse.c#2 integrate .. //depot/projects/mjacob-dev/lib/libprocstat/Makefile#2 integrate .. //depot/projects/mjacob-dev/lib/libprocstat/Symbol.map#1 branch .. //depot/projects/mjacob-dev/lib/libprocstat/Versions.def#1 branch .. //depot/projects/mjacob-dev/lib/libprocstat/libprocstat.c#2 integrate .. //depot/projects/mjacob-dev/sbin/geom/class/part/geom_part.c#5 integrate .. //depot/projects/mjacob-dev/sbin/ifconfig/ifmedia.c#3 integrate .. //depot/projects/mjacob-dev/share/man/man4/hpet.4#2 integrate .. //depot/projects/mjacob-dev/share/man/man4/man4.i386/Makefile#2 integrate .. //depot/projects/mjacob-dev/share/man/man4/man4.i386/glxiic.4#1 branch .. //depot/projects/mjacob-dev/sys/conf/files.i386#5 integrate .. //depot/projects/mjacob-dev/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c#6 integrate .. //depot/projects/mjacob-dev/sys/dev/ath/if_ath.c#7 integrate .. //depot/projects/mjacob-dev/sys/dev/ath/if_ath_sysctl.c#3 integrate .. //depot/projects/mjacob-dev/sys/dev/ath/if_athioctl.h#5 integrate .. //depot/projects/mjacob-dev/sys/dev/bge/if_bge.c#5 integrate .. //depot/projects/mjacob-dev/sys/dev/cxgbe/t4_sge.c#4 integrate .. //depot/projects/mjacob-dev/sys/dev/glxiic/glxiic.c#1 branch .. //depot/projects/mjacob-dev/sys/dev/iwn/if_iwn.c#5 integrate .. //depot/projects/mjacob-dev/sys/dev/mii/mii.c#3 integrate .. //depot/projects/mjacob-dev/sys/dev/mk48txx/mk48txx.c#2 integrate .. //depot/projects/mjacob-dev/sys/dev/mk48txx/mk48txxreg.h#2 integrate .. //depot/projects/mjacob-dev/sys/dev/scc/scc_bfe_ebus.c#2 integrate .. //depot/projects/mjacob-dev/sys/dev/uart/uart_cpu_sparc64.c#2 integrate .. //depot/projects/mjacob-dev/sys/fs/nfs/nfs_commonkrpc.c#3 integrate .. //depot/projects/mjacob-dev/sys/fs/nfs/nfs_commonport.c#4 integrate .. //depot/projects/mjacob-dev/sys/fs/nfsclient/nfs_clkrpc.c#2 integrate .. //depot/projects/mjacob-dev/sys/fs/nfsclient/nfs_clnfsiod.c#3 integrate .. //depot/projects/mjacob-dev/sys/fs/nfsclient/nfs_clsubs.c#4 integrate .. //depot/projects/mjacob-dev/sys/fs/nfsclient/nfs_clvfsops.c#6 integrate .. //depot/projects/mjacob-dev/sys/fs/nfsclient/nfs_clvnops.c#4 integrate .. //depot/projects/mjacob-dev/sys/geom/eli/g_eli_key_cache.c#2 integrate .. //depot/projects/mjacob-dev/sys/geom/part/g_part.c#5 integrate .. //depot/projects/mjacob-dev/sys/i386/conf/NOTES#3 integrate .. //depot/projects/mjacob-dev/sys/modules/Makefile#6 integrate .. //depot/projects/mjacob-dev/sys/modules/glxiic/Makefile#1 branch .. //depot/projects/mjacob-dev/sys/net/if_media.h#3 integrate .. //depot/projects/mjacob-dev/sys/netinet/sctp_output.c#6 integrate .. //depot/projects/mjacob-dev/sys/netinet/sctp_output.h#4 integrate .. //depot/projects/mjacob-dev/sys/nfs/nfs_common.c#2 integrate .. //depot/projects/mjacob-dev/sys/nfsclient/nfs_krpc.c#2 integrate .. //depot/projects/mjacob-dev/sys/nfsclient/nfs_nfsiod.c#2 integrate .. //depot/projects/mjacob-dev/sys/nfsclient/nfs_subs.c#4 integrate .. //depot/projects/mjacob-dev/sys/nfsclient/nfs_vfsops.c#5 integrate .. //depot/projects/mjacob-dev/sys/nfsclient/nfs_vnops.c#3 integrate .. //depot/projects/mjacob-dev/sys/sparc64/sparc64/eeprom.c#2 integrate .. //depot/projects/mjacob-dev/usr.bin/nfsstat/nfsstat.c#5 integrate .. //depot/projects/mjacob-dev/usr.sbin/nfsd/nfsv4.4#3 integrate Differences ... ==== //depot/projects/mjacob-dev/MAINTAINERS#4 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.164 2011/03/14 22:42:41 davidch Exp $ +$FreeBSD: src/MAINTAINERS,v 1.165 2011/05/14 17:44:12 cperciva Exp $ Please note that the content of this file is strictly advisory. No locks listed here are valid. The only strict review requirements @@ -108,7 +108,7 @@ bs{diff,patch} cperciva Pre-commit review requested. portsnap cperciva Pre-commit review requested. freebsd-update cperciva Pre-commit review requested. -openssl - No non-upstream commits should be done. +openssl benl Pre-commit review requested. sys/netgraph/bluetooth emax Pre-commit review preferred. lib/libbluetooth emax Pre-commit review preferred. lib/libsdp emax Pre-commit review preferred. ==== //depot/projects/mjacob-dev/bin/sh/eval.c#5 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.103 2011/04/25 20:54:12 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.104 2011/05/15 17:00:43 jilles Exp $"); #include #include @@ -552,7 +552,8 @@ if (prevfd >= 0) close(prevfd); prevfd = pip[0]; - close(pip[1]); + if (pip[1] != -1) + close(pip[1]); } INTON; if (n->npipe.backgnd == 0) { ==== //depot/projects/mjacob-dev/bin/sh/miscbltin.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/miscbltin.c,v 1.44 2010/11/23 22:17:39 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/miscbltin.c,v 1.45 2011/05/15 22:09:27 jilles Exp $"); /* * Miscellaneous builtins. @@ -465,7 +465,7 @@ "(-%c) ", l->option); out1fmt("%-18s %18s ", l->name, optbuf); if (val == RLIM_INFINITY) - out1fmt("unlimited\n"); + out1str("unlimited\n"); else { val /= l->factor; @@ -491,7 +491,7 @@ val = limit.rlim_max; if (val == RLIM_INFINITY) - out1fmt("unlimited\n"); + out1str("unlimited\n"); else { val /= l->factor; ==== //depot/projects/mjacob-dev/bin/sh/var.c#5 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/var.c,v 1.59 2011/05/08 17:40:10 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/var.c,v 1.60 2011/05/15 22:09:27 jilles Exp $"); #include #include @@ -681,14 +681,13 @@ out1str(cmdname); out1c(' '); } - p = strchr(vp->text, '='); if (values && !(vp->flags & VUNSET)) { - p++; - outbin(vp->text, p - vp->text, - out1); - out1qstr(p); + outbin(vp->text, + vp->name_len + 1, out1); + out1qstr(vp->text + + vp->name_len + 1); } else - outbin(vp->text, p - vp->text, + outbin(vp->text, vp->name_len, out1); out1c('\n'); } ==== //depot/projects/mjacob-dev/games/fortune/datfiles/fortunes#3 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.292 2011/02/13 18:18:56 brucec Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.293 2011/05/14 19:03:45 uqs Exp $ % ======================================================================= || || @@ -10494,13 +10494,13 @@ Antonio Antonio Was tired of living alonio He thought he would woo Antonio Antonio -Miss Lucamy Lu, Rode of on his polo ponio +Miss Lucamy Lu, Rode off on his polo ponio Miss Lucamy Lucy Molonio. And found the maid In a bowery shade, Sitting and knitting alonio. Antonio Antonio Said if you will be my ownio -I'll love tou true Oh nonio Antonio +I'll love you true Oh nonio Antonio And buy for you You're far too bleak and bonio An icery creamry conio. And all that I wish You singular fish @@ -10509,7 +10509,7 @@ Uttered a dismal moanio And went off and hid Or I'm told that he did -In the Antartical Zonio. +In the Antarctical Zonio. % Antonym, n.: The opposite of the word you're trying to think of. @@ -20232,7 +20232,7 @@ Goodbye, cool world. % Goose pimples rose all over me, my hair stood on end, my eyes filled with -tears of love and gratitude for this greatest of all conquerers of human +tears of love and gratitude for this greatest of all conquerors of human misery and shame, and my breath came in little gasps. If I had not known that the Leader would have scorned such adulation, I might have fallen to my knees in unashamed worship, but instead I drew myself to attention, raised @@ -25099,7 +25099,7 @@ enlightenment % IBM: - [Internation Business Machines Corp.] Also known as Itty Bitty + [International Business Machines Corp.] Also known as Itty Bitty Machines or The Lawyer's Friend. The dominant force in computer marketing, having supplied worldwide some 75% of all known hardware and 10% of all software. To protect itself from the litigious envy ==== //depot/projects/mjacob-dev/games/fortune/datfiles/fortunes-o.real#3 (text+ko) ==== @@ -1,4 +1,4 @@ -%% $FreeBSD: src/games/fortune/datfiles/fortunes-o.real,v 1.38 2011/02/13 18:18:56 brucec Exp $ +%% $FreeBSD: src/games/fortune/datfiles/fortunes-o.real,v 1.39 2011/05/14 19:03:45 uqs Exp $ % PLAYGIRL, Inc. Philadelphia, Pa. 19369 @@ -7722,7 +7722,7 @@ I was lewd, but my God! she was lewder. She said it was crude To be wooed in the nude-- -I persued her, subdued her, and screwed her! +I pursued her, subdued her, and screwed her! % I would like to say, Mister Bunce, I'm a great connoisseur of hot cunts. @@ -9044,7 +9044,7 @@ distant neighbors about the tragedy, a few of them reported that the only stranger they had seen in the area for weeks was a tall desperado wearing a black hat and a red neckerchief. - The cowboy saddled his fastest horse and set out to find the villian. + The cowboy saddled his fastest horse and set out to find the villain. He searched for months but couldn't catch up with the culprit; in town after dusty town he was told that a man fitting the description had been there but had just departed; usually after some heinous crime. ==== //depot/projects/mjacob-dev/games/fortune/datfiles/fortunes-o.sp.ok#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/games/fortune/datfiles/fortunes-o.sp.ok,v 1.3 2007/12/09 01:00:11 dougb Exp $ +# $FreeBSD: src/games/fortune/datfiles/fortunes-o.sp.ok,v 1.4 2011/05/14 19:03:45 uqs Exp $ a'plucking AAAaaeeeeeeeeeiiiiiiiii Aaah @@ -1121,7 +1121,6 @@ penis pere Perelman -persued pestes Peteer Pettigrew @@ -1600,7 +1599,6 @@ vici Vida vidi -villian virginem Visme viziti ==== //depot/projects/mjacob-dev/games/fortune/datfiles/fortunes.sp.ok#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/games/fortune/datfiles/fortunes.sp.ok,v 1.11 2010/03/31 18:21:25 uqs Exp $ +# $FreeBSD: src/games/fortune/datfiles/fortunes.sp.ok,v 1.12 2011/05/14 19:03:45 uqs Exp $ AAAAAAAAAaaaaaaaaaaaaaaaccccccccckkkkkk AAAARRRRGGGGHHHH aafte @@ -139,7 +139,6 @@ ANRS Ansley answerback -Antartic Anthony's Antonym Antrim @@ -375,7 +374,6 @@ Besicovitch Beslove Betazoid -bethumped Bette Bevan BEW @@ -468,7 +466,6 @@ bookaholic Booker's boola -Boorchi Boorstin bootable Boothe @@ -576,7 +573,6 @@ bumperless Bumstead Bungei -BURBULATION Buren Burggoven burgled @@ -623,7 +619,6 @@ Callahan's Callimachus Camden -Camelia Cameron Camillo Campbell @@ -771,7 +766,6 @@ Churchy Chuzzlewit CI -Cianci Ciardi cinched cinema's @@ -806,7 +800,6 @@ cockamamie Cocteau Cody -Cody's Coevolution cogito Cohen's @@ -826,7 +819,6 @@ Commedia Commie CommUNIXque -compuberty computatis Computerdom computerites @@ -1077,8 +1069,6 @@ DMPK Dobb's Dobbs -doberman -doberperson Dobie Doc Docquier @@ -1203,7 +1193,6 @@ Einstein's Eisley Elbert -ELBONICS Eldridge electrocommunications Electrocution @@ -1264,7 +1253,6 @@ Escher esperantisto Esplandian -Esser est estas Estes @@ -1293,7 +1281,6 @@ exhibitionists EXP expatriated -extemporanea extracurricular Exupery Exxon's @@ -1301,7 +1288,6 @@ Eyquem Ezrin FAA -FACISM Factorials Fadiman Fafhrd @@ -1340,7 +1326,6 @@ Felton feminism's Femme -FENDERBERG Fenelon Fenster Ferber @@ -1369,7 +1354,6 @@ fiks filees filename -Filgoer's filigrees Filkharmonics Fillmore @@ -1398,7 +1382,6 @@ Flandry Flannagan's Flannery -FLANNISTER Flappity flatfoot flatteries @@ -1410,7 +1393,6 @@ floppity Florio floss -flouride Flugg's Flummery flutterby @@ -1557,7 +1539,6 @@ Genderplex Genesereth Genghis -genlock genocide Genter Geritol @@ -1605,7 +1586,6 @@ Glanvill Glaser gleekzorp -GLEEMITES Glegg gleknow Glib's @@ -2013,7 +1993,6 @@ ifthen Igmmlptk Ignatowski -ignisecond ihuxw IIc III's @@ -2498,7 +2477,6 @@ Lowells Lowery's Lowes -Lownes LP LPA LSD @@ -2534,7 +2512,6 @@ Mabbitt Mabley Macaroons -MacBeth Maccius MacDowell MacDuff @@ -2621,7 +2598,6 @@ Maud Maud'Dib Maugham -Maughm Maupin Maureens Maurois @@ -2630,7 +2606,6 @@ Maxson May's Mayorga -Mårten MBAs MBH MC @@ -2687,7 +2662,6 @@ mendicants Mengot Menninger -Mensa Menschen Meow meowing @@ -2715,7 +2689,6 @@ microchips Microcomputing micrometric -Microsystem's Microsystems MicroVAXes midgets @@ -2730,7 +2703,6 @@ Milkbone Millay Milligan -millihelen Millikan Millikan's millions @@ -2763,7 +2735,6 @@ Mitgong mittengrabben mitts -mittsquinter MITZIE Mix's Miyamoto @@ -2779,7 +2750,6 @@ Modula Moebius Mohandas -Mohandis mohmen Moishe Molander @@ -2803,7 +2773,6 @@ moonshiner's Moore's mopeds -mophobia Moping moralists Mordecai @@ -2832,7 +2801,6 @@ MTA Muad'dib muckest -mucklucks Mudgeeraba Mudhead mudslide @@ -2888,7 +2856,6 @@ nanometers Nansen Napoleon's -narcolepulacyi Narnia Nasium's Naso @@ -2909,7 +2876,6 @@ Nebuchadnezzar Nebuchadnezzar's necesas -necessitious NecroSoft Nehru Neil's @@ -2940,7 +2906,6 @@ NFL Ngdanga Niagra -Niccoli Nicklaus Nicol Nicolaides @@ -3165,7 +3130,6 @@ PECCATOPHOBIA Pecor's Pedaeration -pediddel Peers's Pegler pelted @@ -3192,7 +3156,6 @@ Petaluma Petersons Petr -petribar Petronius Pfeiffer Pfffttt @@ -3204,7 +3167,6 @@ philogyny phoney Phooey -phosflink Picadilly Pickard Pickle's @@ -3246,7 +3208,6 @@ Pocatello Podunk Pohl's -Poincair Poincare's pointy Polanski @@ -3347,7 +3308,6 @@ punchline punning PUPs -PURPITATION Purshottam PUSHes pushy @@ -3551,7 +3511,6 @@ Sacher's Sadat Saddam -sadoequinecrophilia Saens Safford Safire's @@ -3605,7 +3564,6 @@ Schieffer schisms schizophrenics -schlattwhapper schlichte schluerfen Schmendrick @@ -3631,7 +3589,6 @@ Scott's Scoville SCRBL -SCRIBLINE Scrubb scullery scurries @@ -3784,7 +3741,6 @@ something's Sondheim Sooooo -Soren Sorhed sort've sorta @@ -3799,7 +3755,6 @@ Spacemen Spaceport spacewar -SPAGMUMPS spake Spam spank @@ -3824,7 +3779,6 @@ Springsteen sprites SPSW -SQUATCHO squaws squealers squrooneg @@ -3980,7 +3934,6 @@ telematic telepath teleportation -TELEPRESSION telepsychology tempfile tendrils @@ -4028,7 +3981,6 @@ Tirith tis Tiselius -Titas tites TLC TM @@ -4060,7 +4012,6 @@ Tourbillon Toven trans -transcendant transmogrifiers trapezes Traub @@ -4121,7 +4072,6 @@ tyg typefaces Tyroon -tzu Ubi UDA Udall's @@ -4152,7 +4102,6 @@ untechnician unvoist Updike -upharsen uponst Urey Urho ==== //depot/projects/mjacob-dev/games/fortune/datfiles/freebsd-tips.sp.ok#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/games/fortune/datfiles/freebsd-tips.sp.ok,v 1.1 2007/12/07 22:27:04 dougb Exp $ +# $FreeBSD: src/games/fortune/datfiles/freebsd-tips.sp.ok,v 1.2 2011/05/14 19:03:45 uqs Exp $ aliasname allscreens AUTH @@ -45,7 +45,6 @@ natserv ncal netcat -netscape netstat newfile NICs ==== //depot/projects/mjacob-dev/games/fortune/datfiles/gerrold.limerick#2 (text+ko) ==== @@ -1,9 +1,9 @@ -%% $FreeBSD: src/games/fortune/datfiles/gerrold.limerick,v 1.6 2007/12/31 18:38:32 dougb Exp $ +%% $FreeBSD: src/games/fortune/datfiles/gerrold.limerick,v 1.7 2011/05/14 19:03:54 uqs Exp $ %% From The War Against The Chtorr, %% Copyright David Gerrold, 1984-2000, all rights reserved, %% used with permission of the author. %% -%%© This is the copyright line. +%%© This is the copyright line. %%Eighty-nine is the year we assign. %% These verses are caroled %% by one David Gerrold. ==== //depot/projects/mjacob-dev/games/fortune/datfiles/limerick#2 (text+ko) ==== @@ -1,4 +1,4 @@ -%% $FreeBSD: src/games/fortune/datfiles/limerick,v 1.16 2010/03/31 18:21:25 uqs Exp $ +%% $FreeBSD: src/games/fortune/datfiles/limerick,v 1.17 2011/05/14 19:03:45 uqs Exp $ % A bad little girl in Madrid, A most reprehensible kid, @@ -260,7 +260,7 @@ % A dulcet-voiced callgirl named Shedd, Who's cultured, well-spoken, well-bred, - Had achieved some reknown + Had achieved some renown For her tone going down-- There's a nice civil tongue in her head. % @@ -307,7 +307,7 @@ By bleeding all over his face. % A gay young prince from Morocco -Made love in a manner rococco. +Made love in a manner rococo. He painted his penis To resemble a Venus And flavored his semen with cocoa. ==== //depot/projects/mjacob-dev/games/fortune/datfiles/limerick.sp.ok#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/games/fortune/datfiles/limerick.sp.ok,v 1.1 2007/12/07 22:27:04 dougb Exp $ +# $FreeBSD: src/games/fortune/datfiles/limerick.sp.ok,v 1.2 2011/05/14 19:03:45 uqs Exp $ abbess's Abercrombie Aberystwyth @@ -283,6 +283,7 @@ meanie meanies meany +Mensa mentis midgets minimis @@ -353,11 +354,9 @@ quints ravished Reims -reknown Resounded retriebrve Rhyll -rococco rogered Salinas Sandem ==== //depot/projects/mjacob-dev/games/fortune/datfiles/startrek.sp.ok#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/games/fortune/datfiles/startrek.sp.ok,v 1.2 2003/01/04 17:08:23 schweikh Exp $ +# $FreeBSD: src/games/fortune/datfiles/startrek.sp.ok,v 1.3 2011/05/14 19:03:45 uqs Exp $ Adonais Amanda Apella @@ -14,7 +14,6 @@ Corby Daystrom Deela -Dehaver Elaan Eleen Eneg ==== //depot/projects/mjacob-dev/games/fortune/datfiles/zippy.sp.ok#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/games/fortune/datfiles/zippy.sp.ok,v 1.2 2007/12/07 22:27:04 dougb Exp $ +# $FreeBSD: src/games/fortune/datfiles/zippy.sp.ok,v 1.3 2011/05/14 19:03:45 uqs Exp $ ANAL ASEXUAL Astro @@ -180,7 +180,7 @@ matic meatball meltdown -naugahide +naugahyde obstetrician poindexter pre ==== //depot/projects/mjacob-dev/games/morse/morse.c#2 (text+ko) ==== @@ -43,7 +43,7 @@ static char sccsid[] = "@(#)morse.c 8.1 (Berkeley) 5/31/93"; #endif static const char rcsid[] = - "$FreeBSD: src/games/morse/morse.c,v 1.25 2010/02/15 18:46:02 imp Exp $"; + "$FreeBSD: src/games/morse/morse.c,v 1.26 2011/05/14 19:03:30 uqs Exp $"; #endif /* not lint */ #include @@ -161,20 +161,20 @@ static const struct morsetab iso8859_7tab[] = { /* - * The greek alphabet; you'll need an 8859-7 font in order + * The Greek alphabet; you'll need an ISO8859-7 font in order * to see the actual characters. * This table does not implement: * - the special sequences for the seven diphthongs, * - the punctuation differences. * Implementing these features would introduce too many * special-cases in the program's main loop. - * The diphtong sequences are: + * The diphthong sequences are: * alpha iota .-.- * alpha upsilon ..-- * epsilon upsilon ---. * eta upsilon ...- - * omikron iota ---.. - * omikron upsilon ..- + * omicron iota ---.. + * omicron upsilon ..- * upsilon iota .--- * The different punctuation symbols are: * ; ..-.- @@ -193,10 +193,10 @@ {'è', "-.-."}, /* theta */ {'é', ".."}, /* iota */ {'ß', ".."}, /* iota with acute */ - {'ú', ".."}, /* iota with diairesis */ - {'À', ".."}, /* iota with acute and diairesis */ + {'ú', ".."}, /* iota with diaeresis */ + {'À', ".."}, /* iota with acute and diaeresis */ {'ê', "-.-"}, /* kappa */ - {'ë', ".-.."}, /* lamda */ + {'ë', ".-.."}, /* lambda */ {'ì', "--"}, /* mu */ {'í', "-."}, /* nu */ {'î', "-..-"}, /* xi */ @@ -209,8 +209,8 @@ {'ô', "-"}, /* tau */ {'õ', "-.--"}, /* upsilon */ {'ý', "-.--"}, /* upsilon with acute */ - {'û', "-.--"}, /* upsilon and diairesis */ - {'à', "-.--"}, /* upsilon with acute and diairesis */ + {'û', "-.--"}, /* upsilon and diaeresis */ + {'à', "-.--"}, /* upsilon with acute and diaeresis */ {'ö', "..-."}, /* phi */ {'÷', "----"}, /* chi */ {'ø', "--.-"}, /* psi */ @@ -222,29 +222,29 @@ static const struct morsetab koi8rtab[] = { /* - * the cyrillic alphabet; you'll need a KOI8R font in order + * The Cyrillic alphabet; you'll need a KOI8-R font in order * to see the actual characters */ - {'Á', ".-"}, /* a */ + {'Á', ".-"}, /* a */ {'Â', "-..."}, /* be */ {'×', ".--"}, /* ve */ {'Ç', "--."}, /* ge */ {'Ä', "-.."}, /* de */ - {'Å', "."}, /* ye */ - {'£', "."}, /* yo, the same as ye */ + {'Å', "."}, /* ye */ + {'£', "."}, /* yo, the same as ye */ {'Ö', "...-"}, /* she */ {'Ú', "--.."}, /* ze */ - {'É', ".."}, /* i */ + {'É', ".."}, /* i */ {'Ê', ".---"}, /* i kratkoye */ {'Ë', "-.-"}, /* ka */ {'Ì', ".-.."}, /* el */ - {'Í', "--"}, /* em */ - {'Î', "-."}, /* en */ + {'Í', "--"}, /* em */ + {'Î', "-."}, /* en */ {'Ï', "---"}, /* o */ {'Ð', ".--."}, /* pe */ {'Ò', ".-."}, /* er */ {'Ó', "..."}, /* es */ - {'Ô', "-"}, /* te */ + {'Ô', "-"}, /* te */ {'Õ', "..-"}, /* u */ {'Æ', "..-."}, /* ef */ {'È', "...."}, /* kha */ @@ -305,9 +305,9 @@ while ((ch = getopt(argc, argv, GETOPTOPTS)) != -1) switch ((char) ch) { - case 'c': - cpm = atoi(optarg); - break; + case 'c': + cpm = atoi(optarg); + break; case 'd': device = optarg; break; ==== //depot/projects/mjacob-dev/lib/libprocstat/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libprocstat/Makefile,v 1.2 2011/05/12 22:21:39 stas Exp $ +# $FreeBSD: src/lib/libprocstat/Makefile,v 1.3 2011/05/14 22:15:38 stas Exp $ .include @@ -12,6 +12,9 @@ smbfs.c \ udf.c +VERSION_DEF= ${.CURDIR}/Versions.def +SYMBOL_MAPS= ${.CURDIR}/Symbol.map + INCS= libprocstat.h CFLAGS+= -I. -I${.CURDIR} -D_KVM_VNODE SHLIB_MAJOR= 1 ==== //depot/projects/mjacob-dev/lib/libprocstat/libprocstat.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libprocstat/libprocstat.c,v 1.2 2011/05/12 22:21:39 stas Exp $"); +__FBSDID("$FreeBSD: src/lib/libprocstat/libprocstat.c,v 1.3 2011/05/15 00:46:25 stas Exp $"); #include #include @@ -253,7 +253,7 @@ if (procstat->type == PROCSTAT_SYSCTL) return (procstat_getfiles_sysctl(procstat, kp, mmapped)); else if (procstat->type == PROCSTAT_KVM) - return (procstat_getfiles_kvm(procstat, kp, mmapped)); + return (procstat_getfiles_kvm(procstat, kp, mmapped)); else return (NULL); } ==== //depot/projects/mjacob-dev/sbin/geom/class/part/geom_part.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/geom/class/part/geom_part.c,v 1.45 2011/05/03 07:33:39 ae Exp $"); +__FBSDID("$FreeBSD: src/sbin/geom/class/part/geom_part.c,v 1.47 2011/05/15 16:16:48 ae Exp $"); #include #include @@ -253,13 +253,7 @@ bestsector = 0; LIST_FOREACH(pp, &gp->lg_provider, lg_provider) { s = find_provcfg(pp, "start"); - if (s == NULL) { - s = find_provcfg(pp, "offset"); - sector = - (off_t)strtoimax(s, NULL, 0) / pp->lg_sectorsize; - } else - sector = (off_t)strtoimax(s, NULL, 0); - + sector = (off_t)strtoimax(s, NULL, 0); if (sector < minsector) continue; if (bestpp != NULL && sector >= bestsector) @@ -379,18 +373,9 @@ errx(EXIT_FAILURE, "invalid partition index"); s = find_provcfg(pp, "start"); - if (s == NULL) { - s = find_provcfg(pp, "offset"); - start = (off_t)strtoimax(s, NULL, 0) / pp->lg_sectorsize; - } else - start = (off_t)strtoimax(s, NULL, 0); + start = (off_t)strtoimax(s, NULL, 0); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue May 17 03:38:46 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 94FC91065670; Tue, 17 May 2011 03:38:46 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 57675106564A for ; Tue, 17 May 2011 03:38:46 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 446438FC08 for ; Tue, 17 May 2011 03:38:46 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p4H3ckIC001274 for ; Tue, 17 May 2011 03:38:46 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p4H3ckE0001271 for perforce@freebsd.org; Tue, 17 May 2011 03:38:46 GMT (envelope-from rene@FreeBSD.org) Date: Tue, 17 May 2011 03:38:46 GMT Message-Id: <201105170338.p4H3ckE0001271@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 193270 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 May 2011 03:38:46 -0000 http://p4web.freebsd.org/@@193270?ac=10 Change 193270 by rene@rene_acer on 2011/05/17 03:37:41 MFen Handbook: * network-servers 1.128 -> 1.129 Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/network-servers/chapter.sgml#38 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/network-servers/chapter.sgml#38 (text+ko) ==== @@ -4,7 +4,7 @@ $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/network-servers/chapter.sgml,v 1.30 2011/03/06 15:39:59 remko Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml - %SRCID% 1.128 + %SRCID% 1.129 --> @@ -3391,7 +3391,7 @@ Redenen om een naamserver te draaien Naamservers bestaan in het algemeen in twee smaken: autoratieve - naamservers en caching naamservers. + naamservers en caching (ook bekend als resolving) naamservers. Er is een autoratieve naamserver nodig als: @@ -3564,8 +3564,9 @@ // Internetverkeer veroorzaken. options { - // Relatief aan de chroot-map, indien aanwezig - directory "/etc/namedb"; + // Alle namen van bestanden en paden zijn relatief aan de chroot-map, + // indien aanwezig, en moeten volledig gekwalificeerd zijn. + directory "/etc/namedb/working"; pid-file "/var/run/named/pid" dump-file "/var/dump/named_dump.db" statistics-file "/var/stats/named.stats" @@ -3660,7 +3661,7 @@ // Het traditionele root-hint-mechanisme. Gebruik dit OF de // onderstaande slaafzones. -zone "." { type hint; file "named.root"; }; +zone "." { type hint; file "/etc/namedb/named.root"; }; /* Het slaaf maken van de volgende zones vanaf de root-naamservers heeft een aantal aanzienlijke voordelen: @@ -3677,11 +3678,16 @@ Verwijder het commentaar uit de onderstaande regels en commentarieer de bovenstaande hintzone om dit mechanisme te gebruiken. + + Zoals gedocumenteerd op http://dns.icann.org/services/axfr/ zijn deze + zones: "." (de root), ARPA, IN-ADDR.ARPA, IP6.ARPA en ROOT-SERVERS.NET + beschikbaar voor AXFR van deze servers op IPv4 en IPv6: + xfr.lax.dns.icann.org, xfr.cjr.dns.icann.org */ zone "." { type slave; - file "slave/root.slave"; + file "/etc/namedb/slave/root.slave"; masters { 192.5.5.241; // F.ROOT-SERVERS.NET. }; @@ -3690,140 +3696,147 @@ zone "arpa" { type slave; - file "slave/arpa.slave"; + file "/etc/namedb/slave/arpa.slave"; masters { 192.5.5.241; // F.ROOT-SERVERS.NET. }; notify no; }; -zone "in-addr.arpa" { - type slave; - file "slave/in-addr.arpa.slave"; - masters { - 192.5.5.241; // F.ROOT-SERVERS.NET. - }; - notify no; -}; - /* Het lokaal serveren van de volgende zones voorkomt dat enig verzoek voor deze zones uw netwerk verlaat en naar de root-naamservers gaat. Dit heeft twee aanzienlijke voordelen: 1. Snellere lokale resolutie voor uw gebruikers 2. Er zal geen vals verkeer vanaf uw netwerk naar de roots worden verzonden */ -// RFC 1912 -zone "localhost" { type master; file "master/localhost-forward.db"; }; -zone "127.in-addr.arpa" { type master; file "master/localhost-reverse.db"; }; -zone "255.in-addr.arpa" { type master; file "master/empty.db"; }; +// RFCs 1912 en 5735 (en BCP32 voor localhost) +zone "localhost" { type master; file "/etc/namedb/master/localhost-forward.db"; }; +zone "127.in-addr.arpa" { type master; file "/etc/namedb/master/localhost-reverse.db"; }; +zone "255.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; }; // RFC 1912-stijl zone voor IPv6 localhost adres -zone "0.ip6.arpa" { type master; file "master/localhost-reverse.db"; }; +zone "0.ip6.arpa" { type master; file "/etc/namedb/master/localhost-reverse.db"; }; + +// "Dit" netwerk (RFCs 1912 en 5735) +zone "0.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; }; + +// Netwerken voor privaat gebruik (RFC 1918 en 5735) +zone "10.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; }; +zone "16.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; }; +zone "17.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; }; +zone "18.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; }; +zone "19.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; }; +zone "20.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; }; +zone "21.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; }; +zone "22.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; }; +zone "23.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; }; +zone "24.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; }; +zone "25.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; }; +zone "26.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; }; +zone "27.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; }; +zone "28.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; }; +zone "29.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; }; +zone "30.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; }; +zone "31.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; }; +zone "168.192.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; }; + +// Lokale link/APIPA (RFCs 3927 en 5735) +zone "254.169.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; }; -// "Dit" netwerk (RFCs 1912 en 3330) -zone "0.in-addr.arpa" { type master; file "master/empty.db"; }; +// IETF protocol-toewijzingen (RFCs 5735 en 5736) +zone "0.0.192.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; }; -// Netwerken voor privaat gebruik (RFC 1918) -zone "10.in-addr.arpa" { type master; file "master/empty.db"; }; -zone "16.172.in-addr.arpa" { type master; file "master/empty.db"; }; -zone "17.172.in-addr.arpa" { type master; file "master/empty.db"; }; -zone "18.172.in-addr.arpa" { type master; file "master/empty.db"; }; -zone "19.172.in-addr.arpa" { type master; file "master/empty.db"; }; -zone "20.172.in-addr.arpa" { type master; file "master/empty.db"; }; -zone "21.172.in-addr.arpa" { type master; file "master/empty.db"; }; -zone "22.172.in-addr.arpa" { type master; file "master/empty.db"; }; -zone "23.172.in-addr.arpa" { type master; file "master/empty.db"; }; -zone "24.172.in-addr.arpa" { type master; file "master/empty.db"; }; -zone "25.172.in-addr.arpa" { type master; file "master/empty.db"; }; -zone "26.172.in-addr.arpa" { type master; file "master/empty.db"; }; -zone "27.172.in-addr.arpa" { type master; file "master/empty.db"; }; -zone "28.172.in-addr.arpa" { type master; file "master/empty.db"; }; -zone "29.172.in-addr.arpa" { type master; file "master/empty.db"; }; -zone "30.172.in-addr.arpa" { type master; file "master/empty.db"; }; -zone "31.172.in-addr.arpa" { type master; file "master/empty.db"; }; -zone "168.192.in-addr.arpa" { type master; file "master/empty.db"; }; +// TEST-NET-[1-3] voor documentatie (RFCs 5735 en 5737) +zone "2.0.192.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; }; +zone "100.51.198.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; }; +zone "113.0.203.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; }; -// Lokale link/APIPA (RFCs 3330 en 3927) -zone "254.169.in-addr.arpa" { type master; file "master/empty.db"; }; +// IPv6-bereik voor documentatie (RFC 3849) +zone "8.b.d.0.1.0.0.2.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; }; -// TEST-NET voor documentatie (RFC 3330) -zone "2.0.192.in-addr.arpa" { type master; file "master/empty.db"; }; +// Domeinnamen voor documentatie en testen (BCP 32) +zone "test" { type master; file "/etc/namedb/master/empty.db"; }; +zone "example" { type master; file "/etc/namedb/master/empty.db"; }; +zone "invalid" { type master; file "/etc/namedb/master/empty.db"; }; +zone "example.com" { type master; file "/etc/namedb/master/empty.db"; }; +zone "example.net" { type master; file "/etc/namedb/master/empty.db"; }; +zone "example.org" { type master; file "/etc/namedb/master/empty.db"; }; -// Router benchmarken (RFC 3330) -zone "18.198.in-addr.arpa" { type master; file "master/empty.db"; } -zone "19.198.in-addr.arpa" { type master; file "master/empty.db"; } +// Router benchmarken (RFC 2544 en 5735) +zone "18.198.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; } +zone "19.198.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; } -// Gereserveerd door IANA - oude ruimte van klasse E -zone "240.in-addr.arpa" { type master; file "master/empty.db"; } -zone "241.in-addr.arpa" { type master; file "master/empty.db"; } -zone "242.in-addr.arpa" { type master; file "master/empty.db"; } -zone "243.in-addr.arpa" { type master; file "master/empty.db"; } -zone "244.in-addr.arpa" { type master; file "master/empty.db"; } -zone "245.in-addr.arpa" { type master; file "master/empty.db"; } -zone "246.in-addr.arpa" { type master; file "master/empty.db"; } -zone "247.in-addr.arpa" { type master; file "master/empty.db"; } -zone "248.in-addr.arpa" { type master; file "master/empty.db"; } -zone "249.in-addr.arpa" { type master; file "master/empty.db"; } -zone "250.in-addr.arpa" { type master; file "master/empty.db"; } -zone "251.in-addr.arpa" { type master; file "master/empty.db"; } -zone "252.in-addr.arpa" { type master; file "master/empty.db"; } -zone "253.in-addr.arpa" { type master; file "master/empty.db"; } -zone "254.in-addr.arpa" { type master; file "master/empty.db"; } +// Gereserveerd door IANA - oude ruimte van klasse E (RFC 5735) +zone "240.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; } +zone "241.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; } +zone "242.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; } +zone "243.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; } +zone "244.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; } +zone "245.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; } +zone "246.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; } +zone "247.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; } +zone "248.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; } +zone "249.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; } +zone "250.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; } +zone "251.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; } +zone "252.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; } +zone "253.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; } +zone "254.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; } // Niet-toegewezen IPv6-adressen (RFC 4291) -zone "1.ip6.arpa" { type master; file "master/empty.db"; } -zone "2.ip6.arpa" { type master; file "master/empty.db"; } -zone "3.ip6.arpa" { type master; file "master/empty.db"; } -zone "4.ip6.arpa" { type master; file "master/empty.db"; } -zone "5.ip6.arpa" { type master; file "master/empty.db"; } -zone "6.ip6.arpa" { type master; file "master/empty.db"; } -zone "7.ip6.arpa" { type master; file "master/empty.db"; } -zone "8.ip6.arpa" { type master; file "master/empty.db"; } -zone "9.ip6.arpa" { type master; file "master/empty.db"; } -zone "a.ip6.arpa" { type master; file "master/empty.db"; } -zone "b.ip6.arpa" { type master; file "master/empty.db"; } -zone "c.ip6.arpa" { type master; file "master/empty.db"; } -zone "d.ip6.arpa" { type master; file "master/empty.db"; } -zone "e.ip6.arpa" { type master; file "master/empty.db"; } -zone "0.f.ip6.arpa" { type master; file "master/empty.db"; } -zone "1.f.ip6.arpa" { type master; file "master/empty.db"; } -zone "2.f.ip6.arpa" { type master; file "master/empty.db"; } -zone "3.f.ip6.arpa" { type master; file "master/empty.db"; } -zone "4.f.ip6.arpa" { type master; file "master/empty.db"; } -zone "5.f.ip6.arpa" { type master; file "master/empty.db"; } -zone "6.f.ip6.arpa" { type master; file "master/empty.db"; } -zone "7.f.ip6.arpa" { type master; file "master/empty.db"; } -zone "8.f.ip6.arpa" { type master; file "master/empty.db"; } -zone "9.f.ip6.arpa" { type master; file "master/empty.db"; } -zone "a.f.ip6.arpa" { type master; file "master/empty.db"; } -zone "b.f.ip6.arpa" { type master; file "master/empty.db"; } -zone "0.e.f.ip6.arpa" { type master; file "master/empty.db"; } -zone "1.e.f.ip6.arpa" { type master; file "master/empty.db"; } -zone "2.e.f.ip6.arpa" { type master; file "master/empty.db"; } -zone "3.e.f.ip6.arpa" { type master; file "master/empty.db"; } -zone "4.e.f.ip6.arpa" { type master; file "master/empty.db"; } -zone "5.e.f.ip6.arpa" { type master; file "master/empty.db"; } -zone "6.e.f.ip6.arpa" { type master; file "master/empty.db"; } -zone "7.e.f.ip6.arpa" { type master; file "master/empty.db"; } +zone "1.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; } +zone "2.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; } +zone "3.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; } +zone "4.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; } +zone "5.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; } +zone "6.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; } +zone "7.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; } +zone "8.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; } +zone "9.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; } +zone "a.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; } +zone "b.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; } +zone "c.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; } +zone "d.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; } +zone "e.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; } +zone "0.f.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; } +zone "1.f.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; } +zone "2.f.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; } +zone "3.f.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; } +zone "4.f.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; } +zone "5.f.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; } +zone "6.f.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; } +zone "7.f.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; } +zone "8.f.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; } +zone "9.f.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; } +zone "a.f.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; } +zone "b.f.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; } +zone "0.e.f.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; } +zone "1.e.f.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; } +zone "2.e.f.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; } +zone "3.e.f.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; } +zone "4.e.f.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; } +zone "5.e.f.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; } +zone "6.e.f.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; } +zone "7.e.f.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; } // IPv6 ULA (RFC 4193) -zone "c.f.ip6.arpa" { type master; file "master/empty.db"; } -zone "d.f.ip6.arpa" { type master; file "master/empty.db"; } +zone "c.f.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; } +zone "d.f.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; } // IPv6 lokale link (RFC 4291) -zone "8.e.f.ip6.arpa" { type master; file "master/empty.db"; } -zone "9.e.f.ip6.arpa" { type master; file "master/empty.db"; } -zone "a.e.f.ip6.arpa" { type master; file "master/empty.db"; } -zone "b.e.f.ip6.arpa" { type master; file "master/empty.db"; } +zone "8.e.f.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; } +zone "9.e.f.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; } +zone "a.e.f.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; } +zone "b.e.f.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; } // IPv6 verouderde site-lokale adressen (RFC 3879) -zone "c.e.f.ip6.arpa" { type master; file "master/empty.db"; } -zone "d.e.f.ip6.arpa" { type master; file "master/empty.db"; } -zone "e.e.f.ip6.arpa" { type master; file "master/empty.db"; } -zone "f.e.f.ip6.arpa" { type master; file "master/empty.db"; } +zone "c.e.f.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; } +zone "d.e.f.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; } +zone "e.e.f.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; } +zone "f.e.f.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; } // IP6.INT is verouderd (RFC 4159) -zone "ip6.int" { type master; file "master/empty.db"; } +zone "ip6.int" { type master; file "/etc/namedb/master/empty.db"; } // NB: De IP-adressen hieronder zijn bedoeld als voorbeeld en dienen // niet gebruikt te worden! @@ -3855,14 +3868,14 @@ allow-update { key "exampleorgkey"; }; - file "dynamic/example.org"; + file "/etc/namedb/dynamic/example.org"; }; */ /* Voorbeeld van een omgekeerde slaafzone zone "1.168.192.in-addr.arpa" { type slave; - file "slave/1.168.192.in-addr.arpa"; + file "/etc/namedb/slave/1.168.192.in-addr.arpa"; masters { 192.168.1.1; }; @@ -4221,13 +4234,13 @@ BIND 5e Editie RFC1034 - + url="http://tools.ietf.org/rfc/html/rfc1034">RFC1034 - Domeinnamen - Concepten en Faciliteiten RFC1035 - + url="http://tools.ietf.org/rfc/html/rfc1035">RFC1035 - Domeinnamen - Implementatie en Specificatie From owner-p4-projects@FreeBSD.ORG Tue May 17 03:44:15 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0DE9B1065673; Tue, 17 May 2011 03:44:15 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C39371065675 for ; Tue, 17 May 2011 03:44:14 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id B08B38FC19 for ; Tue, 17 May 2011 03:44:14 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p4H3iE1x003022 for ; Tue, 17 May 2011 03:44:14 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p4H3iEYV003019 for perforce@freebsd.org; Tue, 17 May 2011 03:44:14 GMT (envelope-from rene@FreeBSD.org) Date: Tue, 17 May 2011 03:44:14 GMT Message-Id: <201105170344.p4H3iEYV003019@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 193271 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 May 2011 03:44:15 -0000 http://p4web.freebsd.org/@@193271?ac=10 Change 193271 by rene@rene_acer on 2011/05/17 03:43:59 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/freebsd-update-server/article.sgml#4 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/linux-emulation/article.sgml#4 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/corp-net-guide/book.sgml#3 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/dev-model/book.sgml#4 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/faq/book.sgml#36 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/filesystems/chapter.sgml#7 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#26 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/security/chapter.sgml#17 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/captions/2006/mckusick-kernelinternals/mckusick-kernelinternals-1.sbv#3 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/captions/2007/meetbsd/brueffer-torprvacy.sbv#3 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/captions/2009/asiabsdcon/rao-kernellocking-1.sbv#3 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/captions/2009/dcbsdcon/bejtlich-networksecurity.sbv#3 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/captions/2009/dcbsdcon/dixon-bsdisstilldying.sbv#3 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/captions/2009/dcbsdcon/mckusick-historyofbsd.sbv#3 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#7 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/teams.ent#2 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/eresources/chapter.sgml#36 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/install/chapter.sgml#24 integrate .. //depot/projects/docproj_nl/share/mk/doc.docbook.mk#2 integrate .. //depot/projects/docproj_nl/www/en/administration.sgml#21 integrate .. //depot/projects/docproj_nl/www/en/donations/donors.sgml#40 integrate .. //depot/projects/docproj_nl/www/en/donations/wantlist.sgml#26 integrate .. //depot/projects/docproj_nl/www/en/portmgr/policies_eol.sgml#2 integrate .. //depot/projects/docproj_nl/www/en/portmgr/qa.sgml#3 integrate .. //depot/projects/docproj_nl/www/en/projects/ideas/ideas.xml#12 integrate .. //depot/projects/docproj_nl/www/en/projects/mips/index.sgml#3 integrate .. //depot/projects/docproj_nl/www/en/projects/newbies.sgml#5 integrate .. //depot/projects/docproj_nl/www/nl/administration.sgml#30 integrate .. //depot/projects/docproj_nl/www/share/sgml/commercial.consult.xml#28 integrate .. //depot/projects/docproj_nl/www/share/sgml/commercial.isp.xml#24 integrate .. //depot/projects/docproj_nl/www/share/sgml/commercial.software.xml#12 integrate .. //depot/projects/docproj_nl/www/share/sgml/events.xml#39 integrate .. //depot/projects/docproj_nl/www/share/sgml/news.xml#109 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/freebsd-update-server/article.sgml#4 (text+ko) ==== @@ -22,7 +22,7 @@ Jason Helfman - $FreeBSD: doc/en_US.ISO8859-1/articles/freebsd-update-server/article.sgml,v 1.4 2011/03/08 18:39:34 manolis Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/freebsd-update-server/article.sgml,v 1.5 2011/05/15 20:41:30 uqs Exp $ &tm-attrib.freebsd; @@ -731,7 +731,7 @@ * Why is this tip necessary? What is the original problem it tries to solve? - * How to install the changes of the tip (preferrably in a + * How to install the changes of the tip, preferably in a element, with clearly separated steps. * How to check that the changes of the tip had a measurable and noticeable effect. ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/linux-emulation/article.sgml#4 (text+ko) ==== @@ -1,4 +1,4 @@ - + fgetvp - given a thread and a file - descripton number it returns the associated vnode + descriptor number it returns the associated vnode &man.vn.lock.9; - locks a vnode ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/corp-net-guide/book.sgml#3 (text+ko) ==== @@ -1,4 +1,4 @@ - + process. The manager is responsible for running and maintaining the election - system, and is the final authority should minor unforseen - events happen in the election process. Major unforseen + system, and is the final authority should minor unforeseen + events happen in the election process. Major unforeseen events have to be discussed with the @@ -1196,10 +1196,10 @@ Donations Liaison Officer The task of - the donations liason officer is to match + the donations liaison officer is to match the developers with needs with people or organisations willing to make a - donation. The Donations Liason Charter is + donation. The Donations Liaison Charter is available here ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/faq/book.sgml#36 (text+ko) ==== @@ -12,7 +12,7 @@ The &os; Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.1135 2011/05/14 20:44:31 hrs Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.1136 2011/05/15 20:41:30 uqs Exp $ 1995 @@ -2756,7 +2756,7 @@ No, and there is not likely to be. - Broadcom refuses to publically release programming + Broadcom refuses to publicly release programming information for their wireless chipsets, most likely because they use software controlled radios. In order to get FCC type acceptance for their parts, they have to ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/filesystems/chapter.sgml#7 (text+ko) ==== @@ -1,6 +1,6 @@ @@ -527,9 +527,9 @@ &prompt.root; zfs set checksum=off storage/home - This is not a wise idea; however, as checksums take - very little storage space and are more useful enabled. There - also appear to be no noticeable costs having them enabled. + This is not a wise idea, however, as checksums take + very little storage space and are more useful when enabled. There + also appears to be no noticeable costs in having them enabled. While enabled, it is possible to have ZFS check data integrity using checksum verification. This process is known as scrubbing. To verify the ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#26 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -2518,7 +2518,7 @@ on which password format is used within your network. If you have trouble authenticating on an NIS client, this is a pretty good place to start looking for possible problems. Remember: - if you want to deploy an NIS server for a heterogenous + if you want to deploy an NIS server for a heterogeneous network, you will probably have to use DES on all systems because it is the lowest common standard. @@ -3393,7 +3393,7 @@ As documented at http://dns.icann.org/services/axfr/ these zones: "." (the root), ARPA, IN-ADDR.ARPA, IP6.ARPA, and ROOT-SERVERS.NET - are availble for AXFR from these servers on IPv4 and IPv6: + are available for AXFR from these servers on IPv4 and IPv6: xfr.lax.dns.icann.org, xfr.cjr.dns.icann.org */ /* ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/security/chapter.sgml#17 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -632,7 +632,7 @@ enough. Workarounds like this may not be possible for all secure levels or for all the potential restrictions they enforce. A bit of forward planning is a good idea. Understanding the restrictions - imposed by each secure level is important as they severly diminish + imposed by each secure level is important as they severely diminish the ease of system use. It will also make choosing a default setting much simpler and prevent any surprises. @@ -740,7 +740,7 @@ as a post-break-in evaluation mechanism. It is especially useful in tracking down how an intruder has actually broken into a system, assuming the file is still intact after the break-in has - occured. + occurred. Finally, security scripts should process the log files, and the logs themselves should be generated in as secure a manner as ==== //depot/projects/docproj_nl/en_US.ISO8859-1/captions/2006/mckusick-kernelinternals/mckusick-kernelinternals-1.sbv#3 (text+ko) ==== @@ -393,14 +393,14 @@ description of what's going on 0:05:50.569,0:05:54.719 -and then I will go back and i'll go through the +and then I will go back and I'll go through the same material again but at a lower level of 0:05:54.719,0:05:55.300 detail 0:05:55.300,0:05:59.939 -then i finally go back and go through a very nittily +then I finally go back and go through a very nittily low-level of detail 0:05:59.939,0:06:04.649 @@ -419,7 +419,7 @@ low level niggly details 0:06:14.190,0:06:17.900 -i'll give you a clue as i will say ""Brain +I'll give you a clue as I will say ""Brain reset, I'm starting a new topic"" so even if 0:06:17.900,0:06:19.330 @@ -464,7 +464,7 @@ here 0:06:56.919,0:07:01.169 -As i said we're going to go roughly +As I said we're going to go roughly 0:07:01.169,0:07:03.270 just about two-and-an-half hours of lecture @@ -506,7 +506,7 @@ you have to sort of layout terminology 0:07:29.739,0:07:32.080 -although we use normal english words +although we use normal English words 0:07:32.080,0:07:34.419 they have @@ -848,7 +848,7 @@ 0:12:28.660,0:12:33.440 one well let me just give it as a bit -of advice to the class esspecially those of +of advice to the class especially those of 0:12:33.440,0:12:36.780 you who work in system administration. @@ -1013,7 +1013,7 @@ 0:14:59.390,0:15:03.390 But Filesystems think they have buffers and so -there's this manouver where we make +there's this maneuver where we make 0:15:03.390,0:15:06.149 these things that look like what historically @@ -1054,7 +1054,7 @@ for example what is used by ext3 0:15:39.630,0:15:41.179 -and so i'll go through soft updates and +and so I'll go through soft updates and 0:15:41.179,0:15:45.260 a lot of the issues in soft updates are the @@ -1091,7 +1091,7 @@ 0:16:12.500,0:16:15.920 you've worked with things like the network -appilance box you're probably quite +appliance box you're probably quite 0:16:15.920,0:16:19.640 aware of what snapshots are and how they do @@ -1302,7 +1302,7 @@ yeah yeah you are done with Week 8. 0:19:18.279,0:19:20.590 -on the other hand if you dont come to Week +on the other hand if you don't come to Week 8 0:19:20.590,0:19:22.790 @@ -1449,7 +1449,7 @@ are 0:21:22.440,0:21:24.940 -i'll talk primarily about IPv4 +I'll talk primarily about IPv4 0:21:24.940,0:21:31.940 but I will also try and talk a bit about @@ -1540,7 +1540,7 @@ 0:22:37.309,0:22:42.220 being overrun because we're simply trying -to do too much on this machine?,etc. +to do too much on this machine? etc. 0:22:42.220,0:22:45.440 so that's the sort of level of thing that we're @@ -1721,7 +1721,7 @@ should be the floating point unit and several 0:25:20.030,0:25:24.080 -of them that would be the memory the core momory +of them that would be the memory the core memory literally the core memory 0:25:24.080,0:25:29.110 @@ -1993,10 +1993,10 @@ 0:28:52.669,0:28:58.660 was one that had these characteristics - had a a paged virtual address space +had a paged virtual address space 0:28:58.660,0:29:02.980 -so you din't have to know as in the old days how much physical +so you didn't have to know as in the old days how much physical memory is on the machine and make your application 0:29:02.980,0:29:04.740 @@ -2148,7 +2148,7 @@ AT&T bell laboratories 0:31:17.129,0:31:19.750 -the big industrial labratory at that time +the big industrial laboratory at that time 0:31:19.750,0:31:21.380 and MIT @@ -2357,7 +2357,7 @@ and write that thing 0:34:07.940,0:34:11.290 -so if i hand you a descriptor +so if I hand you a descriptor you can read from that the descriptor or you can write 0:34:11.290,0:34:13.259 @@ -2391,7 +2391,7 @@ 0:34:33.419,0:34:37.429 and there was another set of system calls which -would open a terminal,read a terminal, write terminal, +would open a terminal, read a terminal, write terminal, 0:34:37.429,0:34:38.089 close terminal @@ -2400,7 +2400,7 @@ and yet another one 0:34:39.210,0:34:42.409 -which was create a pipe,read a pipe, +which was create a pipe, read a pipe, write a pipe and so on. 0:34:42.409,0:34:47.699 @@ -2415,11 +2415,11 @@ use the read terminal 0:34:53.159,0:34:57.419 -or is it a file which in case i need +or is it a file which in case I need to use read file or is it a pipe in which in case 0:34:57.419,0:34:59.189 -i need to use read pipe +I need to use read pipe 0:34:59.189,0:35:01.860 and so the program itself had to have all @@ -2533,7 +2533,7 @@ Okay? so far so good? 0:36:22.499,0:36:24.719 -all right so i said that there were +all right so I said that there were 0:36:24.719,0:36:27.160 two key ideas that UNIX had @@ -2691,7 +2691,7 @@ new one, put it back in and re-submit it 0:38:25.239,0:38:28.729 -As heaven forbid you couldnt touch that +As heaven forbid you couldn't touch that card reader you know, it had to be done by 0:38:28.729,0:38:29.970 @@ -2893,7 +2893,7 @@ as files 0:41:15.809,0:41:19.319 -but you didn't have atleast to remember to create +but you didn't have at least to remember to create them and delete them 0:41:19.319,0:41:20.200 @@ -3049,7 +3049,7 @@ is bringing down upon itself 0:43:22.339,0:43:25.590 -such as a segment fault,a divide by zero +such as a segment fault, a divide by zero 0:43:25.590,0:43:26.910 and some other @@ -3122,10 +3122,10 @@ about is how long it takes them to compute 0:44:23.249,0:44:24.959 -we dont actually care what the answer is +we don't actually care what the answer is 0:44:24.959,0:44:26.019 -In theory we dont +In theory we don't 0:44:26.019,0:44:29.779 I personally like my benchmark stop with @@ -3342,7 +3342,7 @@ actually gets implemented 0:47:18.899,0:47:22.729 -but in essense you can think of it +but in essence you can think of it is is there sort of this whaling Wall and these little 0:47:22.729,0:47:24.990 @@ -3455,7 +3455,7 @@ you would write if you look at top half kernel 0:48:45.539,0:48:49.640 -code you know you see all read,come in +code you know you see all read, come in it's got these parameters we Mark around we 0:48:49.640,0:48:53.719 @@ -3576,7 +3576,7 @@ then go to sleep.oh man 0:50:17.219,0:50:20.469 -you didnt tell us you're going to do this we +you didn't tell us you're going to do this we have to go off to do a whole lot of other work 0:50:20.469,0:50:23.029 @@ -3715,7 +3715,7 @@ available 0:52:01.689,0:52:05.049 -they historically coudnt wait for memory to be +they historically couldn't wait for memory to be available 0:52:05.049,0:52:08.380 @@ -3934,7 +3934,7 @@ schedulers like the real time scheduler 0:55:01.360,0:55:02.869 -where what I'm saying isnt that true +where what I'm saying isn't that true 0:55:02.869,0:55:05.709 we'll talk about some of the schedulers was @@ -4110,7 +4110,7 @@ this of course is desirable because 0:57:23.759,0:57:27.059 -when you're running in this unprevileged +when you're running in this unprivileged mode 0:57:27.059,0:57:28.300 @@ -4176,7 +4176,7 @@ 0:58:13.109,0:58:16.730 whereas when you're running in unprivileged -mode you cant write those kinds of +mode you can't write those kinds of 0:58:16.730,0:58:20.179 of things @@ -4186,7 +4186,7 @@ 2000 on 0:58:24.119,0:58:26.630 -now run with privileged and unprevileged mode +now run with privileged and unprivileged mode 0:58:26.630,0:58:28.649 but UNIX has always required that @@ -4198,7 +4198,7 @@ user process 0:58:31.319,0:58:33.389 -you cannot block i mean +you cannot block I mean 0:58:33.389,0:58:37.969 you cannot execute the instructions which ==== //depot/projects/docproj_nl/en_US.ISO8859-1/captions/2007/meetbsd/brueffer-torprvacy.sbv#3 (text+ko) ==== @@ -24,7 +24,7 @@ uh, so... 0:00:36.290,0:00:39.500 -I want to first talk about who needs anonimity anyway +I want to first talk about who needs anonymity anyway 0:00:39.500,0:00:42.880 Is it just for criminals or some other bad guys, right? @@ -124,7 +124,7 @@ So, so umm 0:02:17.719,0:02:20.489 -socialy sensitive information, like when you want to uh, +socially sensitive information, like when you want to uh, 0:02:20.489,0:02:23.719 when you were abused @@ -912,7 +912,7 @@ want to run you own node, uh 0:15:18.540,0:15:19.220 -waht kind of node you actually want to run +what kind of node you actually want to run 0:15:19.220,0:15:24.120 if you look at the picture, uh earlier @@ -1106,7 +1106,7 @@ and uh, 0:18:55.930,0:19:02.920 -posts a circle rendesvouz cookie there. A piece of +posts a circle rendezvous cookie there. A piece of data so uh, she can, uh 0:19:02.920,0:19:05.480 @@ -1119,7 +1119,7 @@ gives the introduction point 0:19:07.860,0:19:14.500 -the address of her random rendesvouz point that +the address of her random rendezvous point that Alice has chosen 0:19:14.500,0:19:18.550 @@ -1132,28 +1132,28 @@ and Alice and Bob uh, 0:19:28.160,0:19:31.230 -make a rendesvouz point, and +make a rendezvous point, and 0:19:31.230,0:19:34.940 Bob uses this, this uh 0:19:34.940,0:19:36.700 -rendesvouz cookie to +rendezvous cookie to 0:19:36.700,0:19:38.180 -actually identify himself on the rendesvouz point +actually identify himself on the rendezvous point 0:19:38.180,0:19:39.990 and after that 0:19:39.990,0:19:46.990 -all the connection of data runs through this rendesvouz point. +all the connection of data runs through this rendezvous point. 0:19:50.870,0:19:53.180 uh, if time permits I'll actually uh, 0:19:53.180,0:19:54.710 -set up a rendesvouz +set up a rendezvous 0:19:54.710,0:19:55.960 a hidden service here @@ -1187,7 +1187,7 @@ practically, anyone knows this 0:20:25.580,0:20:27.580 -there can be crytpo restrictions +there can be crypto restrictions 0:20:27.580,0:20:29.070 for example Great Britain, the uh @@ -1478,7 +1478,7 @@ It's also Disk and Swap encryption 0:24:32.950,0:24:38.010 -which is important, especialy the swap encryption. And uh, +which is important, especially the swap encryption. And uh, 0:24:38.010,0:24:39.390 there's also audit @@ -1919,7 +1919,7 @@ public key, and uh, if you 0:35:19.369,0:35:22.159 -uncomment this sutff, +uncomment this stuff, 0:35:22.159,0:35:24.999 and uh, @@ -2306,7 +2306,7 @@ Tor developers actually run those directory servers 0:45:01.499,0:45:08.499 -but this is really critical infrastucture +but this is really critical infrastructure 0:45:11.729,0:45:12.719 uhm @@ -2338,7 +2338,7 @@ I used to run a middleman node, 0:45:39.219,0:45:40.369 -and in one monthm +and in one month 0:45:40.369,0:45:42.699 it would make @@ -2362,7 +2362,7 @@ and unfortunately also a lot of filesharing systems 0:45:56.259,0:45:59.739 -which it doesn't relly make sense because they're slow +which it doesn't really make sense because they're slow 0:45:59.739,0:46:00.570 So uhm, ==== //depot/projects/docproj_nl/en_US.ISO8859-1/captions/2009/asiabsdcon/rao-kernellocking-1.sbv#3 (text+ko) ==== @@ -458,7 +458,7 @@ that I discovered 0:07:45.009,0:07:48.439 -and the scheduler was move with a seperate lock +and the scheduler was move with a separate lock 0:07:48.439,0:07:50.449 in order to @@ -563,7 +563,7 @@ concurrently adjust to the structure but prevents the threads from 0:09:23.699,0:09:25.390 -writing nto the protected path. +writing to the protected path. 0:09:25.390,0:09:28.890 while the reader..while they are readers @@ -690,7 +690,7 @@ its usage is pretty much discouraged 0:11:23.570,0:11:28.320 -basically FreeBSD you can consider locking primative divided into three classes +basically FreeBSD you can consider locking primitive divided into three classes 0:11:28.320,0:11:31.250 three classes of @@ -999,7 +999,7 @@ to cope with that 0:16:42.020,0:16:45.830 -another thing is that while you cant +another thing is that while you can't 0:16:45.830,0:16:47.920 allow @@ -1011,7 +1011,7 @@ while holding spin lock 0:16:52.570,0:16:55.249 -it's obvious you cant +it's obvious you can't 0:16:55.249,0:16:59.580 acquire a locking primitive while holding a spin lock @@ -1101,7 +1101,7 @@ solve this problem actually in the 0:18:17.780,0:18:21.170 -kernel using a technique called priority propogation +kernel using a technique called priority propagation 0:18:21.170,0:18:22.020 basically @@ -1146,7 +1146,7 @@ cannot support 0:18:57.310,0:19:03.430 -priority propogation fixes for read lock that happens because you'd like to +priority propagation fixes for read lock that happens because you'd like to 0:19:03.430,0:19:07.290 the turnstile should keep track of all the readers @@ -1185,7 +1185,7 @@ what happens 0:19:39.070,0:19:42.150 -about the priority propogation is that the +about the priority propagation is that the 0:19:42.150,0:19:44.830 the threads and the turnstiles @@ -1235,7 +1235,7 @@ 0:20:26.150,0:20:31.120 well as you know higher level, higher value means lower priority. so if this is 0:20:31.120,0:20:34.960 -a suitable pace for priority propogation +a suitable pace for priority propagation 0:20:34.960,0:20:40.820 but what happens is that this owner is actually sleeping on another turnstile @@ -1250,7 +1250,7 @@ so 0:20:50.750,0:20:55.530 -just propogating priority to the first owner was just unuseful because the first +just propagating priority to the first owner was just unuseful because the first 0:20:55.530,0:20:56.340 one @@ -1265,7 +1265,7 @@ keep the chain to a 0:21:00.580,0:21:04.820 -lower priority so it's was going to be propogated to the first one +lower priority so it's was going to be propagated to the first one 0:21:04.820,0:21:07.679 actually running @@ -1274,7 +1274,7 @@ owner of the chain 0:21:09.870,0:21:14.670 -this is the situation after the propogation as you can see all of threads in the chain +this is the situation after the propagation as you can see all of threads in the chain 0:21:14.670,0:21:16.559 has the same priority @@ -1508,7 +1508,7 @@ lockmgr and the sx lock 0:25:25.540,0:25:26.860 -so you cant hold +so you can't hold 0:25:26.860,0:25:29.410 a mutex for example @@ -1541,13 +1541,13 @@ as the sleepqueues are born just to serve wait channels 0:26:04.779,0:26:09.190 - they don't track owner too so they dont care about priority propogation and priority inversion problem + they don't track owner too so they dont care about priority propagation and priority inversion problem 0:26:09.190,0:26:14.430 just because sleepqueues entirely should not have work 0:26:14.430,0:26:20.150 -so for example lockmgr and sx have not priority propogation +so for example lockmgr and sx have not priority propagation 0:26:20.150,0:26:22.360 systems and the @@ -1562,7 +1562,7 @@ it's you mean why it's not 0:26:39.000,0:26:41.790 -why doesnt blocking primitives exist yeah? +why doesn't blocking primitives exist yeah? 0:26:41.790,0:26:44.250 so imagine that for example the @@ -1598,7 +1598,7 @@ the using the turnstile you will go to a 0:27:06.930,0:27:12.110 -always the mechanism of priority propogation and priority inversion handling.Its +always the mechanism of priority propagation and priority inversion handling.Its 0:27:12.110,0:27:13.760 not very @@ -1676,7 +1676,7 @@ however 0:28:12.340,0:28:17.669 -as you could have seen before the three containers create a heirarchy that +as you could have seen before the three containers create a hierarchy that 0:28:17.669,0:28:20.090 should not be broken like @@ -1730,7 +1730,7 @@ to sleep 0:29:12.680,0:29:15.760 -in order to retreive your memory +in order to retrieve your memory 0:29:15.760,0:29:17.890 and if you do with a lock hold @@ -1853,7 +1853,7 @@ once they are asleep 0:31:04.740,0:31:07.470 -that condvar still doesnt +that condvar still doesn't 0:31:07.470,0:31:12.430 maybe if we could port these features to the condition variables we we will be able @@ -2292,7 +2292,7 @@ would you repeat 0:39:59.919,0:40:03.879 - some voice please. No I cant hear + some voice please. No I can't hear 0:40:03.879,0:40:05.509 It seems to me that ==== //depot/projects/docproj_nl/en_US.ISO8859-1/captions/2009/dcbsdcon/bejtlich-networksecurity.sbv#3 (text+ko) ==== @@ -2071,7 +2071,7 @@ and I will say by the way 0:26:58.740,0:27:04.310 -I don't run the one sytem I expose in my home lab +I don't run the one system I expose in my home lab is not an Intel system 0:27:04.310,0:27:06.940 ==== //depot/projects/docproj_nl/en_US.ISO8859-1/captions/2009/dcbsdcon/dixon-bsdisstilldying.sbv#3 (text+ko) ==== @@ -1259,7 +1259,7 @@ nature, 0:20:53.540,0:20:57.750 -but includ a number of political and legal +but include a number of political and legal obstacles as well. 0:20:57.750,0:21:03.240 ==== //depot/projects/docproj_nl/en_US.ISO8859-1/captions/2009/dcbsdcon/mckusick-historyofbsd.sbv#3 (text+ko) ==== @@ -470,7 +470,7 @@ other people many years uh later so 2.11 0:06:41.090,0:06:43.279 -does not preceed 3.0 +does not precede 3.0 0:06:43.279,0:06:48.550 Uh 2.11 is you know contemporary @@ -905,7 +905,7 @@ to start working about 0:12:28.789,0:12:31.030 -renweing et cetera. +renewing et cetera. 0:12:31.030,0:12:33.180 Uh in any way @@ -1215,7 +1215,7 @@ Uh and so 0:16:25.480,0:16:28.920 -Bill needs to be able to run sometests back and forth +Bill needs to be able to run some tests back and forth between these machines 0:16:28.920,0:16:31.080 @@ -1502,6 +1502,7 @@ 0:20:32.890,0:20:38.010 and then someone else hears about it. They want it then someone else wants it nahnah..... + 0:20:38.010,0:20:42.030 It's not like today and where you just put it up and anonymous FTP. This was still @@ -2760,7 +2761,7 @@ as well 0:37:54.839,0:37:57.150 -uh so bring Keith Bostick on board and +uh so bring Keith Bostic on board and 0:37:57.150,0:37:59.560 Uh one of his of requirements for coming @@ -3409,7 +3410,7 @@ 0:46:41.830,0:46:45.309 there's not a question that a graduate student -has never asked me that I hadn't dealed with, +has never asked me that I hadn't dealt with, 0:46:45.309,0:46:51.309 and lawyer is not up to a graduate student. @@ -3534,7 +3535,7 @@ FreeBSD had to do it 0:48:22.150,0:48:24.329 -the netBSD folks had to do it uh +the NetBSD folks had to do it uh 0:48:24.329,0:48:26.289 and it was a huge amount of work but they @@ -3909,4 +3910,4 @@ one question. 0:53:45.349,0:53:45.599 -All right ! Well Thank You very much. +All right! Well Thank You very much. ==== //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#7 (text+ko) ==== @@ -1,5 +1,5 @@