PERFORCE change 198618 for review

Tue Sep 6 06:38:30 UTC 2011

http://p4web.freebsd.org/@@198618?ac=10

Change 198618 by rene at rene_acer on 2011/09/06 06:37:49

	IFC

Affected files ...

.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#103 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/pr-guidelines/article.sgml#8 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#26 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml#24 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#14 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/Makefile#3 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#111 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/mailing-lists.ent#22 integrate
.. //depot/projects/docproj_nl/share/images/callouts/1.png#2 integrate
.. //depot/projects/docproj_nl/share/images/callouts/10.png#2 integrate
.. //depot/projects/docproj_nl/share/images/callouts/11.png#2 integrate
.. //depot/projects/docproj_nl/share/images/callouts/12.png#2 integrate
.. //depot/projects/docproj_nl/share/images/callouts/13.png#2 integrate
.. //depot/projects/docproj_nl/share/images/callouts/14.png#2 integrate
.. //depot/projects/docproj_nl/share/images/callouts/15.png#2 integrate
.. //depot/projects/docproj_nl/share/images/callouts/16.png#1 branch
.. //depot/projects/docproj_nl/share/images/callouts/17.png#1 branch
.. //depot/projects/docproj_nl/share/images/callouts/18.png#1 branch
.. //depot/projects/docproj_nl/share/images/callouts/19.png#1 branch
.. //depot/projects/docproj_nl/share/images/callouts/2.png#2 integrate
.. //depot/projects/docproj_nl/share/images/callouts/20.png#1 branch
.. //depot/projects/docproj_nl/share/images/callouts/21.png#1 branch
.. //depot/projects/docproj_nl/share/images/callouts/22.png#1 branch
.. //depot/projects/docproj_nl/share/images/callouts/23.png#1 branch
.. //depot/projects/docproj_nl/share/images/callouts/24.png#1 branch
.. //depot/projects/docproj_nl/share/images/callouts/25.png#1 branch
.. //depot/projects/docproj_nl/share/images/callouts/26.png#1 branch
.. //depot/projects/docproj_nl/share/images/callouts/27.png#1 branch
.. //depot/projects/docproj_nl/share/images/callouts/28.png#1 branch
.. //depot/projects/docproj_nl/share/images/callouts/29.png#1 branch
.. //depot/projects/docproj_nl/share/images/callouts/3.png#2 integrate
.. //depot/projects/docproj_nl/share/images/callouts/30.png#1 branch
.. //depot/projects/docproj_nl/share/images/callouts/4.png#2 integrate
.. //depot/projects/docproj_nl/share/images/callouts/5.png#2 integrate
.. //depot/projects/docproj_nl/share/images/callouts/6.png#2 integrate
.. //depot/projects/docproj_nl/share/images/callouts/7.png#2 integrate
.. //depot/projects/docproj_nl/share/images/callouts/8.png#2 integrate
.. //depot/projects/docproj_nl/share/images/callouts/9.png#2 integrate
.. //depot/projects/docproj_nl/share/images/callouts/gen.sh#1 branch
.. //depot/projects/docproj_nl/www/en/advocacy/index.sgml#3 integrate
.. //depot/projects/docproj_nl/www/en/layout/js/google.js#3 integrate
.. //depot/projects/docproj_nl/www/en/marketing/Makefile#2 integrate
.. //depot/projects/docproj_nl/www/en/marketing/index.sgml#2 integrate
.. //depot/projects/docproj_nl/www/en/marketing/os-comparison.sgml#3 delete
.. //depot/projects/docproj_nl/www/en/platforms/ppc.sgml#8 integrate
.. //depot/projects/docproj_nl/www/en/where.sgml#12 integrate
.. //depot/projects/docproj_nl/www/share/sgml/news.xml#116 integrate

Differences ...

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

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.1016 2011/08/28 17:56:27 rakuco Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.1017 2011/09/02 14:25:41 culot Exp $ -->
 <!--
 	NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical
 	order by first name.
@@ -8237,6 +8237,11 @@
     </listitem>
 
     <listitem>
+      <para>Ralf Gebhart
+	<email>gebhart at secnetix.de</email></para>
+    </listitem>
+
+    <listitem>
       <para>Ralf van Dooren
 	<email>r.vdooren at snow.nl</email></para>
     </listitem>

==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/pr-guidelines/article.sgml#8 (text+ko) ====

@@ -15,7 +15,7 @@
   <articleinfo>
     <title>Problem Report Handling Guidelines</title>
 
-    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/pr-guidelines/article.sgml,v 1.37 2011/05/14 20:44:31 hrs Exp $</pubdate>
+    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/pr-guidelines/article.sgml,v 1.38 2011/09/01 16:35:16 ryusuke Exp $</pubdate>
 
     <legalnotice id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
@@ -666,9 +666,9 @@
 
 	    <row>
 	      <entry>port which is maintained by
-		openoffice at FreeBSD.org</entry>
+		office at FreeBSD.org</entry>
 	      <entry>ports</entry>
