PERFORCE change 143453 for review

Gabor Kovesdan gabor at FreeBSD.org
Sat Jun 14 18:08:48 UTC 2008 

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

Change 143453 by gabor at gabor_server on 2008/06/14 18:07:48

	IFC

Affected files ...

.. //depot/projects/docproj_es/doc/en_US.ISO8859-1/share/sgml/authors.ent#2 integrate
.. //depot/projects/docproj_es/doc/en_US.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#2 integrate
.. //depot/projects/docproj_es/doc/en_US.ISO8859-1/share/sgml/mailing-lists.ent#2 integrate
.. //depot/projects/docproj_es/doc/share/pgpkeys/ed.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/ivoras.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/manolis.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/pgpkeys-developers.sgml#2 integrate
.. //depot/projects/docproj_es/doc/share/pgpkeys/pgpkeys.ent#2 integrate
.. //depot/projects/docproj_es/doc/share/pgpkeys/stas.key#2 integrate
.. //depot/projects/docproj_es/doc/share/sgml/freebsd.dsl#2 integrate
.. //depot/projects/docproj_es/doc/share/sgml/man-refs.ent#2 integrate
.. //depot/projects/docproj_es/src/release/doc/en_US.ISO8859-1/readme/article.sgml#2 integrate
.. //depot/projects/docproj_es/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#2 integrate
.. //depot/projects/docproj_es/src/release/doc/share/sgml/release.ent#2 integrate
.. //depot/projects/docproj_es/www/en/Makefile#2 integrate
.. //depot/projects/docproj_es/www/en/developers.sgml#2 integrate
.. //depot/projects/docproj_es/www/en/docproj/translations.sgml#4 integrate
.. //depot/projects/docproj_es/www/en/docs/books.sgml#3 integrate
.. //depot/projects/docproj_es/www/en/donations/wantlist.sgml#2 integrate
.. //depot/projects/docproj_es/www/en/gifs/Makefile#2 integrate
.. //depot/projects/docproj_es/www/en/gifs/apachepower.gif#2 delete
.. //depot/projects/docproj_es/www/en/gifs/light_button.png#1 branch
.. //depot/projects/docproj_es/www/en/gnome/index.xsl#2 integrate
.. //depot/projects/docproj_es/www/en/internal/about.sgml#2 integrate
.. //depot/projects/docproj_es/www/en/multimedia/Makefile#2 integrate
.. //depot/projects/docproj_es/www/en/multimedia/Makefile.inc#1 branch
.. //depot/projects/docproj_es/www/en/multimedia/Makefile.output#1 branch
.. //depot/projects/docproj_es/www/en/multimedia/multimedia-input.xml#2 integrate
.. //depot/projects/docproj_es/www/en/multimedia/multimedia.pl#2 integrate
.. //depot/projects/docproj_es/www/en/multimedia/multimedia.sgml.intro#1 branch
.. //depot/projects/docproj_es/www/en/multimedia/multimedia.sgml.post#1 branch
.. //depot/projects/docproj_es/www/en/multimedia/multimedia.sgml.pre#1 branch
.. //depot/projects/docproj_es/www/en/news/news.sgml#2 integrate
.. //depot/projects/docproj_es/www/en/platforms/alpha.sgml#2 integrate
.. //depot/projects/docproj_es/www/en/platforms/amd64.sgml#2 integrate
.. //depot/projects/docproj_es/www/en/platforms/amd64/motherboards.sgml#2 integrate
.. //depot/projects/docproj_es/www/en/platforms/arm.sgml#2 integrate
.. //depot/projects/docproj_es/www/en/platforms/mips.sgml#2 integrate
.. //depot/projects/docproj_es/www/en/platforms/pc98.sgml#2 integrate
.. //depot/projects/docproj_es/www/en/platforms/ppc.sgml#2 integrate
.. //depot/projects/docproj_es/www/en/platforms/sparc.sgml#2 integrate
.. //depot/projects/docproj_es/www/en/platforms/sun4v.sgml#2 integrate
.. //depot/projects/docproj_es/www/en/platforms/xbox.sgml#2 integrate
.. //depot/projects/docproj_es/www/en/projects/ideas/ideas.xml#3 integrate
.. //depot/projects/docproj_es/www/en/releng/index.sgml#2 integrate
.. //depot/projects/docproj_es/www/en/security/security.sgml#2 integrate
.. //depot/projects/docproj_es/www/share/sgml/commercial.consult.xml#2 integrate
.. //depot/projects/docproj_es/www/share/sgml/commercial.isp.xml#2 integrate
.. //depot/projects/docproj_es/www/share/sgml/events.xml#3 integrate
.. //depot/projects/docproj_es/www/share/sgml/news.xml#3 integrate
.. //depot/projects/docproj_es/www/share/sgml/templates.events.xsl#2 integrate
.. //depot/projects/docproj_es/www/share/sgml/usergroups.xml#3 integrate

Differences ...

==== //depot/projects/docproj_es/doc/en_US.ISO8859-1/share/sgml/authors.ent#2 (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.445 2008/04/22 15:26:14 pgj Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.449 2008/06/12 22:13:27 ivoras Exp $
 -->
 
 <!ENTITY a.aaron "Aaron Dalton <email>aaron at FreeBSD.org</email>">
@@ -292,6 +292,8 @@
 
 <!ENTITY a.dwmalone "David Malone <email>dwmalone at FreeBSD.org</email>">
 
+<!ENTITY a.ed "Ed Schouten <email>ed at FreeBSD.org</email>">
+
 <!ENTITY a.edwin "Edwin Groothuis <email>edwin at FreeBSD.org</email>">
 
 <!ENTITY a.ehaupt "Emanuel Haupt <email>ehaupt at FreeBSD.org</email>">
@@ -428,6 +430,8 @@
 
 <!ENTITY a.itojun "Jun-ichiro Itoh <email>itojun at itojun.org</email>">
 
+<!ENTITY a.ivoras "Ivan Voras <email>ivoras at FreeBSD.org</email>">
+
 <!ENTITY a.iwasaki "Mitsuru IWASAKI <email>iwasaki at FreeBSD.org</email>">
 
 <!ENTITY a.jadawin "Philippe Audeoud <email>jadawin at FreeBSD.org</email>">
@@ -624,6 +628,8 @@
 
 <!ENTITY a.maho "Maho Nakata <email>maho at FreeBSD.org</email>">
 
