Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 24 Aug 2009 06:37:18 GMT
From:      Rene Ladan <rene@FreeBSD.org>
To:        Perforce Change Reviews <perforce@FreeBSD.org>
Subject:   PERFORCE change 167707 for review
Message-ID:  <200908240637.n7O6bIFo011280@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=167707

Change 167707 by rene@rene_self on 2009/08/24 06:37:16

	IFC	

Affected files ...

.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/committers-guide/article.sgml#28 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#32 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#28 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/portbuild/article.sgml#15 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#18 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/basics/chapter.sgml#6 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#15 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#10 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/dtrace/chapter.sgml#7 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/filesystems/chapter.sgml#5 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml#5 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/x11/chapter.sgml#6 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#23 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml#19 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/disks/chapter.sgml#11 integrate
.. //depot/projects/docproj_nl/share/pgpkeys/fluffy.key#1 branch
.. //depot/projects/docproj_nl/share/pgpkeys/lulf.key#2 integrate
.. //depot/projects/docproj_nl/share/pgpkeys/marck.key#3 integrate
.. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#25 integrate
.. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#22 integrate
.. //depot/projects/docproj_nl/www/en/donations/donors.sgml#19 integrate
.. //depot/projects/docproj_nl/www/en/gnome/docs/halfaq.sgml#4 integrate
.. //depot/projects/docproj_nl/www/en/platforms/arm.sgml#2 integrate
.. //depot/projects/docproj_nl/www/en/projects/newbies.sgml#2 integrate
.. //depot/projects/docproj_nl/www/en/releases/8.0R/Makefile#1 branch
.. //depot/projects/docproj_nl/www/en/releases/8.0R/schedule.sgml#1 branch
.. //depot/projects/docproj_nl/www/en/releng/index.sgml#27 integrate
.. //depot/projects/docproj_nl/www/nl/share/sgml/header.l10n.ent#14 integrate
.. //depot/projects/docproj_nl/www/share/sgml/commercial.consult.xml#11 integrate
.. //depot/projects/docproj_nl/www/share/sgml/commercial.isp.xml#11 integrate
.. //depot/projects/docproj_nl/www/share/sgml/events.xml#20 integrate
.. //depot/projects/docproj_nl/www/share/sgml/news.xml#47 integrate
.. //depot/projects/docproj_nl/www/share/sgml/press.xml#15 integrate

Differences ...

==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/committers-guide/article.sgml#28 (text+ko) ====

@@ -9,7 +9,7 @@
 
     <corpauthor>The &os; Documentation Project</corpauthor>
 
-    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.285 2009/07/18 15:46:44 keramida Exp $</pubdate>
+    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.286 2009/08/13 15:51:59 rwatson Exp $</pubdate>
 
     <copyright>
       <year>1999</year>
@@ -60,11 +60,16 @@
       <tgroup cols="2">
 	<tbody>
 	  <row>
-	    <entry><emphasis>Main Repository Host</emphasis></entry>
+	    <entry><emphasis>Main CVS Repository Host</emphasis></entry>
 	    <entry><hostid role="fqdn">ncvs.FreeBSD.org</hostid></entry>
 	  </row>
 
 	  <row>
+	    <entry><emphasis>Main Subversion Repository Host</emphasis></entry>
+	    <entry><hostid role="fqdn">svn.FreeBSD.org</hostid></entry>
+	  </row>
+
+	  <row>
 	    <entry><emphasis>Login Methods</emphasis></entry>
 	    <entry>&man.ssh.1;, protocol 2 only</entry>
 	  </row>
@@ -77,8 +82,15 @@
 	  </row>
 
 	  <row>
+	    <entry><emphasis>Main Subversion Root</emphasis></entry>
+	    <entry>
+	      <literal>svn+ssh://</literal><hostid role="fqdn">svn.FreeBSD.org</hostid><filename>/base</filename> (although also see <xref linkend="vcs.operations">).
+	    </entry>
+	  </row>
+
+	  <row>
 	    <entry><emphasis>Main &a.cvsadm;</emphasis></entry>
-	    <entry>&a.peter; and &a.markm;, as well as &a.joe; and &a.marcus; for
+	    <entry>&a.peter; and &a.simon;, as well as &a.joe; and &a.marcus; for
 	      <filename>ports/</filename></entry>
 	  </row>
 
@@ -115,6 +127,7 @@
 	    <entry>
 	      <literal>RELENG_6</literal> (6.X-STABLE), 
 	      <literal>RELENG_7</literal> (7.X-STABLE), 
+	      <literal>RELENG_8</literal> (7.X-STABLE), 
 	      <literal>HEAD</literal> (-CURRENT)
 	    </entry>
 	  </row>
@@ -125,6 +138,7 @@
 	    <entry>
 	      <literal>stable/6</literal> (6.X-STABLE),
 	      <literal>stable/7</literal> (7.X-STABLE),
+	      <literal>stable/8</literal> (8.X-STABLE),
 	      <literal>head</literal> (-CURRENT)
 	    </entry>
 	  </row>

==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#32 (text+ko) ====

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.870 2009/07/26 12:55:29 bsam Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.874 2009/08/22 04:02:15 tabthorpe Exp $ -->
 <!--
 	NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical
 	order by first name.
@@ -2636,6 +2636,11 @@
     </listitem>
 
     <listitem>
+      <para>Edmondas Girkantas
+	<email>eg@fbsd.lt</email></para>
+    </listitem>
+
+    <listitem>
       <para>Edson Brandi
 	<email>ebrandi.home@uol.com.br</email></para>
     </listitem>
@@ -6561,7 +6566,7 @@
 
     <listitem>
       <para>Mike Durian
-	<email>durian@plutotech.com</email></para>
+	<email>durian@boogie.com</email></para>
     </listitem>
 
     <listitem>
@@ -7870,6 +7875,11 @@
     </listitem>
 
     <listitem>
+      <para>Piotr Florczyk
+	<email>p.florczyk@adminworkshop.pl</email></para>
+    </listitem>
+
+    <listitem>
       <para>Piotr Rybicki
 	<email>meritus@innervision.pl</email></para>
     </listitem>
