PERFORCE change 160261 for review
Gabor Pali
pgj at FreeBSD.org
Mon Apr 6 03:47:13 PDT 2009
http://perforce.freebsd.org/chv.cgi?CH=160261
Change 160261 by pgj at beehive on 2009/04/06 10:46:37
IFC
Affected files ...
.. //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/authors.ent#26 integrate
.. //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys-developers.sgml#20 integrate
.. //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys.ent#20 integrate
.. //depot/projects/docproj_hu/doc/share/pgpkeys/rmacklem.key#1 branch
.. //depot/projects/docproj_hu/www/en/developers.sgml#22 integrate
.. //depot/projects/docproj_hu/www/en/releases/7.2R/schedule.sgml#4 integrate
.. //depot/projects/docproj_hu/www/en/releng/index.sgml#17 integrate
.. //depot/projects/docproj_hu/www/share/sgml/news.xml#46 integrate
Differences ...
==== //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/authors.ent#26 (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.475 2009/03/25 18:41:42 skreuzer Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.476 2009/04/05 17:51:17 rmacklem Exp $
-->
<!ENTITY a.aaron "Aaron Dalton <email>aaron at FreeBSD.org</email>">
@@ -900,6 +900,8 @@
<!ENTITY a.rink "Rink Springer <email>rink at FreeBSD.org</email>">
+<!ENTITY a.rmacklem "Rick Macklem <email>rmacklem at FreeBSD.org</email>">
+
<!ENTITY a.rnoland "Robert Noland <email>rnoland at FreeBSD.org</email>">
<!ENTITY a.rnordier "Robert Nordier <email>rnordier at FreeBSD.org</email>">
==== //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys-developers.sgml#20 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/share/pgpkeys/pgpkeys-developers.sgml,v 1.92 2009/03/25 18:41:42 skreuzer Exp $
+ $FreeBSD: doc/share/pgpkeys/pgpkeys-developers.sgml,v 1.93 2009/04/05 19:07:50 rmacklem Exp $
-->
<sect2 id="pgpkey-ariff">
@@ -761,6 +761,11 @@
&pgpkey.pav;
</sect2>
+ <sect2 id="pgpkey-rmacklem">
+ <title>&a.rmacklem;</title>
+ &pgpkey.rmacklem;
+ </sect2>
+
<sect2 id="pgpkey-bmah">
<title>&a.bmah;</title>
&pgpkey.bmah;
==== //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys.ent#20 (text+ko) ====
@@ -1,5 +1,5 @@
-<!-- $FreeBSD: doc/share/pgpkeys/pgpkeys.ent,v 1.188 2009/03/25 18:41:43 skreuzer Exp $ -->
+<!-- $FreeBSD: doc/share/pgpkeys/pgpkeys.ent,v 1.189 2009/04/05 19:07:50 rmacklem Exp $ -->
<!-- PGP keyblocks -->
<!ENTITY pgpkey.aaron SYSTEM "aaron.key">
<!ENTITY pgpkey.ache SYSTEM "ache.key">
@@ -241,6 +241,7 @@
<!ENTITY pgpkey.rich SYSTEM "rich.key">
<!ENTITY pgpkey.rik SYSTEM "rik.key">
<!ENTITY pgpkey.rink SYSTEM "rink.key">
+<!ENTITY pgpkey.rmacklem SYSTEM "rmacklem.key">
<!ENTITY pgpkey.rnoland SYSTEM "rnoland.key">
<!ENTITY pgpkey.roam SYSTEM "roam.key">
<!ENTITY pgpkey.roberto SYSTEM "roberto.key">
==== //depot/projects/docproj_hu/www/en/developers.sgml#22 (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.217 2009/03/25 19:43:16 skreuzer Exp $
+$FreeBSD: www/en/developers.sgml,v 1.218 2009/04/05 18:06:29 rmacklem Exp $
-->
@@ -451,6 +451,7 @@
<!ENTITY a.rich "Rich Murphey">
<!ENTITY a.rik "Roman Kurakin">
<!ENTITY a.rink "Rink Springer">
+<!ENTITY a.rmacklem "Rick Macklem">
<!ENTITY a.rnoland "Robert Noland">
<!ENTITY a.rnordier "Robert Nordier">
<!ENTITY a.roam "Peter Pentchev">
==== //depot/projects/docproj_hu/www/en/releases/7.2R/schedule.sgml#4 (text+ko) ====
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
<!ENTITY base CDATA "../..">
<!ENTITY email 'freebsd-qa'>
-<!ENTITY date "$FreeBSD: www/en/releases/7.2R/schedule.sgml,v 1.4 2009/04/01 19:03:06 blackend Exp $">
+<!ENTITY date "$FreeBSD: www/en/releases/7.2R/schedule.sgml,v 1.6 2009/04/03 17:15:05 blackend Exp $">
<!ENTITY local.rel "7.2">
<!ENTITY local.rel.tag "7_2">
<!ENTITY title "FreeBSD &local.rel; Release Process">
@@ -46,8 +46,8 @@
<tr>
<td>Announce the Ports Freeze</td>
- <td>--</td>
- <td>--</td>
+ <td>3 April 2009</td>
+ <td>3 April 2009</td>
<td>Someone from <tt>portmgr@</tt> should email
<tt>freebsd-ports@</tt> to set a date
for the week long ports freeze and tagging of the ports tree.</td>
@@ -69,14 +69,14 @@
<tr>
<td>Announce <tt>doc/</tt> tree slush</td>
<td>--</td>
- <td>--</td>
+ <td>3 April 2009</td>
<td>Notification of the impending <tt>doc/</tt> tree slush should
be sent to <tt>doc@</tt>.</td>
</tr>
<tr>
<td>Ports tree frozen</td>
- <td>--</td>
+ <td>13 April 2009</td>
<td>--</td>
<td>Only approved commits will be permitted to the <tt>ports/</tt>
tree during the freeze.</td>
@@ -85,7 +85,7 @@
<!-- doceng should tweak these values after we commit it to CVS -->
<tr>
<td><tt>doc/</tt> tree slush</td>
- <td>--</td>
+ <td>10 April 2009</td>
<td>--</td>
<td>Non-essential commits to the <tt>en_US.ISO8859-1/</tt> subtree
should be delayed from this point until after the <tt>doc/</tt>
@@ -96,8 +96,8 @@
<!-- doceng should tweak these values after we commit it to CVS -->
<tr>
<td><tt>doc/</tt> tree tagged.</td>
+ <td>17 April 2009</td>
<td>--</td>
- <td>--</td>
<td>Version number bumps for <tt>doc/</tt> subtree.
<tt>RELEASE_&local.rel.tag;_0</tt> tag for <tt>doc/</tt>. <tt>doc/</tt>
slush ends at this time.</td>
@@ -130,14 +130,14 @@
<!-- release bits get loaded to avoid network congestion problems -->
<tr>
<td>Ports tree tagged</td>
+ <td>20 April 2009</td>
<td>--</td>
- <td>--</td>
<td><tt>RELEASE_&local.rel.tag;_0</tt> tag for <tt>ports/</tt>.</td>
</tr>
<tr>
<td>Ports tree unfrozen</td>
- <td>--</td>
+ <td>20 April 2009</td>
<td>--</td>
<td>After the <tt>ports/</tt> tree is tagged,
the <tt>ports/</tt> tree will be re-opened for commits, but
@@ -146,7 +146,7 @@
<tr>
<td>Final package build starts</td>
- <td>--</td>
+ <td>20 April 2009</td>
<td>--</td>
<td>The ports cluster and
<a href="http://pointyhat.FreeBSD.org">pointyhat</a>
==== //depot/projects/docproj_hu/www/en/releng/index.sgml#17 (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/releng/index.sgml,v 1.255 2009/03/24 05:55:40 maxim Exp $">
+<!ENTITY date "$FreeBSD: www/en/releng/index.sgml,v 1.256 2009/04/03 13:09:51 blackend Exp $">
<!ENTITY email 're'>
<!ENTITY title "Release Engineering Information">
<!ENTITY % navinclude.developers "INCLUDE">
@@ -50,7 +50,7 @@
<tr>
<td>May 2009</td>
<td><a href="../releases/7.2R/schedule.html">FreeBSD 7.2</a></td>
- <td>A draft release schedule has been announced.</td>
+ <td>BETA1 is available</td>
</tr>
<tr>
==== //depot/projects/docproj_hu/www/share/sgml/news.xml#46 (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.237 2009/04/03 11:57:04 blackend Exp $
+ $FreeBSD: www/share/sgml/news.xml,v 1.238 2009/04/05 18:17:30 rmacklem Exp $
</cvs:keyword>
</cvs:keywords>
@@ -51,6 +51,16 @@
sites</a>.</p>
</event>
</day>
+
+ <day>
+ <name>6</name>
+
+ <event>
+ <p>New committer: <a href="mailto:rmacklem at FreeBSD.org">Rick
+ Macklem</a> (src)</p>
+ </event>
+ </day>
+
</month>
<month>
More information about the p4-projects
mailing list