+<!ENTITY a.manolis "Manolis Kiagias <email>manolis at FreeBSD.org</email>">
+
 <!ENTITY a.marcel "Marcel Moolenaar <email>marcel at FreeBSD.org</email>">
 
 <!ENTITY a.marck "Dmitry Morozovsky <email>marck at FreeBSD.org</email>">

==== //depot/projects/docproj_es/doc/en_US.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#2 (text+ko) ====

@@ -1,5 +1,5 @@
 <!--
-    $FreeBSD: doc/en_US.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml,v 1.29 2008/04/12 21:40:31 brueffer Exp $
+    $FreeBSD: doc/en_US.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml,v 1.30 2008/05/28 06:54:27 keramida Exp $
 
     FreeBSD Glossary Terms
 	Please keep this file sorted alphabetically/ASCIIly by glossterm.
@@ -224,7 +224,7 @@
       <glossterm>Base Address Register</glossterm>
       <acronym>BAR</acronym>
       <glossdef>
-        <para>The registers that determine which address range a PCI device
+        <para>The registers that determine which address range a <acronym>PCI</acronym> device
 	  will respond to.</para>
       </glossdef>
     </glossentry>

==== //depot/projects/docproj_es/doc/en_US.ISO8859-1/share/sgml/mailing-lists.ent#2 (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.57 2007/06/19 17:18:51 linimon Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/share/sgml/mailing-lists.ent,v 1.58 2008/05/28 00:40:13 gabor Exp $
 -->
 
 <!ENTITY a.mailman.listinfo "http://lists.FreeBSD.org/mailman/listinfo">
@@ -349,6 +349,10 @@
 <!ENTITY a.realtime "<ulink url='&a.realtime.url;'>FreeBSD realtime extensions mailing list</ulink>">
 <!ENTITY a.realtime.name "<ulink url='&a.realtime.url;'>freebsd-realtime</ulink>">
 
+<!ENTITY a.ruby.url "&a.mailman.listinfo;/freebsd-ruby">
+<!ENTITY a.ruby "<ulink url='&a.ruby.url;'>FreeBSD Ruby mailing list</ulink>">
+<!ENTITY a.ruby.name "<ulink url='&a.ruby.url;'>freebsd-ruby</ulink>">
+
 <!ENTITY a.scsi.url "&a.mailman.listinfo;/freebsd-scsi">
 <!ENTITY a.scsi "<ulink url='&a.scsi.url;'>FreeBSD SCSI subsystem mailing list</ulink>">
 <!ENTITY a.scsi.name "<ulink url='&a.scsi.url;'>freebsd-scsi</ulink>">

==== //depot/projects/docproj_es/doc/share/pgpkeys/pgpkeys-developers.sgml#2 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/share/pgpkeys/pgpkeys-developers.sgml,v 1.68 2008/04/22 15:26:14 pgj Exp $
+     $FreeBSD: doc/share/pgpkeys/pgpkeys-developers.sgml,v 1.72 2008/06/12 22:13:27 ivoras Exp $
 -->
 
     <sect2 id="pgpkey-ariff">
@@ -34,11 +34,21 @@
       &pgpkey.mat;
     </sect2>
 
+    <sect2 id="pgpkey-araujo">
+      <title>&a.araujo;</title>
+      &pgpkey.araujo;
+    </sect2>
+
     <sect2 id="pgpkey-asami">
       <title>&a.asami;</title>
       &pgpkey.asami;
     </sect2>
 
+    <sect2 id="pgpkey-jadawin">
+      <title>&a.jadawin;</title>
+      &pgpkey.jadawin;
+    </sect2>
+
     <sect2 id="pgpkey-timur">
       <title>&a.timur;</title>
       &pgpkey.timur;
@@ -374,11 +384,21 @@
       &pgpkey.gioria;
     </sect2>
 
+    <sect2 id="pgpkey-daichi">
+      <title>&a.daichi;</title>
+      &pgpkey.daichi;
+    </sect2>
+
     <sect2 id="pgpkey-mnag">
       <title>&a.mnag;</title>
       &pgpkey.mnag;
     </sect2>
 
+    <sect2 id="pgpkey-grehan">
+      <title>&a.grehan;</title>
+      &pgpkey.grehan;
+    </sect2>
+
     <sect2 id="pgpkey-jmg">
       <title>&a.jmg;</title>
       &pgpkey.jmg;
@@ -434,6 +454,11 @@
       &pgpkey.mich;
     </sect2>
 
+    <sect2 id="pgpkey-lwhsu">
+      <title>&a.lwhsu;</title>
+      &pgpkey.lwhsu;
+    </sect2>
+
     <sect2 id="pgpkey-foxfair">
       <title>&a.foxfair;</title>
       &pgpkey.foxfair;
@@ -494,6 +519,11 @@
       &pgpkey.fjoe;
     </sect2>
 
+    <sect2 id="pgpkey-manolis">
+      <title>&a.manolis;</title>
+      &pgpkey.manolis;
+    </sect2>
+
     <sect2 id="pgpkey-jkim">
       <title>&a.jkim;</title>
       &pgpkey.jkim;
@@ -564,6 +594,11 @@
       &pgpkey.erwin;
     </sect2>
 
+    <sect2 id="pgpkey-laszlof">
+      <title>&a.laszlof;</title>
+      &pgpkey.laszlof;
+    </sect2>
+
     <sect2 id="pgpkey-lawrance">
       <title>&a.lawrance;</title>
       &pgpkey.lawrance;
@@ -644,6 +679,11 @@
       &pgpkey.arved;
     </sect2>
 
+    <sect2 id="pgpkey-dryice">
+      <title>&a.dryice;</title>
+      &pgpkey.dryice;
+    </sect2>
+
     <sect2 id="pgpkey-nemoliu">
       <title>&a.nemoliu;</title>
       &pgpkey.nemoliu;
@@ -704,6 +744,11 @@
       &pgpkey.matusita;
     </sect2>
 
+    <sect2 id="pgpkey-mm">
+      <title>&a.mm;</title>
+      &pgpkey.mm;
+    </sect2>
+
     <sect2 id="pgpkey-tmclaugh">
       <title>&a.tmclaugh;</title>
       &pgpkey.tmclaugh;
@@ -764,6 +809,11 @@
       &pgpkey.max;
     </sect2>
 
+    <sect2 id="pgpkey-maho">
+      <title>&a.maho;</title>
+      &pgpkey.maho;
+    </sect2>
+
     <sect2 id="pgpkey-yoichi">
       <title>&a.yoichi;</title>
       &pgpkey.yoichi;
@@ -789,6 +839,11 @@
       &pgpkey.anders;
     </sect2>
 