-	      <entry>freebsd-openoffice</entry>
+	      <entry>freebsd-office</entry>
 	      <entry>mailing list</entry>
 	    </row>
 

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

@@ -1,6 +1,6 @@
 <!--
      The FreeBSD Documentation Project
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml,v 1.111 2011/08/25 11:33:22 ryusuke Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml,v 1.114 2011/09/03 18:27:07 ryusuke Exp $
 -->
 
 <chapter id="desktop">
@@ -21,8 +21,8 @@
 
     <para>FreeBSD can run a wide variety of desktop applications, such
       as browsers and word processors.  Most of these are available as
-      packages or can be automatically built from the ports
-      collection.  Many new users expect to find these kinds of
+      packages or can be automatically built from the Ports Collection.
+      Many new users expect to find these kinds of
       applications on their desktop.  This chapter will show you how
       to install some popular desktop applications effortlessly,
       either from their packages or from the Ports Collection.</para>
@@ -520,8 +520,8 @@
 
       <screen>&prompt.root; <userinput>pkg_add -r koffice</userinput></screen>
 
-      <para>If the package is not available, you can use the ports
-        collection.  For instance, to install
+      <para>If the package is not available, you can use the Ports Collection.
+	For instance, to install
         <application>KOffice</application> for
         <application>KDE3</application>, do:</para>
 
@@ -888,8 +888,7 @@
 
       <screen>&prompt.root; <userinput>pkg_add -r gv</userinput></screen>
 
-      <para>If you cannot get the package, you can use the Ports
-        collection:</para>
+      <para>If you cannot get the package, you can use the Ports Collection:</para>
 
       <screen>&prompt.root; <userinput>cd /usr/ports/print/gv</userinput>
 &prompt.root; <userinput>make install clean</userinput></screen>
@@ -1035,8 +1034,7 @@
 
       <screen>&prompt.root; <userinput>pkg_add -r gnucash</userinput></screen>
 
-      <para>If the package is not available, you can use the ports
-        collection:</para>
+      <para>If the package is not available, you can use the Ports Collection:</para>
 
       <screen>&prompt.root; <userinput>cd /usr/ports/finance/gnucash</userinput>
 &prompt.root; <userinput>make install clean</userinput></screen>
@@ -1069,8 +1067,8 @@
 
       <screen>&prompt.root; <userinput>pkg_add -r gnumeric</userinput></screen>
 
-      <para>If the package is not available, you can use the ports
-        collection by doing:</para>
+      <para>If the package is not available, you can use the Ports Collection
+	by doing:</para>
 
       <screen>&prompt.root; <userinput>cd /usr/ports/math/gnumeric</userinput>
 &prompt.root; <userinput>make install clean</userinput></screen>
@@ -1098,8 +1096,8 @@
 
       <screen>&prompt.root; <userinput>pkg_add -r abacus</userinput></screen>
 
-      <para>If the package is not available, you can use the ports
-        collection by doing:</para>
+      <para>If the package is not available, you can use the Ports Collection
+	by doing:</para>
 
       <screen>&prompt.root; <userinput>cd /usr/ports/deskutils/abacus</userinput>
 &prompt.root; <userinput>make install clean</userinput></screen>
@@ -1144,7 +1142,7 @@
     <para>While FreeBSD is popular among ISPs for its performance and
       stability, it is quite ready for day-to-day use as a desktop.
       With several thousand applications available as
-      <ulink url="http://www.FreeBSD.org/where.html">packages</ulink> or
+      <ulink url="http://www.FreeBSD.org/applications.html">packages</ulink> or
       <ulink url="http://www.FreeBSD.org/ports/index.html">ports</ulink>,
       you can build a perfect desktop that suits all your needs.</para>
 
@@ -1176,7 +1174,7 @@
 
 	  <row>
             <entry><application>KOffice</application></entry>
-	    <entry><literal>koffice-kde3</literal></entry>
+	    <entry><literal>koffice</literal></entry>
 	    <entry><filename role="package">editors/koffice-kde3</filename></entry>
 	  </row>
 

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

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml,v 1.209 2011/07/23 21:39:12 gjb Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml,v 1.210 2011/09/01 17:18:10 ryusuke Exp $
 -->
 
 <appendix id="eresources">
@@ -411,12 +411,6 @@
 	    </row>
 
 	    <row>
-	      <entry>&a.openoffice.name;</entry>
-	      <entry>Porting <application>OpenOffice.org</application> and
-		<application>&staroffice;</application> to FreeBSD</entry>
-	    </row>
-
-	    <row>
 	      <entry>&a.performance.name;</entry>
 	      <entry>Performance tuning questions for high
 		performance/load installations</entry>
@@ -1426,18 +1420,6 @@
 	</varlistentry>
 
 	<varlistentry>
