diff --git a/en/Makefile b/en/Makefile
index 6eefdfb7ce..8a0b9bad4d 100644
--- a/en/Makefile
+++ b/en/Makefile
@@ -1,102 +1,102 @@
-# $FreeBSD: www/en/Makefile,v 1.130 2005/10/06 14:28:40 ale Exp $
+# $FreeBSD: www/en/Makefile,v 1.131 2005/10/06 14:34:56 blackend Exp $
.if exists(Makefile.conf)
.include "Makefile.conf"
.endif
.if exists(../Makefile.inc)
.include "../Makefile.inc"
.endif
# These are turned into validated, normalized HTML files.
DOCS= applications.sgml
DOCS+= about.sgml
DOCS+= art.sgml
DOCS+= availability.sgml
DOCS+= community.sgml
DOCS+= docs.sgml
DOCS+= features.sgml
DOCS+= internet.sgml
DOCS+= mailto.sgml
DOCS+= publish.sgml
DOCS+= relnotes.sgml
DOCS+= send-pr.sgml
DOCS+= support.sgml
DOCS+= where.sgml
DOCS+= y2kbug.sgml
XMLDOCS= index:xsl:${XML_NEWS_NEWS}:
DEPENDSET.index=transtable mirrors news press events \
navigation advisories notices
XMLDOCS+= usergroups:${XSL_USERGROUPS}:${XML_USERGROUPS}:
DEPENDSET.usergroups=transtable usergroups
PARAMS.usergroups= --param pagename "'FreeBSD User Groups'"
# These will be directly installed.
DATA= favicon.ico
DATA+= freebsd.css
DATA+= index.css
DATA+= robots.txt
-DATA+= vendors.html
+DATA+= vendors.html
# Subdirectories
# SGML
SUBDIR= FAQ
SUBDIR+= advocacy
SUBDIR+= commercial
SUBDIR+= community
SUBDIR+= copyright
SUBDIR+= developers
SUBDIR+= docproj
SUBDIR+= docs
SUBDIR+= donations
SUBDIR+= events
SUBDIR+= gnome
SUBDIR+= handbook
SUBDIR+= internal
SUBDIR+= java
SUBDIR+= kse
SUBDIR+= layout
SUBDIR+= marketing
SUBDIR+= news
SUBDIR+= platforms
SUBDIR+= portmgr
SUBDIR+= projects
SUBDIR+= prstats
SUBDIR+= releases
SUBDIR+= releng
SUBDIR+= search
SUBDIR+= security
SUBDIR+= smp
SUBDIR+= snapshots
SUBDIR+= support
SUBDIR+= tutorials
.if !defined(WEB_ONLY) || empty(WEB_ONLY)
SUBDIR+= doc
SUBDIR+= ports
.endif
.if defined(BUILD_RELNOTES)
SUBDIR+= relnotes
.endif
# Non-SGML
SUBDIR+= cgi
SUBDIR+= gifs
SUBDIR+= layout
WEB_LANG?= da de es fr it ja nl pt_BR zh ru
#WEB_LANG?= da de es fr it ja nl pt_BR ru tr zh
# Non-English
.if !defined(ENGLISH_ONLY) || empty(ENGLISH_ONLY)
.for DIR in ${WEB_LANG}
SUBDIR+= ../${DIR}
.endfor
.endif
WEBDIR?= data
.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/index.xsl b/en/index.xsl
index 6476b3513d..34c0c3e2d7 100644
--- a/en/index.xsl
+++ b/en/index.xsl
@@ -1,320 +1,326 @@
-
+
-
+
Spamtrap, do not email:
<a href="mailto:bruscar@freebsd.org">bruscar@freebsd.org</a>
Based on BSD UNIX®
FreeBSD is an advanced operating system for x86 compatible (including Pentium® and Athlon ™), amd64 compatible (including Opteron ™, Athlon 64, and EM64T), Alpha/AXP, IA-64, PC-98 and UltraSPARC® architectures. It is derived from BSD, the version of UNIX® developed at the University of California, Berkeley. It is developed and maintained by a large team of individuals. Additional platforms are in various stages of development.
There are many options for installing FreeBSD, including
installation from CD-ROM, DVD, floppy disk, an MS-DOS® partition,
magnetic tape, anonymous FTP, and NFS. Please read through the
installation
guide before downloading the entire FreeBSD distribution.
Note: If you are in doubt of which platform /
architecture to get, you probably need i386.
If you plan on getting FreeBSD via FTP, please check the
listing of mirror
sites in the handbook to see if there is a site
closer to you. For more information about past, present and
future releases in general, please visit the release information page.
+
+
Help With The Next FreeBSD Release
+
+
Our developers and release engineers are working on the
+ the next release of FreeBSD; if you wish to help with testing,
+ please download the latest build. Please note that these images
+ are, by their very nature, intended for testing and should not
+ be used in production environments.
If you're interested in a purely experimental
snapshot release of FreeBSD-CURRENT (AKA
&rel.head;-CURRENT), aimed at developers and bleeding-edge
testers only, then please see the daily snapshot
server FTP site.
Applications and Utility Software
The Ports Collection
The FreeBSD Ports Collection is a diverse collection of utility
and application software that has been ported to FreeBSD.
For information about how you can contribute
your favorite piece of software to the Port Collection,
have a look at The
Porter's Handbook and the article Contributing
to FreeBSD.