svn commit: r46192 - in head/en_US.ISO8859-1: htdocs htdocs/layout/css share/xml
Allan Jude <[email protected]>
| Newsgroups | gmane.os.freebsd.devel.cvs.doc |
|---|---|
| Message-ID | <[email protected]> |
Author: allanjude
Date: Mon Jan 12 21:14:41 2015
New Revision: 46192
URL: https://svnweb.freebsd.org/changeset/doc/46192
Log:
Rearrange the download page into more readable tables
Improve the text and descriptions around the tables
Make Virtual Machine images easier to find
Differential Revision: https://reviews.freebsd.org/D1102
Reviewed by: gjb, rodrigc, bcr
Approved by: wblock (mentor)
Sponsored by: ScaleEngine Inc.
Modified:
head/en_US.ISO8859-1/htdocs/layout/css/text.css
head/en_US.ISO8859-1/htdocs/where.xml
head/en_US.ISO8859-1/share/xml/release.l10n.ent
Modified: head/en_US.ISO8859-1/htdocs/layout/css/text.css
==============================================================================
--- head/en_US.ISO8859-1/htdocs/layout/css/text.css Mon Jan 12 19:00:51 2015 (r46191)
+++ head/en_US.ISO8859-1/htdocs/layout/css/text.css Mon Jan 12 21:14:41 2015 (r46192)
@@ -134,3 +134,20 @@ a:active { color:
padding: 0;
font-size: 1.1em;
}
+
+ul.txtdownloadlist, ul.txtdocslist {
+ list-style: none;
+ padding: 0 10px;
+}
+
+.txtdocslist a {
+ color: #000000;
+}
+
+.tblwide {
+ width: 100%;
+}
+
+.tbldownload th, .tbldownload td {
+ vertical-align: top;
+}
Modified: head/en_US.ISO8859-1/htdocs/where.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/where.xml Mon Jan 12 19:00:51 2015 (r46191)
+++ head/en_US.ISO8859-1/htdocs/where.xml Mon Jan 12 21:14:41 2015 (r46192)
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
"http://www.FreeBSD.org/XML/share/xml/xhtml10-freebsd.dtd" [
-<!ENTITY title "Getting FreeBSD">
+<!ENTITY title "Download FreeBSD">
<!ENTITY url.rel "ftp://ftp.FreeBSD.org/pub/FreeBSD/releases">
+<!ENTITY url.snapshot "ftp://ftp.FreeBSD.org/pub/FreeBSD/snapshots">
]>
<html xmlns="http://www.w3.org/1999/xhtml">
@@ -14,221 +15,160 @@
<body class="navinclude.download">
- <a name="releases"></a>
+ <a name="choose-version"></a>
- <h2><a href="&base;/releases/index.html">Release
- Information</a></h2>
+ <a name="choose-arch"></a>
- <p>Detailed descriptions of past, present, and future releases.
- Look here first to determine what the latest version of FreeBSD
- is.</p>
+ <h2>Choosing an Architecture</h2>
- <a name="install"></a>
-
- <h2>Install FreeBSD</h2>
-
- <p>There are many options for installing FreeBSD, including
- installation from CD-ROM, DVD, USB stick or even directly using
- anonymous FTP, HTTP, or NFS. Depending on the &os; version you want
- to install, please read through the <a
- href="&base;/doc/en_US.ISO8859-1/books/handbook/bsdinstall.html">&os; 9.X/10.X
- installation guide</a> or the <a
- href="&base;/doc/en_US.ISO8859-1/books/handbook/install.html">&os; 8.X
- installation guide</a> before downloading the entire FreeBSD distribution.</p>
-
- <a name="distribution"></a>
+ <p>Modern PCs use the amd64 architecture, including those with
+ Intel® branded processors. Computers with more than
+ 3 GB of memory should use amd64. If the computer is an
+ older, 32-bit only model, use i386. For embedded devices and
+ single-board computers (SBC) such as the Raspberry Pi, Beagle
+ Bone Black, Panda Board, and Zed Board, use the armv6 SD card
+ image.</p>
+
+ <a name="choose-image"></a>
+
+ <h2>Choosing an Image</h2>
+
+ <p>The &os; installer can be downloaded in a number of different
+ formats including CD (disc1), DVD (dvd1), and Network Install
+ (bootonly) sized <a
+ href="&base;/doc/en_US.ISO8859-1/books/handbook/install-diff-media.html#install-cdrom">ISO</a>
+ Disc Images, as well as regular and mini USB memory stick
+ images. Later versions of &os; are also offered as prebuild
+ expandable Virtual Machine images, and as SD Cards for embedded
+ platforms.</p>
<a name="download"></a>
- <h2>Download FreeBSD</h2>
+ <a name="download-rel"></a>
- <p>If you plan on getting FreeBSD via FTP or HTTP, please check
- the listing of <a
- href="&base;/doc/en_US.ISO8859-1/books/handbook/mirrors-ftp.html"><strong>mirror
- sites</strong></a> in the handbook to see if there is a site
- closer to you.</p>
+ <h1>&os; &rel.current;-RELEASE</h1>
- <table class="tblbasic">
- <thead>
- <tr style="text-align: center;">
- <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>Release<br/>Notes</td>
- <td>Hardware<br/>Notes</td>
- <td>Installation<br/>Notes</td>
- <td>Errata</td>
- </tr>
- </thead>
+ <table class="tblbasic tblwide tbldownload">
<tbody>
<tr>
- <td colspan="2">FreeBSD &rel.current;-RELEASE</td>
- <td colspan="2"></td>
- <td rowspan="7"><a href="&base;/releases/&rel.current;R/relnotes.html">[View]</a></td>
- <td rowspan="7"><a href="&base;/releases/&rel.current;R/hardware.html">[View]</a></td>
- <td rowspan="7"><a href="&base;/releases/&rel.current;R/installation.html">[View]</a></td>
- <td rowspan="7"><a href="&base;/releases/&rel.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/&rel.current;-RELEASE">[Distribution]</a></td>
- <td><a href="&url.rel;/amd64/amd64/ISO-IMAGES/&rel.current;/">[ISO]</a><br/>
- <a href="&url.rel;/VM-IMAGES/&rel.current;-RELEASE/amd64/">[VM Images]</a></td>
- </tr>
- <tr>
- <td></td>
- <td>arm</td>
- <td> </td>
- <td><a href="&url.rel;/arm/armv6/ISO-IMAGES/&rel.current;/">[SD Card Image]</a></td>
- </tr>
- <tr>
- <td></td>
- <td>i386</td>
- <td><a href="&url.rel;/i386/i386/&rel.current;-RELEASE">[Distribution]</a></td>
- <td><a href="&url.rel;/i386/i386/ISO-IMAGES/&rel.current;/">[ISO]</a><br/>
- <a href="&url.rel;/VM-IMAGES/&rel.current;-RELEASE/i386/">[VM Images]</a></td>
- </tr>
- <tr>
- <td></td>
- <td>ia64</td>
- <td><a href="&url.rel;/ia64/ia64/&rel.current;-RELEASE">[Distribution]</a></td>
- <td><a href="&url.rel;/ia64/ia64/ISO-IMAGES/&rel.current;/">[ISO]</a></td>
- </tr>
- <tr>
- <td></td>
- <td>powerpc</td>
- <td><a href="&url.rel;/powerpc/powerpc/&rel.current;-RELEASE">[Distribution]</a></td>
- <td><a href="&url.rel;/powerpc/powerpc/ISO-IMAGES/&rel.current;/">[ISO]</a></td>
- </tr>
- <tr>
- <td></td>
- <td>powerpc64</td>
- <td><a href="&url.rel;/powerpc/powerpc64/&rel.current;-RELEASE">[Distribution]</a></td>
- <td><a href="&url.rel;/powerpc/powerpc64/ISO-IMAGES/&rel.current;/">[ISO]</a></td>
- </tr>
- <tr>
- <td></td>
- <td>sparc64</td>
- <td><a href="&url.rel;/sparc64/sparc64/&rel.current;-RELEASE">[Distribution]</a></td>
- <td><a href="&url.rel;/sparc64/sparc64/ISO-IMAGES/&rel.current;/">[ISO]</a></td>
- </tr>
- <tr>
- <td colspan="2">FreeBSD &rel2.current;-RELEASE</td>
- <td colspan="2"></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/&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/&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/&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/&rel3.current;-RELEASE">[Distribution]</a></td>
- <td><a href="&url.rel;/pc98/ISO-IMAGES/&rel3.current;/">[ISO]</a></td>
- </tr>
- <!--
- <tr>
- <td colspan="2">FreeBSD &rel3.current;-RELEASE</td>
- <td colspan="2"></td>
- <td rowspan="7"><a href="&base;/releases/&rel3.current;R/relnotes.html">[View]</a></td>
- <td rowspan="7"><a href="&base;/releases/&rel3.current;R/hardware.html">[View]</a></td>
- <td rowspan="7"><a href="&base;/doc/en_US.ISO8859-1/books/handbook/install.html">[View]</a></td>
- <td rowspan="7"><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/&rel3.current;-RELEASE">[Distribution]</a></td>
- <td colspan="2" align="right"><a href="&url.rel;/amd64/ISO-IMAGES/&rel3.current;/">[ISO]</a></td>
+ <th>Installer Images</th>
+ <th>Virtual Machine Images</th>
+ <th>Documentation</th>
+ </tr>
+ <tr>
+ <td>
+ <ul class="txtdownloadlist">
+ <li><a href="&url.rel;/amd64/amd64/ISO-IMAGES/&rel.current;/">amd64</a></li>
+ <li><a href="&url.rel;/i386/i386/ISO-IMAGES/&rel.current;/">i386</a></li>
+ <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&rel.current;/">armv6</a></li>
+ <li><a href="&url.rel;/ia64/ia64/ISO-IMAGES/&rel.current;/">ia64</a></li>
+ <li><a href="&url.rel;/powerpc/powerpc/ISO-IMAGES/&rel.current;/">powerpc</a></li>
+ <li><a href="&url.rel;/powerpc/powerpc64/ISO-IMAGES/&rel.current;/">powerpc64</a></li>
+ <li><a href="&url.rel;/sparc64/sparc64/ISO-IMAGES/&rel.current;/">sparc64</a></li>
+ </ul>
+ </td>
+ <td>
+ <ul class="txtdownloadlist">
+ <li><a href="&url.rel;/VM-IMAGES/&rel.current;-RELEASE/amd64/Latest/">amd64</a></li>
+ <li><a href="&url.rel;/VM-IMAGES/&rel.current;-RELEASE/i386/Latest/">i386</a></li>
+ </ul>
+ </td>
+ <td>
+ <ul class="txtdocslist">
+ <li><a href="&base;/releases/index.html#current">Released</a>: &rel.current.date;</li>
+ <li><a href="&u.rel.notes;">Release Notes</a></li>
+ <li><a href="&u.rel.hardware;">Hardware Compatibility List</a></li>
+ <li><a href="&u.rel.installation;">Installation Instructions</a></li>
+ <li><a href="&u.rel.errata;">Errata</a></li>
+ </ul>
+ </td>
</tr>
+ </tbody>
+ </table>
+ <br />
+
+ <a name="download-rel2"></a>
+
+ <h1>&os; &rel2.current;-RELEASE</h1>
+
+ <table class="tblbasic tblwide tbldownload">
+ <tbody>
<tr>
- <td></td>
- <td>i386</td>
- <td><a href="&url.rel;/i386/&rel3.current;-RELEASE">[Distribution]</a></td>
- <td colspan="2" align="right"><a href="&url.rel;/i386/ISO-IMAGES/&rel3.current;/">[ISO]</a></td>
+ <th>Installer Images</th>
+ <th>Virtual Machine Images</th>
+ <th>Documentation</th>
+ </tr>
+ <tr>
+ <td>
+ <ul class="txtdownloadlist">
+ <li><a href="&url.rel;/amd64/amd64/ISO-IMAGES/&rel2.current;/">amd64</a></li>
+ <li><a href="&url.rel;/i386/i386/ISO-IMAGES/&rel2.current;/">i386</a></li>
+ <li><a href="&url.rel;/ia64/ia64/ISO-IMAGES/&rel2.current;/">ia64</a></li>
+ <li><a href="&url.rel;/powerpc/powerpc/ISO-IMAGES/&rel2.current;/">powerpc</a></li>
+ <li><a href="&url.rel;/powerpc/powerpc64/ISO-IMAGES/&rel2.current;/">powerpc64</a></li>
+ <li><a href="&url.rel;/sparc64/sparc64/ISO-IMAGES/&rel2.current;/">sparc64</a></li>
+ </ul>
+ </td>
+ <td>
+ <ul class="txtdownloadlist">
+ <li><a href="&url.rel;/VM-IMAGES/&rel2.current;-RELEASE/amd64/Latest/">amd64</a></li>
+ <li><a href="&url.rel;/VM-IMAGES/&rel2.current;-RELEASE/i386/Latest/">i386</a></li>
+ </ul>
+ </td>
+ <td>
+ <ul class="txtdocslist">
+ <li><a href="&base;/releases/index.html#current">Released</a>: &rel2.current.date;</li>
+ <li><a href="&u.rel2.notes;">Release Notes</a></li>
+ <li><a href="&u.rel2.hardware;">Hardware Compatibility List</a></li>
+ <li><a href="&u.rel2.installation;">Installation Instructions</a></li>
+ <li><a href="&u.rel2.errata;">Errata</a></li>
+ </ul>
+ </td>
</tr>
+ </tbody>
+ </table>
+ <br />
+
+ <a name="download-rel3"></a>
+
+ <h1>&os; &rel3.current;-RELEASE</h1>
+
+ <table class="tblbasic tblwide tbldownload">
+ <tbody>
<tr>
- <td></td>
- <td>pc98</td>
- <td><a href="&url.rel;/pc98/&rel3.current;-RELEASE">[Distribution]</a></td>
- <td colspan="2" align="right"><a href="&url.rel;/pc98/ISO-IMAGES/&rel3.current;/">[ISO]</a></td>
+ <th>Installer Images</th>
+ <th>Documentation</th>
</tr>
<tr>
- <td></td>
- <td>sparc64</td>
- <td><a href="&url.rel;/sparc64/&rel3.current;-RELEASE">[Distribution]</a></td>
- <td colspan="2" align="right"><a href="&url.rel;/sparc64/ISO-IMAGES/&rel3.current;/">[ISO]</a></td>
+ <td>
+ <ul class="txtdownloadlist">
+ <li><a href="&url.rel;/amd64/ISO-IMAGES/&rel2.current;/">amd64</a></li>
+ <li><a href="&url.rel;/i386/ISO-IMAGES/&rel2.current;/">i386</a></li>
+ <li><a href="&url.rel;/pc98/ISO-IMAGES/&rel2.current;/">pc98</a></li>
+ </ul>
+ </td>
+ <td>
+ <ul class="txtdocslist">
+ <li><a href="&base;/releases/index.html#current">Released</a>: &rel3.current.date;</li>
+ <li><a href="&u.rel3.notes;">Release Notes</a></li>
+ <li><a href="&u.rel3.hardware;">Hardware Compatibility List</a></li>
+ <li><a href="&u.rel3.installation;">Installation Instructions</a></li>
+ <li><a href="&u.rel3.errata;">Errata</a></li>
+ </ul>
+ </td>
</tr>
- -->
</tbody>
</table>
-
- <p><em>Note:</em> If you are in doubt of which platform /
- architecture to get, you probably need <em>i386</em> if you have
- an older computer, and <em>amd64</em> if you have a newer
- computer.</p>
+ <br />
&beta.desc;
+ <a name="download-snapshots"></a>
+
+ <h1>Development Snapshots</h1>
+
<p>If you are interested in a purely experimental
- <strong>snapshot</strong> release of FreeBSD-CURRENT (AKA
+ <strong>snapshot</strong> release of &os;-CURRENT (AKA
&rel.head;-CURRENT), aimed at developers and bleeding-edge
testers only, then please see the <a
href="&base;/snapshots/">&os; Snapshot Releases</a> page. For
@@ -237,16 +177,67 @@
href="&base;/releases/index.html">release information
page</a>.</p>
+ <h1>&os; &rel.head;-CURRENT</h1>
+
+ <table class="tblbasic tblwide tbldownload">
+ <tbody>
+ <tr>
+ <th>Installer Images</th>
+ <th>Virtual Machine Images</th>
+ </tr>
+ <tr>
+ <td>
+ <ul class="txtdownloadlist">
+ <li><a href="&url.snapshot;/amd64/amd64/ISO-IMAGES/&rel.head;/">amd64</a></li>
+ <li><a href="&url.snapshot;/i386/i386/ISO-IMAGES/&rel.head;/">i386</a></li>
+ <li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel.head;/">armv6</a></li>
+ <li><a href="&url.snapshot;/powerpc/powerpc/ISO-IMAGES/&rel.head;/">powerpc</a></li>
+ <li><a href="&url.snapshot;/powerpc/powerpc64/ISO-IMAGES/&rel.head;/">powerpc64</a></li>
+ <li><a href="&url.snapshot;/sparc64/sparc64/ISO-IMAGES/&rel.head;/">sparc64</a></li>
+ </ul>
+ </td>
+ <td>
+ <ul class="txtdownloadlist">
+ <li><a href="&url.snapshot;/VM-IMAGES/&rel.head;-CURRENT/amd64/Latest/">amd64</a></li>
+ <li><a href="&url.snapshot;/VM-IMAGES/&rel.head;-CURRENT/i386/Latest/">i386</a></li>
+ </ul>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+
+ <p>If you plan on getting &os; via HTTP or FTP, please check
+ the listing of <a
+ href="&base;/doc/en_US.ISO8859-1/books/handbook/mirrors-ftp.html"><strong>mirror
+ sites</strong></a> in the handbook to see if there is a site
+ closer to you.</p>
+
+ <a name="install"></a>
+
+ <h2>Install &os;</h2>
+
+ <p>There are many options for installing &os;, including
+ installation from CD-ROM, DVD, USB Memory Stick or even directly
+ using anonymous FTP, HTTP, or NFS. Depending on the &os;
+ version you want to install, please read through the <a
+ href="&base;/doc/en_US.ISO8859-1/books/handbook/bsdinstall.html">&os; 9.X/10.X
+ installation guide</a> or the <a
+ href="&base;/doc/en_US.ISO8859-1/books/handbook/install.html">&os; 8.X
+ installation guide</a> before downloading the entire &os;
+ distribution.</p>
+
+ <a name="distribution"></a>
+
<h2>Purchase &os; Media</h2>
- <p>FreeBSD can be acquired on CD-ROM or DVD from <a
+ <p>&os; can be acquired on CD-ROM or DVD from <a
href="http://www.freebsdmall.com/">FreeBSD Mall</a>, or
one of the other <a
href="&base;/doc/en_US.ISO8859-1/books/handbook/mirrors.html">CD-ROM
and DVD Publishers</a>.</p>
-
<a name="past"></a>
+
<h2>Past Releases</h2>
<p>For downloading past releases, please visit the <a
@@ -254,24 +245,25 @@
archive</a>.</p>
<a name="derived"></a>
- <h2>FreeBSD-derived Operating System Distributions</h2>
- <p>FreeBSD is widely used as a building block for other commercial
+ <h2>&os;-derived Operating System Distributions</h2>
+
+ <p>&os; is widely used as a building block for other commercial
and open-source operating systems. The projects below are
- widely used and of particular interest to FreeBSD users.</p>
+ widely used and of particular interest to &os; users.</p>
- <ul>
+ <ul class="txtdownloadlist">
<li><p><a href="http://www.freenas.org">FreeNAS</a> is an open
- source storage platform based on FreeBSD and supports sharing
+ source storage platform based on &os; and supports sharing
across Windows, Apple, and UNIX-like systems.</p></li>
- <li><p><a href="http://www.pcbsd.org">PC-BSD</a> is a FreeBSD
+ <li><p><a href="http://www.pcbsd.org">PC-BSD</a> is a &os;
derivative with a graphical installer and impressive desktop
tools aimed at ease of use for the casual computer
user.</p></li>
<li><p><a href="http://www.pfsense.org">pfSense</a> is a free,
- open source customized distribution of FreeBSD tailored for
+ open source customized distribution of &os; tailored for
use as a firewall and router.</p></li>
</ul>
@@ -281,11 +273,11 @@
<h3>The Ports Collection</h3>
- <p>The FreeBSD Ports Collection is a diverse collection of utility
- and application software that has been ported to FreeBSD.</p>
+ <p>The &os; Ports Collection is a diverse collection of utility
+ and application software that has been ported to &os;.</p>
- <ul>
- <li><a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/">FreeBSD
+ <ul class="txtdownloadlist">
+ <li><a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/">&os;
Ports Collection</a></li>
<li><a href="&base;/ports/index.html">Web interface to the Ports
@@ -301,7 +293,7 @@
href="&base;/doc/en_US.ISO8859-1/books/porters-handbook/index.html">The
Porter's Handbook</a></em> and the article <em><a
href="&base;/doc/en_US.ISO8859-1/articles/contributing/index.html">Contributing
- to FreeBSD</a></em>.</p>
+ to &os;</a></em>.</p>
</body>
</html>
Modified: head/en_US.ISO8859-1/share/xml/release.l10n.ent
==============================================================================
--- head/en_US.ISO8859-1/share/xml/release.l10n.ent Mon Jan 12 19:00:51 2015 (r46191)
+++ head/en_US.ISO8859-1/share/xml/release.l10n.ent Mon Jan 12 21:14:41 2015 (r46192)
@@ -8,61 +8,44 @@
<![%beta2.testing;[
<!ENTITY beta.second '
- <table xmlns="http://www.w3.org/1999/xhtml" class="tblbasic">
- <thead>
- <tr style="text-align: center;">
- <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>TODO List</td>-->
- </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>
- </tr>
- <tr>
- <td></td>
- <td>amd64<br/>(x86-64, x64)</td>
- <td><a href="&url.rel;/amd64/amd64/&betarel2.current;-&betarel2.vers;">[Distribution]</a></td>
- <td><a href="&url.rel;/amd64/amd64/ISO-IMAGES/&betarel2.current;/">[ISO]</a></td>
- </tr>
- <tr>
- <td></td>
- <td>i386</td>
- <td><a href="&url.rel;/i386/i386/&betarel2.current;-&betarel2.vers;">[Distribution]</a></td>
- <td><a href="&url.rel;/i386/i386/ISO-IMAGES/&betarel2.current;/">[ISO]</a></td>
- </tr>
- <tr>
- <td></td>
- <td>ia64</td>
- <td><a href="&url.rel;/ia64/ia64/&betarel2.current;-&betarel2.vers;">[Distribution]</a></td>
- <td><a href="&url.rel;/ia64/ia64/ISO-IMAGES/&betarel2.current;/">[ISO]</a></td>
- </tr>
- <tr>
- <td></td>
- <td>powerpc</td>
- <td><a href="&url.rel;/powerpc/powerpc/&betarel2.current;-&betarel2.vers;">[Distribution]</a></td>
- <td><a href="&url.rel;/powerpc/powerpc/ISO-IMAGES/&betarel2.current;/">[ISO]</a></td>
- </tr>
- <tr>
- <td></td>
- <td>powerpc64</td>
- <td><a href="&url.rel;/powerpc/powerpc64/&betarel2.current;-&betarel2.vers;">[Distribution]</a></td>
- <td><a href="&url.rel;/powerpc/powerpc64/ISO-IMAGES/&betarel2.current;/">[ISO]</a></td>
- </tr>
- <tr>
- <td></td>
- <td>sparc64</td>
- <td><a href="&url.rel;/sparc64/sparc64/&betarel2.current;-&betarel2.vers;">[Distribution]</a></td>
- <td><a href="&url.rel;/sparc64/sparc64/ISO-IMAGES/&betarel2.current;/">[ISO]</a></td>
- </tr>
- </tbody>
- </table>
+ <div xmlns="http://www.w3.org/1999/xhtml">
+ <h1>&os; &betarel2.current;-&betarel2.vers;</h1>
+
+ <table class="tblbasic tblwide tbldownload">
+ <tbody>
+ <tr>
+ <th>Installer Images</th>
+ <th>Virtual Machine Images</th>
+ <th>Documentation</th>
+ </tr>
+ <tr>
+ <td>
+ <ul class="txtdownloadlist">
+ <li><a href="&url.snapshot;/amd64/amd64/ISO-IMAGES/&betarel2.current;/">amd64</a></li>
+ <li><a href="&url.snapshot;/i386/i386/ISO-IMAGES/&betarel2.current;/">i386</a></li>
+ <li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&betarel2.current;/">armv6</a></li>
+ <li><a href="&url.snapshot;/ia64/ia64/ISO-IMAGES/&betarel2.current;/">ia64</a></li>
+ <li><a href="&url.snapshot;/powerpc/powerpc/ISO-IMAGES/&betarel2.current;/">powerpc</a></li>
+ <li><a href="&url.snapshot;/powerpc/powerpc64/ISO-IMAGES/&betarel2.current;/">powerpc64</a></li>
+ <li><a href="&url.snapshot;/sparc64/sparc64/ISO-IMAGES/&betarel2.current;/">sparc64</a></li>
+ </ul>
+ </td>
+ <td>
+ <ul class="txtdownloadlist">
+ <li><a href="&url.snapshot;/VM-IMAGES/&betarel2.current;-&betarel2.vers;/amd64/Latest/">amd64</a></li>
+ <li><a href="&url.snapshot;/VM-IMAGES/&betarel2.current;-&betarel2.vers;/i386/Latest/">i386</a></li>
+ </ul>
+ </td>
+ <td>
+ <ul class="txtdocslist">
+ <li><a href="&enbase;/releases/&betarel2.current;R/todo.html">TODO List</a></li>
+ </ul>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ <br />
+ </div>
'>
]]>
<!ENTITY beta.second ''>
@@ -73,75 +56,42 @@
<div xmlns="http://www.w3.org/1999/xhtml">
&beta.helptest;
- <table class="tblbasic">
- <thead>
- <tr style="text-align: center;">
- <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>TODO List</td>
- </tr>
- </thead>
+ <h1>&os; &betarel.current;-&betarel.vers;</h1>
+
+ <table class="tblbasic tblwide tbldownload">
<tbody>
<tr>
- <td colspan="2">FreeBSD &betarel.current;-&betarel.vers;</td>
- <td colspan="2"></td>
- <td rowspan="7"><a href="&enbase;/releases/&betarel.current;R/todo.html">[View]</a></td>
- </tr>
- <tr>
- <td></td>
- <td>amd64<br/>(x86-64, x64)</td>
- <td><a href="&url.rel;/amd64/amd64/&betarel.current;-&betarel.vers;">[Distribution]</a></td>
- <td><a href="&url.rel;/amd64/amd64/ISO-IMAGES/&betarel.current;/">[ISO]</a><br/>
- <a href="&url.rel;/VM-IMAGES/&betarel.current;-&betarel.vers;/amd64/">[VM Images]</a></td>
- </tr>
- <tr>
- <td></td>
- <td>arm</td>
- <td><a href="&url.rel;/arm/armv6/&betarel.current;-&betarel.vers;">[Distribution]</a></td>
- <td><a href="&url.rel;/arm/armv6/ISO-IMAGES/&betarel.current;/">[SD Card Image]</a></td>
- </tr>
- <tr>
- <td></td>
- <td>i386</td>
- <td><a href="&url.rel;/i386/i386/&betarel.current;-&betarel.vers;">[Distribution]</a></td>
- <td><a href="&url.rel;/i386/i386/ISO-IMAGES/&betarel.current;/">[ISO]</a><br/>
- <a href="&url.rel;/VM-IMAGES/&betarel.current;-&betarel.vers;/i386/">[VM Images]</a></td>
- </tr>
- <tr>
- <td></td>
- <td>ia64</td>
- <td><a href="&url.rel;/ia64/ia64/&betarel.current;-&betarel.vers;">[Distribution]</a></td>
- <td><a href="&url.rel;/ia64/ia64/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
- </tr>
- <!--
- <tr>
- <td></td>
- <td>pc98</td>
- <td><a href="&url.rel;/pc98/i386/&betarel.current;-&betarel.vers;">[Distribution]</a></td>
- <td><a href="&url.rel;/pc98/i386/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
- </tr>
- -->
- <tr>
- <td></td>
- <td>powerpc</td>
- <td><a href="&url.rel;/powerpc/powerpc/&betarel.current;-&betarel.vers;">[Distribution]</a></td>
- <td><a href="&url.rel;/powerpc/powerpc/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
- </tr>
- <tr>
- <td></td>
- <td>powerpc64</td>
- <td><a href="&url.rel;/powerpc/powerpc64/&betarel.current;-&betarel.vers;">[Distribution]</a></td>
- <td><a href="&url.rel;/powerpc/powerpc64/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
- </tr>
- <tr>
- <td></td>
- <td>sparc64</td>
- <td><a href="&url.rel;/sparc64/sparc64/&betarel.current;-&betarel.vers;">[Distribution]</a></td>
- <td><a href="&url.rel;/sparc64/sparc64/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
+ <th>Installer Images</th>
+ <th>Virtual Machine Images</th>
+ <th>Documentation</th>
+ </tr>
+ <tr>
+ <td>
+ <ul class="txtdownloadlist">
+ <li><a href="&url.snapshot;/amd64/amd64/ISO-IMAGES/&betarel.current;/">amd64</a></li>
+ <li><a href="&url.snapshot;/i386/i386/ISO-IMAGES/&betarel.current;/">i386</a></li>
+ <li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&betarel.current;/">armv6</a></li>
+ <li><a href="&url.snapshot;/ia64/ia64/ISO-IMAGES/&betarel.current;/">ia64</a></li>
+ <li><a href="&url.snapshot;/powerpc/powerpc/ISO-IMAGES/&betarel.current;/">powerpc</a></li>
+ <li><a href="&url.snapshot;/powerpc/powerpc64/ISO-IMAGES/&betarel.current;/">powerpc64</a></li>
+ <li><a href="&url.snapshot;/sparc64/sparc64/ISO-IMAGES/&betarel.current;/">sparc64</a></li>
+ </ul>
+ </td>
+ <td>
+ <ul class="txtdownloadlist">
+ <li><a href="&url.snapshot;/VM-IMAGES/&betarel.current;-&betarel.vers;/amd64/Latest/">amd64</a></li>
+ <li><a href="&url.snapshot;/VM-IMAGES/&betarel.current;-&betarel.vers;/i386/Latest/">i386</a></li>
+ </ul>
+ </td>
+ <td>
+ <ul class="txtdocslist">
+ <li><a href="&enbase;/releases/&betarel.current;R/todo.html">TODO List</a></li>
+ </ul>
+ </td>
</tr>
</tbody>
</table>
+ <br />
&beta.second;
</div>
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-doc-all
To unsubscribe, send any mail to "[email protected]"