-	  <term>&a.openoffice.name;</term>
-
-	  <listitem>
-	    <para><emphasis>OpenOffice.org</emphasis></para>
-
-	    <para>Discussions concerning the porting and maintenance
-	      of <application>OpenOffice.org</application> and
-	      <application>&staroffice;</application>.</para>
-	   </listitem>
-	</varlistentry>
-
-	<varlistentry>
 	  <term>&a.performance.name;</term>
 
 	  <listitem>

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

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml,v 1.197 2011/05/27 11:02:03 avg Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml,v 1.199 2011/09/05 14:54:35 ryusuke Exp $
 -->
 
 <chapter id="kernelconfig">
@@ -233,7 +233,7 @@
       page:</para>
 
     <programlisting>Alternatively, to load the driver as a module at boot time, place the
-following line in &man.loader.conf.5:
+following line in &man.loader.conf.5;:
 
     if_ath_load="YES"</programlisting>
 
@@ -725,7 +725,7 @@
       <para>Kernels making use of <literal>PROCFS</literal> must also
         include support for <literal>PSEUDOFS</literal>.</para>
 
-    <programlisting>options          GEOM_GPT          # GUID Partition Tables.</programlisting>
+    <programlisting>options          GEOM_PART_GPT     # GUID Partition Tables.</programlisting>
 
     <para>This option brings the ability to have a large number of
       partitions on a single disk.</para>
@@ -962,7 +962,7 @@
 device          ciss       # Compaq Smart RAID 5*
 device          dpt        # DPT Smartcache III, IV - See NOTES for options
 device          hptmv      # Highpoint RocketRAID 182x
-device          rr232x     # Highpoint RocketRAID 232x
+device          hptrr      # Highpoint RocketRAID 17xx, 22xx, 23xx, 25xx
 device          iir        # Intel Integrated RAID
 device          ips        # IBM (Adaptec) ServeRAID
 device          mly        # Mylex AcceleRAID/eXtremeRAID

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/Makefile#3 (text+ko) ====

@@ -1,5 +1,5 @@
 # 
-# $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/Makefile,v 1.8 2011/07/08 16:08:33 ryusuke Exp $
+# $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/Makefile,v 1.9 2011/09/05 13:26:06 dougb Exp $
 #
 # Build the FreeBSD Porter's Handbook.
 #
@@ -41,6 +41,12 @@
 IMAGES_LIB+=	callouts/13.png
 IMAGES_LIB+=	callouts/14.png
 IMAGES_LIB+=	callouts/15.png
+IMAGES_LIB+=	callouts/16.png
+IMAGES_LIB+=	callouts/17.png
+IMAGES_LIB+=	callouts/18.png
+IMAGES_LIB+=	callouts/19.png
+IMAGES_LIB+=	callouts/20.png
+IMAGES_LIB+=	callouts/21.png
 
 URL_RELPREFIX?=	../../../..
 DOC_PREFIX?= ${.CURDIR}/../../..

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#111 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.1115 2011/08/15 06:06:40 linimon Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.1116 2011/09/05 12:00:45 dougb Exp $
 -->
 
 <!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -9897,60 +9897,60 @@
 	<sect2 id="security-notify-vuxml-db">
 	  <title>The VuXML database</title>
 
-	  <para>A very important and urgent step to take as early as
-	    a security vulnerability is discovered is to notify the
+	  <para>A very important and urgent step to take as early after
+	    a security vulnerability is discovered as possible is to notify the
 	    community of port users about the jeopardy.  Such
 	    notification serves two purposes.  First, should the danger
-	    be really severe, it will be wise to apply an instant workaround,
-	    e.g., stop the affected network service or even deinstall
-	    the port completely, until the vulnerability is closed.
+	    be really severe it will be wise to apply an instant workaround.
+	    E.g., stop the affected network service or even deinstall
+	    the port completely until the vulnerability is closed.
 	    Second, a lot of users tend to upgrade installed packages
-	    just occasionally.  They will know from the notification
+	    only occasionally.  They will know from the notification
 	    that they <emphasis>must</emphasis> update the package
 	    without delay as soon as a corrected version is available.</para>
 
-	  <para>Given the huge number of ports in the tree,
+	  <para>Given the huge number of ports in the tree
 	    a security advisory cannot be issued on each incident
 	    without creating a flood and losing the attention of
-	    the audience by the time it comes to really serious
+	    the audience when it comes to really serious
 	    matters.  Therefore security vulnerabilities found in
 	    ports are recorded in <ulink
 	    url="http://vuxml.freebsd.org/">the FreeBSD VuXML
 	    database</ulink>.  The Security Officer Team members
-	    are monitoring it for issues requiring their
+	    also monitor it for issues requiring their
 	    intervention.</para>
 
-	  <para>If you have committer rights, you can update the VuXML
+	  <para>If you have committer rights you can update the VuXML
 	    database by yourself.  So you will both help the Security
 	    Officer Team and deliver the crucial information to the
 	    community earlier.  However, if you are not a committer,
 	    or you believe you have found an exceptionally severe
-	    vulnerability, or whatever, please do not hesitate to
+	    vulnerability please do not hesitate to
 	    contact the Security Officer Team directly as described
 	    on the <ulink
 	    url="http://www.freebsd.org/security/#how">FreeBSD
 	    Security Information</ulink> page.</para>
 
