Date: Thu, 25 Feb 2010 20:31:56 GMT From: Gabor Pali <pgj@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 175089 for review Message-ID: <201002252031.o1PKVu5F021494@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/chv.cgi?CH=175089 Change 175089 by pgj@Binturong on 2010/02/25 20:31:47 IFC Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/version-guide/article.sgml#11 integrate .. //depot/projects/docproj_hu/www/en/cgi/search.cgi#2 integrate .. //depot/projects/docproj_hu/www/en/releases/7.3R/Makefile#1 branch .. //depot/projects/docproj_hu/www/en/releases/7.3R/docbook.css#1 branch .. //depot/projects/docproj_hu/www/en/releases/7.3R/schedule.sgml#1 branch .. //depot/projects/docproj_hu/www/en/releases/Makefile#5 integrate .. //depot/projects/docproj_hu/www/en/releng/index.sgml#36 integrate .. //depot/projects/docproj_hu/www/en/where.sgml#7 integrate .. //depot/projects/docproj_hu/www/share/sgml/release.ent#21 integrate Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/version-guide/article.sgml#11 (text+ko) ==== @@ -24,7 +24,7 @@ </author> </authorgroup> - <pubdate>$FreeBSD: doc/hu_HU.ISO8859-2/articles/version-guide/article.sgml,v 1.8 2008/06/25 11:28:04 gabor Exp $</pubdate> + <pubdate>$FreeBSD: doc/hu_HU.ISO8859-2/articles/version-guide/article.sgml,v 1.9 2010/02/22 12:06:15 pgj Exp $</pubdate> <legalnotice id="trademarks" role="trademarks"> &tm-attrib.freebsd; ==== //depot/projects/docproj_hu/www/en/cgi/search.cgi#2 (text+ko) ==== @@ -15,7 +15,7 @@ # Disclaimer: # This is pretty ugly in places. # -# $FreeBSD: www/en/cgi/search.cgi,v 1.27 2006/03/24 01:51:18 kuriyama Exp $ +# $FreeBSD: www/en/cgi/search.cgi,v 1.28 2010/02/25 09:50:44 wosch Exp $ $server_root = '/usr/local/www'; @@ -248,7 +248,7 @@ # print "<input type=\"checkbox\" name=\"rf\" value=\"$docnum\"/>"; print "Score: <em>$score</em>; "; $_ = $date; - /(...?)(..)(..)/ && ($yr = $1 + 1900, $mo = $months[$2 - 1], $dy = $3); + /^(..?)(..)(..)$/ && ($yr = $1 + ($1 > 69 ? 1900 : 2000), $mo = $months[$2 - 1], $dy = $3); print "Lines: <em>$lines</em>; "; print "${dy}-${mo}-${yr}; "; print "Archive: <em>$file</em>"; ==== //depot/projects/docproj_hu/www/en/releases/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: www/en/releases/Makefile,v 1.54 2009/09/23 20:03:59 blackend Exp $ +# $FreeBSD: www/en/releases/Makefile,v 1.55 2010/02/23 20:57:17 hrs Exp $ .if exists(../Makefile.conf) .include "../Makefile.conf" @@ -15,7 +15,8 @@ SUBDIR+= 4.6.2R 4.7R 4.8R 4.9R 4.10R 4.11R SUBDIR+= 5.0R 5.1R 5.2R 5.2.1R 5.3R 5.4R 5.5R SUBDIR+= 6.0R 6.1R 6.2R 6.3R 6.4R -SUBDIR+= 7.0R 7.1R 7.2R 8.0R +SUBDIR+= 7.0R 7.1R 7.2R 7.3R +SUBDIR+= 8.0R .if defined $(NEW_BUILD) SUBDIR= ==== //depot/projects/docproj_hu/www/en/releng/index.sgml#36 (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.280 2010/02/04 23:20:03 delphij Exp $"> +<!ENTITY date "$FreeBSD: www/en/releng/index.sgml,v 1.281 2010/02/23 21:00:59 hrs Exp $"> <!ENTITY email 're'> <!ENTITY title "Release Engineering Information"> <!ENTITY % navinclude.developers "INCLUDE"> @@ -48,15 +48,10 @@ </tr> <tr> - <td>May 2009</td> - <td><a href="../releases/7.2R/schedule.html">FreeBSD 7.2</a></td> - <td>released on schedule</td> - </tr> - - <tr> - <td>November 2009</td> - <td><a href="../releases/8.0R/schedule.html">FreeBSD 8.0</a></td> - <td>Released.</td> + <td>March 2010</td> + <td>&os; 7.3</td> + <td>RC1 is <a + href="http://lists.freebsd.org/pipermail/freebsd-stable/2010-February/055146.html">available</a></td> </tr> </table> @@ -100,9 +95,16 @@ <tr> <td><tt>RELENG_7</tt></td> + <td>Open</td> + <td>committers</td> + <td>Development branch for 7-STABLE.</td> + </tr> + + <tr> + <td><tt>RELENG_7_3</tt></td> <td>Frozen</td> <td>&contact.re;</td> - <td>Development branch for 7-STABLE.</td> + <td>Frozen in preparation for 7.3-RELEASE.</td> </tr> <tr> ==== //depot/projects/docproj_hu/www/en/where.sgml#7 (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.103 2010/01/21 20:55:04 jkois Exp $"> +<!ENTITY date "$FreeBSD: www/en/where.sgml,v 1.104 2010/02/23 20:59:45 hrs Exp $"> <!ENTITY title "Getting FreeBSD"> <!ENTITY % navinclude.download "INCLUDE"> <!ENTITY url.rel "ftp://ftp.FreeBSD.org/pub/FreeBSD/releases"> @@ -175,20 +175,17 @@ <td colspan="2">Version & Platform</td> <td>Distribution</td> <td title="ISO9660 CD image"><a href="&base;/doc/en_US.ISO8859-1/books/handbook/install-diff-media.html#INSTALL-CDROM">ISO</a></td> - <td>Schedule</td> -<!-- - <td>TODO List</td> ---> + <td>Status page</td> </tr> </thead> <tbody> <tr> <td colspan="2">FreeBSD &betarel.current;-&betarel.vers;</td> <td colspan="2"></td> - <td rowspan="7"><a href="&base;/releases/&betarel.current;R/schedule.html">[View]</a></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/7.3TODO">[View]</a></td> </tr> <tr> <td></td> @@ -202,24 +199,28 @@ <td><a href="&url.rel;/i386/&betarel.current;-&betarel.vers;">[Distribution]</a></td> <td><a href="&url.rel;/i386/ISO-IMAGES/&betarel.current;/">[ISO]</a></td> </tr> +<!-- <tr> <td></td> <td>ia64</td> <td><a href="&url.rel;/ia64/&betarel.current;-&betarel.vers;">[Distribution]</a></td> <td><a href="&url.rel;/ia64/ISO-IMAGES/&betarel.current;/">[ISO]</a></td> </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>sparc64</td> ==== //depot/projects/docproj_hu/www/share/sgml/release.ent#21 (text+ko) ==== @@ -1,4 +1,4 @@ -<!-- $FreeBSD: www/share/sgml/release.ent,v 1.41 2009/11/29 20:16:53 marcus Exp $ --> +<!-- $FreeBSD: www/share/sgml/release.ent,v 1.42 2010/02/23 20:59:45 hrs Exp $ --> <!-- XXX rel.current and u.rel.* should be available in doc/ --> <!-- The currently released versions of FreeBSD. This value is used to @@ -28,10 +28,10 @@ <!-- If there is no release currently in the release cycle (i.e. we don't have something in BETAn or RCn), then change %beta.testing below to "IGNORE". If we do, use "INCLUDE". --> -<!ENTITY beta.testing "IGNORE"> -<!ENTITY % beta.testing "IGNORE"> -<!ENTITY betarel.current '8.0'> -<!ENTITY betarel.vers 'RC3'> +<!ENTITY beta.testing "INCLUDE"> +<!ENTITY % beta.testing "INCLUDE"> +<!ENTITY betarel.current '7.3'> +<!ENTITY betarel.vers 'RC1'> <!ENTITY u.betarel.schedule '&base;/releases/&betarel.current;R/schedule.html'> <!-- If we have a second release in the release cycle (e.g. 5.x and 6.y
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201002252031.o1PKVu5F021494>