Date: Mon, 20 Jan 2014 15:14:09 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43575 - in head: en_US.ISO8859-1/htdocs share/xml Message-ID: <201401201514.s0KFE9cI029672@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Mon Jan 20 15:14:09 2014 New Revision: 43575 URL: http://svnweb.freebsd.org/changeset/doc/43575 Log: Swap the order releases are listed in release.ent, making rel.current -> 10, rel2.current -> 9, rel3.current -> 8. Turn off the beta.testing entity. Update where.xml accordingly. Add rel3.current to the legacy releases on the index page. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: head/en_US.ISO8859-1/htdocs/index.xsl head/en_US.ISO8859-1/htdocs/where.xml head/share/xml/release.ent Modified: head/en_US.ISO8859-1/htdocs/index.xsl ============================================================================== --- head/en_US.ISO8859-1/htdocs/index.xsl Mon Jan 20 14:49:00 2014 (r43574) +++ head/en_US.ISO8859-1/htdocs/index.xsl Mon Jan 20 15:14:09 2014 (r43575) @@ -80,7 +80,9 @@ <li>Production: <a href="&u.rel.announce;">&rel.current;</a></li> <li>Legacy: <a - href="&u.rel2.announce;">&rel2.current;</a></li> + href="&u.rel2.announce;">&rel2.current;</a>, + <a + href="&u.rel3.announce;">&rel3.current;</a></li> <xsl:if test="'&beta.testing;' != 'IGNORE'"> <li>Upcoming: <a href="&base;/where.html#helptest">&betarel.current;-&betarel.vers;</a></li> Modified: head/en_US.ISO8859-1/htdocs/where.xml ============================================================================== --- head/en_US.ISO8859-1/htdocs/where.xml Mon Jan 20 14:49:00 2014 (r43574) +++ head/en_US.ISO8859-1/htdocs/where.xml Mon Jan 20 15:14:09 2014 (r43575) @@ -106,28 +106,72 @@ <tr> <td colspan="2">FreeBSD &rel2.current;-RELEASE</td> <td colspan="2"></td> - <td rowspan="5"><a href="&base;/releases/&rel2.current;R/relnotes.html">[View]</a></td> - <td rowspan="5"><a href="&base;/releases/&rel2.current;R/hardware.html">[View]</a></td> + <td rowspan="7"><a href="&base;/releases/&rel2.current;R/relnotes.html">[View]</a></td> + <td rowspan="7"><a href="&base;/releases/&rel2.current;R/hardware.html">[View]</a></td> + <td rowspan="7"><a href="&base;/releases/&rel2.current;R/installation.html">[View]</a></td> + <td rowspan="7"><a href="&base;/releases/&rel2.current;R/errata.html">[View]</a></td> + </tr> + <tr> + <td></td> + <td>amd64<br/>(x86-64, x64)</td> + <td><a href="&url.rel;/amd64/amd64/&rel2.current;-RELEASE">[Distribution]</a></td> + <td><a href="&url.rel;/amd64/amd64/ISO-IMAGES/&rel2.current;/">[ISO]</a></td> + </tr> + <tr> + <td></td> + <td>i386</td> + <td><a href="&url.rel;/i386/i386/&rel2.current;-RELEASE">[Distribution]</a></td> + <td><a href="&url.rel;/i386/i386/ISO-IMAGES/&rel2.current;/">[ISO]</a></td> + </tr> + <tr> + <td></td> + <td>ia64</td> + <td><a href="&url.rel;/ia64/ia64/&rel2.current;-RELEASE">[Distribution]</a></td> + <td><a href="&url.rel;/ia64/ia64/ISO-IMAGES/&rel2.current;/">[ISO]</a></td> + </tr> + <tr> + <td></td> + <td>powerpc</td> + <td><a href="&url.rel;/powerpc/powerpc/&rel2.current;-RELEASE">[Distribution]</a></td> + <td><a href="&url.rel;/powerpc/powerpc/ISO-IMAGES/&rel2.current;/">[ISO]</a></td> + </tr> + <tr> + <td></td> + <td>powerpc64</td> + <td><a href="&url.rel;/powerpc/powerpc64/&rel2.current;-RELEASE">[Distribution]</a></td> + <td><a href="&url.rel;/powerpc/powerpc64/ISO-IMAGES/&rel2.current;/">[ISO]</a></td> + </tr> + <tr> + <td></td> + <td>sparc64</td> + <td><a href="&url.rel;/sparc64/sparc64/&rel2.current;-RELEASE">[Distribution]</a></td> + <td><a href="&url.rel;/sparc64/sparc64/ISO-IMAGES/&rel2.current;/">[ISO]</a></td> + </tr> + <tr> + <td colspan="2">FreeBSD &rel3.current;-RELEASE</td> + <td colspan="2"></td> + <td rowspan="5"><a href="&base;/releases/&rel3.current;R/relnotes.html">[View]</a></td> + <td rowspan="5"><a href="&base;/releases/&rel3.current;R/hardware.html">[View]</a></td> <td rowspan="5"><a href="&base;/doc/en_US.ISO8859-1/books/handbook/install.html">[View]</a></td> - <td rowspan="5"><a href="&base;/releases/&rel2.current;R/errata.html">[View]</a></td> + <td rowspan="5"><a href="&base;/releases/&rel3.current;R/errata.html">[View]</a></td> </tr> <tr> <td></td> <td>amd64<br/>(x86-64, x64)</td> - <td><a href="&url.rel;/amd64/&rel2.current;-RELEASE">[Distribution]</a></td> - <td><a href="&url.rel;/amd64/ISO-IMAGES/&rel2.current;/">[ISO]</a></td> + <td><a href="&url.rel;/amd64/&rel3.current;-RELEASE">[Distribution]</a></td> + <td><a href="&url.rel;/amd64/ISO-IMAGES/&rel3.current;/">[ISO]</a></td> </tr> <tr> <td></td> <td>i386</td> - <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> + <td><a href="&url.rel;/i386/&rel3.current;-RELEASE">[Distribution]</a></td> + <td><a href="&url.rel;/i386/ISO-IMAGES/&rel3.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> + <td><a href="&url.rel;/pc98/&rel3.current;-RELEASE">[Distribution]</a></td> + <td><a href="&url.rel;/pc98/ISO-IMAGES/&rel3.current;/">[ISO]</a></td> </tr> <!-- <tr> Modified: head/share/xml/release.ent ============================================================================== --- head/share/xml/release.ent Mon Jan 20 14:49:00 2014 (r43574) +++ head/share/xml/release.ent Mon Jan 20 15:14:09 2014 (r43575) @@ -29,8 +29,8 @@ don't have something in BETAn or RCn), then change %beta.testing below to "IGNORE". If we do, use "INCLUDE". --> -<!ENTITY beta.testing "INCLUDE"> -<!ENTITY % beta.testing "INCLUDE"> +<!ENTITY beta.testing "IGNORE"> +<!ENTITY % beta.testing "IGNORE"> <!ENTITY betarel.current '10.0'> <!ENTITY betarel.vers 'RC5'> <!ENTITY u.betarel.schedule '&base;/releases/&betarel.current;R/schedule.html'> @@ -43,9 +43,9 @@ <!ENTITY betarel2.vers 'RC4'> <!ENTITY u.betarel2.schedule '&base;/releases/&betarel2.current;R/schedule.html'> -<!ENTITY rel.current.major '9'> -<!ENTITY rel.current '&rel.current.major;.2'> -<!ENTITY rel.current.date 'September 2013'> +<!ENTITY rel.current.major '10'> +<!ENTITY rel.current '10.0'> +<!ENTITY rel.current.date 'January 2014'> <!-- URLs to information on the latest release --> <!ENTITY u.rel.notes '&base;/releases/&rel.current;R/relnotes.html'> @@ -56,22 +56,22 @@ <!ENTITY u.rel.readme '&base;/releases/&rel.current;R/readme.html'> <!-- Secondary "current release" entities --> -<!ENTITY rel2.current.major '8'> -<!ENTITY rel2.current '8.4'> -<!ENTITY rel2.current.date 'June 2013'> - -<!-- URLs to information on the latest release --> -<!ENTITY u.rel2.notes '&base;/releases/&rel2.current;R/relnotes.html'> -<!ENTITY u.rel2.announce '&base;/releases/&rel2.current;R/announce.html'> -<!ENTITY u.rel2.errata '&base;/releases/&rel2.current;R/errata.html'> -<!ENTITY u.rel2.hardware '&base;/releases/&rel2.current;R/hardware.html'> -<!ENTITY u.rel2.installation '&base;/releases/&rel2.current;R/installation.html'> -<!ENTITY u.rel2.readme '&base;/releases/&rel2.current;R/readme.html'> +<!ENTITY rel2.current.major '9'> +<!ENTITY rel2.current '&rel2.current.major;.2'> +<!ENTITY rel2.current.date 'September 2013'> + +<!-- URLs to information on the latest rel2ease --> +<!ENTITY u.rel2.notes '&base;/rel2eases/&rel2.current;R/rel2notes.html'> +<!ENTITY u.rel2.announce '&base;/rel2eases/&rel2.current;R/announce.html'> +<!ENTITY u.rel2.errata '&base;/rel2eases/&rel2.current;R/errata.html'> +<!ENTITY u.rel2.hardware '&base;/rel2eases/&rel2.current;R/hardware.html'> +<!ENTITY u.rel2.installation '&base;/rel2eases/&rel2.current;R/installation.html'> +<!ENTITY u.rel2.readme '&base;/rel2eases/&rel2.current;R/readme.html'> <!-- Tertiary "current release" entities --> -<!ENTITY rel3.current.major '7'> -<!ENTITY rel3.current '7.4'> -<!ENTITY rel3.current.date 'February 2011'> +<!ENTITY rel3.current.major '8'> +<!ENTITY rel3.current '8.4'> +<!ENTITY rel3.current.date 'June 2013'> <!-- URLs to information on the latest release --> <!ENTITY u.rel3.notes '&base;/releases/&rel3.current;R/relnotes.html'>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401201514.s0KFE9cI029672>