PERFORCE change 167383 for review

Gabor Pali pgj at FreeBSD.org
Sat Aug 15 22:23:19 UTC 2009 

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

Change 167383 by pgj at beehive on 2009/08/15 22:23:06

	IFC

Affected files ...

.. //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/authors.ent#36 integrate
.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/gjournal-desktop/article.sgml#12 integrate
.. //depot/projects/docproj_hu/doc/share/pgpkeys/fluffy.key#1 branch
.. //depot/projects/docproj_hu/doc/share/pgpkeys/marck.key#3 integrate
.. //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys-developers.sgml#31 integrate
.. //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys.ent#29 integrate
.. //depot/projects/docproj_hu/www/en/donations/donors.sgml#20 integrate
.. //depot/projects/docproj_hu/www/en/platforms/arm.sgml#3 integrate
.. //depot/projects/docproj_hu/www/en/projects/newbies.sgml#3 integrate
.. //depot/projects/docproj_hu/www/share/sgml/commercial.consult.xml#14 integrate
.. //depot/projects/docproj_hu/www/share/sgml/commercial.isp.xml#15 integrate
.. //depot/projects/docproj_hu/www/share/sgml/news.xml#65 integrate

Differences ...

==== //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/authors.ent#36 (text+ko) ====

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

==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/gjournal-desktop/article.sgml#12 (text+ko) ====

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/hu_HU.ISO8859-2/articles/gjournal-desktop/article.sgml,v 1.2 2008/12/22 13:16:32 pgj Exp $ -->
+<!-- $FreeBSD: doc/hu_HU.ISO8859-2/articles/gjournal-desktop/article.sgml,v 1.3 2009/08/08 22:19:45 pgj Exp $ -->
 
 <!--
 
@@ -38,7 +38,7 @@
       <holder role="mailto:manolis at FreeBSD.org">Manolis Kiagias</holder>
     </copyright>
 
-    <releaseinfo>$FreeBSD: doc/hu_HU.ISO8859-2/articles/gjournal-desktop/article.sgml,v 1.2 2008/12/22 13:16:32 pgj Exp $</releaseinfo>
+    <releaseinfo>$FreeBSD: doc/hu_HU.ISO8859-2/articles/gjournal-desktop/article.sgml,v 1.3 2009/08/08 22:19:45 pgj Exp $</releaseinfo>
 
     <legalnotice id="trademarks" role="trademarks">
       &tm-attrib.freebsd;

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

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

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

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

==== //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys.ent#29 (text+ko) ====

@@ -1,5 +1,5 @@
 
-<!-- $FreeBSD: doc/share/pgpkeys/pgpkeys.ent,v 1.200 2009/07/20 15:09:52 yzlin Exp $ -->
+<!-- $FreeBSD: doc/share/pgpkeys/pgpkeys.ent,v 1.201 2009/08/10 16:55:15 fluffy Exp $ -->
 <!-- PGP keyblocks -->
 <!ENTITY pgpkey.aaron SYSTEM "aaron.key">
 <!ENTITY pgpkey.ache SYSTEM "ache.key">
@@ -90,6 +90,7 @@
 <!ENTITY pgpkey.fanf SYSTEM "fanf.key">
 <!ENTITY pgpkey.farrokhi SYSTEM "farrokhi.key">
 <!ENTITY pgpkey.fjoe SYSTEM "fjoe.key">
+<!ENTITY pgpkey.fluffy SYSTEM "fluffy.key">
 <!ENTITY pgpkey.flz SYSTEM "flz.key">
 <!ENTITY pgpkey.foxfair SYSTEM "foxfair.key">
 <!ENTITY pgpkey.gabor SYSTEM "gabor.key">

==== //depot/projects/docproj_hu/www/en/donations/donors.sgml#20 (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.393 2009/07/28 14:25:07 tabthorpe Exp $">
+<!ENTITY date "$FreeBSD: www/en/donations/donors.sgml,v 1.394 2009/08/12 15:20:11 tabthorpe Exp $">
 <!ENTITY title "Hardware Donors Page">
 <!ENTITY % navinclude.about "INCLUDE">
 <!ENTITY % developers SYSTEM "../developers.sgml"> %developers;
@@ -2607,6 +2607,13 @@
     <td> rpaulo </td>
     <td> Received </td>
   </tr>
+
+  <tr>
+    <td> bms </td>
+    <td> See MIPS Run book </td>
+    <td> stas </td>
+    <td> Received </td>
+  </tr>
 </table>
 
 &footer;

==== //depot/projects/docproj_hu/www/en/platforms/arm.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/platforms/arm.sgml,v 1.12 2008/05/31 21:03:22 jkois Exp $">
+<!ENTITY date "$FreeBSD: www/en/platforms/arm.sgml,v 1.13 2009/08/13 05:58:35 remko Exp $">
 <!ENTITY title "FreeBSD/ARM Project">
 <!ENTITY email 'freebsd-arm'>
 <!ENTITY % navinclude.developers "INCLUDE">