-	  <para>All right, you elected the hard way.  As it may be obvious
-	    from its title, the VuXML database is essentially an
+	  <para>As may be obvious
+	    from its title the VuXML database is an
 	    XML document.  Its source file <filename>vuln.xml</filename>
 	    is kept right inside the port <filename
 	    role="package">security/vuxml</filename>.  Therefore
 	    the file's full pathname will be
 	    <filename><envar>PORTSDIR</envar>/security/vuxml/vuln.xml</filename>.
 	    Each time you discover a security vulnerability in a
-	    port, please add an entry for it to that file.
+	    port please add an entry for it to that file.
 	    Until you are familiar with VuXML, the best thing you can
 	    do is to find an existing entry fitting your case, then copy
-	    it and use as a template.</para>
+	    it and use it as a template.</para>
 	</sect2>
 
 	<sect2 id="security-notify-vuxml-intro">
 	  <title>A short introduction to VuXML</title>
 
-	  <para>The full-blown XML is complex and far beyond the scope of
+	  <para>The full-blown XML format is complex, and far beyond the scope of
 	    this book.  However, to gain basic insight on the structure
-	    of a VuXML entry, you need only the notion of tags.  XML
+	    of a VuXML entry you need only the notion of tags.  XML
 	    tag names are enclosed in angle brackets.  Each opening
 	    &lt;tag&gt; must have a matching closing &lt;/tag&gt;.
 	    Tags may be nested.  If nesting, the inner tags must be
@@ -9958,7 +9958,7 @@
 	    tags, i.e.  more complex rules of nesting them.  Sounds
 	    very similar to HTML, doesn't it?  The major difference
 	    is that XML is e<emphasis>X</emphasis>tensible, i.e. based
-	    on defining custom tags.  Due to its intrinsic structure,
+	    on defining custom tags.  Due to its intrinsic structure
 	    XML puts otherwise amorphous data into shape.  VuXML is
 	    particularly tailored to mark up descriptions of security
 	    vulnerabilities.</para>
@@ -10014,7 +10014,7 @@
   &lt;/dates&gt;
 &lt;/vuln&gt;</programlisting>
 
-	  <para>The tag names are supposed to be self-descriptive,
+	  <para>The tag names are supposed to be self-explanatory
 	    so we shall take a closer look only at fields you will need
 	    to fill in by yourself:</para>
 
@@ -10027,12 +10027,7 @@
 		for each new VuXML entry (and do not forget to substitute
 		it for the template UUID unless you are writing the
 		entry from scratch).  You can use &man.uuidgen.1; to
-		generate a VuXML UUID; alternatively, if you are using
-		FreeBSD 4.x, you may install the port <filename
-		role="package">devel/p5-Data-UUID</filename> and issue
-		the following command:</para>
-
-	      <programlisting>perl -MData::UUID -le 'print lc new Data::UUID-&gt;create_str'</programlisting>
+		generate a VuXML UUID.</para>
 	    </callout>
 
 	    <callout arearefs="co-vx-top">
@@ -10223,26 +10218,37 @@
 	    vulnerability in the package <literal>clamav</literal>
 	    that has been fixed in version <literal>0.65_7</literal>.</para>
 
-	  <para>As a prerequisite, you need to install fresh versions of the
-	    ports <filename role="package">ports-mgmt/portaudit</filename> and
-	    <filename role="package">ports-mgmt/portaudit-db</filename>.</para>
+	  <para>As a prerequisite, you need to <emphasis>install</emphasis> fresh versions of the
+	    ports <filename role="package">ports-mgmt/portaudit</filename>,
+	    <filename role="package">ports-mgmt/portaudit-db</filename>, and
+	    <filename role="package">security/vuxml</filename>.</para>
+
+	  <note>
+	    <para>To run <command>packaudit</command> you must have
+	      permission to write to its
+	      <filename><makevar>DATABASEDIR</makevar></filename>,
+	      typically <filename>/var/db/portaudit</filename>.</para>
+
+	    <para>To use a different directory set the
+	      <filename><makevar>DATABASEDIR</makevar></filename>
+	      environment variable to a different location.</para>
+
+	    <para>If you are working in a directory other than
+	      <filename>${PORTSDIR}/security/vuxml</filename> set the
+	      <filename><makevar>VUXMLDIR</makevar></filename>
+	      environment variable to the directory where
+	      <filename>vuln.xml</filename> is located.</para>
+	  </note>
 
 	  <para>First, check whether there already is an entry for this
-	    vulnerability.  If there were such entry, it would match the
+	    vulnerability.  If there were such an entry, it would match the
 	    previous version of the package,
 	    <literal>0.65_6</literal>:</para>
 
 	  <screen>&prompt.user; <userinput>packaudit</userinput>
 &prompt.user; <userinput>portaudit clamav-0.65_6</userinput></screen>
 