+    <sect2 id="pgpkey-lofi">
+      <title>&a.lofi;</title>
+      &pgpkey.lofi;
+    </sect2>
+
     <sect2 id="pgpkey-obrien">
       <title>&a.obrien;</title>
       &pgpkey.obrien;
@@ -854,6 +909,11 @@
       &pgpkey.krion;
     </sect2>
 
+    <sect2 id="pgpkey-sepotvin">
+      <title>&a.sepotvin;</title>
+      &pgpkey.sepotvin;
+    </sect2>
+
     <sect2 id="pgpkey-markp">
       <title>&a.markp;</title>
       &pgpkey.markp;
@@ -944,6 +1004,11 @@
       &pgpkey.wosch;
     </sect2>
 
+    <sect2 id="pgpkey-ed">
+      <title>&a.ed;</title>
+      &pgpkey.ed;
+    </sect2>
+
     <sect2 id="pgpkey-das">
       <title>&a.das;</title>
       &pgpkey.das;
@@ -989,11 +1054,21 @@
       &pgpkey.nork;
     </sect2>
 
+    <sect2 id="pgpkey-syrinx">
+      <title>&a.syrinx;</title>
+      &pgpkey.syrinx;
+    </sect2>
+
     <sect2 id="pgpkey-vanilla">
       <title>&a.vanilla;</title>
       &pgpkey.vanilla;
     </sect2>
 
+    <sect2 id="pgpkey-bms">
+      <title>&a.bms;</title>
+      &pgpkey.bms;
+    </sect2>
+
     <sect2 id="pgpkey-demon">
       <title>&a.demon;</title>
       &pgpkey.demon;
@@ -1254,3 +1329,7 @@
       &pgpkey.tabthorpe;
     </sect2>
 
+    <sect2 id="pgpkey-ivoras">
+      <title>&a.ivoras;</title>
+      &pgpkey.ivoras;
+    </sect2>

==== //depot/projects/docproj_es/doc/share/pgpkeys/pgpkeys.ent#2 (text+ko) ====

@@ -1,5 +1,5 @@
 
-<!-- $FreeBSD: doc/share/pgpkeys/pgpkeys.ent,v 1.165 2008/04/22 15:26:14 pgj Exp $ -->
+<!-- $FreeBSD: doc/share/pgpkeys/pgpkeys.ent,v 1.168 2008/06/12 22:13:27 ivoras Exp $ -->
 <!-- PGP keyblocks -->
 <!ENTITY pgpkey.aaron SYSTEM "aaron.key">
 <!ENTITY pgpkey.ache SYSTEM "ache.key">
@@ -75,6 +75,7 @@
 <!ENTITY pgpkey.dougb SYSTEM "dougb.key">
 <!ENTITY pgpkey.dryice SYSTEM "dryice.key">
 <!ENTITY pgpkey.dwmalone SYSTEM "dwmalone.key">
+<!ENTITY pgpkey.ed SYSTEM "ed.key">
 <!ENTITY pgpkey.ehaupt SYSTEM "ehaupt.key">
 <!ENTITY pgpkey.emax SYSTEM "emax.key">
 <!ENTITY pgpkey.erwin SYSTEM "erwin.key">
@@ -107,6 +108,7 @@
 <!ENTITY pgpkey.ijliao SYSTEM "ijliao.key">
 <!ENTITY pgpkey.imp SYSTEM "imp.key">
 <!ENTITY pgpkey.itetcu SYSTEM "itetcu.key">
+<!ENTITY pgpkey.ivoras SYSTEM "ivoras.key">
 <!ENTITY pgpkey.jadawin SYSTEM "jadawin.key">
 <!ENTITY pgpkey.jcamou SYSTEM "jcamou.key">
 <!ENTITY pgpkey.jdp SYSTEM "jdp.key">
@@ -158,6 +160,7 @@
 <!ENTITY pgpkey.lwhsu SYSTEM "lwhsu.key">
 <!ENTITY pgpkey.lx SYSTEM "lx.key">
 <!ENTITY pgpkey.maho SYSTEM "maho.key">
+<!ENTITY pgpkey.manolis SYSTEM "manolis.key">
 <!ENTITY pgpkey.marcel SYSTEM "marcel.key">
 <!ENTITY pgpkey.marck SYSTEM "marck.key">
 <!ENTITY pgpkey.marcus SYSTEM "marcus.key">

==== //depot/projects/docproj_es/doc/share/pgpkeys/stas.key#2 (text+ko) ====

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/share/pgpkeys/stas.key,v 1.1 2006/09/20 08:21:27 stas Exp $ -->
+<!-- $FreeBSD: doc/share/pgpkeys/stas.key,v 1.2 2008/05/27 21:37:01 stas Exp $ -->
 <!--
 sh addkey.sh stas EB269581;
 -->
@@ -7,6 +7,8 @@
       Key fingerprint = F21E D6CC 5626 9609 6CE2  A385 2BF5 5993 EB26 9581
 uid                  Stanislav Sedov <stas at FreeBSD.org>
 uid                  Stanislav Sedov <ssedov at mbsd.msk.ru>