@@ -63,7 +63,7 @@
 
     <p>Additionally, support for the Technologic Systems TS-7200 devboard
       is in the works, as is support for the Atmel AT91SAM926x CPU and
-      the Mavell Orion ARM SoC, the Samsung S3C2XX0 range, and Cirrus
+      the Marvell Orion ARM SoC, the Samsung S3C2XX0 range, and Cirrus
       Logic EP93XX CPUs.</p>
 
     <h3><a name="todo">What Needs To Be Done</a></h3>

==== //depot/projects/docproj_hu/www/en/projects/newbies.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/projects/newbies.sgml,v 1.56 2008/06/15 12:14:51 jkois Exp $">
+<!ENTITY date "$FreeBSD: www/en/projects/newbies.sgml,v 1.58 2009/08/09 12:58:45 blackend Exp $">
 <!ENTITY title 'Resources for Newbies'>
 <!ENTITY % navinclude.docs "INCLUDE">
 <!ENTITY url.articles "&base;/doc/en_US.ISO8859-1/articles">
@@ -136,7 +136,7 @@
 
       <li><p>Apple's <a href="http://www.apple.com/macosx">Mac OS
         X</a>
-        is <a href="http://www.apple.com/macosx/features/unix/">based
+        is <a href="http://www.apple.com/server/macosx/technology/unix.html">based
         in part</a> on FreeBSD and includes a rich &unix; foundation in
         addition to the proprietary Apple user interface.</p></li>
     </ul>
@@ -178,6 +178,19 @@
 	  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 format.</p>
+      </li>
+
       <li><p><a href="http://www.mcsr.olemiss.edu/unixhelp/">UNIXhelp
 	    for Users</a> is another introductory guide which is available in
 	  HTML at a mirror site near you, or can be installed on your own

==== //depot/projects/docproj_hu/www/share/sgml/commercial.consult.xml#14 (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.61 2009/07/16 13:22:45 danger Exp $ -->
+<!-- $FreeBSD: www/share/sgml/commercial.consult.xml,v 1.62 2009/08/13 09:00:10 remko 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.61 2009/07/16 13:22:45 danger Exp $
+      $FreeBSD: www/share/sgml/commercial.consult.xml,v 1.62 2009/08/13 09:00:10 remko Exp $
     </cvs:keyword>
   </cvs:keywords>
 
@@ -1429,14 +1429,14 @@
 
   <entry id="Raditex" category="europe">
     <name>Raditex AB</name>
-    <url>http://raditex.se/</url>
+    <url>http://raditex.nu/</url>
     <description>
       Raditex AB are a firm of consultants and also do education in Unix.
       We have long experience with all kinds of Unix systems not only
       FreeBSD or Linux. For more information phone us at +46.8.6949270 or
       give us an email at <a
-      href="mailto:info at raditex.se">info at raditex.se</a> or <a
-      href="http://raditex.se/">visit our web site</a>.
+      href="mailto:gorhas at raditex.nu">gorhas at raditex.nu</a> or <a
+      href="http://raditex.nu/">visit our web site</a>.
     </description>
   </entry>
 

==== //depot/projects/docproj_hu/www/share/sgml/commercial.isp.xml#15 (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.48 2009/06/22 20:27:16 jkois Exp $ -->
+<!-- $FreeBSD: www/share/sgml/commercial.isp.xml,v 1.49 2009/08/14 07:00:23 remko 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.48 2009/06/22 20:27:16 jkois Exp $
+      $FreeBSD: www/share/sgml/commercial.isp.xml,v 1.49 2009/08/14 07:00:23 remko Exp $
     </cvs:keyword>
   </cvs:keywords>
 
@@ -299,7 +299,7 @@
 
   <entry id="Quonix">
     <name>Quonix Networks</name>
-    <url>http://www.quonix.net/</url>
+    <url>http://www.quonix.net/products/dia.html</url>
     <description>
       Quonix Networks provides a variety of personal and enterprise
       hosting solutions powered by FreeBSD, including web, mail, secure

==== //depot/projects/docproj_hu/www/share/sgml/news.xml#65 (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.265 2009/07/20 15:44:53 yzlin Exp $
+      $FreeBSD: www/share/sgml/news.xml,v 1.266 2009/08/13 14:06:18 fluffy Exp $
     </cvs:keyword>
   </cvs:keywords>
 
@@ -33,6 +33,19 @@
     <name>2009</name>
 
     <month>
+      <name>8</name>
+
+      <day>
+	<name>10</name>
+	<event>
+	  <p>New committer: <a href="mailto:fluffy at FreeBSD.org">Dima
+	  Panov</a> (ports)</p>
+	</event>
+      </day>
+
+    </month>
+
+    <month>
       <name>7</name>
 
       <day>

More information about the p4-projects mailing list