-	  <note>
-	    <para>To run <command>packaudit</command>, you must have
-	      permission to write to its
-	      <filename><makevar>DATABASEDIR</makevar></filename>,
-	      typically <filename>/var/db/portaudit</filename>.</para>
-	  </note>
-
-	  <para>If there is none found, you get the green light to add
+	  <para>If there is none found, you have the green light to add
 	    a new entry for this vulnerability.  Now you can generate
 	    a brand-new UUID (assume it's
 	    <literal>74a9541d-5d6c-11d8-80e3-0020ed76ef5a</literal>) and

==== //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/mailing-lists.ent#22 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      Names of FreeBSD mailing lists and related software.
 
-     $FreeBSD: doc/en_US.ISO8859-1/share/sgml/mailing-lists.ent,v 1.80 2011/07/23 21:39:12 gjb Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/share/sgml/mailing-lists.ent,v 1.81 2011/09/01 17:18:10 ryusuke Exp $
 -->
 
 <!ENTITY a.mailman.listinfo "http://lists.FreeBSD.org/mailman/listinfo">
@@ -311,10 +311,6 @@
 <!ENTITY a.office "<ulink url='&a.office.url;'>Office applications on FreeBSD</ulink>">
 <!ENTITY a.office.name "<ulink url='&a.office.url;'>freebsd-office</ulink>">
 
-<!ENTITY a.openoffice.url "&a.mailman.listinfo;/freebsd-openoffice">
-<!ENTITY a.openoffice "<ulink url='&a.openoffice.url;'>FreeBSD OpenOffice mailing list</ulink>">
-<!ENTITY a.openoffice.name "<ulink url='&a.openoffice.url;'>freebsd-openoffice</ulink>">
-
 <!ENTITY a.performance.url "&a.mailman.listinfo;/freebsd-performance">
 <!ENTITY a.performance "<ulink url='&a.performance.url;'>FreeBSD performance mailing list</ulink>">
 <!ENTITY a.performance.name "<ulink url='&a.performance.url;'>freebsd-performance</ulink>">

==== //depot/projects/docproj_nl/share/images/callouts/1.png#2 (text+ko) ====

@@ -1,3 +1,5 @@
 ‰PNG
 