+uid                  Stanislav Sedov (Corporate email) <stas at ht-systems.ru>
+uid                  Stanislav Sedov <stas at SpringDaemons.com>
 sub   1024g/B47898B1 2006-05-20 [expires: 2011-05-19]
 ]]></programlisting>
 <programlisting role="pgpkey"><![CDATA[
@@ -20,26 +22,34 @@
 onbDgYchc8GDhthxKomYL01j4rbZtVoTKqb66Oj2yH9toz8dx/NqyxXoI/x9xrS5
 uUVbA/940a5tL+uwZ4ri3aC1B7rLqHw8PQU78RlljW+XTNFwK0nxPw4ibOR/q+cj
 4T329Ts2e8pwHW/mouO1V0G5hfsc9ieeFeuZwFtcp1HcZ8NQiy9kD9oJeou3D3DF
-MfelXs6u9oTI0mQ91b3SSQ3P2EQyMeCfptqAFPu0UdJraNvxsbQdU3RhbmlzbGF2
-IFNlZG92IDxzdGFzQDMxMC5ydT6IcgQwEQIAMgUCRQ6enysdIERvbid0IGhhdmUg
-YWNjZXNzIHRvIHRoaXMgbWFpbGJveCBhbnltb3JlAAoJECv1WZPrJpWBBXgAmgMo
-cJCpg1WO81PtGQWRPBdmOiM1AJ0c0S2tT3fiiWy3YxGX/Gg5xa9ZVYhmBBMRAgAm
-BQJEes1cAhsDBQkJZgGABgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQK/VZk+sm
-lYGy4ACeL2/uE1wfNoSX3s7r6rFH/4XTn5sAn1FrlcGP3UqWL1PnuDcFr326I1dz
-tCRTdGFuaXNsYXYgU2Vkb3YgPHNzZWRvdkBtYnNkLm1zay5ydT6IZgQTEQIAJgUC
-RG+JPgIbAwUJCWYBgAYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJECv1WZPrJpWB
-oBIAn0r8P82jc6Kckvrl6NAvMZTUyTxCAJ9HdqfKdpZX7T68vdKEt1DiwBemA7Qi
-U3RhbmlzbGF2IFNlZG92IDxzdGFzQEZyZWVCU0Qub3JnPohpBBMRAgApAhsDBQkJ
-ZgGABgsJCAcDAgQVAggDBBYCAwECHgECF4AFAkUOoFkCGQEACgkQK/VZk+smlYG5
-4gCfcNonqxmYyMPgX+/bvQ51bE60f2EAn3hJ+odNmcWZpUEGDyVRBGoJanZduQEN
-BERviT8QBACA+7zeO4/5Os+DiAMsmADE5sMbuq96tQX//IVK/YegpFZS7C89a8wk
-ZdQqxjNul11Qi0ow3abEjkf8hw7XFHR/EFM5L26ZIflFJfyNsBRVh58qzoiUqDnV
-Zrvtld4OE0Xy90G3RtsIdBx1SIlW/9haY2mhPtuMIO2IazX2P+uC8wADBQP/f/vA
-zrNU7Jymo+rExfEn4dNEQXn+tGWSxaPWlD9/eJCMYVmXCDymKvpxDbBs9+485/Pb
-FgTkqDSz422avxM51562FgFES4Nb9WwI8hZajzGNcBUFdBEIpIOWbu8AxXbqAam5
-jG2nulcyHpVKeQx1/yFE3vxQnHPeQWDJochx7b+ITwQYEQIADwUCRG+JPwIbDAUJ
-CWYBgAAKCRAr9VmT6yaVgcV0AJ9dE8CfMFLLmQDzDXyectDxX4YsagCfQUrPSKzU
-6ZOB1kr0hXd13pXQdVA=
-=g9qV
+MfelXs6u9oTI0mQ91b3SSQ3P2EQyMeCfptqAFPu0UdJraNvxsbQkU3RhbmlzbGF2
+IFNlZG92IDxzc2Vkb3ZAbWJzZC5tc2sucnU+iGYEExECACYFAkRviT4CGwMFCQlm
+AYAGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRAr9VmT6yaVgaASAJ9K/D/No3Oi
+nJL65ejQLzGU1Mk8QgCfR3anynaWV+0+vL3ShLdQ4sAXpgO0HVN0YW5pc2xhdiBT
+ZWRvdiA8c3Rhc0AzMTAucnU+iGYEExECACYFAkR6zVwCGwMFCQlmAYAGCwkIBwMC
+BBUCCAMEFgIDAQIeAQIXgAAKCRAr9VmT6yaVgbLgAJ4vb+4TXB82hJfezuvqsUf/
+hdOfmwCfUWuVwY/dSpYvU+e4NwWvfbojV3OIcgQwEQIAMgUCRQ6enysdIERvbid0
+IGhhdmUgYWNjZXNzIHRvIHRoaXMgbWFpbGJveCBhbnltb3JlAAoJECv1WZPrJpWB
+BXgAmgMocJCpg1WO81PtGQWRPBdmOiM1AJ0c0S2tT3fiiWy3YxGX/Gg5xa9ZVbQi
+U3RhbmlzbGF2IFNlZG92IDxzdGFzQEZyZWVCU0Qub3JnPohmBBMRAgAmBQJFDp/B
+AhsDBQkJZgGABgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQK/VZk+smlYF7RACg
+hODpJ1VD7Ig2cXPdmGW4RlW9KKAAn1R5wo571zi6AXzMrkdadd3c+shYiGkEExEC
+ACkCGwMFCQlmAYAGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAUCRQ6gWQIZAQAKCRAr
+9VmT6yaVgbniAJ9w2ierGZjIw+Bf79u9DnVsTrR/YQCfeEn6h02ZxZmlQQYPJVEE
+aglqdl20NlN0YW5pc2xhdiBTZWRvdiAoQ29ycG9yYXRlIGVtYWlsKSA8c3Rhc0Bo
+dC1zeXN0ZW1zLnJ1PohmBBMRAgAmBQJFn/FkAhsDBQkJZgGABgsJCAcDAgQVAggD
+BBYCAwECHgECF4AACgkQK/VZk+smlYEdagCggKIJ8ZgcjZ40ZJGu0taNvzoWRxMA
+n2BMkkgve4inf8PvjAbVB6uE5L9DtChTdGFuaXNsYXYgU2Vkb3YgPHN0YXNAU3By
+aW5nRGFlbW9ucy5jb20+iGYEExECACYFAkWf8YcCGwMFCQlmAYAGCwkIBwMCBBUC
+CAMEFgIDAQIeAQIXgAAKCRAr9VmT6yaVgYm3AJwIXgbVOu1HuxWKKw4Qx2MLa9nQ
+HACggUYpsqq/0ZnBuiQN6fKCrHDz6Uu5AQ0ERG+JPxAEAID7vN47j/k6z4OIAyyY
+AMTmwxu6r3q1Bf/8hUr9h6CkVlLsLz1rzCRl1CrGM26XXVCLSjDdpsSOR/yHDtcU
+dH8QUzkvbpkh+UUl/I2wFFWHnyrOiJSoOdVmu+2V3g4TRfL3QbdG2wh0HHVIiVb/
+2FpjaaE+24wg7YhrNfY/64LzAAMFA/9/+8DOs1TsnKaj6sTF8Sfh00RBef60ZZLF
+o9aUP394kIxhWZcIPKYq+nENsGz37jzn89sWBOSoNLPjbZq/EznXnrYWAURLg1v1
+bAjyFlqPMY1wFQV0EQikg5Zu7wDFduoBqbmMbae6VzIelUp5DHX/IUTe/FCcc95B
+YMmhyHHtv4hPBBgRAgAPBQJEb4k/AhsMBQkJZgGAAAoJECv1WZPrJpWBxXQAn1nQ
+CpmmHqHf/nKbG7p7PHKva5UoAJ98THErNvF+BMYRZmYKAZi5xqeEeQ==
+=joMy
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>

==== //depot/projects/docproj_es/doc/share/sgml/freebsd.dsl#2 (text+ko) ====

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/share/sgml/freebsd.dsl,v 1.93 2007/07/30 09:52:42 blackend Exp $ -->
+<!-- $FreeBSD: doc/share/sgml/freebsd.dsl,v 1.94 2008/05/24 16:16:20 blackend Exp $ -->
 
 <!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
 <!ENTITY % output.html		"IGNORE">
@@ -211,12 +211,12 @@
                  (u (string-append "http://www.FreeBSD.org/cgi/man.cgi?query="
                          (data r) "&" "amp;" "sektion=" (data m))))
             (case v
-              (("current") (string-append u "&" "amp;" "manpath=FreeBSD+7-current"))
+              (("current") (string-append u "&" "amp;" "manpath=FreeBSD+8-current"))
               (("xfree86") (string-append u "&" "amp;" "manpath=XFree86+4.5.0"))
               (("xorg")    (string-append u "&" "amp;" "manpath=X11R7.2"))
               (("netbsd")  (string-append u "&" "amp;" "manpath=NetBSD+3.0"))
               (("openbsd") (string-append u "&" "amp;" "manpath=OpenBSD+4.1"))
-              (("ports")   (string-append u "&" "amp;" "manpath=FreeBSD+6.2-RELEASE+and+Ports"))
+              (("ports")   (string-append u "&" "amp;" "manpath=FreeBSD+7.0-RELEASE+and+Ports"))
               (else u))))
 
         (element application ($bold-seq$))

==== //depot/projects/docproj_es/doc/share/sgml/man-refs.ent#2 (text+ko) ====

@@ -20,7 +20,7 @@
      lexicographical order by the entity (i.e., the dots used in place of
      special characters should not be expanded when comparing).
 
-     $FreeBSD: doc/share/sgml/man-refs.ent,v 1.461 2008/04/20 18:15:46 hrs Exp $
+     $FreeBSD: doc/share/sgml/man-refs.ent,v 1.462 2008/05/31 13:14:38 hrs Exp $
 -->
 
 <!ENTITY man...1 "<citerefentry/<refentrytitle/[/<manvolnum/1//">
@@ -3437,6 +3437,7 @@
 <!ENTITY man.iwi.4 "<citerefentry/<refentrytitle/iwi/<manvolnum/4//">
 <!ENTITY man.iwic.4 "<citerefentry/<refentrytitle/iwic/<manvolnum/4//">
 <!ENTITY man.ixgb.4 "<citerefentry/<refentrytitle/ixgb/<manvolnum/4//">
+<!ENTITY man.jme.4 "<citerefentry/<refentrytitle/jme/<manvolnum/4//">
 <!ENTITY man.joy.4 "<citerefentry/<refentrytitle/joy/<manvolnum/4//">
 <!ENTITY man.kame.4 "<citerefentry/<refentrytitle/kame/<manvolnum/4//">
 <!ENTITY man.kbdmux.4 "<citerefentry/<refentrytitle/kbdmux/<manvolnum/4//">

==== //depot/projects/docproj_es/src/release/doc/en_US.ISO8859-1/readme/article.sgml#2 (text+ko) ====

@@ -12,7 +12,7 @@
 
     <corpauthor>The &os; Project</corpauthor>
 
-    <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/readme/article.sgml,v 1.40 2007/08/18 17:11:14 bmah Exp $</pubdate>
+    <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/readme/article.sgml,v 1.41 2008/05/31 13:45:35 hrs Exp $</pubdate>
 
     <copyright>
       <year>2000</year>
@@ -23,6 +23,7 @@
       <year>2005</year>
       <year>2006</year>
       <year>2007</year>
+      <year>2008</year>
       <holder role="mailto:doc at FreeBSD.org">The &os; Documentation Project</holder>
     </copyright>
 
@@ -58,8 +59,8 @@
 	Intel Itanium Processor based computers (&arch.ia64;),
 	NEC PC-9801/9821 series PCs and compatibles (&arch.pc98;),
 	and &ultrasparc; machines (&arch.sparc64;).  Versions
-	for the &powerpc; (&arch.powerpc;), and &mips; (mips)
-	architectures are currently under
+	for the &arm; (&arch.arm;), &mips; (&arch.mips;), and
+	&powerpc; (&arch.powerpc;) architectures are currently under
 	development as well.  &os; works with a wide variety of
 	peripherals and configurations and can be used for everything
 	from software development to games to Internet Service

==== //depot/projects/docproj_es/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#2 (text+ko) ====

@@ -17,7 +17,7 @@
 
   <corpauthor>The &os; Project</corpauthor>
 
-  <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1088 2008/04/20 18:17:33 hrs Exp $</pubdate>
+  <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1090 2008/06/05 13:37:40 rafan Exp $</pubdate>
 
   <copyright>
     <year>2000</year>
@@ -208,6 +208,8 @@
       <para role="merged">The &man.cmx.4; driver, a driver for Omnikey CardMan 4040
         PCMCIA smartcard readers, has been added.</para>
 
+      <para>The &man.syscons.4; driver now supports Colemak keyboard layout.</para>
+
       <para role="merged">The &man.uslcom.4; driver, a driver for Silicon
         Laboratories CP2101/CP2102-based USB serial adapters, has been
         imported from OpenBSD.</para>
@@ -228,6 +230,10 @@
 	  client/desktop adapters.  A new igb driver
 	  will support new server adapters.</para>
 
+	<para>The &man.jme.4; driver has been added to provide support
+	  for PCIe network adapters based on JMicron JMC250 Gigabit
+	  Ethernet and JMC260 Fast Ethernet controllers.</para>
+
 	<para>The &man.malo.4; driver has been added to provide
 	  support for Marvell Libertas 88W8335 based PCI network
 	  adapters.</para>
@@ -263,6 +269,10 @@
         the <varname>net.bpf.zerocopy_enable</varname> sysctl
         variable to <literal>1</literal>.</para>
 
+      <para>ISDN4BSD(I4B), <filename>netatm</filename>, and all
+        related subsystems have been removed due to lack of
+        multi-processor support.</para>
+
       <para role="merged">A bug in TCP options padding, where the wrong padding
         bytes were used, has been fixed.</para>
 
@@ -320,6 +330,11 @@
       supports a <option>-a</option> flag, which is equivalent to
       specifying the <option>-RrP</option> flags.</para>
 
+    <para>BSD-licensed version of &man.cpio.1; based on
+      <filename>libarchive</filename>, has replaced the GNU cpio.
+      Note that the GNU cpio is still installed as
+      <filename>gcpio</filename>.</para>
+
     <para>The &man.env.1; program now supports <option>-u
       <replaceable>name</replaceable></option>
       which will completely unset the given variable
@@ -332,6 +347,10 @@
       of primaries that were present in GNU find but not &os;
       &man.find.1;.</para>
 
+    <para>&man.jexec.8; now supports <option>-h
+      <replaceable>hostname</replaceable></option> option to specify the
+      jail where the command will be executed.</para>
+
     <para>&man.kgdb.1; now supports a new <command>add-kld</command>
       command to make it easier to debug crash dumps with kernel
       modules.</para>
@@ -343,6 +362,11 @@
     <para>&man.nc.1; now supports a <option>-O</option> switch to
       disable the use of TCP options.</para>
 
+    <para>The &man.ping6.8; utility now returns <literal>2</literal>
+      when the packet transmission was successful but no responses
+      were received (this is the same behavior as &man.ping.8;).
+      It returned a non-zero value before this change.</para>
+
     <para>The &man.procstat.1; utility has been added to display
       detailed information about processes.</para>
 
@@ -357,6 +381,17 @@
       flag to enable &man.compress.1;-style
       compression/decompression.</para>
 
+    <para>The &man.tar.1; utility now supports a
+      <option>--numeric-owner</option> flag to ignore user/group names
+      on create and extract.</para>
+
+    <para>The &man.tar.1; utility now supports an
+      <option>-S</option> flag to sparsify files on extraction.</para>
+
+    <para>The &man.tar.1; utility now supports a <option>-s</option>
+      flag to substitute filenames based on the specified regular
+      expression.</para>
+
     <para>The &man.tcgetsid.3; library function has been added to
       return the process group ID for the session leader for the
       controlling terminal.  It is defined in IEEE Std 1003.1-2001
@@ -407,7 +442,7 @@
       v408 to v416.</para>
 
     <para><application>ncurses</application> has been updated from
-      5.6-20061217 to 5.6-20080209.</para>
+      5.6-20061217 to 5.6-20080503.</para>
 
     <para role="merged"><application>OpenPAM</application> has been updated from the
       Figwort release to the Hydrangea release.</para>
@@ -427,6 +462,13 @@
   <sect2 id="ports">
     <title>Ports/Packages Collection Infrastructure</title>
 
+    <para>The &man.pkg.create.1; utility now supports
+      <option>-n</option>.  When this option is specified and a
+      package tarball exists, it will not be overwritten.  This is
+      useful when multiple packages are saved with several consecutive
+      runs of &man.pkg.create.1; with the <option>-Rb</option>
+      options.</para>
+
     <para>The pkg_sign and pkg_check utilities for cryptographically
       signing &os; packages have been removed.  They were only useful
       for packages compressed using &man.gzip.1;; however

==== //depot/projects/docproj_es/src/release/doc/share/sgml/release.ent#2 (text+ko) ====

@@ -1,6 +1,6 @@
 <!-- -*- sgml -*-
 
-     $FreeBSD: src/release/doc/share/sgml/release.ent,v 1.32 2008/04/20 17:58:05 hrs Exp $
+     $FreeBSD: src/release/doc/share/sgml/release.ent,v 1.33 2008/05/31 13:45:35 hrs Exp $
 
      OS Release Information -->
 
@@ -54,6 +54,7 @@
 <!ENTITY arch.arm "arm">
 <!ENTITY arch.i386 "i386">
 <!ENTITY arch.ia64 "ia64">
+<!ENTITY arch.mips "mips">
 <!ENTITY arch.pc98 "pc98">
 <!ENTITY arch.powerpc "powerpc">
 <!ENTITY arch.sparc64 "sparc64">

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

@@ -1,4 +1,4 @@
-# $FreeBSD: www/en/Makefile,v 1.145 2008/04/21 01:41:45 murray Exp $
+# $FreeBSD: www/en/Makefile,v 1.146 2008/06/13 08:52:47 remko Exp $
 
 .if exists(Makefile.conf)
 .include "Makefile.conf"
@@ -63,6 +63,7 @@
 SUBDIR+= java
 SUBDIR+= kse
 SUBDIR+= marketing
+SUBDIR+= multimedia
 SUBDIR+= news
 SUBDIR+= platforms
 SUBDIR+= portmgr

==== //depot/projects/docproj_es/www/en/developers.sgml#2 (text+ko) ====

@@ -6,7 +6,7 @@
 us to update author names, or the representation of those names (such
 as adding email addresses), by just editing a single file.
 
-$FreeBSD: www/en/developers.sgml,v 1.192 2008/04/22 15:29:45 pgj Exp $
+$FreeBSD: www/en/developers.sgml,v 1.195 2008/06/12 22:13:27 ivoras Exp $
 
 -->
 
@@ -148,6 +148,7 @@
 <!ENTITY a.dwcjr "David W. Chapman Jr.">
 <!ENTITY a.dwhite "Doug White">
 <!ENTITY a.dwmalone "David Malone">
+<!ENTITY a.ed "Ed Schouten">
 <!ENTITY a.edwin "Edwin Groothuis">
 <!ENTITY a.ehaupt "Emanuel Haupt">
 <!ENTITY a.eik "Oliver Eikemeier">
@@ -216,6 +217,7 @@
 <!ENTITY a.issei "Issei Suzuki">
 <!ENTITY a.itetcu "Ion-Mihai Tetcu">
 <!ENTITY a.itojun "Jun-ichiro Itoh">
+<!ENTITY a.ivoras "Ivan Voras">
 <!ENTITY a.iwasaki "Mitsuru IWASAKI">
 <!ENTITY a.jadawin "Philippe Audeoud">
 <!ENTITY a.jake "Jake Burkholder">
@@ -314,6 +316,7 @@
 <!ENTITY a.lwhsu "Li-Wen Hsu">
 <!ENTITY a.lx "David Thiel">
 <!ENTITY a.maho "Maho Nakata">
+<!ENTITY a.manolis "Manolis Kiagias">
 <!ENTITY a.marcel "Marcel Moolenaar">
 <!ENTITY a.marck "Dmitry Morozovsky">
 <!ENTITY a.marcus "Joe Marcus Clarke">

==== //depot/projects/docproj_es/www/en/docproj/translations.sgml#4 (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/docproj/translations.sgml,v 1.101 2008/04/29 09:28:57 gabor Exp $">
+<!ENTITY date "$FreeBSD: www/en/docproj/translations.sgml,v 1.104 2008/05/26 17:07:14 gabor Exp $">
 <!ENTITY title "FreeBSD Documentation Project: Translations">
 <!ENTITY % navinclude.docs "INCLUDE">
 ]>
@@ -165,22 +165,13 @@
 <h2>The FreeBSD Dutch Documentation Project</h2>
 <b>E-Mail</b>: <a href="mailto:remko at FreeBSD.org">remko at FreeBSD.org</a><br>
 <dl>
-<dt><i>Mailing lists available</i></dt>
-  <dd>Send an email to <a
-    href="mailto:majordomo at majordomo.elvandar.org">majordomo at majordomo.elvandar.org</a>
-    "subscribe freebsd-doc-nl" in the body of the
-    message for subscribing to the FreeBSD-doc-nl discussions
-    mailing list in Dutch.<br></dd>
-  <dd>Send an email to <a
-    href="mailto:majordomo at majordomo.elvandar.org">majordomo at majordomo.elvandar.org</a>
-    "subscribe freebsd-doc-nl-cvs" in the body of the
-    message for subscribing to the FreeBSD-doc-nl-cvs CVS mailing
-    list.<br></dd>
 <dt><i>Released documents</i></dt>
-  <dd><a href="http://www.freebsd.org/doc/nl/books/handbook">Handbook (80% complete)</a></dd>
-<dt><i>Work in progress</i></dt>
+  <dd><a href="http://www.freebsd.org/doc/nl/books/handbook">Handbook (85% complete)</a></dd>
+<dt><i>Work in progress (gets periodically build from perforce)</i></dt>
   <dd><a href="http://www.freebsd-nl.org/doc/nl">Handbook</a></dd>
   <dd><a href="http://www.freebsd-nl.org/www/nl">Web page</a></dd>
+<dt><i>Repository of the ongoing work</i></dt>
+  <dd><a href="http://p4web.freebsd.org/@md=d&amp;cd=//depot/projects/docproj_nl/&amp;c=aXw@//depot/projects/docproj_nl/?ac=83">Perforce</a></dd>
 </dl>
  
 <a name="estonian"></a>
@@ -280,7 +271,13 @@
 <dt><i>Documents available</i></dt>
   <dd>
     <a href="../hu/index.html">Web</a>,
-    <a href="../doc/hu_HU.ISO8859-2/articles/">some articles</a>.
+    <a href="../doc/hu_HU.ISO8859-2/articles/">some articles</a>,
+    <a href="../doc/hu_HU.ISO8859-2/books/handbook/">Handbook</a>.
+  </dd>
+<dt><i>Repositories of ongoing work</i></dt>
+  <dd>
+    <a href="http://p4web.freebsd.org/@md=d&amp;cd=//depot/projects/docproj_hu/&amp;c=aXw@//depot/projects/docproj_hu/?ac=83">Perforce</a>
+      (doc, www and src/release/doc).
   </dd>
 </dl>
 

==== //depot/projects/docproj_es/www/en/docs/books.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/docs/books.sgml,v 1.35 2008/04/28 15:47:21 gabor Exp $">
+<!ENTITY date "$FreeBSD: www/en/docs/books.sgml,v 1.38 2008/05/31 13:35:17 remko Exp $">
 <!ENTITY title "Books and Articles Online">
 <!ENTITY % navinclude.docs "INCLUDE">
 
@@ -140,6 +140,10 @@
 	      A list of organizations and individuals who have helped
 	        enhance FreeBSD.</p>
 
+	    <p><a href="&url.articles;/cups/index.html">CUPS on &os;</a>
+	      (cups)<br>
+	      How to setup CUPS with &os;.</p>
+
 	    <p><a href="&url.articles;/cvs-freebsd/index.html">Setting up a
 	        CVS repository - The FreeBSD way</a> (cvs-freebsd)<br>
 	      How to set up a CVS repository that uses the same CVSROOT
@@ -196,11 +200,11 @@
 		useful information from the -questions mailing list.</p>
 
 	    <p><a href="&url.articles;/geom-class/index.html">Writing
-	        a GEOM Class</a>(geom-class)<br>
+	        a GEOM Class</a> (geom-class)<br>
 	      A guide to GEOM internals, and writing your own class.</p>
 
 	    <p><a href="&url.articles;/gjournal-desktop/index.html">Implementing
-	        UFS journaling on a desktop PC</a>(gjournal-desktop)<br>
+	        UFS journaling on a desktop PC</a> (gjournal-desktop)<br>
 	      A guide to create UFS partitions configured with journaling
 		for desktop use.</p>
 
@@ -225,6 +229,11 @@
 	        (laptop)<br>
 	      Information about running FreeBSD on a laptop.</p>
 
+	    <p><a href="&url.articles;/ldap-auth/index.html">LDAP Authentication</a>
+		(ldap-auth)<br>
+	      A practical guide about setting up an LDAP server on
+		&os; and how to use it for authenticating users.</p>
+
 	    <p><a href="&url.articles;/linux-comparison/index.html">FreeBSD: An Open Source Alternative to Linux</a>
 	        (linux-comparison)<br>
 	      A white paper explaining the differences between Linux

==== //depot/projects/docproj_es/www/en/donations/wantlist.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/donations/wantlist.sgml,v 1.458 2008/04/15 16:17:03 arved Exp $">
+<!ENTITY date "$FreeBSD: www/en/donations/wantlist.sgml,v 1.459 2008/06/04 04:03:08 marcel Exp $">
 <!ENTITY title "FreeBSD Developers Want List">
 <!ENTITY email 'donations'>
 <!ENTITY % navinclude.about "INCLUDE">
@@ -221,14 +221,6 @@
 	<td>More memory allows for better workloads when testing code in
 	  SMP setups.</td>
       </tr>
-      <tr>
-	<td>marcel</td>
-	<td>CA, USA</td>
-	<td>Memory kits for the SGI O2. No 256MB (2x128MB) kits as that
-	  requires PROM version 4.4 or higher. Preferably 128MB (2x64MB)
-	  kits. At most 4 kits fit the O2, so 4 kits of 128MB would be
-	  ideal.</td>
-      </tr>
 
       <tr>
 	<td>markm</td>

==== //depot/projects/docproj_es/www/en/gifs/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: www/en/gifs/Makefile,v 1.60 2008/02/12 19:52:02 remko Exp $
+# $FreeBSD: www/en/gifs/Makefile,v 1.61 2008/05/26 17:13:47 gabor Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
@@ -7,8 +7,8 @@
 .include "../Makefile.inc"
 .endif
 
-DATA=   apache.gif apachepower.gif daemon.gif doc.gif
-DATA+=  home.gif littlelogo.gif new.gif power-button.gif
+DATA=   apache.gif daemon.gif doc.gif
+DATA+=  home.gif light_button.png littlelogo.gif new.gif power-button.gif
 DATA+=  powerlogo.gif ugu_icon.gif wclogo.gif topbar.gif
 DATA+=  flash0.gif flash1.gif soft0.gif soft1.gif support0.gif support1.gif
 DATA+=  docs0.gif docs1.gif vendors0.gif vendors1.gif search0.gif search1.gif

==== //depot/projects/docproj_es/www/en/gnome/index.xsl#2 (text+ko) ====

@@ -4,7 +4,7 @@
 <!ENTITY title "The FreeBSD GNOME Project">
 <!ENTITY % navinclude.gnome "INCLUDE">
 ]>
-<!-- $FreeBSD: www/en/gnome/index.xsl,v 1.99 2008/03/30 18:30:45 marcus Exp $ -->
+<!-- $FreeBSD: www/en/gnome/index.xsl,v 1.100 2008/05/22 18:26:21 mezz Exp $ -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 		xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
@@ -99,29 +99,32 @@
 		<img src="&base;/gnome/images/gnome.png" align="right"
                    border="0" alt="GNOME Logo"/>
 
-	       		<p>GNOME is a complete desktop environment, and a
-			   comprehensive suite of applications. In GNOME,
-			   everything is easy to use, attractive, powerful,
-			   and works the way you expect.</p>
-
-			 <p>The
-			   <a href="http://www.gnome.org">GNOME
-			     desktop</a> is a window-based desktop
-			   environment that provides many business,
-			   productivity, and entertainment
-			   applications, and makes non-GNOME programs
-			   faster and easier to run. The
-			  <a href="http://developer.gnome.org">GNOME development
-			    platform</a> is a collection of
-			  application-development tools and libraries
-			  used by many programs, such as <a
-			    href="http://www.firefox.com">Mozilla
-			    Firefox</a>.</p>
+	       		<p>GNOME is a complete graphical desktop for X,
+	       	   including everything from a window manager to
+	       	   web browsers, audio players, office programs, and
+	       	   more.</p>
 
 		       <p>The FreeBSD GNOME Project is a team of devoted
 			 developers and users that manage the
 			 integration of GNOME and FreeBSD.</p>
 
+		<h2>How to install GNOME</h2>
+
+		<p>The easiest way to install GNOME is to install either of
+		the following ports:</p>
+		<ul>
+			<li>x11/gnome2 (the full desktop)</li>
+			<li>x11/gnome2-lite (the minimum desktop environment)</li>
+		</ul>
+
+		<p>And, as desired, one or all of:</p>
+		<ul>
+			<li>x11/gnome2-fifth-toe (common applications)</li>
+			<li>x11/gnome2-power-tools (tools/toys for power users)</li>
+			<li>editors/gnome2-office (office productivity)</li>
+			<li>devel/gnome2-hacker-tools (development tools)</li>
+		</ul>
+
 		<h2>Upgrading to GNOME 2.22?</h2>
 
 		<p>If you are upgrading from GNOME 2.20 to GNOME 2.22, read the
@@ -147,11 +150,11 @@
 		<h2>Resources</h2>
 		<ul>
 		  <li><a href="http://www.gnome.org/">GNOME Project</a></li>
+		  <li><a href="http://developer.gnome.org">GNOME development platform</a></li>
 		  <li><a href="http://gnomedesktop.org">FootNotes</a></li>
 		  <li><a href="http://www.gnomejournal.org">GNOME Journal</a></li>
-		  <li><a
-		      href="http://www.gnomefiles.org">GNOME
-		      Files</a></li>
+		  <li><a href="http://www.gnomefiles.org">GNOME Files</a></li>
+		  <li><a href="http://planet.gnome.org">Planet GNOME (blogs)</a></li>
 		</ul>
 
 		<h2>Related Projects</h2>

==== //depot/projects/docproj_es/www/en/internal/about.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/internal/about.sgml,v 1.60 2008/03/12 12:41:34 remko Exp $">
+<!ENTITY date "$FreeBSD: www/en/internal/about.sgml,v 1.61 2008/05/26 17:13:46 gabor Exp $">
 <!ENTITY title "About the FreeBSD WWW Server">
 <!ENTITY % navinclude.docs "INCLUDE">
 ]>
@@ -35,9 +35,9 @@
 
 <h2>The Software</h2>
 
-    <img src="../gifs/apachepower.gif" alt="Powered by Apache" align="right"><p>
-      These pages are served up by the versatile and efficient <a
-      href="http://www.apache.org/">Apache http server</a>.  In
+    <img src="../gifs/light_button.png" alt="lighttpd fly light." align="right"><p>
+      These pages are served up by the fast, secure and flexible <a
+      href="http://www.lighttpd.net/">lighttpd webserver</a>.  In
       addition, there are a few locally crafted CGI scripts.
       Indexing of these pages and the mailing list archive are
       provided by freewais-sf, a derivative of the CNIDR freewais.</p>

==== //depot/projects/docproj_es/www/en/multimedia/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: www/en/multimedia/Makefile,v 1.2 2007/05/15 21:53:43 keramida Exp $
+# $FreeBSD: www/en/multimedia/Makefile,v 1.3 2008/06/12 19:02:27 remko Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
@@ -10,30 +10,30 @@
 .include "Makefile.inc"
 .endif
 
-INDEXLINK= multimedia.html
+#all: build
+all: build
+	cd output && make all DIRPRFX=multimedia/output/
 
-FXML = multimedia-input.xml
-FHTML = \
-	multimedia.html.intro \
-	multimedia.html.pre \
-	multimedia.html.post
-FLIST = multimedia.created
-FSCRIPT = multimedia.pl
+install:
+	cd output && make install DIRPRFX=multimedia/output/
 
-.if exists(${FLIST})
-DATA!=	cat ${FLIST}
-.else
-DATA=	${INDEXLINK}
-.endif
+TEMPLATES=	multimedia.sgml.intro \
+		multimedia.sgml.post \
+		multimedia.sgml.pre \
+		multimedia.html.intro \
+		multimedia.html.post \
+		multimedia.html.pre \
+		multimedia-input.xml
 
-all: ${FLIST}

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

More information about the p4-projects mailing list