PERFORCE change 177188 for review
Gabor Pali
pgj at FreeBSD.org
Wed Apr 21 19:56:10 UTC 2010
http://p4web.freebsd.org/@@177188?ac=10
Change 177188 by pgj at Binturong on 2010/04/21 19:55:58
IFC
Affected files ...
.. //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/authors.ent#49 integrate
.. //depot/projects/docproj_hu/doc/share/pgpkeys/anchie.key#1 branch
.. //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys-developers.sgml#41 integrate
.. //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys.ent#39 integrate
.. //depot/projects/docproj_hu/doc/share/pgpkeys/rstone.key#1 branch
.. //depot/projects/docproj_hu/www/en/developers.sgml#45 integrate
.. //depot/projects/docproj_hu/www/en/news/status/report-2010-01-2010-03.xml#1 branch
.. //depot/projects/docproj_hu/www/en/snapshots/index.sgml#2 integrate
.. //depot/projects/docproj_hu/www/share/sgml/news.xml#94 integrate
Differences ...
==== //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/authors.ent#49 (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.502 2010/04/11 17:13:08 sahil Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.505 2010/04/21 07:19:51 randi Exp $
-->
<!ENTITY a.aaron "Aaron Dalton <email>aaron at FreeBSD.org</email>">
@@ -58,6 +58,8 @@
<!ENTITY a.amurai "Atsushi Murai <email>amurai at FreeBSD.org</email>">
+<!ENTITY a.anchie "Ana Kukec <email>anchie at FreeBSD.org</email>">
+
<!ENTITY a.anders "Anders Nordby <email>anders at FreeBSD.org</email>">
<!ENTITY a.andre "Andre Oppermann <email>andre at FreeBSD.org</email>">
@@ -910,6 +912,8 @@
<!ENTITY a.raj "Rafal Jaworowski <email>raj at FreeBSD.org</email>">
+<!ENTITY a.randi "Randi Harper <email>randi at FreeBSD.org</email>">
+
<!ENTITY a.rdivacky "Roman Divacky <email>rdivacky at FreeBSD.org</email>">
<!ENTITY a.rees "Jim Rees <email>rees at FreeBSD.org</email>">
@@ -958,6 +962,8 @@
<!ENTITY a.rsm "Scott Mitchell <email>rsm at FreeBSD.org</email>">
+<!ENTITY a.rstone "Ryan Stone <email>rstone at FreeBSD.org</email>">
+
<!ENTITY a.ru "Ruslan Ermilov <email>ru at FreeBSD.org</email>">
<!ENTITY a.rushani "Hideyuki KURASHINA <email>rushani at FreeBSD.org</email>">
==== //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys-developers.sgml#41 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/share/pgpkeys/pgpkeys-developers.sgml,v 1.120 2010/04/11 17:13:08 sahil Exp $
+ $FreeBSD: doc/share/pgpkeys/pgpkeys-developers.sgml,v 1.122 2010/04/20 22:31:46 rstone Exp $
-->
<sect2 id="pgpkey-ariff">
@@ -656,6 +656,11 @@
&pgpkey.gabor;
</sect2>
+ <sect2 id="pgpkey-anchie">
+ <title>&a.anchie;</title>
+ &pgpkey.anchie;
+ </sect2>
+
<sect2 id="pgpkey-rik">
<title>&a.rik;</title>
&pgpkey.rik;
@@ -1331,6 +1336,11 @@
&pgpkey.vs;
</sect2>
+ <sect2 id="pgpkey-rstone">
+ <title>&a.rstone;</title>
+ &pgpkey.rstone;
+ </sect2>
+
<sect2 id="pgpkey-xride">
<title>&a.xride;</title>
&pgpkey.xride;
==== //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys.ent#39 (text+ko) ====
@@ -1,5 +1,5 @@
-<!-- $FreeBSD: doc/share/pgpkeys/pgpkeys.ent,v 1.212 2010/04/11 17:13:08 sahil Exp $ -->
+<!-- $FreeBSD: doc/share/pgpkeys/pgpkeys.ent,v 1.214 2010/04/20 22:31:46 rstone Exp $ -->
<!-- PGP keyblocks -->
<!ENTITY pgpkey.aaron SYSTEM "aaron.key">
<!ENTITY pgpkey.ache SYSTEM "ache.key">
@@ -11,6 +11,7 @@
<!ENTITY pgpkey.alex SYSTEM "alex.key">
<!ENTITY pgpkey.alexbl SYSTEM "alexbl.key">
<!ENTITY pgpkey.amdmi3 SYSTEM "amdmi3.key">
+<!ENTITY pgpkey.anchie SYSTEM "anchie.key">
<!ENTITY pgpkey.anders SYSTEM "anders.key">
<!ENTITY pgpkey.andreas SYSTEM "andreas.key">
<!ENTITY pgpkey.anholt SYSTEM "anholt.key">
@@ -262,6 +263,7 @@
<!ENTITY pgpkey.rodrigc SYSTEM "rodrigc.key">
<!ENTITY pgpkey.rpaulo SYSTEM "rpaulo.key">
<!ENTITY pgpkey.rrs SYSTEM "rrs.key">
+<!ENTITY pgpkey.rstone SYSTEM "rstone.key">
<!ENTITY pgpkey.ru SYSTEM "ru.key">
<!ENTITY pgpkey.rushani SYSTEM "rushani.key">
<!ENTITY pgpkey.ryusuke SYSTEM "ryusuke.key">
==== //depot/projects/docproj_hu/www/en/developers.sgml#45 (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.246 2010/04/11 17:19:14 sahil Exp $
+$FreeBSD: www/en/developers.sgml,v 1.249 2010/04/21 08:12:38 randi Exp $
-->
@@ -32,6 +32,7 @@
<!ENTITY a.amdmi3 "Dmitry Marakasov">
<!ENTITY a.amorita "Akio Morita">
<!ENTITY a.amurai "Atsushi Murai">
+<!ENTITY a.anchie "Ana Kukec">
<!ENTITY a.anders "Anders Nordby">
<!ENTITY a.andre "Andre Oppermann">
<!ENTITY a.andreas "Andreas Klemm">
@@ -455,6 +456,7 @@
<!ENTITY a.qingli "Qing Li">
<!ENTITY a.rafan "Rong-En Fan">
<!ENTITY a.raj "Rafal Jaworowski">
+<!ENTITY a.randi "Randi Harper">
<!ENTITY a.rdivacky "Roman Divacky">
<!ENTITY a.rees "Jim Rees">
<!ENTITY a.reg "Jeremy Lea">
@@ -479,6 +481,7 @@
<!ENTITY a.rrs "Randall R. Stewart">
<!ENTITY a.rse "Ralf S. Engelschall">
<!ENTITY a.rsm "Scott Mitchell">
+<!ENTITY a.rstone "Ryan Stone">
<!ENTITY a.ru "Ruslan Ermilov">
<!ENTITY a.rushani "Hideyuki KURASHINA">
<!ENTITY a.rv "Rajesh Vaidheeswarran">
==== //depot/projects/docproj_hu/www/en/snapshots/index.sgml#2 (text+ko) ====
@@ -1,13 +1,13 @@
<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
<!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/en/snapshots/index.sgml,v 1.43 2008/03/10 17:03:38 simon Exp $">
+<!ENTITY date "$FreeBSD: www/en/snapshots/index.sgml,v 1.44 2010/04/17 19:14:17 jkois Exp $">
<!ENTITY title "FreeBSD Snapshot Releases">
<!ENTITY % navinclude.download "INCLUDE">
<!ENTITY % developers SYSTEM "../developers.sgml"> %developers;
<!ENTITY url.snapshots "ftp://ftp.freebsd.org/pub/FreeBSD/snapshots">
]>
-<!-- $FreeBSD: www/en/snapshots/index.sgml,v 1.43 2008/03/10 17:03:38 simon Exp $ -->
+<!-- $FreeBSD: www/en/snapshots/index.sgml,v 1.44 2010/04/17 19:14:17 jkois Exp $ -->
<html>
&header;
@@ -32,7 +32,8 @@
sites</a>.</p>
<p>Currently the snapshots of
- <a href="&base;/doc/en_US.ISO8859-1/books/handbook/current-stable.html#CURRENT">8-CURRENT</a>,
+ <a href="&base;/doc/en_US.ISO8859-1/books/handbook/current-stable.html#CURRENT">9-CURRENT</a>,
+ <a href="&base;/doc/en_US.ISO8859-1/books/handbook/current-stable.html#STABLE">8-STABLE</a>,
<a href="&base;/doc/en_US.ISO8859-1/books/handbook/current-stable.html#STABLE">7-STABLE</a>,
and
<a href="&base;/doc/en_US.ISO8859-1/books/handbook/current-stable.html#STABLE">6-STABLE</a>
@@ -89,6 +90,7 @@
and it turns out that you never even tried the snapshots,
well, it cuts both ways!</p>
+<!--
<h2>Other Resources</h2>
<p>Here are some related resources. Note that they are managed by
@@ -101,7 +103,7 @@
<ul>
<li><a href="http://snapshots.us.FreeBSD.org/">FreeBSD snapshots by &a.brd; (brd@)</a>.</li>
</ul>
-
+-->
&footer;
</body>
</html>
==== //depot/projects/docproj_hu/www/share/sgml/news.xml#94 (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.310 2010/04/11 19:38:00 rene Exp $
+ $FreeBSD: www/share/sgml/news.xml,v 1.313 2010/04/21 08:14:56 randi Exp $
</cvs:keyword>
</cvs:keywords>
@@ -36,6 +36,33 @@
<name>4</name>
<day>
+ <name>20</name>
+
+ <event>
+ <p>New committer: <a href="mailto:randi at FreeBSD.org">Randi Harper</a> (src)</p>
+ </event>
+
+ </day>
+
+ <day>
+ <name>19</name>
+
+ <event>
+ <p>New committer: <a href="mailto:rstone at FreeBSD.org">Ryan Stone</a> (src)</p>
+ </event>
+
+ </day>
+
+ <day>
+ <name>14</name>
+
+ <event>
+ <p>New committer: <a href="mailto:anchie at FreeBSD.org">Ana Kukec</a> (src)</p>
+ </event>
+
+ </day>
+
+ <day>
<name>11</name>
<event>
More information about the p4-projects
mailing list