-\ No newline at end of file
++”øñÅÐÌgÑõü ¦à–rþñ…aò“=ðÂ¥?ÿÿ+|†èš|”Á|ˆÁX¦¾.£!a>;f¶B(Êí‹UÂ‡Á|66	óù k°H+êAç§OÀ>ÉG`ÌãNåN5_4ùè 1\ No newline at end of file

==== //depot/projects/docproj_nl/share/images/callouts/10.png#2 (text+ko) ====

@@ -1,3 +1,5 @@
 ‰PNG
 
-\ No newline at end of file
++˜cô:|.=}
+”øñÅÐUÀõ”dr"ßš3þ´þ‰Z6ïÇ†ÉGfùÔššÄÀP4ãcˆ´Séõ‹SÌÉùè}H,.8ö‘Áàõÿÿ{¸CØgC$6NÞ5‘AUæÿÿ Tn_„ÄŠ_×20è¼ýÿßsƒùl„DƒÝ‹Çè}&EHÈÎy©ühù7ÏÙ·&_\ No newline at end of file

==== //depot/projects/docproj_nl/share/images/callouts/11.png#2 (text+ko) ====

@@ -1,5 +1,4 @@
 ‰PNG
 
--tEXtCopyright-êÜ ë•ûñ‹3çÌœÃˆÖuíºNMÓp†ˆˆhš¦$ITUÝ††aTUE@DëºÞn7]×mÛÀó|EÇ=ŸÏoQ–e×ëõý~E¡ëzY–}ß¡m["â\ No newline at end of file
++”øñÅÐUÀõ”dr"XôjÊÑª†Î?¾0L>2ûÈg ÖÔ$Ë	÷þ¼ÓÌÀ0ù(ƒù"9½/	î\¾E* 	óéÜ!ì³! 0¡$åöÅ*áÃ`>›„ù|5X$&9×…QQ•Ÿ"!ZªpÀÐè\ Ÿº xÐùé°ÏAò$ó¸S¹SÍM>úã#H\ No newline at end of file

==== //depot/projects/docproj_nl/share/images/callouts/12.png#2 (text+ko) ====

@@ -1,5 +1,4 @@
 ‰PNG
 
--tEXtCopyright-3,ü+KV-¶™-³òeƒÅmç†ÝëåÞpïSÏyyB\ No newline at end of file
++XCõÍú(ñã‹¡«€ë)ÉäD‰W·öüiý»ÿò§_¾“Ì>ò¨55‰¡fççPéa_þ<–Ï`¾HÎGïDÂuqê®ÿÿK¾0p‡00°Ï†H€€dá©™G¯D2pû"K¸ì}a¾b?¯'·ƒùl„„ñ‘Ÿ?çûÊ~”µt`f˜|!1ñå(¸¥r®£¢+??Ð¹ÕXA0ÜëïsŸº0 Cç§OÀ>ÉG`ÌãNåN5_4ùè 1\ No newline at end of file

==== //depot/projects/docproj_nl/share/images/callouts/13.png#2 (text+ko) ====

@@ -1,5 +1,4 @@
 ‰PNG
 
--tEXtCopyright-Qu]ÿªÛn·\ No newline at end of file
++Øvlõxú(ñã‹¡«€ë)ÉäDÙ÷ßý>ñ÷Én_&™}ä3PkjCíÌGü•ÍÞ?Óçp2˜/’óÑû‘P4Ñ]È®2#ðF¿Uwûlˆlsý/Ðúƒ{·/ªãÜ¸ÛÿòÌg#$z/¼ÅôÛIôÿÿbs†ÉG&¹_yïù|ÞsÔtÆ	s]ÕXùùAÉÜŒV÷Üf®t.ÐƒO]€¡óÓ'`Ÿƒä#0Hæq§r§š/š|ôÇG\ No newline at end of file

==== //depot/projects/docproj_nl/share/images/callouts/14.png#2 (text+ko) ====

@@ -1,3 +1,4 @@
 ‰PNG
 
-\ No newline at end of file
++”øñÅÐUÀõ”dr"D8…û×Ûýq?¾0L>2ûÈg ÖÔ$°Ðî»ÞÜŸÌ4ù(ƒù"9½/0‰ivÅŸnþšÌd>;„}6DÂhÛ¹Ë¬ 	 (·/BbìA¯©Ý.µng0ŸÈ÷˜5wÖÜ®\Í¬e\ No newline at end of file

==== //depot/projects/docproj_nl/share/images/callouts/15.png#2 (text+ko) ====

@@ -1,6 +1,5 @@
 ‰PNG
 
--tEXtCopyright-Ã-€	‚Ðï÷xžçû¾ã8·ÛmÈ”‘L\ No newline at end of file
++”øñÅÐUÀõ”dr"PŒû©ê¯·¿Þþ>÷Ûœaò‘ÙG>µ¦&10«ëµ02µ2Þ;5œÁ|‘œÞˆ„5ë‹s-ÛføÈ|:wûlˆDÂ‡ÏíKNT¿ž.ñ‡Û!Á"Ëî´¼åÿvóÙ‰¼ð	×|Îÿ?ŸnÆ0ù(BÂyþOÛ[ß2VËL¹
+r®£¢+??ÈJ…1eŽQÆ~?¾€<øÄÐÅƒÎOŸ€}’À ™ÇÊj¾hòÑAb\ No newline at end of file

==== //depot/projects/docproj_nl/share/images/callouts/2.png#2 (text+ko) ====

@@ -1,4 +1,4 @@
 ‰PNG
 
--]£°°Ð+†f„¬ÐK
UÉG¤{º÷u¸ÛÖkí»¹ãSàÞ@¦cB»æïSCá¸hS‰øž¤{ë2y–4Cm¬s^ö¹% ÐûD¯§+O£ŽJ)}‹:TÙ5`Ÿ/£\ No newline at end of file
++ª(Û[\ No newline at end of file

==== //depot/projects/docproj_nl/share/images/callouts/3.png#2 (text+ko) ====

@@ -1,6 +1,3 @@
 ‰PNG
 
--»F``¨a ¡+§&–ÞÓU¹¹ª²
-qXÒ çqî
-Kà¢µ‚Ð\ No newline at end of file
+\ No newline at end of file

==== //depot/projects/docproj_nl/share/images/callouts/4.png#2 (text+ko) ====

@@ -1,4 +1,5 @@
 ‰PNG
 
--KªF¾ê6Ž[ê¼Ã\ No newline at end of file
++”øñÅÐ" ÿ¥õ².XÊùÇ†ÉG 
+«v¸>à¾^áL>Ê`¾Â|²={ZLÂ|:wˆÁÍq½MÅfj7L(Êíb¤¯»»j÷å]ï•"ÌÀ>æ³A×Ï³æÎš{õÚû÷ÑÆ`£æƒ¬„Q@'ë“3“ÿv®+Ð¹@>AHA|ñô	ØçÀ ù’yÜ©Ü©æ‹&ýñ$\ No newline at end of file

==== //depot/projects/docproj_nl/share/images/callouts/5.png#2 (text+ko) ====

@@ -1,4 +1,5 @@
 ‰PNG
 
--†ª—ðõ†~+_Bh  áýIlgvö’—ÅÏM‚áÖZmÖÃmã†Àwb$|SÜq$Ìñ^€%Ô)%¤•°ÞÔèõYP3ö]2QÙjµ%—›õ|ç#[7/B_û\ No newline at end of file
++”øñÅÐÄ]$óë-:—¥œ|a˜|¢îì©ÔG¦V¦V|þ Þä£æ‹@æÕŸÎÏZºa_D'ˆo>;Äëÿé°èôR¡‡íîø@Qn_ƒñ Ç†Œk_§·jƒ%|Ìgƒöjë	
+þ:¥ø:Ø¨ù k€@ôÔ£KÏJ^~¾Ã"2lùs]@Lþß¡þÜ`Ÿ¸ôàˆÜƒÎOŸ€}’À ™ÇÊj¾hòÑAb\ No newline at end of file