@@ -9739,6 +9749,11 @@
     </listitem>
 
     <listitem>
+      <para>Troels Kofoed Jacobsen
+	<email>tkjacobsen@gmail.com</email></para>
+    </listitem>
+
+    <listitem>
       <para>Tsung-Han Yeh
 	<email>snowfly@yuntech.edu.tw</email></para>
     </listitem>

==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#28 (text+ko) ====

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml,v 1.271 2009/07/20 14:55:34 yzlin Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml,v 1.272 2009/08/10 17:10:24 fluffy Exp $ -->
 <!--
 	NOTE TO NEW COMMITTERS: Core and committers lists are sorted in
 	alphabetical order by last name. Please keep in mind that fact while
@@ -835,10 +835,6 @@
     </listitem>
 
     <listitem>
-      <para>&a.zml;</para>
-    </listitem>
-
-    <listitem>
       <para>&a.avl;</para>
     </listitem>
 
@@ -1071,6 +1067,10 @@
     </listitem>
 
     <listitem>
+      <para>&a.fluffy;</para>
+    </listitem>
+
+    <listitem>
       <para>&a.sat;</para>
     </listitem>
 

==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/portbuild/article.sgml#15 (text+ko) ====

@@ -11,7 +11,7 @@
       <corpauthor>The &os; Ports Management Team</corpauthor>
     </authorgroup>
 
-    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/portbuild/article.sgml,v 1.43 2009/07/18 18:56:54 linimon Exp $</pubdate>
+    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/portbuild/article.sgml,v 1.44 2009/08/05 01:48:18 linimon Exp $</pubdate>
 
     <copyright>
       <year>2003</year>
@@ -1406,7 +1406,8 @@
 
 	    <listitem>
 	      <para>Create the appropriate
-		<filename>etc/rc.conf</filename>.  (If you have multiple,
+		<filename>etc/rc.conf</filename>.  (If you are using
+		  <literal>pxeboot</literal>, and have multiple,
 		  different, machines, you will need to put those in
 		  the override directories.)</para>
 

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#18 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml,v 1.424 2009/07/11 07:23:05 keramida Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml,v 1.425 2009/08/11 17:33:35 manolis Exp $
 -->
 
 <chapter id="advanced-networking">
@@ -427,7 +427,7 @@
 	changing the following variable to <literal>YES</literal> in
 	&man.rc.conf.5;:</para>
 
-      <programlisting>gateway_enable=YES          # Set to YES if this host will be a gateway</programlisting>
+      <programlisting>gateway_enable="YES"          # Set to YES if this host will be a gateway</programlisting>
 
       <para>This option will set the &man.sysctl.8; variable
 	<varname>net.inet.ip.forwarding</varname> to

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/basics/chapter.sgml#6 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/basics/chapter.sgml,v 1.156 2008/12/23 00:15:20 trhodes Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/basics/chapter.sgml,v 1.157 2009/08/11 14:41:08 blackend Exp $
 -->
 
 <chapter id="basics">
@@ -998,7 +998,7 @@
 	    </row>
 	    
 	    <row>
-	      <entry><filename class="directory">/usr/ports</filename></entry>
+	      <entry><filename class="directory">/usr/ports/</filename></entry>
 	      <entry>The FreeBSD Ports Collection (optional).</entry>
 	    </row>
 	    
@@ -1060,7 +1060,7 @@
 	    </row>
 	    
 	    <row>
-	      <entry><filename>/var/yp</filename></entry>
+	      <entry><filename class="directory">/var/yp/</filename></entry>
 	      <entry>NIS maps.</entry>
 	    </row>
 

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#15 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml,v 1.243 2009/05/01 09:48:50 pgj Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml,v 1.244 2009/08/11 18:48:57 manolis Exp $
 -->
 
 <chapter id="updating-upgrading">
@@ -275,14 +275,14 @@
 
       <para>If any kernel patches have been applied the system will
 	need a reboot.  If all went well the system should be patched
-	and <command>freebsd-update</command> may be ran as a nightly
+	and <command>freebsd-update</command> may be run as a nightly
 	&man.cron.8; job.  An entry in <filename>/etc/crontab</filename>
 	would be sufficient to accomplish this task:</para>
 
       <programlisting>@daily                                  root    freebsd-update cron</programlisting>
 
       <para>This entry states that once every day, the
-	<command>freebsd-update</command> will be ran.  In this way,
+	<command>freebsd-update</command> utility will be run.  In this way,
 	using the <option>cron</option> argument,
 	<command>freebsd-update</command> will only check if updates
 	exist.  If patches exist, they will automatically be downloaded

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#10 (text+ko) ====

@@ -1,6 +1,6 @@
 <!--
      The FreeBSD Documentation Project
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml,v 1.89 2009/07/25 10:03:35 blackend Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml,v 1.91 2009/08/19 07:26:21 blackend Exp $
 -->
 
 <chapter id="desktop">
@@ -226,11 +226,17 @@
 	<literal>about:plugins</literal> in the location bar and press
 	<keycap>Enter</keycap>.  A page listing the installed plugins
 	will be displayed; the <application>&java;</application>
-	plugin should be listed there now.  If it is not, as
-	<username>root</username>, run the following command:</para>
+	plugin should be listed there now.  If it is not, each user
+	will have to run the following command:</para>
+
+      <screen>&prompt.user; <userinput>ln -s /usr/local/diablo-jre1.6.0/plugin/i386/ns7/libjavaplugin_oji.so \
+  $HOME/.mozilla/plugins/</userinput></screen>
+
+      <para>or, if you installed the <application>Diablo
+	&jdk;</application> package:</para>
 
-      <screen>&prompt.root; <userinput>ln -s /usr/local/diablo-jre1.6.0/plugin/i386/ns7/libjavaplugin_oji.so \
-  /usr/local/lib/browser_plugins/</userinput></screen>
+      <screen>&prompt.user; <userinput>ln -s /usr/local/diablo-jdk1.6.0/jre/plugin/i386/ns7/libjavaplugin_oji.so \
+  $HOME/.mozilla/plugins/</userinput></screen>
 
       <para>Then relaunch your browser.</para>
     </sect2>

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/dtrace/chapter.sgml#7 (text+ko) ====

@@ -8,7 +8,7 @@
 
 <!--
      The FreeBSD Documentation Project
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/dtrace/chapter.sgml,v 1.7 2008/12/23 18:48:21 trhodes Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/dtrace/chapter.sgml,v 1.8 2009/08/17 19:37:27 bcr Exp $
 -->
 
 <chapter id="dtrace">
@@ -120,7 +120,7 @@
       This <acronym>CTF</acronym> data is added to the binaries by the
       <command>ctfconvert</command> and <command>ctfmerge</command>
       build tools.  The <command>ctfconvert</command> utility parses
-      <acronym>DWARF</acronym> debug <acronym>ELF</acronym> sections
+      <acronym>DWARF</acronym> <acronym>ELF</acronym> debug sections
       created by the compiler and <command>ctfmerge</command> merges
       <acronym>CTF</acronym> <acronym>ELF</acronym> sections from
       objects into either executables or shared libraries.  More on

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/filesystems/chapter.sgml#5 (text+ko) ====

@@ -1,6 +1,6 @@
 <!--
      The FreeBSD Documentation Project
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/filesystems/chapter.sgml,v 1.5 2008/11/26 04:54:41 pgj Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/filesystems/chapter.sgml,v 1.8 2009/08/14 16:48:45 bcr Exp $
 -->
 
 <chapter id="filesystems">
@@ -108,7 +108,7 @@
   </sect1>
 
   <sect1 id="filesystems-zfs">
-    <title>The Z File System</title>
+    <title>The Z File System (ZFS)</title>
 
     <para>The Z&nbsp;file system, developed by &sun;, is a new
       technology designed to use a pooled storage method.  This means
@@ -151,7 +151,7 @@
 	  devices are available as modules, they may simply be loaded
 	  using the <filename>/boot/loader.conf</filename> file.</para>
 
-	<para>Users of the i386 architecture should add the following
+	<para>Users of the &i386; architecture should add the following
 	  option to their kernel configuration file, rebuild their
 	  kernel, and reboot:</para>
 
@@ -198,19 +198,20 @@
 	<screen>&prompt.root; <userinput>echo 'zfs_enable="YES"' &gt;&gt; /etc/rc.conf</userinput>
 &prompt.root; <userinput>/etc/rc.d/zfs start</userinput></screen>
 
-	<para>The remainder of this document assumes two
+	<para>The remainder of this document assumes three
 	  <acronym>SCSI</acronym> disks are available, and their device names
-	  are <devicename><replaceable>da0</replaceable></devicename>
-	  and <devicename><replaceable>da1</replaceable></devicename>
-	  respectively.  Users of <acronym>IDE</acronym> hardware may
-	  use the <devicename><replaceable>ad</replaceable></devicename>
+	  are <devicename><replaceable>da0</replaceable></devicename>,
+	  <devicename><replaceable>da1</replaceable></devicename>
+	  and <devicename><replaceable>da2</replaceable></devicename>.
+	  Users of <acronym>IDE</acronym> hardware may use the
+	  <devicename><replaceable>ad</replaceable></devicename>
 	  devices in place of <acronym>SCSI</acronym> hardware.</para>
 
       <sect3>
 	<title>Single Disk Pool</title>
 
-	<para>To create a <acronym>ZFS</acronym> over a single disk
-	  device, use the <command>zpool</command> command:</para>
+	<para>To create a simple, non-redundant <acronym>ZFS</acronym> pool using a
+	  single disk device, use the <command>zpool</command> command:</para>
 
 	<screen>&prompt.root; <userinput>zpool create example /dev/da0</userinput></screen>
 
@@ -340,13 +341,22 @@
 	<title><acronym>ZFS</acronym> RAID-Z</title>
 
 	<para>As previously noted, this section will assume that
-	  two <acronym>SCSI</acronym> exists as devices
-	  <devicename>da0</devicename> and
-	  <devicename>da1</devicename>.  To create a
+	  three <acronym>SCSI</acronym> disks exist as devices
+	  <devicename>da0</devicename>, <devicename>da1</devicename>
+	  and <devicename>da2</devicename> (or <devicename>ad0</devicename>
+	  and beyond in case IDE disks are being used).  To create a
 	  <acronym>RAID</acronym>-Z pool, issue the following
 	  command:</para>
 
-	<screen>&prompt.root; <userinput>zpool create storage raidz da0 da1</userinput></screen>
+	<screen>&prompt.root; <userinput>zpool create storage raidz da0 da1 da2</userinput></screen>
+
+	<note><para>&sun; recommends that the amount of devices used in a
+	  <acronym>RAID</acronym>-Z configuration is between three and nine.  If your needs
+	  call for a single pool to consist of 10 disks or more, consider
+	  breaking it up into smaller <acronym>RAID</acronym>-Z groups.  If
+	  you only have two disks and still require redundancy, consider using
+	  a <acronym>ZFS</acronym> mirror instead.  See the &man.zpool.8;
+	  manual page for more details.</para></note>
 
 	<para>The <literal>storage</literal> zpool should have been
 	  created.  This may be verified by using the &man.mount.8; and
@@ -432,8 +442,8 @@
 /dev/ad0s1a    2026030  235240  1628708    13%    /
 devfs                1       1        0   100%    /dev
 /dev/ad0s1d   54098308 1032826 48737618     2%    /usr
-storage       17547008       0 17547008     0%    /storage
-storage/home  17547008       0 17547008     0%    /home</screen>
+storage       26320512       0 26320512     0%    /storage
+storage/home  26320512       0 26320512     0%    /home</screen>
 
 	<para>This completes the <acronym>RAID</acronym>-Z
 	  configuration.  To get status updates about the file systems
@@ -477,6 +487,7 @@
 	  raidz1    DEGRADED     0     0     0
 	    da0     ONLINE       0     0     0
 	    da1     OFFLINE      0     0     0
+	    da2     ONLINE       0     0     0
 
 errors: No known data errors</screen>
 
@@ -509,6 +520,7 @@
 	  raidz1    ONLINE       0     0     0
 	    da0     ONLINE       0     0     0
 	    da1     ONLINE       0     0     0
+	    da2     ONLINE       0     0     0
 
 errors: No known data errors</screen>
 
@@ -556,6 +568,7 @@
 	  raidz1    ONLINE       0     0     0
 	    da0     ONLINE       0     0     0
 	    da1     ONLINE       0     0     0
+	    da2     ONLINE       0     0     0
 
 errors: No known data errors</screen>
 

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml#5 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml,v 1.132 2009/06/17 18:01:54 bcr Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml,v 1.134 2009/08/14 07:30:07 blackend Exp $
 -->
 
 <chapter id="multimedia">
@@ -1484,7 +1484,8 @@
 	<application>SANE</application> has a <ulink
 	url="http://www.sane-project.org/sane-supported-devices.html">supported
 	devices</ulink> list that can provide you with information
-	about the support for a scanner and its status.  The
+	about the support for a scanner and its status.  On systems
+	prior to &os;&nbsp;8.X the
 	&man.uscanner.4; manual page also provides a list of supported
 	USB scanners.</para>
     </sect2>
@@ -1508,36 +1509,35 @@
 	<programlisting>device usb
 device uhci
 device ohci
-device uscanner</programlisting>
+device ehci</programlisting>
 
-	<para>Depending upon the USB chipset on your motherboard, you
-	  will only need either <literal>device uhci</literal> or
-	  <literal>device ohci</literal>, however having both in the
-	  kernel configuration file is harmless.</para>
+	<para>On systems prior to &os;&nbsp;8.X, the following line is
+	  also needed:</para>
 
-	<para>If you do not want to rebuild your kernel and your
-	  kernel is not the <filename>GENERIC</filename> one, you can
-	  directly load the &man.uscanner.4; device driver module with
-	  the &man.kldload.8; command:</para>
+	<programlisting>device uscanner</programlisting>
 
-	<screen>&prompt.root; <userinput>kldload uscanner</userinput></screen>
+	<para>On these versions of &os;, the &man.uscanner.4; device
+	  driver provides support for the USB scanners.  Since
+	  &os;&nbsp;8.0, this support is directly provided by
+	  the &man.libusb.3; library.</para>
 
-	<para>To load this module at each system startup, add the
-	  following line to
-	  <filename>/boot/loader.conf</filename>:</para>
-
-	<programlisting>uscanner_load="YES"</programlisting>
-
-	<para>After rebooting with the correct kernel, or after
-	  loading the required module, plug in your USB scanner.  A
+	<para>After rebooting with the correct kernel,
+	  plug in your USB scanner.  A
 	  line showing the detection of your
 	  scanner should appear in the system message buffer
 	  (&man.dmesg.8;):</para>
 
+	<screen>ugen0.2: &lt;EPSON&gt; at usbus0</screen>
+
+	<para>or on a &os;&nbsp;7.X system:</para>
+
 	<screen>uscanner0: EPSON EPSON Scanner, rev 1.10/3.02, addr 2</screen>
 
-	<para>This shows that our scanner is using the
-	  <filename>/dev/uscanner0</filename> device node.</para>
+	<para>These messages show that our scanner is using
+	  either <filename>/dev/ugen0.2</filename> or
+	  <filename>/dev/uscanner0</filename> as device node according
+	  to the &os; version we run.  For this example, a
+	  &epson.perfection; 1650 USB scanner was used.</para>
       </sect3>
 
       <sect3>
@@ -1639,6 +1639,19 @@
       <screen>&prompt.root; <userinput>scanimage -L</userinput>
 device `snapscan:/dev/pass3' is a AGFA SNAPSCAN 600 flatbed scanner</screen>
 
+      <para>Or, for example with the USB scanner used in the <xref
+	linkend="scanners-kernel-usb">:</para>
+
+      <screen>&prompt.root; <userinput>scanimage -L</userinput>
+device 'epson2:libusb:/dev/usb:/dev/ugen0.2' is a Epson GT-8200 flatbed scanner</screen>
+
+      <para>This output comes from a &os;&nbsp;8.X system, the
+	<literal>`epson2:libusb:/dev/usb:/dev/ugen0.2'</literal> item
+	gives us the backend name (<literal>epson2</literal>) and the
+	device node (<literal>/dev/ugen0.2</literal>) used by our
+	scanner.</para>
+
+      <note>
       <para>No output or a message saying that no scanners were
 	identified indicates that &man.scanimage.1; is unable to
 	identify the scanner.  If this happens, you will need to edit
@@ -1650,7 +1663,9 @@
 	scanners.</para>
 
       <para>For example, with the USB scanner used in the <xref
-	linkend="scanners-kernel-usb">,
+	linkend="scanners-kernel-usb">, under &os;&nbsp;8.X the
+	scanner is perfectly detected and working but under prior
+	versions of &os; (where &man.uscanner.4; driver is used)
 	<command>sane-find-scanner</command> gives us the following
 	information:</para>
 
@@ -1669,9 +1684,9 @@
 which came with this software (README, FAQ, manpages).</screen>
 
       <para>Since the scanner is not identified, we will need to edit
-	the <filename>/usr/local/etc/sane.d/epson.conf</filename>
+	the <filename>/usr/local/etc/sane.d/epson2.conf</filename>
 	file.  The scanner model used was the &epson.perfection; 1650,
-	so we know the scanner will use the <literal>epson</literal>
+	so we know the scanner will use the <literal>epson2</literal>
 	backend.  Be sure to read the help comments in the backends
 	configuration files.  Line changes are quite simple: comment
 	out all lines that have the wrong interface for your scanner
@@ -1696,6 +1711,7 @@
 	concerned with is the
 	<literal>`epson:/dev/uscanner0'</literal> field, which give us
 	the right backend name and the right device node.</para>
+      </note>
 
       <para>Once the <command>scanimage -L</command> command is able
 	to see the scanner, the configuration is complete.  The device
@@ -1727,23 +1743,48 @@
 	to the scanner.  The user will need read and write
 	permissions to the device node used by the scanner.  As an
 	example, our USB scanner uses the device node
-	<filename>/dev/uscanner0</filename> which is owned by the
-	<groupname>operator</groupname> group.  Adding the user
-	<username><replaceable>joe</replaceable></username> to the
-	<groupname>operator</groupname> group will allow him to use
-	the scanner:</para>
+	<filename>/dev/ugen0.2</filename> which is in fact just a
+	symlink to the real device node called
+	<filename>/dev/usb/0.2.0</filename> (a quick look at the
+	contain of the <filename class="directory">/dev</filename>
+	directory will confirm it).  Both, the symlink and the
+	device node, are owned respectively by the
+	<groupname>wheel</groupname> and the
+	<groupname>operator</groupname> groups.  Adding the user
+	<username><replaceable>joe</replaceable></username> to these
+	groups will allow him to use
+	the scanner but, for obvious security reasons, you should
+	think twice before adding a user to any group, especially the
+	<groupname>wheel</groupname> group.  A better solution would
+	be creating a specific group for using the USB devices
+	and make the scanner device accessible to members of this
+	group.</para>
+
+      <para>So we will use, for example, a group called
+	<groupname><replaceable>usb</replaceable></groupname>.  The
+	first step is the creation of this group with the help of the
+	&man.pw.8; command:</para>
 
-      <screen>&prompt.root; <userinput>pw groupmod operator -m <replaceable>joe</replaceable></userinput></screen>
+      <screen>&prompt.root; <userinput>pw groupadd usb</userinput></screen>
 
-      <para>For more details read the &man.pw.8; manual page.  You
-	also have to set the correct write permissions (0660 or 0664)
-	on the <filename>/dev/uscanner0</filename> device node, by
-	default the <groupname>operator</groupname> group can only
-	read the device node.  This is done by adding the following
+      <para>Then we have to make the <filename>/dev/ugen0.2</filename>
+	symlink and  the <filename>/dev/usb/0.2.0</filename> device node accessible to the <groupname>usb</groupname> group
+	with the correct write permissions (<literal>0660</literal> or
+	<literal>0664</literal>), cause by default only the owner of
+	these files (<username>root</username>) can write to them.
+	All of this is done by adding the following
 	lines to the <filename>/etc/devfs.rules</filename> file:</para>
 
       <programlisting>[system=5]
-add path uscanner0 mode 660</programlisting>
+add path ugen0.2 mode 0660 group usb
+add path usb/0.2.0 mode 0666 group usb</programlisting>
+
+      <para>For the &os;&nbsp;7.X users, the following lines with the
+	correct device node, most of time
+	<filename>/dev/uscanner0</filename>, are needed:</para>
+
+      <programlisting>[system=5]
+add path uscanner0 mode 660 group usb</programlisting>
 
       <para>Then add the following to
 	<filename>/etc/rc.conf</filename> and reboot the
@@ -1754,11 +1795,13 @@
       <para>More information regarding these lines can be found in the
 	&man.devfs.8; manual page.</para>
 
-      <note>
-	<para>Of course, for security reasons, you should think twice
-	  before adding a user to any group, especially the
-	  <groupname>operator</groupname> group.</para>
-      </note>
+      <para>Now, one will just have to add users to the
+	<groupname><replaceable>usb</replaceable></groupname> group to
+	allow the access to the scanner:</para>
+
+      <screen>&prompt.root; <userinput>pw groupmod usb -m <replaceable>joe</replaceable></userinput></screen>
+
+      <para>For more details read the &man.pw.8; manual page.</para>
     </sect2>
   </sect1>
 </chapter>

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/x11/chapter.sgml#6 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/x11/chapter.sgml,v 1.191 2009/04/29 05:53:22 manolis Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/x11/chapter.sgml,v 1.192 2009/08/14 19:50:12 bcr Exp $
 -->
 
 <chapter id="x11">
@@ -434,7 +434,7 @@
 	<para>Desktop environments like
 	  <application>GNOME</application>,
 	  <application>KDE</application> or
-	  <application>XFce</application> have tools allowing the user
+	  <application>Xfce</application> have tools allowing the user
 	  to easily set the screen parameters such as the resolution.
 	  So if the default configuration is not acceptable and you
 	  planned to install a desktop environment then just continue
@@ -1617,18 +1617,18 @@
      </sect2>
 
      <sect2 id="x11-wm-xfce">
-         <title>XFce</title>
+         <title>Xfce</title>
        <sect3 id="x11-wm-xfce-about">
-         <title>About XFce</title>
+         <title>About Xfce</title>
 
-        <para><application>XFce</application> is a desktop environment
+        <para><application>Xfce</application> is a desktop environment
           based on the GTK+
           toolkit used by <application>GNOME</application>, but is much
           more lightweight and meant for those who want a simple,
           efficient desktop which is nevertheless easy to use and
           configure.  Visually, it looks very much like
           <application>CDE</application>, found on commercial &unix;
-          systems.  Some of <application>XFce</application>'s features
+          systems.  Some of <application>Xfce</application>'s features
           are:</para>
 
          <itemizedlist>
@@ -1661,15 +1661,15 @@
            </listitem>
          </itemizedlist>
 
-         <para>More information on <application>XFce</application>
-          can be found on the <ulink url="http://www.xfce.org/">XFce
+         <para>More information on <application>Xfce</application>
+          can be found on the <ulink url="http://www.xfce.org/">Xfce
             website</ulink>.</para>
        </sect3>
 
        <sect3 id="x11-wm-xfce-install">
-         <title>Installing XFce</title>
+         <title>Installing Xfce</title>
 
-        <para>A binary package for <application>XFce</application>
+        <para>A binary package for <application>Xfce</application>
           exists (at the time of writing).  To install, simply type:</para>
 
         <screen>&prompt.root; <userinput>pkg_add -r xfce4</userinput></screen>
@@ -1681,13 +1681,13 @@
 &prompt.root; <userinput>make install clean</userinput></screen>
 
         <para>Now, tell the X server to launch
-         <application>XFce</application> the next time X is started.
+         <application>Xfce</application> the next time X is started.
          Simply type this:</para>
 
         <screen>&prompt.user; <userinput>echo "/usr/local/bin/startxfce4" &gt; ~/.xinitrc</userinput></screen>
 
         <para>The next time X is started,
-          <application>XFce</application> will be the desktop.
+          <application>Xfce</application> will be the desktop.
           As before, if a display manager like
           <application>XDM</application> is being used, create an
           <filename>.xsession</filename>, as described in the

==== //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#23 (text+ko) ====

@@ -13,7 +13,7 @@
                  builds for the other languages, and we will poke fun of you
                  in public.
 
-     $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.487 2009/07/20 14:15:44 yzlin Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.488 2009/08/10 16:50:10 fluffy Exp $
 -->
 
 <!ENTITY a.aaron "Aaron Dalton <email>aaron@FreeBSD.org</email>">
@@ -348,6 +348,8 @@
 
 <!ENTITY a.flathill "Seiichirou Hiraoka <email>flathill@FreeBSD.org</email>">
 
+<!ENTITY a.fluffy "Dima Panov <email>fluffy@FreeBSD.org</email>">
+
 <!ENTITY a.flz "Florent Thoumie <email>flz@FreeBSD.org</email>">
 
 <!ENTITY a.foxfair "Howard F. Hu <email>foxfair@FreeBSD.org</email>">

==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml#19 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Dutch Documentation Project
 
-     $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml,v 1.19 2009/04/10 22:11:37 rene Exp $
+     $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml,v 1.20 2009/08/03 13:48:00 rene Exp $
 
      %SOURCE%	en_US.ISO8859-1/books/handbook/desktop/chapter.sgml
      %SRCID%	1.89

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

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Dutch Documentation Project
 
-     $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/disks/chapter.sgml,v 1.12 2008/12/28 16:50:53 rene Exp $
+     $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/disks/chapter.sgml,v 1.13 2009/08/03 14:10:16 rene Exp $
 
      %SOURCE%	en_US.ISO8859-1/books/handbook/disks/chapter.sgml
      %SRCID%	1.291

==== //depot/projects/docproj_nl/share/pgpkeys/lulf.key#2 (text+ko) ====

@@ -1,66 +1,57 @@
-<!-- $FreeBSD: doc/share/pgpkeys/lulf.key,v 1.1 2007/10/25 19:28:58 lulf Exp $ -->
+<!-- $FreeBSD: doc/share/pgpkeys/lulf.key,v 1.2 2009/08/19 22:05:11 lulf Exp $ -->
 <!--
-sh addkey.sh lulf 73087425;
+sh addkey.sh lulf ADE1B837;
 -->
 <programlisting role="pgpfingerprint"><![CDATA[
-pub   1024D/73087425 2003-12-21
-      Key fingerprint = FDC2 6422 3949 9965 0F33  8726 0882 E0F2 7308 7425
-uid                  Ulf Lilleengen <lulf@idi.ntnu.no>
-uid                  Ulf Lilleengen <lulf@kerneled.org>
-uid                  Ulf Lilleengen <lulf@bbnett.no>
+pub   1024D/ADE1B837 2009-08-19 [expires: 2014-08-18]
+      Key fingerprint = 3822 B4E6 6D1C 6F71 4AA8  7A27 ADDF C400 ADE1 B837
+uid                  Ulf Lilleengen <ulf.lilleengen@gmail.com>
+uid                  Ulf Lilleengen <lulf@pvv.ntnu.no>
 uid                  Ulf Lilleengen <lulf@stud.ntnu.no>
-uid                  Ulf Lilleengen <lulf@pvv.ntnu.no>
-uid                  Ulf Lilleengen <lulf@kerneled.com>
 uid                  Ulf Lilleengen <lulf@FreeBSD.org>
-sub   1024g/CD5F3420 2003-12-21
+uid                  Ulf Lilleengen <lulf@idi.ntnu.no>
+sub   2048g/B5409122 2009-08-19 [expires: 2014-08-18]
 ]]></programlisting>
 <programlisting role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
-mQGiBD/lfxARBACrpdJye4zO2JikjmeUGzGYnVyCw3LN6oeksqtB/lUkUGDtkZe/
-XThVT2Asbx7U0MgiYs2S0/fKStdkaRFSLWpNgao4+pCiEQ/hs1GTt7ScH4fLNTN9
-YG/CENGOf9aSfeB/IZLXYXSXKicg6veLXq7VTsCcS9gELG9oCcZtUjF5gwCghzPS
-Sm0xpC5tBM4o0IgS6ics/jED/1BtbGw+hHo1UZSb/KUt14Hr0RKsEEuqxaOXsT0d
-5KQQkeBOsX7EtHD27g/mz5BFPLa1kMkci1V7ikuOpr0cMuxprpTIKir2T80bfpsh
-xAF2a+sjonJje2msur1855/jnHluelBeJcQoeQv6V0MkdIIJI9TN15St19rNYzmg
-iQfVA/4/XdKIGzJFYAh9G4QoOY1uqi0SrblEbXRvr+qpsGe1Ecnu3SDrdbB7VDvJ
-agPx8/lD7e6E4jpbbiDIhPPuGzxrrdimPO/Bj1pUsWx+SnMAX7XRm/I53aPLMBga
-fhuthR1dQ6V1tUknncdW4ZVYFmtdsYw9dzHeDwl0QovPcx1fKrQhVWxmIExpbGxl
-ZW5nZW4gPGx1bGZAaWRpLm50bnUubm8+iHcEExECADcCGwMGCwkIBwMCBBUCCAME
-FgIDAQIeAQIXgAIZAQUCQ4odFxMYaHR0cDovL3BncC5taXQuZWR1AAoJEAiC4PJz
-CHQlkKAAn2IrzE++SBDcd6NYtc2bxQH3ncZ2AJ9WE9IKAAQcIbrz87f30IQRvbW1
-XLQiVWxmIExpbGxlZW5nZW4gPGx1bGZAa2VybmVsZWQub3JnPohyBBMRAgAyAhsD
-BgsJCAcDAgMVAgMDFgIBAh4BAheABQJDih0cExhodHRwOi8vcGdwLm1pdC5lZHUA
-CgkQCILg8nMIdCXigwCeNKpq8RopSSXk/Ab9KOzviakGxEAAn2Sf33OvPqZyvspm
-i6i9HwODXpNziF4EExECAB4FAkDmFQ4CGwMGCwkIBwMCAxUCAwMWAgECHgECF4AA
-CgkQCILg8nMIdCWMqACfTS7hPMk6MsfILzd6WmqMakZryFcAmwesOd8mBVMk35+K
-AbkM8rAnK3SyiGEEExECACECGwMGCwkIBwMCAxUCAwMWAgECHgECF4AFAkK8LmoC
-GQEACgkQCILg8nMIdCW9RwCggaqhKrm8o8zI8pzC+JNMePbGUq0AmwZMXH8Rx1Rh
-4KwxG9l5z6Z1mKVJtB9VbGYgTGlsbGVlbmdlbiA8bHVsZkBiYm5ldHQubm8+iHIE
-ExECADICGwMGCwkIBwMCAxUCAwMWAgECHgECF4AFAkOKHRwTGGh0dHA6Ly9wZ3Au
-bWl0LmVkdQAKCRAIguDycwh0JakfAJ9p1R6siiMj6SELxG1qMDg9MrUXHQCdH2LV
-kvfV6LYfKMuE6cAS7xW7hMWIXgQTEQIAHgUCQrwuTAIbAwYLCQgHAwIDFQIDAxYC
-AQIeAQIXgAAKCRAIguDycwh0Jba0AJ4tOVOMv8OsYwjXgNqKb4yiTdwd8gCfQc7+
-clv5cX8fd/pZN69fnaQm+ha0IlVsZiBMaWxsZWVuZ2VuIDxsdWxmQHN0dWQubnRu
-dS5ubz6IdAQTEQIANAIbAwYLCQgHAwIEFQIIAwQWAgMBAh4BAheABQJDih0cExho
-dHRwOi8vcGdwLm1pdC5lZHUACgkQCILg8nMIdCVNfQCfdTCvzJkgzNlMroWJrKLC
-bc2ET8wAnjY1r/V9b5AB0bE2YyjmsrqKkIkhtCFVbGYgTGlsbGVlbmdlbiA8bHVs
-ZkBwdnYubnRudS5ubz6IYAQTEQIAIAUCQ+U5zwIbAwYLCQgHAwIEFQIIAwQWAgMB
-Ah4BAheAAAoJEAiC4PJzCHQlU1wAn0HM455aU7PaRK/ZZBTjyzLIMhw5AJ4313Uh
-DxV2WIPYXBkcqwjX6glNH7QiVWxmIExpbGxlZW5nZW4gPGx1bGZAa2VybmVsZWQu
-Y29tPoheBBMRAgAeBQI/5X8QAhsDBgsJCAcDAgMVAgMDFgIBAh4BAheAAAoJEAiC
-4PJzCHQl3vUAn1VYOvi74AI/F2uy5B8bH/RfVABCAJ45AKdEIOTB23oUu180WplE
-YjJ2xLQhVWxmIExpbGxlZW5nZW4gPGx1bGZARnJlZUJTRC5vcmc+iGAEExECACAF
-AkcPt8QCGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRAIguDycwh0JcmZAJ9M
-a2kofa4Hhj4nu43tx29PGudF8QCfasClfuVlDbpnc9h29eI+H0rYzqe5AQ0EP+V/
-ERAEAJPhbg/p8IX++4RejKMBesIcwIesMcBfKfPYr+9kxVDzgKVhXMumV4fF78W4
-QGbF57HunU7aghdiB5AqGBQ32AAlmVQO2YpvxaQwWb0N92LfosQEWCC/c6/muofm
-PyvfP28HxNzxI8V2/PuQTJkzMB/IrbNRM8R8ptso8sASLuOTAAMFA/43xIF7QGNF
-XqageSnFfTfvpPvH5RMpp7+bd1ingnLidpEhFcUqu81Qhijr7qxIXwW6Lo9kPicq
-v1tuRYNsroZBHbUpc7KHsJzXDm/J/g+QpFgFsHuZ7Z0Bm/UsItA5ugOv1d6mJQm7
-jylV69XbpR7kKX4US8V5ikVUKCvOVC9BgIhJBBgRAgAJBQI/5X8RAhsMAAoJEAiC
-4PJzCHQlH6wAn2w+rfUbxlNv37wBNGgZ1Y5WVoEwAJwJslKSlIMH+/Dqu3enqWPq
-G7h35Q==
-=VA4c
+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
+L1JhS/1K
+=sCn9
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>

==== //depot/projects/docproj_nl/share/pgpkeys/marck.key#3 (text+ko) ====

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/share/pgpkeys/marck.key,v 1.5 2009/02/15 23:54:57 marck Exp $ -->
+<!-- $FreeBSD: doc/share/pgpkeys/marck.key,v 1.6 2009/08/11 04:54:48 marck Exp $ -->
 <!--
 sh addkey.sh marck 6B691B03;
 -->
@@ -82,19 +82,33 @@
 x4EQJ+mIRgQQEQIABgUCR5ZYAgAKCRBZxqJbrEANAhg6AJ4nm2EzjE/SDAh4H+LF
 +BKMOw2xGwCeOWOm7pr3bShpwsVtE8Os3NimZ/iIRgQQEQIABgUCSHJXhAAKCRA9
 6g22+4pu9KAzAJ0cfSUFB4HhdLve85oDa3m94RcPjACdGs+PIT5+jAX1O7Te/g7t
-wu/j4kS5Ag0EO1hObhAIANX5TO/cDWaKqIaSRz4NyjTpHgtIDQpzT8D94KOnRmaP
-0B46pcNxP62+zRXIP3iHFKTGits2EoGqsw/2Y+S4RxtL/669ykxb4W7TtBwHG9mX
-EsgoiEol5eylKhNHOe2ZUwm5BIq3PTPywueehMMB7A4cqg+k+PDLyibzz6lvYKrp
-oVvaXezfX8k6vOmiRIWyazhEG3KOjiS3fnzI+qYXHUiiWjGx/CM+DcBzcuvebW5e
-j1ewB7O0qjIvxzuJep/KYO6n748CLYqLzF5mkSa0SCBWcK2LvfjlOjxp4mCSslIP
-eJO2DbGeBsmzhCWV10DqZdds9t3T7tBAKr56QAswUHsAAwUH/3Un3UAEi2tgn7Cm
-lOuM6l2iyxm0dT4xrzUzBrhPHUKpY28vUv3CFn+3qvhv/F2S56Oe+jbjhG2gljfP
-E16MUSbYwCjCuLpU76ZgFpQL17TLn+1hehhCjihqSIL3mWK09W95Gyxj9xrzG7fM
-gLgzwsZk/r3qh1Y2Mef+47FD4Om5conFeoqdJCyH59LJQ0zZVG8Ldr/tYYvcKvTb
-pxqGjaYQ3eOAVgVJPvqHpMeWETA34HUfOVDZHtM2w03KeHR4Tlxa/opdIrmZchzk
-0ETdYPy/t6AfbJ+avbIbH8rJUd6ifblrKUqGyrc+gJ5435T3YowGVGpVVRZQyyfg
-uRP+CIOIRgQYEQIABgUCO1hObgAKCRCF1FBFa2kbA5t6AJ9B0laWrFnyRvVGo/NV
-QHmv6xkKhwCbBo5yKzSSgAUpfzjAw5PKW481T6g=
-=nJcP
+wu/j4kSIRgQQEQIABgUCO1wQigAKCRD05kd+98Xhk/nFAKDPr/T/knlIoray7RDO
+cqjTlUTncACeNLX6jfvow8AKnB3laC/Ymrt+ASmIRgQQEQIABgUCPEXRvwAKCRCz
+/c1UhFFFUb7QAJ9aSw93GcOUCKkayV3iH3HgZAt1/ACg5xpMDxm8WpZ6q89RtSN0
+HSMiBQmIRgQQEQIABgUCPxU2kwAKCRC0EDmiWTkEzOMpAJ9xwYSASXStYKGlGFr+
+AMWsDg/1/wCeKtdBHOIcI/zgr6D6+xAxNegGJwSIRgQQEQIABgUCP8tZNgAKCRDH
+9XXLUPkQeNMGAJwNMgkXVgrUicL+wr5cCKfLrMKXuACgtOMBUMGTy+/i+ocQkG1S
+3KPTtMuIRgQTEQIABgUCPjaxlwAKCRAL8GQSYLofR/pQAJsEcOIcAgWv2cMiiAFb
+QtjXggpZEQCgpQWcE8tHGi+42R7zQy7wH+1i/siIRgQTEQIABgUCP6FL2wAKCRD9
+LjUgMMgeauw2AJ9wqTN/auShtbpRZOC/NoxtsYg/9wCcDWoEYJ14cQ+2Wilc5x/A
+OhDL7ASIRgQTEQIABgUCQF8aXwAKCRCFt2wt19VfGh/gAJ9VSfwUs10rKN7QjVi0
+Ro+9U22VTQCgnsmdxivQAiC3tVXKwLFoLGZWbuCIVwQTEQIAFwUCO1hOQQULBwoD
+BAMVAwIDFgIBAheAAAoJEIXUUEVraRsDU1cAn3W3KI6pFIZ3Tqv2X5FUzRV/StQT
+AKCC+oelCEntN8wlOYx6/jy24NfijYhaBBMRAgAaBQsHCgMEAxUDAgMWAgECF4AF
+AkEYjrUCGQEACgkQhdRQRWtpGwN77QCghQMNJImV8v37n32a+5FCELO9c+kAniw2
+TeeriYrXOMC3DGJPX9GCuN6MuQINBDtYTm4QCADV+Uzv3A1miqiGkkc+Dco06R4L
+SA0Kc0/A/eCjp0Zmj9AeOqXDcT+tvs0VyD94hxSkxorbNhKBqrMP9mPkuEcbS/+u
+vcpMW+Fu07QcBxvZlxLIKIhKJeXspSoTRzntmVMJuQSKtz0z8sLnnoTDAewOHKoP
+pPjwy8om88+pb2Cq6aFb2l3s31/JOrzpokSFsms4RBtyjo4kt358yPqmFx1Iolox
+sfwjPg3Ac3Lr3m1uXo9XsAeztKoyL8c7iXqfymDup++PAi2Ki8xeZpEmtEggVnCt
+i7345To8aeJgkrJSD3iTtg2xngbJs4QllddA6mXXbPbd0+7QQCq+ekALMFB7AAMF
+B/91J91ABItrYJ+wppTrjOpdossZtHU+Ma81Mwa4Tx1CqWNvL1L9whZ/t6r4b/xd
+kuejnvo244RtoJY3zxNejFEm2MAowri6VO+mYBaUC9e0y5/tYXoYQo4oakiC95li
+tPVveRssY/ca8xu3zIC4M8LGZP696odWNjHn/uOxQ+DpuXKJxXqKnSQsh+fSyUNM
+2VRvC3a/7WGL3Cr026caho2mEN3jgFYFST76h6THlhEwN+B1HzlQ2R7TNsNNynh0
+eE5cWv6KXSK5mXIc5NBE3WD8v7egH2yfmr2yGx/KyVHeon25aylKhsq3PoCeeN+U
+92KMBlRqVVUWUMsn4LkT/giDiEYEGBECAAYFAjtYTm4ACgkQhdRQRWtpGwObegCf
+QdJWlqxZ8kb1RqPzVUB5r+sZCocAmwaOcis0koAFKX84wMOTyluPNU+o
+=M8uk
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>

==== //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#25 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/share/pgpkeys/pgpkeys-developers.sgml,v 1.107 2009/07/20 15:09:52 yzlin Exp $
+     $FreeBSD: doc/share/pgpkeys/pgpkeys-developers.sgml,v 1.108 2009/08/10 16:55:15 fluffy Exp $
 -->
 
     <sect2 id="pgpkey-ariff">
@@ -971,6 +971,11 @@
       &pgpkey.hmp;
     </sect2>
 
+    <sect2 id="pgpkey-fluffy">
+      <title>&a.fluffy;</title>
+      &pgpkey.fluffy;
+    </sect2>
+
     <sect2 id="pgpkey-sat">
       <title>&a.sat;</title>
       &pgpkey.sat;

==== //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#22 (text+ko) ====

@@ -1,5 +1,5 @@
 

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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200908240637.n7O6bIFo011280>