Date: Sat, 6 Aug 2011 10:13:28 GMT From: Rene Ladan <rene@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 197269 for review Message-ID: <201108061013.p76ADSMH092105@skunkworks.freebsd.org>
index | next in thread | raw e-mail
http://p4web.freebsd.org/@@197269?ac=10 Change 197269 by rene@rene_acer on 2011/08/06 10:12:59 IFC Affected files ... .. //depot/projects/docproj_nl/www/en/administration.sgml#22 integrate .. //depot/projects/docproj_nl/www/en/releases/9.0R/schedule.sgml#2 integrate .. //depot/projects/docproj_nl/www/en/releng/index.sgml#44 integrate .. //depot/projects/docproj_nl/www/en/where.sgml#11 integrate .. //depot/projects/docproj_nl/www/nl/where.sgml#26 integrate .. //depot/projects/docproj_nl/www/share/sgml/events.xml#42 integrate .. //depot/projects/docproj_nl/www/share/sgml/events2003.xml#1 branch .. //depot/projects/docproj_nl/www/share/sgml/events2004.xml#1 branch .. //depot/projects/docproj_nl/www/share/sgml/events2005.xml#1 branch .. //depot/projects/docproj_nl/www/share/sgml/events2006.xml#1 branch .. //depot/projects/docproj_nl/www/share/sgml/events2007.xml#1 branch .. //depot/projects/docproj_nl/www/share/sgml/events2008.xml#1 branch .. //depot/projects/docproj_nl/www/share/sgml/events2009.xml#1 branch .. //depot/projects/docproj_nl/www/share/sgml/events2010.xml#1 branch .. //depot/projects/docproj_nl/www/share/sgml/events2011.xml#1 branch .. //depot/projects/docproj_nl/www/share/sgml/events2012.xml#1 branch .. //depot/projects/docproj_nl/www/share/sgml/events2013.xml#1 branch .. //depot/projects/docproj_nl/www/share/sgml/news.xml#112 integrate .. //depot/projects/docproj_nl/www/share/sgml/release.ent#35 integrate Differences ... ==== //depot/projects/docproj_nl/www/en/administration.sgml#22 (text+ko) ==== @@ -1,5 +1,5 @@ <!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [ -<!ENTITY date "$FreeBSD: www/en/administration.sgml,v 1.43 2011/05/16 16:03:36 ryusuke Exp $"> +<!ENTITY date "$FreeBSD: www/en/administration.sgml,v 1.44 2011/08/06 00:17:39 gjb Exp $"> <!ENTITY title "FreeBSD Project Administration and Management"> <!ENTITY % navinclude.about "INCLUDE"> <!ENTITY % developers SYSTEM "developers.sgml"> %developers; @@ -501,6 +501,7 @@ <ul> <li>&a.jmb; <<a href="mailto:jmb@FreeBSD.org">jmb@FreeBSD.org</a>></li> <li>&a.brd; <<a href="mailto:brd@FreeBSD.org">brd@FreeBSD.org</a>></li> + <li>&a.sahil; <<a href="mailto:sahil@FreeBSD.org">sahil@FreeBSD.org</a>></li> <li>&a.dhw; <<a href="mailto:dhw@FreeBSD.org">dhw@FreeBSD.org</a>></li> </ul> ==== //depot/projects/docproj_nl/www/en/releases/9.0R/schedule.sgml#2 (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/9.0R/schedule.sgml,v 1.2 2011/07/10 18:00:38 bz Exp $"> +<!ENTITY date "$FreeBSD: www/en/releases/9.0R/schedule.sgml,v 1.3 2011/08/05 02:33:47 hrs Exp $"> <!ENTITY local.rel "9.0"> <!ENTITY local.rel.tag "9_0"> <!ENTITY title "FreeBSD &local.rel; Release Process"> @@ -53,7 +53,7 @@ <tr> <td>Code freeze begins</td> <td>17 July 2011</td> - <td>-</td> + <td>18 July 2011</td> <td>Release Engineers announce that all further commits to the head branch will require explicit approval. Certain blanket approvals will be granted for narrow areas of @@ -63,7 +63,7 @@ <tr> <td>BETA1</td> <td>20 July 2011</td> - <td>-</td> + <td>1 August 2011</td> <td>First beta test snapshot.</td> </tr> ==== //depot/projects/docproj_nl/www/en/releng/index.sgml#44 (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.294 2011/07/10 17:12:24 hrs Exp $"> +<!ENTITY date "$FreeBSD: www/en/releng/index.sgml,v 1.295 2011/08/05 02:25:21 hrs Exp $"> <!ENTITY email 're'> <!ENTITY title "Release Engineering Information"> <!ENTITY % navinclude.developers "INCLUDE"> @@ -50,7 +50,7 @@ <tr> <td>September 2011</td> <td>&os; 9.0</td> - <td>In "Code Slush" (feature freeze) now. <a + <td>In "Code Freeze" now. <a href="&base;/releases/9.0R/schedule.html">The release schedule</a> is available.</td> </tr> @@ -87,12 +87,12 @@ <tr> <td><tt>HEAD</tt></td> - <td>Slush</td> + <td>Frozen</td> <td>committers</td> - <td>Active development branch for 9-CURRENT. No approval from - RE is required in "Code Slush" period though major ongoing - work such as new features must be notified to RE.</td> + <td>Active development branch for 9-CURRENT and now in a + preparation stage for 9.0-RELEASE. All commits to this branch + requires RE's approval.</td> </tr> <tr> ==== //depot/projects/docproj_nl/www/en/where.sgml#11 (text+ko) ==== @@ -1,5 +1,5 @@ <!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [ -<!ENTITY date "$FreeBSD: www/en/where.sgml,v 1.108 2011/01/03 19:03:24 hrs Exp $"> +<!ENTITY date "$FreeBSD: www/en/where.sgml,v 1.111 2011/08/05 22:56:39 gjb Exp $"> <!ENTITY title "Getting FreeBSD"> <!ENTITY % navinclude.download "INCLUDE"> <!ENTITY url.rel "ftp://ftp.FreeBSD.org/pub/FreeBSD/releases"> @@ -119,30 +119,14 @@ <td><a href="&url.rel;/i386/&rel2.current;-RELEASE">[Distribution]</a></td> <td><a href="&url.rel;/i386/ISO-IMAGES/&rel2.current;/">[ISO]</a></td> </tr> -<!-- - <tr> - <td></td> - <td>ia64</td> - <td><a href="&url.rel;/ia64/&rel2.current;-RELEASE">[Distribution]</a></td> - <td><a href="&url.rel;/ia64/ISO-IMAGES/&rel2.current;/">[ISO]</a></td> - </tr> ---> <tr> <td></td> <td>pc98</td> <td><a href="&url.rel;/pc98/&rel2.current;-RELEASE">[Distribution]</a></td> <td><a href="&url.rel;/pc98/ISO-IMAGES/&rel2.current;/">[ISO]</a></td> </tr> -<!-- <tr> <td></td> - <td>powerpc</td> - <td><a href="&url.rel;/powerpc/&rel2.current;-RELEASE">[Distribution]</a></td> - <td><a href="&url.rel;/powerpc/ISO-IMAGES/&rel2.current;/">[ISO]</a></td> - </tr> ---> - <tr> - <td></td> <td>sparc64</td> <td><a href="&url.rel;/sparc64/&rel2.current;-RELEASE">[Distribution]</a></td> <td><a href="&url.rel;/sparc64/ISO-IMAGES/&rel2.current;/">[ISO]</a></td> @@ -186,10 +170,7 @@ <tr> <td colspan="2">FreeBSD &betarel.current;-&betarel.vers;</td> <td colspan="2"></td> -<!-- - <td rowspan="7"><a href="&base;/releases/&betarel.current;R/todo.html">[View]</a></td> ---> - <td rowspan="7"><a href="http://wiki.freebsd.org/Releng/8.2TODO">[View]</a></td> + <td rowspan="7"><a href="http://wiki.freebsd.org/Releng/9.0TODO">[View]</a></td> </tr> <tr> <td></td> @@ -211,28 +192,26 @@ </tr> <tr> <td></td> - <td>pc98</td> - <td><a href="&url.rel;/pc98/&betarel.current;-&betarel.vers;">[Distribution]</a></td> - <td><a href="&url.rel;/pc98/ISO-IMAGES/&betarel.current;/">[ISO]</a></td> - </tr> - <tr> - <td></td> <td>powerpc</td> <td><a href="&url.rel;/powerpc/&betarel.current;-&betarel.vers;">[Distribution]</a></td> <td><a href="&url.rel;/powerpc/ISO-IMAGES/&betarel.current;/">[ISO]</a></td> </tr> <tr> <td></td> + <td>powerpc64</td> + <td><a href="&url.rel;/powerpc64/&betarel.current;-&betarel.vers;">[Distribution]</a></td> + <td><a href="&url.rel;/powerpc64/ISO-IMAGES/&betarel.current;/">[ISO]</a></td> + <tr> + <td></td> <td>sparc64</td> <td><a href="&url.rel;/sparc64/&betarel.current;-&betarel.vers;">[Distribution]</a></td> <td><a href="&url.rel;/sparc64/ISO-IMAGES/&betarel.current;/">[ISO]</a></td> </tr> -<!-- </tbody> </table> ---> + <![ %beta2.testing; [ -<!-- + <table class="tblbasic"> <thead> <tr style="text-align: center;"> @@ -243,13 +222,13 @@ </tr> </thead> <tbody> ---> + <tr> <td colspan="2">FreeBSD &betarel2.current;-&betarel2.vers;</td> <td colspan="2"></td> -<!-- + <td><a href="&base;/releases/&betarel2.current;R/todo.html">[View]</a></td> ---> + <td rowspan="7"><a href="http://wiki.freebsd.org/Releng/7.4TODO">[View]</a></td> </tr> <tr> @@ -267,8 +246,8 @@ <tr> <td></td> <td>ia64</td> - <td><!--a href="&url.rel;/ia64/&betarel2.current;-&betarel2.vers;"-->[Distribution]<!--/a--></td> - <td><!--a href="&url.rel;/ia64/ISO-IMAGES/&betarel2.current;/"-->[ISO]<!--/a--></td> + <td><a href="&url.rel;/ia64/&betarel2.current;-&betarel2.vers;">[Distribution]</a></td> + <td><a href="&url.rel;/ia64/ISO-IMAGES/&betarel2.current;/">[ISO]</a></td> </tr> <tr> <td></td> @@ -279,8 +258,8 @@ <tr> <td></td> <td>powerpc</td> - <td><!--a href="&url.rel;/powerpc/&betarel2.current;-&betarel2.vers;"-->[Distribution]<!--/a--></td> - <td><!--a href="&url.rel;/powerpc/ISO-IMAGES/&betarel2.current;/"-->[ISO]<!--/a--></td> + <td><a href="&url.rel;/powerpc/&betarel2.current;-&betarel2.vers;">[Distribution]</a></td> + <td><a href="&url.rel;/powerpc/ISO-IMAGES/&betarel2.current;/">[ISO]</a></td> </tr> <tr> <td></td> @@ -290,6 +269,7 @@ </tr> </tbody> </table> + ]]> ]]> ==== //depot/projects/docproj_nl/www/nl/where.sgml#26 (text+ko) ==== @@ -1,5 +1,5 @@ <!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [ -<!ENTITY date "$FreeBSD: www/nl/where.sgml,v 1.11 2011/01/03 20:10:47 rene Exp $"> +<!ENTITY date "$FreeBSD: www/nl/where.sgml,v 1.12 2011/08/05 22:56:40 gjb Exp $"> <!ENTITY title "&os; verkrijgen"> <!ENTITY % navinclude.download "INCLUDE"> <!ENTITY url.rel "ftp://ftp.FreeBSD.org/pub/FreeBSD/releases"> @@ -166,11 +166,11 @@ <![ %beta.testing; [ <a name="helptest"></a> - <h2>Help met de volgende &os;-uitgave<![%beta2.testing; [n]]></h2> + <h2>Help met de volgende &os;-uitgave<![%beta.testing; [n]]></h2> <p>Ontwikkelaars en uitgavebeheerders werken aan de volgende - uitgave<![%beta2.testing; [n]]> van &os;. Als u mee wilt helpen met - testen, download dan de laatste build<![%beta2.testing; [s]]>. Let + uitgave<![%beta.testing; [n]]> van &os;. Als u mee wilt helpen met + testen, download dan de laatste build<![%beta.testing; [s]]>. Let wel dat deze beelden bedoeld zijn voor testen en niet gebruikt horen te worden in productie-omgevingen.</p> @@ -212,12 +212,6 @@ </tr> <tr> <td></td> - <td>pc98</td> - <td><a href="&url.rel;/pc98/&betarel.current;-&betarel.vers;">[Distributie]</a></td> - <td><a href="&url.rel;/pc98/ISO-IMAGES/&betarel.current;/">[ISO]</a></td> - </tr> - <tr> - <td></td> <td>powerpc</td> <td><a href="&url.rel;/powerpc/&betarel.current;-&betarel.vers;">[Distributie]</a></td> <td><a href="&url.rel;/powerpc/ISO-IMAGES/&betarel.current;/">[ISO]</a></td> @@ -228,12 +222,10 @@ <td><a href="&url.rel;/sparc64/&betarel.current;-&betarel.vers;">[Distributie]</a></td> <td><a href="&url.rel;/sparc64/ISO-IMAGES/&betarel.current;/">[ISO]</a></td> </tr> -<!-- </tbody> </table> ---> + <