==== //depot/projects/docproj_nl/share/images/callouts/6.png#2 (text+ko) ====

@@ -1,6 +1,4 @@
 ‰PNG
 
--š
-úýFa¾PXXj˜'”ú	¡†‚‚ªÌnçnöˆˆó©ºµ„oPêHÈÜl\BuNØ«ð!‹«i`¥À°ÞûdÂÝÛ'äì× ¿ç,ÃË–eøÔ¸g¡NL©¤Lï<
ÿV‘õðˆ?³s8ê
-¸Y\ No newline at end of file
++”øñÅÐ$œ¨ó³ð÷†;OÄcRÎ?¾0L>æÚÿþBÞ~ã®ý¦Å þä£æ‹@«7ÿÿ†•Þ3ýÏ\ No newline at end of file

==== //depot/projects/docproj_nl/share/images/callouts/7.png#2 (text+ko) ====

@@ -1,4 +1,4 @@
 ‰PNG
 
--Hdä‘+‰H¾äò’£ší‡“ ×e
_ÊÐpD—²ã„l½ðC›0T+ÈÊ«+¤®	’VA†jÝ“ ƒ{ŒO•9ølsLGÉIÉz¼ó>61¿GVS\ No newline at end of file
++”øñÅÐ•!>ý×[\ê”rþñ…aò*[S+S«?•ƒ~€ø“2˜/‚Á8sï–¹Ë„@lóéÜ!0‰ Ê/ŸÅ, l (·/Tœe_ó<˜"nóÙ&ïÕ?ª!0	óù kÀÀºòÿg0	 “€Îu1yøÕX™¡†®@ç=ø"÷ óÓ'`Ÿƒä#0Hæq§r§š/š|ôÇG\ No newline at end of file

==== //depot/projects/docproj_nl/share/images/callouts/8.png#2 (text+ko) ====

@@ -1,5 +1,3 @@
 ‰PNG
 
--–†v…Â¬Ð¼‚a` ×544T¥
-é?Ý»/TõÜ—¸W[Ð‘!DØº…õ¹[`TÈ3Ð(”fñ•põçï¹g¿ˆcµÁÙ3Á1–Ø¿.0µ”>Š¸ú_ê³
+U9Æäïü\ No newline at end of file
+\ No newline at end of file

==== //depot/projects/docproj_nl/share/images/callouts/9.png#2 (text+ko) ====

@@ -1,4 +1,4 @@
 ‰PNG
 
--È^Y¹’kTb++#³©É{“?/ù˜YÙ—y/j†é!ÀÚRj»”Ç+“~ “àöEœ#y@„§·öà·‘š!âî¦s².Ôg±þ…E±‡íÒëOÍr/¯óŒP8bÙÒû\ No newline at end of file
++‡þz9€M˜²„#M~šôöäþf°åG@Îu1®†[ûF³©Ø†®@ç=ø"†ÎOŸ€}’À ™ÇÊj¾hòÑAb\ No newline at end of file

==== //depot/projects/docproj_nl/www/en/advocacy/index.sgml#3 (text+ko) ====

@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/en/advocacy/index.sgml,v 1.18 2011/08/18 01:10:39 gjb Exp $">
+<!ENTITY date "$FreeBSD: www/en/advocacy/index.sgml,v 1.19 2011/09/05 18:52:08 gjb Exp $">
 <!ENTITY title "FreeBSD Advocacy Project">
 <!ENTITY % navinclude.about "INCLUDE">
 ]>
@@ -63,12 +63,6 @@
           comprehensive directory of the web by relying on a vast army of
           volunteer editors.</li>
 
-        <li><a href="&base;/marketing/os-comparison.html"
-          name="freebsdvslinuxvswin2k">FreeBSD vs. Linux vs. Windows 2000</a>
-          is a comparison between the three operating systems which includes
-          reliability, performance, support, cost of ownership,
-          and more. (outdated)</li>
-
 	<li><a name="bsdcan" href="http://www.bsdcan.org/">BSDCan</a>, the
 	  annual BSD Conference held in Ottawa, Canada.</li>
 

==== //depot/projects/docproj_nl/www/en/layout/js/google.js#3 (text+ko) ====

@@ -1,6 +1,7 @@
-/* $FreeBSD: www/en/layout/js/google.js,v 1.7 2011/08/20 23:47:06 gjb Exp $ */
+/* $FreeBSD: www/en/layout/js/google.js,v 1.8 2011/08/31 20:00:29 simon Exp $ */
 
-var h=document.location.host;
+//var h=document.location.host;
+var h=null;
 /*
  * Check that the hosting domain is actually a FreeBSD.org domain, so
  * we don't accidentally obtain data from mirrors.

==== //depot/projects/docproj_nl/www/en/marketing/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: www/en/marketing/Makefile,v 1.2 2005/07/24 16:24:41 murray Exp $
+# $FreeBSD: www/en/marketing/Makefile,v 1.3 2011/09/05 18:52:08 gjb Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
@@ -7,6 +7,6 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS?=	index.sgml os-comparison.sgml
+DOCS?=	index.sgml
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"

==== //depot/projects/docproj_nl/www/en/marketing/index.sgml#2 (text+ko) ====

@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/en/marketing/index.sgml,v 1.11 2008/02/03 11:29:04 jkois Exp $">
+<!ENTITY date "$FreeBSD: www/en/marketing/index.sgml,v 1.12 2011/09/05 18:52:08 gjb Exp $">
 <!ENTITY email 'marketing'>
 <!ENTITY title "Marketing Materials">
 <!ENTITY url.articles "../doc/en_US.ISO8859-1/articles">
@@ -36,9 +36,6 @@
 
   <li><a href="&url.articles;/explaining-bsd/article.html">Explaining BSD</a></li>
 
-  <li><a href="os-comparison.html">FreeBSD vs. Linux vs. Windows
-    2000</a> : How does your OS compare? (outdated)</li>
-
   <li><a href="&url.articles;/casestudy-argentina.com/article.html">Argentina.com : A Case Study</a></li>
 
   <li><a href="&url.articles;/wp-toolbox/article.html">Creating a Software Testing Environment Using FreeBSD</a></li>

==== //depot/projects/docproj_nl/www/en/platforms/ppc.sgml#8 (text+ko) ====

@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/en/platforms/ppc.sgml,v 1.28 2011/08/17 08:53:52 ryusuke Exp $">
+<!ENTITY date "$FreeBSD: www/en/platforms/ppc.sgml,v 1.29 2011/09/05 19:11:14 gjb Exp $">
 <!ENTITY title "FreeBSD/ppc Project">
 <!ENTITY email 'freebsd-ppc'>
 <!ENTITY % navinclude.developers "INCLUDE">
@@ -66,7 +66,7 @@
     available for download, for details on how to obtain these see the
     <a href="&base;/releases/&rel.current;R/announce.html">release announcement.</a>
     Please follow instructions given
-    <a href="http://people.freebsd.org/~grehan/iso_install.txt">here</a>.</p>
+    <a href="http://people.freebsd.org/~nwhitehorn/ppcinstall.txt">here</a>.</p>
 
   <h4><a name="3">How to use ports on FreeBSD/ppc?</a></h4>
 

==== //depot/projects/docproj_nl/www/en/where.sgml#12 (text+ko) ====

@@ -1,5 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
-<!ENTITY date "$FreeBSD: www/en/where.sgml,v 1.111 2011/08/05 22:56:39 gjb Exp $">
+<!ENTITY date "$FreeBSD: www/en/where.sgml,v 1.112 2011/09/05 19:59:57 gjb Exp $">
 <!ENTITY title "Getting FreeBSD">
 <!ENTITY % navinclude.download "INCLUDE">
 <!ENTITY url.rel "ftp://ftp.FreeBSD.org/pub/FreeBSD/releases">
@@ -175,14 +175,14 @@
 	<tr>
 	  <td></td>
 	  <td>amd64</td>
-	  <td><a href="&url.rel;/amd64/&betarel.current;-&betarel.vers;">[Distribution]</a></td>
-	  <td><a href="&url.rel;/amd64/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
+	  <td><a href="&url.rel;/amd64/amd64/&betarel.current;-&betarel.vers;">[Distribution]</a></td>
+	  <td><a href="&url.rel;/amd64/amd64/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
 	</tr>
 	<tr>
 	  <td></td>
 	  <td>i386</td>
-	  <td><a href="&url.rel;/i386/&betarel.current;-&betarel.vers;">[Distribution]</a></td>
-	  <td><a href="&url.rel;/i386/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
+	  <td><a href="&url.rel;/i386/i386/&betarel.current;-&betarel.vers;">[Distribution]</a></td>
+	  <td><a href="&url.rel;/i386/i386/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
 	</tr>
 	<tr>
 	  <td></td>

==== //depot/projects/docproj_nl/www/share/sgml/news.xml#116 (text+ko) ====

@@ -25,7 +25,7 @@
 <news>
   <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
     <cvs:keyword name="freebsd">
-      $FreeBSD: www/share/sgml/news.xml,v 1.391 2011/08/28 18:01:44 rakuco Exp $
+      $FreeBSD: www/share/sgml/news.xml,v 1.392 2011/09/03 12:47:22 gavin Exp $
     </cvs:keyword>
   </cvs:keywords>
 
@@ -88,6 +88,15 @@
       <name>7</name>
 
       <day>
+	<name>17</name>
+	<event>
+	  <p>Enhanced commit privileges: <a
+	     href="mailto:gavin at FreeBSD.org">Gavin Atkinson</a>
+	     (src, doc)</p>
+	</event>
+      </day>
+
+      <day>
 	<name>15</name>
 	<event>
 	  <p>New committer:
