From owner-p4-projects@FreeBSD.ORG  Sun Jun 22 17:30:44 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9F4231065728; Sun, 22 Jun 2008 17:30:44 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AC2341065670
	for <perforce@freebsd.org>; Sun, 22 Jun 2008 17:30:43 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 9F6068FC1C
	for <perforce@freebsd.org>; Sun, 22 Jun 2008 17:30:43 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5MHUhbK080484
	for <perforce@freebsd.org>; Sun, 22 Jun 2008 17:30:43 GMT
	(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5MHUhFU080482
	for perforce@freebsd.org; Sun, 22 Jun 2008 17:30:43 GMT
	(envelope-from gabor@freebsd.org)
Date: Sun, 22 Jun 2008 17:30:43 GMT
Message-Id: <200806221730.m5MHUhFU080482@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gabor@freebsd.org using -f
From: Gabor Kovesdan <gabor@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 143923 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 22 Jun 2008 17:30:45 -0000

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

Change 143923 by gabor@gabor_server on 2008/06/22 17:30:38

	IFC

Affected files ...

.. //depot/projects/docproj_es/doc/en_US.ISO8859-1/share/sgml/authors.ent#3 integrate
.. //depot/projects/docproj_es/doc/en_US.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#3 integrate
.. //depot/projects/docproj_es/doc/share/pgpkeys/amdmi3.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/pgpkeys-developers.sgml#3 integrate
.. //depot/projects/docproj_es/doc/share/pgpkeys/pgpkeys.ent#3 integrate
.. //depot/projects/docproj_es/doc/share/sgml/man-refs.ent#3 integrate
.. //depot/projects/docproj_es/www/en/cgi/query-pr-lib.pl#2 integrate
.. //depot/projects/docproj_es/www/en/community.xsl#2 integrate
.. //depot/projects/docproj_es/www/en/community/irc.sgml#2 integrate
.. //depot/projects/docproj_es/www/en/developers.sgml#3 integrate
.. //depot/projects/docproj_es/www/en/donations/donors.sgml#2 integrate
.. //depot/projects/docproj_es/www/en/index.xsl#2 integrate
.. //depot/projects/docproj_es/www/en/projects/ideas/ideas.xml#4 integrate
.. //depot/projects/docproj_es/www/en/projects/newbies.sgml#2 integrate
.. //depot/projects/docproj_es/www/en/security/Makefile#2 integrate
.. //depot/projects/docproj_es/www/en/security/errata-rss.xsl#1 branch
.. //depot/projects/docproj_es/www/en/security/errata.rss#1 branch
.. //depot/projects/docproj_es/www/share/sgml/commercial.consult.xml#3 integrate
.. //depot/projects/docproj_es/www/share/sgml/commercial.isp.xml#3 integrate
.. //depot/projects/docproj_es/www/share/sgml/libcommon.xsl#2 integrate
.. //depot/projects/docproj_es/www/share/sgml/news.xml#4 integrate
.. //depot/projects/docproj_es/www/share/sgml/notices.xml#2 integrate
.. //depot/projects/docproj_es/www/share/sgml/press.xml#2 integrate

Differences ...

==== //depot/projects/docproj_es/doc/en_US.ISO8859-1/share/sgml/authors.ent#3 (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.449 2008/06/12 22:13:27 ivoras Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.451 2008/06/19 15:03:43 amdmi3 Exp $
 -->
 
 <!ENTITY a.aaron "Aaron Dalton <email>aaron@FreeBSD.org</email>">
@@ -52,6 +52,8 @@
 
 <!ENTITY a.ambrisko "Doug Ambrisko <email>ambrisko@FreeBSD.org</email>">
 
+<!ENTITY a.amdmi3 "Dmitry Marakasov <email>amdmi3@FreeBSD.org</email>">
+
 <!ENTITY a.amorita "Akio Morita <email>amorita@FreeBSD.org</email>">
 
 <!ENTITY a.amurai "Atsushi Murai <email>amurai@FreeBSD.org</email>">
@@ -310,6 +312,8 @@
 
 <!ENTITY a.emoore "Eric Moore <email>emoore@FreeBSD.org</email>">
 
+<!ENTITY a.eri "Ermal Lu&#231;i <email>eri@FreeBSD.org</email>">
+
 <!ENTITY a.eric "Eric Melville <email>eric@FreeBSD.org</email>">
 
 <!ENTITY a.erich "Eric L. Hernes <email>erich@FreeBSD.org</email>">

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

@@ -1,5 +1,5 @@
 <!--
-    $FreeBSD: doc/en_US.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml,v 1.30 2008/05/28 06:54:27 keramida Exp $
+    $FreeBSD: doc/en_US.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml,v 1.31 2008/06/15 12:24:56 gabor Exp $
 
     FreeBSD Glossary Terms
 	Please keep this file sorted alphabetically/ASCIIly by glossterm.
@@ -117,7 +117,8 @@
       <glossterm>Access Control List</glossterm>
       <acronym>ACL</acronym>
       <glossdef>
-        <para></para>
+        <para>A list of permissions attached to an object, usually either a
+	  file or a network device.</para>
       </glossdef>
     </glossentry>
 
@@ -151,7 +152,11 @@
       <glossterm>Advanced Power Management</glossterm>
       <acronym>APM</acronym>
       <glossdef>
-        <para></para>
+        <para>An <acronym>API</acronym> enabling the operating system to work
+	  in conjunction with the <acronym>BIOS</acronym> in order to achieve
+	  power management.  <acronym>APM</acronym> has been superseded by
+	  the much more generic and powerful <acronym>ACPI</acronym>
+	  specification for most applications.</para>
       </glossdef>
     </glossentry>
 
@@ -340,7 +345,8 @@
       <glossterm>Challenge Handshake Authentication Protocol</glossterm>
       <acronym>CHAP</acronym>
       <glossdef>
-        <para></para>
+        <para>A method of authenticating a user, based on a secret shared
+	  between client and server.</para>
       </glossdef>
     </glossentry>
 
@@ -358,6 +364,7 @@
       <glossdef>
 	<para>An <acronym>RS232C</acronym> signal giving the remote system
           permission to send data.</para>
+	<glossseealso otherterm="rts-glossary">
       </glossdef>
     </glossentry>
 
@@ -455,6 +462,7 @@
 	<para>An <acronym>RS232C</acronym> signal sent from the modem to the
 	  computer or terminal indicating a readiness to send and receive
 	  data.</para>
+	<glossseealso otherterm="dtr-glossary">
       </glossdef>
     </glossentry>
 
@@ -482,7 +490,8 @@
       <glossterm>Differentiated System Description Table</glossterm>
       <acronym>DSDT</acronym>
       <glossdef>
-        <para></para>
+        <para>An <acronym>ACPI</acronym> table, supplying basic configuration
+	  information about the base system.</para>
       </glossdef>
     </glossentry>
 
@@ -1135,7 +1144,9 @@
       <glossterm>Network Address Translation</glossterm>
       <acronym>NAT</acronym>
       <glossdef>
-        <para></para>
+        <para>A tecnique where <acronym>IP</acronym> packets are rewritten
+	  on the way through a gateway, enabling many machines behind the
+	  gateway to effectively share a single <acronym>IP</acronym> address.</para>
       </glossdef>
     </glossentry>
 
@@ -1161,7 +1172,7 @@
       <glossterm>Network Time Protocol</glossterm>
       <acronym>NTP</acronym>
       <glossdef>
-        <para></para>
+        <para>A means of synchronizing clocks over a network.</para>
       </glossdef>
     </glossentry>
   </glossdiv>
@@ -1413,6 +1424,7 @@
       <acronym>POP</acronym>
       <glossdef>
         <para></para>
+	<glossseealso otherterm="pop3-glossary">
       </glossdef>
     </glossentry>
 

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

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/share/pgpkeys/pgpkeys-developers.sgml,v 1.72 2008/06/12 22:13:27 ivoras Exp $
+     $FreeBSD: doc/share/pgpkeys/pgpkeys-developers.sgml,v 1.73 2008/06/19 15:39:15 amdmi3 Exp $
 -->
 
     <sect2 id="pgpkey-ariff">
@@ -734,6 +734,11 @@
       &pgpkey.ehaupt;
     </sect2>
 
+    <sect2 id="pgpkey-amdmi3">
+      <title>&a.amdmi3;</title>
+      &pgpkey.amdmi3;
+    </sect2>
+
     <sect2 id="pgpkey-kwm">
       <title>&a.kwm;</title>
       &pgpkey.kwm;

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

@@ -1,5 +1,5 @@
 
-<!-- $FreeBSD: doc/share/pgpkeys/pgpkeys.ent,v 1.168 2008/06/12 22:13:27 ivoras Exp $ -->
+<!-- $FreeBSD: doc/share/pgpkeys/pgpkeys.ent,v 1.169 2008/06/19 15:39:15 amdmi3 Exp $ -->
 <!-- PGP keyblocks -->
 <!ENTITY pgpkey.aaron SYSTEM "aaron.key">
 <!ENTITY pgpkey.ache SYSTEM "ache.key">
@@ -10,6 +10,7 @@
 <!ENTITY pgpkey.alepulver SYSTEM "alepulver.key">
 <!ENTITY pgpkey.alex SYSTEM "alex.key">
 <!ENTITY pgpkey.alexbl SYSTEM "alexbl.key">
+<!ENTITY pgpkey.amdmi3 SYSTEM "amdmi3.key">
 <!ENTITY pgpkey.anders SYSTEM "anders.key">
 <!ENTITY pgpkey.andreas SYSTEM "andreas.key">
 <!ENTITY pgpkey.anholt SYSTEM "anholt.key">

==== //depot/projects/docproj_es/doc/share/sgml/man-refs.ent#3 (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.462 2008/05/31 13:14:38 hrs Exp $
+     $FreeBSD: doc/share/sgml/man-refs.ent,v 1.465 2008/06/21 07:18:59 pgj Exp $
 -->
 
 <!ENTITY man...1 "<citerefentry/<refentrytitle/[/<manvolnum/1//">
@@ -701,6 +701,7 @@
 <!ENTITY man.xf86cfg.1 "<citerefentry vendor='xfree86'/<refentrytitle/xf86cfg/<manvolnum/1//">
 <!ENTITY man.xf86config.1 "<citerefentry vendor='xfree86'/<refentrytitle/xf86config/<manvolnum/1//">
 <!ENTITY man.xfontsel.1 "<citerefentry vendor='xfree86'/<refentrytitle/xfontsel/<manvolnum/1//">
+<!ENTITY man.xlsfonts.1 "<citerefentry vendor='xfree86'/<refentrytitle/xlsfonts/<manvolnum/1//">
 <!ENTITY man.xmodmap.1 "<citerefentry vendor='xfree86'/<refentrytitle/xmodmap/<manvolnum/1//">
 <!ENTITY man.xorgcfg.1 "<citerefentry vendor='xorg'/<refentrytitle/xorgcfg/<manvolnum/1//">
 <!ENTITY man.xorgconfig.1 "<citerefentry vendor='xorg'/<refentrytitle/xorgconfig/<manvolnum/1//">
@@ -3346,10 +3347,12 @@
 <!ENTITY man.ep.4 "<citerefentry/<refentrytitle/ep/<manvolnum/4//">
 <!ENTITY man.esp.4 "<citerefentry/<refentrytitle/esp/<manvolnum/4//">
 <!ENTITY man.ex.4 "<citerefentry/<refentrytitle/ex/<manvolnum/4//">
+<!ENTITY man.exa.4 "<citerefentry vendor='xorg'/<refentrytitle/exa/<manvolnum/4//">
 <!ENTITY man.exca.4 "<citerefentry/<refentrytitle/ex/<manvolnum/4//">
 <!ENTITY man.faith.4 "<citerefentry/<refentrytitle/faith/<manvolnum/4//">
 <!ENTITY man.fast.ipsec.4 "<citerefentry/<refentrytitle/fast_ipsec/<manvolnum/4//">
 <!ENTITY man.fatm.4 "<citerefentry/<refentrytitle/fatm/<manvolnum/4//">
+<!ENTITY man.fbdevhw.4 "<citerefentry vendor='xorg'/<refentrytitle/fbdevhw/<manvolnum/4//">
 <!ENTITY man.fd.4 "<citerefentry/<refentrytitle/fd/<manvolnum/4//">
 <!ENTITY man.fdc.4 "<citerefentry/<refentrytitle/fdc/<manvolnum/4//">
 <!ENTITY man.fe.4 "<citerefentry/<refentrytitle/fe/<manvolnum/4//">
@@ -3481,6 +3484,7 @@
 <!ENTITY man.mem.4 "<citerefentry/<refentrytitle/mem/<manvolnum/4//">
 <!ENTITY man.meteor.4 "<citerefentry/<refentrytitle/meteor/<manvolnum/4//">
 <!ENTITY man.mfi.4 "<citerefentry/<refentrytitle/mfi/<manvolnum/4//">
+<!ENTITY man.miff.4 "<citerefentry vendor='xorg'/<refentrytitle/miff/<manvolnum/4//">
 <!ENTITY man.miibus.4 "<citerefentry/<refentrytitle/miibus/<manvolnum/4//">
 <!ENTITY man.mlx.4 "<citerefentry/<refentrytitle/mlx/<manvolnum/4//">
 <!ENTITY man.mly.4 "<citerefentry/<refentrytitle/mly/<manvolnum/4//">
@@ -3793,6 +3797,19 @@
 <!ENTITY man.zero.4 "<citerefentry/<refentrytitle/zero/<manvolnum/4//">
 <!ENTITY man.zyd.4 "<citerefentry/<refentrytitle/zyd/<manvolnum/4//">
 
+<!ENTITY man.ati.4x "<citerefentry vendor='xorg'/<refentrytitle/ati/<manvolnum/4//">
+<!ENTITY man.kbd.4x "<citerefentry vendor='xorg'/<refentrytitle/kbd/<manvolnum/4//">
+<!ENTITY man.i810.4x "<citerefentry vendor='xorg'/<refentrytitle/i810/<manvolnum/4//">
+<!ENTITY man.intel.4x "<citerefentry vendor='xorg'/<refentrytitle/intel/<manvolnum/4//">
+<!ENTITY man.mousedrv.4x "<citerefentry vendor='xorg'/<refentrytitle/mousedrv/<manvolnum/4//">
+<!ENTITY man.nv.4x "<citerefentry vendor='xorg'/<refentrytitle/nv/<manvolnum/4//">
+<!ENTITY man.r128.4x "<citerefentry vendor='xorg'/<refentrytitle/r128/<manvolnum/4//">
+<!ENTITY man.radeon.4x "<citerefentry vendor='xorg'/<refentrytitle/radeon/<manvolnum/4//">
+<!-- <!ENTITY man.radeonhd.4x "<citerefentry vendor='xorg'/<refentrytitle/radeonhd/<manvolnum/4//"> -->
+<!ENTITY man.vesa.4x "<citerefentry vendor='xorg'/<refentrytitle/vesa/<manvolnum/4//">
+<!ENTITY man.via.4x "<citerefentry vendor='xorg'/<refentrytitle/via/<manvolnum/4//">
+<!ENTITY man.vga.4x "<citerefentry vendor='xorg'/<refentrytitle/vga/<manvolnum/4//">
+
 <!ENTITY man.a.out.5 "<citerefentry/<refentrytitle/a.out/<manvolnum/5//">
 <!ENTITY man.acct.5 "<citerefentry/<refentrytitle/acct/<manvolnum/5//">
 <!ENTITY man.aliases.5 "<citerefentry/<refentrytitle/aliases/<manvolnum/5//">
@@ -4277,7 +4294,7 @@
 <!ENTITY man.makemap.8 "<citerefentry/<refentrytitle/makemap/<manvolnum/8//">
 <!ENTITY man.makewhatis.local.8 "<citerefentry/<refentrytitle/makewhatis.local/<manvolnum/8//">
 <!ENTITY man.manctl.8 "<citerefentry/<refentrytitle/manctl/<manvolnum/8//">
-<!ENTITY man.map-mbone.8 "<citerefentry/<refentrytitle/map-mbone/<manvolnum/8//">
+<!ENTITY man.map-mbone.8 "<citerefentry vendor='ports'/<refentrytitle/map-mbone/<manvolnum/8//">
 <!ENTITY man.mca.8 "<citerefentry/<refentrytitle/mca/<manvolnum/8//">
 <!ENTITY man.mdconfig.8 "<citerefentry/<refentrytitle/mdconfig/<manvolnum/8//">
 <!ENTITY man.mdmfs.8 "<citerefentry/<refentrytitle/mdmfs/<manvolnum/8//">
@@ -4323,8 +4340,8 @@
 <!ENTITY man.mount.unionfs.8 "<citerefentry/<refentrytitle/mount_unionfs/<manvolnum/8//">
 <!ENTITY man.mountd.8 "<citerefentry/<refentrytitle/mountd/<manvolnum/8//">
 <!ENTITY man.moused.8 "<citerefentry/<refentrytitle/moused/<manvolnum/8//">
-<!ENTITY man.mrinfo.8 "<citerefentry/<refentrytitle/mrinfo/<manvolnum/8//">
-<!ENTITY man.mrouted.8 "<citerefentry/<refentrytitle/mrouted/<manvolnum/8//">
+<!ENTITY man.mrinfo.8 "<citerefentry vendor='ports'/<refentrytitle/mrinfo/<manvolnum/8//">
+<!ENTITY man.mrouted.8 "<citerefentry vendor='ports'/<refentrytitle/mrouted/<manvolnum/8//">
 <!ENTITY man.mtest.8 "<citerefentry/<refentrytitle/mtest/<manvolnum/8//">
 <!ENTITY man.mtrace.8 "<citerefentry/<refentrytitle/mtrace/<manvolnum/8//">
 <!ENTITY man.mtree.8 "<citerefentry/<refentrytitle/mtree/<manvolnum/8//">

==== //depot/projects/docproj_es/www/en/cgi/query-pr-lib.pl#2 (text+ko) ====

@@ -145,6 +145,7 @@
 <td><select name='release'>
 <option selected='selected' value=''>Any</option>
 <option value='^FreeBSD [2345]'>Pre-6.X</option>
+<option value='^FreeBSD 7'>7.X only</option>
 <option value='^FreeBSD 6'>6.X only</option>
 <option value='^FreeBSD 5'>5.X only</option>
 <option value='^FreeBSD 4'>4.X only</option>

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

@@ -6,7 +6,7 @@
 <!ENTITY % navinclude.community "INCLUDE">
 ]>
 
-<!-- $FreeBSD: www/en/community.xsl,v 1.3 2008/04/21 01:41:45 murray Exp $ -->
+<!-- $FreeBSD: www/en/community.xsl,v 1.4 2008/06/20 21:19:24 danger Exp $ -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
   xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
@@ -42,7 +42,7 @@
 	      <div id="CONTENTWRAP">
 		&header3;
 
-	      <p>FreeBSD is well supported by its active
+	      <p>&os; is well supported by its active
 		community.</p>
 
 	      <p>There are more than one hundred <a
@@ -59,11 +59,15 @@
 		active <a href="&base;/community/irc.html">IRC</a>
 		community.  Many developers also maintain <a
 		href="http://planet.freebsdish.org">blogs</a> about
-		their FreeBSD work.</p>
+	      	their &os; work.  &os; developers and key contributors
+		also maintain <a
+		  href="http://wiki.FreeBSD.org/">wiki</a>, which
+		contains various information about &os; development
+		and &os; related projects.</p>
 
 	      <p>Last year there were <xsl:value-of
 	        select="count(event[number(enddate/year) =
-	        (number($curdate.year) -1)])" /> FreeBSD events in
+	        (number($curdate.year) -1)])" /> &os; events in
 		<xsl:value-of
 		select="count(event[(number(enddate/year) =
 		(number($curdate.year) -1)) and (generate-id() =
@@ -72,7 +76,7 @@
 		around the world.  A <a
 		href="&base;/events/events.ics">calendar</a> and
 		<a href="&base;/events/rss.xml">RSS feed</a> of
-		upcoming FreeBSD-related events are maintained on our
+		upcoming &os;-related events are maintained on our
 		<a href="&base;/events/events.html">events
 		page</a>.</p>
 

==== //depot/projects/docproj_es/www/en/community/irc.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/community/irc.sgml,v 1.3 2006/08/19 21:20:32 hrs Exp $">
+<!ENTITY date "$FreeBSD: www/en/community/irc.sgml,v 1.4 2008/06/20 20:53:48 danger Exp $">
 <!ENTITY title "IRC">
 <!ENTITY % navinclude.community "INCLUDE">
 ]>
@@ -12,7 +12,9 @@
 		project does not control them or endorse IRC as a support medium.
 	 	You may be ignored, insulted, or kicked out if you ask questions on
 		any channel in IRC, though you may have slightly better luck
-		in channels named #freebsdhelp where such exist.  If you
+		in channels named #freebsdhelp where such exist.  A list of known
+		&os; related IRC channels is available in the &os; <a
+		  href="http://wiki.freebsd.org/IrcChannels">wiki</a>.  If you
 	  	want to try these or any other channels on IRC, it is nonetheless
 	        at your own risk and any complaints about conduct on those channels
 		should not be directed to the FreeBSD project.  See also
@@ -22,4 +24,4 @@
 &footer;
 
 </body>
-</html>+</html>

==== //depot/projects/docproj_es/www/en/developers.sgml#3 (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.195 2008/06/12 22:13:27 ivoras Exp $
+$FreeBSD: www/en/developers.sgml,v 1.196 2008/06/19 15:14:40 amdmi3 Exp $
 
 -->
 
@@ -29,6 +29,7 @@
 <!ENTITY a.alexbl "Alexander Botero-Lowry">
 <!ENTITY a.alfred "Alfred Perlstein">
 <!ENTITY a.ambrisko "Doug Ambrisko">
+<!ENTITY a.amdmi3 "Dmitry Marakasov">
 <!ENTITY a.amorita "Akio Morita">
 <!ENTITY a.amurai "Atsushi Murai">
 <!ENTITY a.anders "Anders Nordby">

==== //depot/projects/docproj_es/www/en/donations/donors.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/donors.sgml,v 1.368 2008/04/15 16:17:03 arved Exp $">
+<!ENTITY date "$FreeBSD: www/en/donations/donors.sgml,v 1.369 2008/06/15 22:12:19 simon Exp $">
 <!ENTITY title "Hardware Donors Page">
 <!ENTITY % navinclude.about "INCLUDE">
 <!ENTITY % developers SYSTEM "../developers.sgml"> %developers;
@@ -2447,6 +2447,12 @@
     <td> Received </td>
   </tr>
 
+  <tr>
+    <td> brueffer </td>
+    <td> soekris vpn1401 </td>
+    <td> simon </td>
+    <td> Received </td>
+  </tr>
 </table>
 
 &footer;

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

@@ -4,7 +4,7 @@
 <!ENTITY title "The FreeBSD Project">
 ]>
 
-<!-- $FreeBSD: www/en/index.xsl,v 1.163 2008/02/27 22:09:31 bmah Exp $ -->
+<!-- $FreeBSD: www/en/index.xsl,v 1.164 2008/06/20 20:03:28 danger Exp $ -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
   <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>
@@ -310,6 +310,16 @@
 				<xsl:with-param name="type" select="'notice'" />
 			</xsl:call-template>
 
+			  <div>
+			    	<ul class="newseventslist">
+				  <li class="first-child">
+				    <a href="&base;/security/" title="More Errata Notices">More</a>
+				  </li>
+				  <li class="last-child">
+				    <a href="&base;/security/errata.xml" title="Errata Notices RSS Feed"><img class="rssimage" src="&base;/layout/images/ico_rss.png" width="27" height="12" alt="Errata Notices RSS Feed" /></a>
+				  </li>
+				</ul>
+			  </div> <!-- unnamed -->
 			</div> <!-- newseventswrap -->
 
 		   </div> <!-- FRONTSECURITYCONTENT -->

==== //depot/projects/docproj_es/www/en/projects/ideas/ideas.xml#4 (text+ko) ====

@@ -15,7 +15,7 @@
 <ideas>
   <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
     <cvs:keyword name="freebsd">
-      $FreeBSD: www/en/projects/ideas/ideas.xml,v 1.88 2008/05/28 19:39:41 ed Exp $
+      $FreeBSD: www/en/projects/ideas/ideas.xml,v 1.89 2008/06/18 06:55:29 ed Exp $
     </cvs:keyword>
   </cvs:keywords>
 
@@ -1263,31 +1263,6 @@
 	</desc>
       </idea>
 
-      <idea id="ports-comp43tty">
-	<title>COMPAT_43TTY</title>
-
-	<desc>
-<p><strong>Technical contact</strong>: <a
-  href="mailto:ed@FreeBSD.org">Ed Schouten</a></p>
-<p>Some ports may break when removing COMPAT_43TTY from the kernel
-  configuration since they assume old ioctl's when they identify
-  FreeBSD.  The goal of this entry is to:</p>
-<ul>
-  <li>Identify the ports which behave like this.  A tinderbox setup is probably
-    needed.  Using grep to find "#include &lt;sgtty.h&gt;" and this <a
-    href="http://lists.freebsd.org/pipermail/freebsd-current/2006-June/064010.html">list</a>
-    from Kris Kennaway might also be good starting points.</li>
-  <li>Fix breakages and send patches upstream.</li>
-</ul>
-<p><strong>Note</strong>: Ed is working on this. Please coordinate with him.</p>
-<p><strong>Requirements</strong>:</p>
-<ul>
-  <li>Knowledge of autotools.</li>
-  <li>Time and patience.</li>
-</ul>
-	</desc>
-      </idea>
-
       <idea id="ports-options">
 	<title>Improvements of OPTIONS</title>
 

==== //depot/projects/docproj_es/www/en/projects/newbies.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/projects/newbies.sgml,v 1.55 2007/10/03 23:35:15 murray Exp $">
+<!ENTITY date "$FreeBSD: www/en/projects/newbies.sgml,v 1.56 2008/06/15 12:14:51 jkois Exp $">
 <!ENTITY title 'Resources for Newbies'>
 <!ENTITY % navinclude.docs "INCLUDE">
 <!ENTITY url.articles "&base;/doc/en_US.ISO8859-1/articles">
@@ -177,18 +177,6 @@
 	  question or the odd few minutes to browse. More elementary material
 	  is near the front of the book, but there are short easy articles
 	  throughout.</p></li>
-      
-      <li><p>A <a
-	    href="http://8help.osu.edu/wks/unix_course/">UNIX
-	   Introductory Course</a>
-           from Ohio State University is available online in HTML,
-           postscript and Acrobat PDF formats.</p></li>
-      
-      <li><p>A <a
-	    href="http://8help.osu.edu/wks/sysadm_course/">UNIX
-	   System Administration Course</a>
-           from Ohio State University is available online in HTML,
-           postscript and Acrobat PDF formats.</p></li>
 
       <li><p><a href="http://www.mcsr.olemiss.edu/unixhelp/">UNIXhelp
 	    for Users</a> is another introductory guide which is available in
@@ -197,18 +185,13 @@
       
       <li><p>UNIX questions are dealt with in the newsgroup <a
 	    href="news:comp.unix.questions">comp.unix.questions</a> and the
-	  associated <a
-	    href="http://www.cse.ohio-state.edu/hypertext/faq/usenet/unix-faq/faq/top.html">
-	    Frequently Asked Questions</a>.
-	  You can also get a copy of the
+	  associated
 	  <a href="ftp://rtfm.mit.edu/pub/usenet/news.answers/unix-faq/faq/">FAQ</a>
           from the RMIT FTP site. Newbies are likely to be most interested in
           sections 1 and 2 initially.</p></li>
       
       <li><p>Another interesting newsgroup is <a
-	    href="news:comp.unix.user-friendly">comp.unix.user-friendly</a>
-	  which also has a <a
-	    href="http://www.faqs.org/faqs/unix-faq/user-friendly/index.html">FAQ</a>.
+	    href="news:comp.unix.user-friendly">comp.unix.user-friendly</a>.
 	  Although this newsgroup is for discussing user-friendliness, it can
 	  contain some good information for newbies. The <a
 	    href="ftp://rtfm.mit.edu/pub/usenet/news.answers/unix-faq/user-friendly">FAQ</a>

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

@@ -1,4 +1,4 @@
-# $FreeBSD: www/en/security/Makefile,v 1.16 2008/03/01 01:55:27 simon Exp $
+# $FreeBSD: www/en/security/Makefile,v 1.17 2008/06/20 20:03:28 danger Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
@@ -19,6 +19,7 @@
 security.html: advisories.html.inc advisories.rdf
 
 DEPENDSET.DEFAULT=	advisories
+DEPENDSET.errata-rss=	notices
 XML.DEFAULT=		${XML_ADVISORIES}
 
 XMLDOCS=	advisories:mkindex.xsl::advisories.html.inc
@@ -27,5 +28,6 @@
 
 XMLDOCS+=	advisories-rdf:security-rdf.xsl::advisories.rdf
 XMLDOCS+=	advisories-rss:security-rss.xsl::rss.xml
+XMLDOCS+=	errata-rss:errata-rss.xsl::errata.xml
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"

==== //depot/projects/docproj_es/www/share/sgml/commercial.consult.xml#3 (text+ko) ====

@@ -1,12 +1,12 @@
 <?xml version="1.0"?>
 <!DOCTYPE entries PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for Commercial Gallery//EN"
                          "http://www.FreeBSD.org/XML/www/share/sgml/gallery.dtd">
-<!-- $FreeBSD: www/share/sgml/commercial.consult.xml,v 1.48 2008/05/24 13:39:27 jkois Exp $ -->
+<!-- $FreeBSD: www/share/sgml/commercial.consult.xml,v 1.49 2008/06/15 13:10:18 jkois Exp $ -->
 
 <entries>
   <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
     <cvs:keyword name="freebsd">
-      $FreeBSD: www/share/sgml/commercial.consult.xml,v 1.48 2008/05/24 13:39:27 jkois Exp $
+      $FreeBSD: www/share/sgml/commercial.consult.xml,v 1.49 2008/06/15 13:10:18 jkois Exp $
     </cvs:keyword>
   </cvs:keywords>
 
@@ -1003,6 +1003,23 @@
     </description>
   </entry>
 
+  <entry id="psychsoftek" category="namerica">
+    <name>Psychsoft Consulting</name>
+    <url>http://www.psychsoftek.com</url>
+    <description>
+      Psychsoft Consulting is an Industry recognized leading technology
+      consulting firm based in Quincy, Massachusetts founded in 1987 with a
+      highly educated, trained and experienced staff to help in all your IT
+      needs. Psychsoft, Inc. personnel hold advanced degrees in various
+      fields and have years of experience in IT implementation,
+      troubleshooting, design and configuration. Areas of expertise include:
+      Linux, Microsoft Windows, UNIX (including FreeBSD), TCP/IP, LAN, WAN,
+      VPN, Network security, WIFI security, WIFI design, Database design,
+      SQL, Web site design, Server design, System integration, Network
+      printing and DSL/Broadband/T1 Internet access.
+    </description>
+  </entry>
+
   <entry id="Questwork" category="asia">
     <name>Questwork Consulting Limited</name>
     <url>http://www.questwork.com/</url>

==== //depot/projects/docproj_es/www/share/sgml/commercial.isp.xml#3 (text+ko) ====

@@ -1,12 +1,12 @@
 <?xml version="1.0"?>
 <!DOCTYPE entries PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for Commercial Gallery//EN"
                             "http://www.FreeBSD.org/XML/www/share/sgml/gallery.dtd">
-<!-- $FreeBSD: www/share/sgml/commercial.isp.xml,v 1.32 2008/06/09 19:58:37 jkois Exp $ -->
+<!-- $FreeBSD: www/share/sgml/commercial.isp.xml,v 1.33 2008/06/15 12:52:45 jkois Exp $ -->
 
 <entries>
   <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
     <cvs:keyword name="freebsd">
-      $FreeBSD: www/share/sgml/commercial.isp.xml,v 1.32 2008/06/09 19:58:37 jkois Exp $
+      $FreeBSD: www/share/sgml/commercial.isp.xml,v 1.33 2008/06/15 12:52:45 jkois Exp $
     </cvs:keyword>
   </cvs:keywords>
 
@@ -665,7 +665,7 @@
 
   <entry id="verio">
     <name>Verio</name>
-    <url>http://www.verio.com</url>
+    <url>http://www.verio.com/freebsd</url>
     <description>
       With our FreeBSD VPS v3 and MPS v2, we combine more that 10 years
       of virtualization and managed experience with the proven

==== //depot/projects/docproj_es/www/share/sgml/libcommon.xsl#2 (text+ko) ====

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 <!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN"
 				"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd">
-<!-- $FreeBSD: www/share/sgml/libcommon.xsl,v 1.21 2008/04/21 01:21:41 murray Exp $ -->
+<!-- $FreeBSD: www/share/sgml/libcommon.xsl,v 1.23 2008/06/21 08:02:32 danger Exp $ -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   version="1.0"
@@ -61,6 +61,10 @@
      rss-security-advisories-title               security/security-rss.xsl (for l10n)
      rss-security-advisories-items               security/security-rss.xsl
 
+     rss-errata-notices				 security/errata-rss.xsl
+     rss-errata-notices-title			 security/errata-rss.xsl (for l10n)
+     rss-errata-notices-items			 security/errata-rss.xsl
+
      html-index-advisories-items                   index.xsl
      html-index-advisories-items-lastmodified      index.xsl (for i10n)
      html-index-news-project-items                 index.xsl
@@ -1067,6 +1071,86 @@
     </xsl:for-each>
   </xsl:template>
 
+  <!-- template: "rss-errata-notices"
+       generate a rdf of 10 most recent errata notices -->
+
+  <xsl:template name="rss-errata-notices">
+    <xsl:param name="notices.xml" select="''" />
+
+    <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
+      <channel>
+        <xsl:call-template name="rss-errata-notices-title">
+	  <xsl:with-param name="notices.xml" select="$notices.xml" />
+        </xsl:call-template>
+        <xsl:call-template name="rss-errata-notices-items">
+	  <xsl:with-param name="notices.xml" select="$notices.xml" />
+        </xsl:call-template>
+      </channel>
+    </rss>
+
+  </xsl:template>
+
+  <!-- template: "rss-errata-notices-title"
+       pulls in the 10 most recent errata notices -->
+
+  <xsl:template name="rss-errata-notices-title"
+                xmlns:atom="http://www.w3.org/2005/Atom">
+    <xsl:param name="notices.xml" select="''" />
+
+    <xsl:variable name="title">FreeBSD Errata Notices</xsl:variable>
+    <xsl:variable name="link">http://www.FreeBSD.org/security/</xsl:variable>
+
+    <title><xsl:value-of select="$title" /></title>
+    <link><xsl:value-of select="$link" /></link>
+    <description>Errata notices published from the FreeBSD Project</description>
+    <language>en-us</language>
+    <webMaster>secteam@FreeBSD.org (FreeBSD Security Team)</webMaster>
+    <managingEditor>secteam@FreeBSD.org (FreeBSD Security Team)</managingEditor>
+    <docs>http://blogs.law.harvard.edu/tech/rss</docs>
+    <ttl>120</ttl>
+    <image>
+      <url>http://www.FreeBSD.org/logo/logo-full.png</url>
+      <title><xsl:value-of select="$title" /></title>
+      <link><xsl:value-of select="$link" /></link>
+    </image>
+    <atom:link rel="self" type="application/rss+xml">
+      <xsl:attribute name="href">
+        <xsl:value-of select="$link" /><xsl:text>rss.xml</xsl:text>
+      </xsl:attribute>
+    </atom:link> 
+  </xsl:template>
+
+  <!-- template: "rss-errata-notices-items"
+       pulls in the 10 most recent errata notices -->
+
+  <xsl:template name="rss-errata-notices-items"
+                xmlns:atom="http://www.w3.org/2005/Atom">
+    <xsl:param name="notices.xml" select="''" />
+
+    <xsl:for-each select="document($notices.xml)/descendant::notice[position() &lt;= 10]">
+      <item>
+	<title><xsl:value-of select="name"/></title>
+	<xsl:choose>
+	  <xsl:when test="@omithref = 'yes'">
+	    <link>http://www.FreeBSD.org/security</link>
+	  </xsl:when>
+	  <xsl:otherwise>
+	    <link><xsl:value-of select="concat('&ftpbase;', name, '.asc')" /></link>
+	  </xsl:otherwise>
+	</xsl:choose>
+        <guid><xsl:value-of select="concat('&ftpbase;', name, '.asc')" /></guid>
+        <pubDate>
+          <xsl:call-template name="misc-format-date-string">
+            <xsl:with-param name="year" select="../../../name" />
+            <xsl:with-param name="month" select="../../name" />
+            <xsl:with-param name="day" select="../name" />
+            <xsl:with-param name="date-format" select="$param-l10n-date-format-rfc822" />
+          </xsl:call-template>
+        </pubDate>
+      </item>
+    </xsl:for-each>
+  </xsl:template>
+
   <!-- template: "html-index-news-project-items"
        pulls in the 5 most recent project items -->
 

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

@@ -20,7 +20,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.167 2008/06/13 03:16:31 murray Exp $
+      $FreeBSD: www/share/sgml/news.xml,v 1.169 2008/06/19 15:25:00 amdmi3 Exp $
     </cvs:keyword>
   </cvs:keywords>
 
@@ -30,6 +30,23 @@
     <month>
       <name>6</name>
 
+      <day>
+	<name>19</name>
+	<event>
+	  <p>New committer: <a href="mailto:amdmi3@FreeBSD.org">Dmitry Marakasov</a>
+	    (ports)</p>
+	</event>
+      </day>
+
+      <day>
+       <name>16</name>
+
+       <event>
+         <p>New committer: <a href="mailto:eri@FreeBSD.org">Ermal
+          Lu&#231;i</a> (src)</p>
+       </event>
+      </day>
+
       <day>	
        <name>10</name>
        

==== //depot/projects/docproj_es/www/share/sgml/notices.xml#2 (text+ko) ====

@@ -2,7 +2,7 @@
 <advisories>
   <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
     <cvs:keyword name="freebsd">
-      $FreeBSD: www/share/sgml/notices.xml,v 1.11 2008/04/17 00:18:16 cperciva Exp $
+      $FreeBSD: www/share/sgml/notices.xml,v 1.12 2008/06/19 06:55:30 cperciva Exp $
     </cvs:keyword>
   </cvs:keywords>
 
@@ -10,6 +10,18 @@
     <name>2008</name>
 
     <month>
+      <name>6</name>
+
+      <day>
+	<name>19</name>
+
+	<notice>
+	  <name>FreeBSD-EN-08:02.tcp</name>
+	</notice>
+      </day>
+    </month>
+
+    <month>
       <name>4</name>
 
       <day>

==== //depot/projects/docproj_es/www/share/sgml/press.xml#2 (text+ko) ====

@@ -9,7 +9,7 @@
 <press>
   <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
     <cvs:keyword name="freebsd">
-      $FreeBSD: www/share/sgml/press.xml,v 1.60 2008/03/07 07:30:57 jkoshy Exp $
+      $FreeBSD: www/share/sgml/press.xml,v 1.61 2008/06/21 05:49:58 jkoshy Exp $
     </cvs:keyword>
   </cvs:keywords>
 
@@ -17,6 +17,19 @@
     <name>2008</name>
 
     <month>
+      <name>6</name>
+      <story>
+        <name>Writing a kernel module for FreeBSD 7</name>
+	<url>http://www.freesoftwaremagazine.com/articles/writing_a_kernel_module_for_freebsd</url>
+	<site-name>Free Software Magazine</site-name>
+	<site-url>http://www.freesoftwaremagazine.com/</site-url>
+	<date>19 June 2008</date>
+	<author>Yousef Ourabi</author>
+	<p>A short introduction to building kernel modules on FreeBSD 7.</p>
+      </story>
+    </month>
+
+    <month>
       <name>3</name>
 
       <story>