diff --git a/es_ES.ISO8859-1/share/sgml/authors.ent b/es_ES.ISO8859-1/share/sgml/authors.ent
index 35c36ab6bf..1cdfffacf5 100644
--- a/es_ES.ISO8859-1/share/sgml/authors.ent
+++ b/es_ES.ISO8859-1/share/sgml/authors.ent
@@ -1,845 +1,885 @@
 <!--
      Names and email address of contributing authors and CVS committers.
      Entity names for committers should be the same as their login names on
      freefall.FreeBSD.org.
 
      Use these entities when referencing people.
 
      Please keep this list in alphabetical order by entity names.
 
      IMPORTANT:  If you delete names from this file you *must* ensure that
                  all references to them have been removed from the handbook's
                  translations.  If they haven't then you *will* break the
                  builds for the other languages, and we will poke fun of you
                  in public.
+
      $FreeBSD$
+     $FreeBSDes: doc/es_ES.ISO8859-1/share/sgml/authors.ent,v 1.2 2004/10/08 20:17:44 jesusr Exp $
 -->
 
 <!ENTITY a.abial "Andrzej Bialecki <email>abial@FreeBSD.org</email>">
 
 <!ENTITY a.ache "Andrey A. Chernov <email>ache@FreeBSD.org</email>">
 
 <!ENTITY a.adam "Adam David <email>adam@FreeBSD.org</email>">
 
 <!ENTITY a.adamw "Adam Weinberger <email>adamw@FreeBSD.org</email>">
 
 <!ENTITY a.ade "Ade Lovett <email>ade@FreeBSD.org</email>">
 
 <!ENTITY a.adrian "Adrian Chadd <email>adrian@FreeBSD.org</email>">
 
 <!ENTITY a.akiyama "Shunsuke Akiyama <email>akiyama@FreeBSD.org</email>">
 
 <!ENTITY a.alane "Alan Eldridge <email>alane@FreeBSD.org</email>">
 
 <!ENTITY a.alc "Alan L. Cox <email>alc@FreeBSD.org</email>">
 
 <!ENTITY a.ale "Alex Dupre <email>ale@FreeBSD.org</email>">
 
 <!ENTITY a.alex "Alexander Langer <email>alex@FreeBSD.org</email>">
 
 <!ENTITY a.alfred "Alfred Perlstein <email>alfred@FreeBSD.org</email>">
 
 <!ENTITY a.ambrisko "Doug Ambrisko <email>ambrisko@FreeBSD.org</email>">
 
 <!ENTITY a.amorita "Akio Morita <email>amorita@FreeBSD.org</email>">
 
 <!ENTITY a.amurai "Atsushi Murai <email>amurai@FreeBSD.org</email>">
 
 <!ENTITY a.anders "Anders Nordby <email>anders@FreeBSD.org</email>">
 
 <!ENTITY a.andre "Andre Oppermann <email>andre@FreeBSD.org</email>">
 
 <!ENTITY a.andreas "Andreas Klemm <email>andreas@FreeBSD.org</email>">
 
 <!ENTITY a.andy "Andrey Zakhvatov <email>andy@FreeBSD.org</email>">
 
 <!ENTITY a.anholt "Eric Anholt <email>anholt@FreeBSD.org</email>">
 
 <!ENTITY a.archie "Archie Cobbs <email>archie@FreeBSD.org</email>">
 
 <!ENTITY a.arr "Andrew R. Reiter <email>arr@FreeBSD.org</email>">
 
 <!ENTITY a.arun "Arun Sharma <email>arun@FreeBSD.org</email>">
 
 <!ENTITY a.arved "Tilman Linneweh <email>arved@FreeBSD.org</email>">
 
 <!ENTITY a.asami "Satoshi Asami <email>asami@FreeBSD.org</email>">
 
 <!ENTITY a.asmodai "Jeroen Ruigrok/Asmodai <email>asmodai@FreeBSD.org</email>">
 
 <!ENTITY a.assar "Assar Westerlund <email>assar@FreeBSD.org</email>">
 
 <!ENTITY a.awebster "Andrew Webster <email>awebster@pubnix.net</email>">
 
 <!ENTITY a.babkin "Sergey Babkin <email>babkin@FreeBSD.org</email>">
 
 <!ENTITY a.bbraun "Rob Braun <email>bbraun@FreeBSD.org</email>">
 
 <!ENTITY a.bde "Bruce Evans <email>bde@FreeBSD.org</email>">
 
 <!ENTITY a.bean "Rebecca Visger <email>bean@FreeBSD.org</email>">
 
 <!ENTITY a.ben "Ben Smithurst <email>ben@FreeBSD.org</email>">
 
 <!ENTITY a.benno "Benno Rice <email>benno@FreeBSD.org</email>">
 
 <!ENTITY a.billf "Bill Fumerola <email>billf@FreeBSD.org</email>">
 
 <!ENTITY a.blackend "Marc Fonvieille <email>blackend@FreeBSD.org</email>">
 
 <!ENTITY a.bland "Alexander Nedotsukov <email>bland@FreeBSD.org</email>">
 
 <!ENTITY a.bmah "Bruce A. Mah <email>bmah@FreeBSD.org</email>">
 
 <!ENTITY a.bmilekic "Bosko Milekic <email>bmilekic@FreeBSD.org</email>">
 
 <!ENTITY a.bms "Bruce M. Simpson <email>bms@FreeBSD.org</email>">
 
 <!ENTITY a.bp "Boris Popov <email>bp@FreeBSD.org</email>">
 
 <!ENTITY a.brandon "Brandon Gillespie <email>brandon@FreeBSD.org</email>">
 
 <!ENTITY a.brian "Brian Somers <email>brian@FreeBSD.org</email>">
 
 <!ENTITY a.brooks "Brooks Davis <email>brooks@FreeBSD.org</email>">
 
 <!ENTITY a.brueffer "Christian Br&uuml;ffer <email>brueffer@FreeBSD.org</email>">
 
 <!ENTITY a.bsd "Brian S. Dean <email>bsd@FreeBSD.org</email>">
 
+<!ENTITY a.bz "Bjoern A. Zeeb <email>bz@FreeBSD.org</email>">
+
 <!ENTITY a.cawimm "Charles A. Wimmer <email>cawimm@FreeBSD.org</email>">
 
 <!ENTITY a.ceri "Ceri Davies <email>ceri@FreeBSD.org</email>">
 
 <!ENTITY a.cg "Cameron Grant <email>cg@FreeBSD.org</email>">
 
 <!ENTITY a.charnier "Philippe Charnier <email>charnier@FreeBSD.org</email>">
 
 <!ENTITY a.chern "Chern Lee <email>chern@FreeBSD.org</email>">
 
 <!ENTITY a.chm "Christoph Herrmann <email>chm@FreeBSD.org</email>">
 
 <!ENTITY a.chris "Chris Costello <email>chris@FreeBSD.org</email>">
 
 <!ENTITY a.chuckr "Chuck Robey <email>chuckr@FreeBSD.org</email>">
 
 <!ENTITY a.cjc "Crist J. Clark <email>cjc@FreeBSD.org</email>">
 
 <!ENTITY a.cjh "Junho CHOI <email>cjh@FreeBSD.org</email>">
 
 <!ENTITY a.clement "Clement Laforet <email>clement@FreeBSD.org</email>">
 
 <!ENTITY a.clive "Clive Lin <email>clive@FreeBSD.org</email>">
 
+<!ENTITY a.clsung "Cheng-Lung Sung <email>clsung@FreeBSD.org</email>">
+
 <!ENTITY a.cognet "Olivier Houchard <email>cognet@FreeBSD.org</email>">
 
 <!ENTITY a.cokane "Coleman Kane <email>cokane@FreeBSD.org</email>">
 
 <!ENTITY a.cp "Chuck Paterson <email>cp@FreeBSD.org</email>">
 
 <!ENTITY a.cperciva "Colin Percival <email>cperciva@FreeBSD.org</email>">
 
 <!ENTITY a.cpiazza "Chris Piazza <email>cpiazza@FreeBSD.org</email>">
 
 <!ENTITY a.cracauer "Martin Cracauer <email>cracauer@FreeBSD.org</email>">
 
 <!ENTITY a.csgr "Geoff Rehmet <email>csgr@FreeBSD.org</email>">
 
 <!ENTITY a.cshumway "Christopher Shumway <email>cshumway@FreeBSD.org</email>">
 
+<!ENTITY a.csjp "Christian S.J. Peron <email>csjp@FreeBSD.org</email>">
+
 <!ENTITY a.cwt "Chris Timmons <email>cwt@FreeBSD.org</email>">
 
 <!ENTITY a.cy "Cy Schubert <email>cy@FreeBSD.org</email>">
 
 <!ENTITY a.daichi "Daichi GOTO <email>daichi@FreeBSD.org</email>">
 
 <!ENTITY a.dan "Dan Moschuk <email>dan@FreeBSD.org</email>">
 
+<!ENTITY a.danfe "Alexey Dokuchaev <email>danfe@FreeBSD.org</email>">
+
 <!ENTITY a.danny "Daniel O'Callaghan <email>danny@FreeBSD.org</email>">
 
 <!ENTITY a.dannyboy "Daniel Harris <email>dannyboy@FreeBSD.org</email>">
 
 <!ENTITY a.darrenr "Darren Reed <email>darrenr@FreeBSD.org</email>">
 
 <!ENTITY a.das "David Schultz <email>das@FreeBSD.org</email>">
 
 <!ENTITY a.davidc "Chad David <email>davidc@FreeBSD.org</email>">
 
 <!ENTITY a.davidn "David Nugent <email>davidn@FreeBSD.org</email>">
 
 <!ENTITY a.davidxu "David Xu <email>davidxu@FreeBSD.org</email>">
 
 <!ENTITY a.dbaker "Daniel Baker <email>dbaker@FreeBSD.org</email>">
 
 <!ENTITY a.dburr "Donald Burr <email>dburr@FreeBSD.org</email>">
 
 <!ENTITY a.dcs "Daniel C. Sobral <email>dcs@FreeBSD.org</email>">
 
 <!ENTITY a.dd "Dima Dorfman <email>dd@FreeBSD.org</email>">
 
 <!ENTITY a.dds "Diomidis D. Spinellis <email>dds@FreeBSD.org</email>">
 
 <!ENTITY a.dec "David E. Cross <email>dec@FreeBSD.org</email>">
 
 <!ENTITY a.deischen "Daniel Eischen <email>deischen@FreeBSD.org</email>">
 
+<!ENTITY a.delphij "Xin Li <email>delphij@FreeBSD.org</email>">
+
 <!ENTITY a.demon "Dmitry Sivachenko <email>demon@FreeBSD.org</email>">
 
 <!ENTITY a.den "Denis Peplin <email>den@FreeBSD.org</email>">
 
 <!ENTITY a.des "Dag-Erling C. Sm&oslash;rgrav <email>des@FreeBSD.org</email>">
 
 <!ENTITY a.dfr "Doug Rabson <email>dfr@FreeBSD.org</email>">
 
 <!ENTITY a.dg "David Greenman <email>dg@FreeBSD.org</email>">
 
+<!ENTITY a.dhartmei "Daniel Hartmeier <email>dhartmei@FreeBSD.org</email>">
+
 <!ENTITY a.dhw "David Wolfskill <email>dhw@FreeBSD.org</email>">
 
 <!ENTITY a.dick "Richard Seaman Jr. <email>dick@FreeBSD.org</email>">
 
 <!ENTITY a.dillon "Matthew Dillon <email>dillon@FreeBSD.org</email>">
 
 <!ENTITY a.dima "Dima Ruban <email>dima@FreeBSD.org</email>">
 
 <!ENTITY a.dinoex "Dirk Meyer <email>dinoex@FreeBSD.org</email>">
 
 <!ENTITY a.dirk "Dirk Fr&ouml;mberg <email>dirk@FreeBSD.org</email>">
 
 <!ENTITY a.dmlb "Duncan Barclay <email>dmlb@FreeBSD.org</email>">
 
 <!ENTITY a.dougb "Doug Barton <email>DougB@FreeBSD.org</email>">
 
 <!ENTITY a.dt "Dmitrij Tejblum <email>dt@FreeBSD.org</email>">
 
 <!ENTITY a.dufault "Peter Dufault <email>dufault@FreeBSD.org</email>">
 
 <!ENTITY a.dwcjr "David W. Chapman Jr. <email>dwcjr@FreeBSD.org</email>">
 
 <!ENTITY a.dwhite "Doug White <email>dwhite@FreeBSD.org</email>">
 
 <!ENTITY a.dwmalone "David Malone <email>dwmalone@FreeBSD.org</email>">
 
 <!ENTITY a.edwin "Edwin Groothuis <email>edwin@FreeBSD.org</email>">
 
 <!ENTITY a.eik "Oliver Eikemeier <email>eik@FreeBSD.org</email>">
 
 <!ENTITY a.eivind "Eivind Eklund <email>eivind@FreeBSD.org</email>">
 
 <!ENTITY a.ejc "Eric J. Chet <email>ejc@FreeBSD.org</email>">
 
 <!ENTITY a.emax "Maksim Yevmenkin <email>emax@FreeBSD.org</email>">
 
 <!ENTITY a.emoore "Eric Moore <email>emoore@FreeBSD.org</email>">
 
 <!ENTITY a.eric "Eric Melville <email>eric@FreeBSD.org</email>">
 
 <!ENTITY a.erich "Eric L. Hernes <email>erich@FreeBSD.org</email>">
 
 <!ENTITY a.erwin "Erwin Lansing <email>erwin@FreeBSD.org</email>">
 
 <!ENTITY a.fanf "Tony Finch <email>fanf@FreeBSD.org</email>">
 
 <!ENTITY a.fenner "Bill Fenner <email>fenner@FreeBSD.org</email>">
 
 <!ENTITY a.fjoe "Max Khon <email>fjoe@FreeBSD.org</email>">
 
 <!ENTITY a.flathill "Seiichirou Hiraoka <email>flathill@FreeBSD.org</email>">
 
 <!ENTITY a.foxfair "Howard F. Hu <email>foxfair@FreeBSD.org</email>">
 
 <!ENTITY a.fsmp "Steve Passe <email>fsmp@FreeBSD.org</email>">
 
 <!ENTITY a.furuta "Atsushi Furuta <email>furuta@FreeBSD.org</email>">
 
 <!ENTITY a.gad "Garance A Drosehn <email>gad@FreeBSD.org</email>">
 
 <!ENTITY a.gallatin "Andrew Gallatin <email>gallatin@FreeBSD.org</email>">
 
 <!ENTITY a.gerald "Gerald Pfeifer <email>gerald@FreeBSD.org</email>">
 
 <!ENTITY a.ghelmer "Guy Helmer <email>ghelmer@FreeBSD.org</email>">
 
 <!ENTITY a.gibbs "Justin T. Gibbs <email>gibbs@FreeBSD.org</email>">
 
 <!ENTITY a.gioria "Sebastien Gioria <email>gioria@FreeBSD.org</email>">
 
 <!ENTITY a.gj "Gary Jennejohn <email>gj@FreeBSD.org</email>">
 
+<!ENTITY a.glebius "Gleb Smirnoff <email>glebius@FreeBSD.org</email>">
+
 <!ENTITY a.glewis "Greg Lewis <email>glewis@FreeBSD.org</email>">
 
 <!ENTITY a.gordon "Gordon Tetlow <email>gordon@FreeBSD.org</email>">
 
 <!ENTITY a.gpalmer "Gary Palmer <email>gpalmer@FreeBSD.org</email>">
 
 <!ENTITY a.graichen "Thomas Graichen <email>graichen@FreeBSD.org</email>">
 
 <!ENTITY a.green "Brian F. Feldman <email>green@FreeBSD.org</email>">
 
 <!ENTITY a.grehan "Peter Grehan <email>grehan@FreeBSD.org</email>">
 
 <!ENTITY a.greid "George C. A. Reid <email>greid@FreeBSD.org</email>">
 
 <!ENTITY a.grog "Greg Lehey <email>grog@FreeBSD.org</email>">
 
 <!ENTITY a.groudier "Gerard Roudier <email>groudier@FreeBSD.org</email>">
 
 <!ENTITY a.gryphon "Coranth Gryphon <email>gryphon@FreeBSD.org</email>">
 
 <!ENTITY a.gshapiro "Gregory Neil Shapiro <email>gshapiro@FreeBSD.org</email>">
 
 <!ENTITY a.gsutter "Gregory Sutter <email>gsutter@FreeBSD.org</email>">
 
 <!ENTITY a.guido "Guido van Rooij <email>guido@FreeBSD.org</email>">
 
 <!ENTITY a.hanai "Hiroyuki HANAI <email>hanai@FreeBSD.org</email>">
 
 <!ENTITY a.harti "Hartmut Brandt <email>harti@FreeBSD.org</email>">
 
 <!ENTITY a.helbig "Wolfgang Helbig <email>helbig@FreeBSD.org</email>">
 
 <!ENTITY a.hm "Hellmuth Michaelis <email>hm@FreeBSD.org</email>">
 
 <!ENTITY a.hmp "Hiten Pandya <email>hmp@FreeBSD.org</email>">
 
 <!ENTITY a.hoek "Tim Vanderhoek <email>hoek@FreeBSD.org</email>">
 
 <!ENTITY a.horikawa "Kazuo Horikawa <email>horikawa@FreeBSD.org</email>">
 
 <!ENTITY a.hosokawa "Tatsumi Hosokawa <email>hosokawa@FreeBSD.org</email>">
 
+<!ENTITY a.hq "Herve Quiroz <email>hq@FreeBSD.org</email>">
+
 <!ENTITY a.hrs "Hiroki Sato <email>hrs@FreeBSD.org</email>">
 
 <!ENTITY a.hsu "Jeffrey Hsu <email>hsu@FreeBSD.org</email>">
 
 <!ENTITY a.iedowse "Ian Dowse <email>iedowse@FreeBSD.org</email>">
 
 <!ENTITY a.ijliao "Ying-Chieh Liao <email>ijliao@FreeBSD.org</email>">
 
 <!ENTITY a.ikob "Katsushi Kobayashi <email>ikob@FreeBSD.org</email>">
 
 <!ENTITY a.imp "Warner Losh <email>imp@FreeBSD.org</email>">
 
 <!ENTITY a.imura "R. Imura <email>imura@FreeBSD.org</email>">
 
 <!ENTITY a.issei "Issei Suzuki <email>issei@FreeBSD.org</email>">
 
 <!ENTITY a.itojun "Jun-ichiro Itoh <email>itojun@itojun.org</email>">
 
 <!ENTITY a.iwasaki "Mitsuru IWASAKI <email>iwasaki@FreeBSD.org</email>">
 
 <!ENTITY a.jake "Jake Burkholder <email>jake@FreeBSD.org</email>">
 
 <!ENTITY a.jasone "Jason Evans <email>jasone@FreeBSD.org</email>">
 
 <!ENTITY a.jayanth "Jayanth Vijayaraghavan <email>jayanth@FreeBSD.org</email>">
 
 <!ENTITY a.jb "John Birrell <email>jb@FreeBSD.org</email>">
 
 <!ENTITY a.jdp "John Polstra <email>jdp@FreeBSD.org</email>">
 
 <!ENTITY a.jedgar "Chris D. Faulhaber <email>jedgar@FreeBSD.org</email>">
 
 <!ENTITY a.jeff "Jeff Roberson <email>jeff@FreeBSD.org</email>">
 
 <!ENTITY a.jeh "James Housley <email>jeh@FreeBSD.org</email>">
 
 <!ENTITY a.jehamby "Jake Hamby <email>jehamby@FreeBSD.org</email>">
 
 <!ENTITY a.jennifer "Jennifer Yang <email>jennifer@FreeBSD.org</email>">
 
 <!ENTITY a.jesper "Jesper Skriver <email>jesper@FreeBSD.org</email>">
 
 <!ENTITY a.jesusr "Jesus Rodriguez <email>jesusr@FreeBSD.org</email>">
 
 <!ENTITY a.jfieber "John Fieber <email>jfieber@FreeBSD.org</email>">
 
 <!ENTITY a.jfitz "James FitzGibbon <email>jfitz@FreeBSD.org</email>">
 
 <!ENTITY a.jgreco "Joe Greco <email>jgreco@FreeBSD.org</email>">
 
 <!ENTITY a.jhay "John Hay <email>jhay@FreeBSD.org</email>">
 
 <!ENTITY a.jhb "John Baldwin <email>jhb@FreeBSD.org</email>">
 
 <!ENTITY a.jhs "Julian Stacey <email>jhs@FreeBSD.org</email>">
 
 <!ENTITY a.jim "Jim Mock <email>jim@FreeBSD.org</email>">
 
 <!ENTITY a.jkh "Jordan K. Hubbard <email>jkh@FreeBSD.org</email>">
 
 <!ENTITY a.jkoshy "Joseph Koshy <email>jkoshy@FreeBSD.org</email>">
 
 <!ENTITY a.jlemon "Jonathan Lemon <email>jlemon@FreeBSD.org</email>">
 
 <!ENTITY a.jlrobin "James L. Robinson <email>jlrobin@FreeBSD.org</email>">
 
 <!ENTITY a.jmacd "Joshua Peck Macdonald <email>jmacd@FreeBSD.org</email>">
 
 <!ENTITY a.jmallett "Juli Mallett <email>jmallett@FreeBSD.org</email>">
 
 <!ENTITY a.jmas "Jose M. Alcaide <email>jmas@FreeBSD.org</email>">
 
 <!ENTITY a.jmb "Jonathan M. Bresler <email>jmb@FreeBSD.org</email>">
 
 <!ENTITY a.jmg "John-Mark Gurney <email>jmg@FreeBSD.org</email>">
 
 <!ENTITY a.jmz "Jean-Marc Zucconi <email>jmz@FreeBSD.org</email>">
 
 <!ENTITY a.joe "Josef Karthauser <email>joe@FreeBSD.org</email>">
 
 <!ENTITY a.joerg "J&ouml;rg Wunsch <email>joerg@FreeBSD.org</email>">
 
 <!ENTITY a.johan "Johan Karlsson <email>johan@FreeBSD.org</email>">
 
 <!ENTITY a.john "John Cavanaugh <email>john@FreeBSD.org</email>">
 
 <!ENTITY a.jon "Jonathan Chen <email>jon@FreeBSD.org</email>">
 
 <!ENTITY a.josef "Josef El-Rayes <email>josef@FreeBSD.org</email>">
 
 <!ENTITY a.jseger "Justin Seger <email>jseger@FreeBSD.org</email>">
 
 <!ENTITY a.julian "Julian Elischer <email>julian@FreeBSD.org</email>">
 
 <!ENTITY a.jvh "Johannes Helander <email>jvh@FreeBSD.org</email>">
 
 <!ENTITY a.jwd "John W. DeBoskey <email>jwd@FreeBSD.org</email>">
 
 <!ENTITY a.kan "Alexander Kabaev <email>kan@FreeBSD.org</email>">
 
 <!ENTITY a.karl "Karl Strickland <email>karl@FreeBSD.org</email>">
 
 <!ENTITY a.kato "Takenori KATO <email>kato@FreeBSD.org</email>">
 
 <!ENTITY a.kbyanc "Kelly Yancey <email>kbyanc@FreeBSD.org</email>">
 
 <!ENTITY a.keichii "Michael C. Wu <email>keichii@FreeBSD.org</email>">
 
 <!ENTITY a.keith "Jing-Tang Keith Jang <email>keith@FreeBSD.org</email>">
 
 <!ENTITY a.ken "Kenneth D. Merry <email>ken@FreeBSD.org</email>">
 
 <!ENTITY a.kensmith "Ken Smith <email>kensmith@FreeBSD.org</email>">
 
 <!ENTITY a.keramida "Giorgos Keramidas <email>keramida@FreeBSD.org</email>">
 
 <!ENTITY a.kevlo "Kevin Lo <email>kevlo@FreeBSD.org</email>">
 
 <!ENTITY a.kientzle "Tim Kientzle <email>kientzle@FreeBSD.org</email>">
 
 <!ENTITY a.kiri "Kazuhiko Kiriyama <email>kiri@FreeBSD.org</email>">
 
 <!ENTITY a.kjc "Kenjiro Cho <email>kjc@FreeBSD.org</email>">
 
 <!ENTITY a.knu "Akinori MUSHA <email>knu@FreeBSD.org</email>">
 
 <!ENTITY a.krion "Kirill Ponomarew <email>krion@FreeBSD.org</email>">
 
 <!ENTITY a.kris "Kris Kennaway <email>kris@FreeBSD.org</email>">
 
 <!ENTITY a.kuriyama "Jun Kuriyama <email>kuriyama@FreeBSD.org</email>">
 
+<!ENTITY a.kwm "Koop Mast <email>kwm@FreeBSD.org</email>">
+
 <!ENTITY a.lars "Lars Fredriksen <email>lars@FreeBSD.org</email>">
 
 <!ENTITY a.le "Lukas Ertl <email>le@FreeBSD.org</email>">
 
 <!ENTITY a.leeym "Yen-Ming Lee <email>leeym@FreeBSD.org</email>">
 
+<!ENTITY a.lesi "Dejan Lesjak <email>lesi@FreeBSD.org</email>">
+
 <!ENTITY a.lev "Lev Serebryakov <email>lev@FreeBSD.org</email>">
 
 <!ENTITY a.lile "Larry Lile <email>lile@FreeBSD.org</email>">
 
 <!ENTITY a.linimon "Mark Linimon <email>linimon@FreeBSD.org</email>">
 
 <!ENTITY a.lioux "M&aacute;rio S&eacute;rgio Fujikawa Ferreira <email>lioux@FreeBSD.org</email>">
 
 <!ENTITY a.ljo "L Jonas Olsson <email>ljo@FreeBSD.org</email>">
 
 <!ENTITY a.lkoeller "Lars Koeller <email>lkoeller@FreeBSD.org</email>">
 
 <!ENTITY a.lofi "Michael Nottebrock <email>lofi@FreeBSD.org</email>">
 
 <!ENTITY a.logo "Valentino Vaschetto <email>logo@FreeBSD.org</email>">
 
+<!ENTITY a.lth "Lars Thegler <email>lth@FreeBSD.org</email>">
+
 <!ENTITY a.luigi "Luigi Rizzo <email>luigi@FreeBSD.org</email>">
 
 <!ENTITY a.luoqi "Luoqi Chen <email>luoqi@FreeBSD.org</email>">
 
 <!ENTITY a.maho "Maho Nakata <email>maho@FreeBSD.org</email>">
 
 <!ENTITY a.marcel "Marcel Moolenaar <email>marcel@FreeBSD.org</email>">
 
+<!ENTITY a.marck "Dmitry Morozovsky <email>marck@FreeBSD.org</email>">
+
 <!ENTITY a.marcus "Joe Marcus Clarke <email>marcus@FreeBSD.org</email>">
 
+<!ENTITY a.marius "Marius Strobl <email>marius@FreeBSD.org</email>">
+
 <!ENTITY a.markm "Mark Murray <email>markm@FreeBSD.org</email>">
 
 <!ENTITY a.marko "Mark Ovens <email>marko@FreeBSD.org</email>">
 
 <!ENTITY a.markp "Mark Pulford <email>markp@FreeBSD.org</email>">
 
 <!ENTITY a.marks "Mark Santcroos <email>marks@FreeBSD.org</email>">
 
 <!ENTITY a.markus "Markus Br&uuml;ffer <email>markus@FreeBSD.org</email>">
 
 <!ENTITY a.martin "Martin Renters <email>martin@FreeBSD.org</email>">
 
 <!ENTITY a.mat "Mathieu Arnold <email>mat@FreeBSD.org</email>">
 
 <!ENTITY a.matk "Mathew Kanner <email>matk@FreeBSD.org</email>">
 
 <!ENTITY a.matusita "Makoto Matsushita <email>matusita@FreeBSD.org</email>">
 
 <!ENTITY a.max "Masafumi NAKANE <email>max@FreeBSD.org</email>">
 
 <!ENTITY a.maxim "Maxim Konovalov <email>maxim@FreeBSD.org</email>">
 
 <!ENTITY a.mb "Maxim Bolotin <email>mb@FreeBSD.org</email>">
 
 <!ENTITY a.mbarkah "Ade Barkah <email>mbarkah@FreeBSD.org</email>">
 
 <!ENTITY a.mbr "Martin Blapp <email>mbr@FreeBSD.org</email>">
 
 <!ENTITY a.mckay "Stephen McKay <email>mckay@FreeBSD.org</email>">
 
 <!ENTITY a.mckusick "Kirk McKusick <email>mckusick@FreeBSD.org</email>">
 
 <!ENTITY a.mdodd "Matthew N. Dodd <email>mdodd@FreeBSD.org</email>">
 
+<!ENTITY a.metal "Koichi Suzuki <email>metal@FreeBSD.org</email>">
+
+<!ENTITY a.mezz "Jeremy Messenger <email>mezz@FreeBSD.org</email>">
+
 <!ENTITY a.mharo "Michael Haro <email>mharo@FreeBSD.org</email>">
 
 <!ENTITY a.mheinen "Martin Heinen <email>mheinen@FreeBSD.org</email>">
 
 <!ENTITY a.mi "Mikhail Teterin <email>mi@FreeBSD.org</email>">
 
 <!ENTITY a.mich "Michael L. Hostbaek <email>mich@FreeBSD.org</email>">
 
 <!ENTITY a.mike "Mike Barcroft <email>mike@FreeBSD.org</email>">
 
 <!ENTITY a.mikeh "Mike Heffner <email>mikeh@FreeBSD.org</email>">
 
 <!ENTITY a.mini "Jonathan Mini <email>mini@FreeBSD.org</email>">
 
 <!ENTITY a.mita "Yoshio MITA <email>mita@FreeBSD.org</email>">
 
 <!ENTITY a.mjacob "Matthew Jacob <email>mjacob@FreeBSD.org</email>">
 
 <!ENTITY a.mks "Mike Spengler <email>mks@FreeBSD.org</email>">
 
 <!ENTITY a.mlaier "Max Laier <email>mlaier@FreeBSD.org</email>">
 
 <!ENTITY a.motoyuki "Motoyuki Konno <email>motoyuki@FreeBSD.org</email>">
 
 <!ENTITY a.mp "Mark Peek <email>mp@FreeBSD.org</email>">
 
 <!ENTITY a.mph "Matthew Hunt <email>mph@FreeBSD.org</email>">
 
 <!ENTITY a.mpp "Mike Pritchard <email>mpp@FreeBSD.org</email>">
 
 <!ENTITY a.mr "Michael Reifenberger <email>mr@FreeBSD.org</email>">
 
 <!ENTITY a.msmith "Michael Smith <email>msmith@FreeBSD.org</email>">
 
 <!ENTITY a.mtaylor "Mark J. Taylor <email>mtaylor@FreeBSD.org</email>">
 
 <!ENTITY a.mtm "Mike Makonnen <email>mtm@FreeBSD.org</email>">
 
 <!ENTITY a.murray "Murray Stokely <email>murray@FreeBSD.org</email>">
 
 <!ENTITY a.mux "Maxime Henrion <email>mux@FreeBSD.org</email>">
 
 <!ENTITY a.mwlucas "Michael W. Lucas <email>mwlucas@FreeBSD.org</email>">
 
 <!ENTITY a.naddy "Christian Weisgerber <email>naddy@FreeBSD.org</email>">
 
 <!ENTITY a.nakai "Yukihiro Nakai <email>nakai@FreeBSD.org</email>">
 
 <!ENTITY a.nate "Nate Williams <email>nate@FreeBSD.org</email>">
 
 <!ENTITY a.nbm "Neil Blakey-Milner <email>nbm@FreeBSD.org</email>">
 
 <!ENTITY a.nectar "Jacques Vidrine <email>nectar@FreeBSD.org</email>">
 
 <!ENTITY a.netchild "Alexander Leidinger <email>netchild@FreeBSD.org</email>">
 
 <!ENTITY a.newton "Mark Newton <email>newton@FreeBSD.org</email>">
 
 <!ENTITY a.nhibma "Nick Hibma <email>n_hibma@FreeBSD.org</email>">
 
 <!ENTITY a.nik "Nik Clayton <email>nik@FreeBSD.org</email>">
 
 <!ENTITY a.niklas "Niklas Saers <email>niklas@FreeBSD.org</email>">
 
 <!ENTITY a.njl "Nate Lawson <email>njl@FreeBSD.org</email>">
 
 <!ENTITY a.nobutaka "Nobutaka MANTANI <email>nobutaka@FreeBSD.org</email>">
 
 <!ENTITY a.non "Noriaki Mitsunaga <email>non@FreeBSD.org</email>">
 
 <!ENTITY a.nork "Norikatsu Shigemura <email>nork@FreeBSD.org</email>">
 
 <!ENTITY a.nsayer "Nick Sayer <email>nsayer@FreeBSD.org</email>">
 
 <!ENTITY a.nsouch "Nicolas Souchu <email>nsouch@FreeBSD.org</email>">
 
 <!ENTITY a.nyan "Yoshihiro Takahashi <email>nyan@FreeBSD.org</email>">
 
 <!ENTITY a.obraun "Oliver Braun <email>obraun@FreeBSD.org</email>">
 
 <!ENTITY a.obrien "David O'Brien <email>obrien@FreeBSD.org</email>">
 
 <!ENTITY a.okazaki "Tetsurou OKAZAKI <email>okazaki@FreeBSD.org</email>">
 
 <!ENTITY a.olgeni "Jimmy Olgeni <email>olgeni@FreeBSD.org</email>">
 
 <!ENTITY a.oliver "Oliver Lehmann <email>oliver@FreeBSD.org</email>">
 
 <!ENTITY a.onoe "Atsushi Onoe <email>onoe@FreeBSD.org</email>">
 
 <!ENTITY a.orion "Orion Hodson <email>orion@FreeBSD.org</email>">
 
 <!ENTITY a.osa "Sergey A. Osokin <email>osa@FreeBSD.org</email>">
 
 <!ENTITY a.pat "Patrick Li <email>pat@FreeBSD.org</email>">
 
 <!ENTITY a.patrick "Patrick S. Gardella <email>patrick@FreeBSD.org</email>">
 
 <!ENTITY a.paul "Paul Richards <email>paul@FreeBSD.org</email>">
 
 <!ENTITY a.pav "Pav Lucistnik <email>pav@FreeBSD.org</email>">
 
 <!ENTITY a.pb "Pierre Beyssac <email>pb@FreeBSD.org</email>">
 
 <!ENTITY a.pdeuskar "Prafulla S. Deuskar <email>pdeuskar@FreeBSD.org</email>">
 
 <!ENTITY a.pds "Peter da Silva <email>pds@FreeBSD.org</email>">
 
 <!ENTITY a.peadar "Peter Edwards <email>peadar@FreeBSD.org</email>">
 
 <!ENTITY a.perky "Hye-Shik Chang <email>perky@FreeBSD.org</email>">
 
 <!ENTITY a.petef "Pete Fritchman <email>petef@FreeBSD.org</email>">
 
 <!ENTITY a.peter "Peter Wemm <email>peter@FreeBSD.org</email>">
 
 <!ENTITY a.phantom "Alexey Zelkin <email>phantom@FreeBSD.org</email>">
 
 <!ENTITY a.philip "Philip Paeps <email>philip@FreeBSD.org</email>">
 
 <!ENTITY a.phk "Poul-Henning Kamp <email>phk@FreeBSD.org</email>">
 
 <!ENTITY a.pho "Peter Holm <email>pho@FreeBSD.org</email>">
 
 <!ENTITY a.piero "Piero Serini <email>piero@FreeBSD.org</email>">
 
 <!ENTITY a.pirzyk "Jim Pirzyk <email>pirzyk@FreeBSD.org</email>">
 
 <!ENTITY a.pjd "Pawel Jakub Dawidek <email>pjd@FreeBSD.org</email>">
 
 <!ENTITY a.proven "Chris Provenzano <email>proven@FreeBSD.org</email>">
 
 <!ENTITY a.ps "Paul Saab <email>ps@FreeBSD.org</email>">
 
 <!ENTITY a.pst "Paul Traina <email>pst@FreeBSD.org</email>">
 
 <!ENTITY a.rees "Jim Rees <email>rees@FreeBSD.org</email>">
 
 <!ENTITY a.reg "Jeremy Lea <email>reg@FreeBSD.org</email>">
 
 <!ENTITY a.rgrimes "Rodney Grimes <email>rgrimes@FreeBSD.org</email>">
 
 <!ENTITY a.ricardag "Ricardo AG <email>ricardag@FreeBSD.org</email>">
 
 <!ENTITY a.rich "Rich Murphey <email>rich@FreeBSD.org</email>">
 
 <!ENTITY a.rik "Roman Kurakin <email>rik@FreeBSD.org</email>">
 
 <!ENTITY a.rnordier "Robert Nordier <email>rnordier@FreeBSD.org</email>">
 
 <!ENTITY a.roam "Peter Pentchev <email>roam@FreeBSD.org</email>">
 
 <!ENTITY a.robert "Robert Drehmel <email>robert@FreeBSD.org</email>">
 
 <!ENTITY a.roberto "Ollivier Robert <email>roberto@FreeBSD.org</email>">
 
 <!ENTITY a.roger "Roger Hardiman <email>roger@FreeBSD.org</email>">
 
 <!ENTITY a.rpratt "Randy Pratt <email>rpratt@FreeBSD.org</email>">
 
 <!ENTITY a.rse "Ralf S. Engelschall <email>rse@FreeBSD.org</email>">
 
 <!ENTITY a.rsm "Scott Mitchell <email>rsm@FreeBSD.org</email>">
 
 <!ENTITY a.ru "Ruslan Ermilov <email>ru@FreeBSD.org</email>">
 
 <!ENTITY a.rushani "Hideyuki KURASHINA <email>rushani@FreeBSD.org</email>">
 
 <!ENTITY a.rv "Rajesh Vaidheeswarran <email>rv@FreeBSD.org</email>">
 
 <!ENTITY a.rvb "Robert V. Baron <email>rvb@FreeBSD.org</email>">
 
 <!ENTITY a.rwatson "Robert Watson <email>rwatson@FreeBSD.org</email>">
 
 <!ENTITY a.sada "SADA Kenji <email>sada@FreeBSD.org</email>">
 
 <!ENTITY a.sam "Sam Leffler <email>sam@FreeBSD.org</email>">
 
 <!ENTITY a.sanpei "Yoshiro Sanpei MIHIRA <email>sanpei@FreeBSD.org</email>">
 
 <!ENTITY a.schweikh "Jens Schweikhardt <email>schweikh@FreeBSD.org</email>">
 
 <!ENTITY a.scop "Ville Skytt&auml; <email>scop@FreeBSD.org</email>">
 
 <!ENTITY a.scottl "Scott Long <email>scottl@FreeBSD.org</email>">
 
 <!ENTITY a.scrappy "Marc G. Fournier <email>scrappy@FreeBSD.org</email>">
 
 <!ENTITY a.se "Stefan Esser <email>se@FreeBSD.org</email>">
 
 <!ENTITY a.seanc "Sean Chittenden <email>seanc@FreeBSD.org</email>">
 
 <!ENTITY a.sef "Sean Eric Fagan <email>sef@FreeBSD.org</email>">
 
+<!ENTITY a.sem "Sergey Matveychuk <email>sem@FreeBSD.org</email>">
+
 <!ENTITY a.semenu "Semen Ustimenko <email>semenu@FreeBSD.org</email>">
 
 <!ENTITY a.sergei "Sergei Kolobov <email>sergei@FreeBSD.org</email>">
 
 <!ENTITY a.sf "Satsuki FUJISHIMA <email>sf@FreeBSD.org</email>">
 
 <!ENTITY a.shafeeq "Shafeeq Sinnamohideen <email>shafeeq@FreeBSD.org</email>">
 
 <!ENTITY a.sheldonh "Sheldon Hearn <email>sheldonh@FreeBSD.org</email>">
 
 <!ENTITY a.shiba "Takeshi Shibagaki <email>shiba@FreeBSD.org</email>">
 
 <!ENTITY a.shige "Shigeyuki Fukushima <email>shige@FreeBSD.org</email>">
 
 <!ENTITY a.shin "Yoshinobu Inoue <email>shin@FreeBSD.org</email>">
 
 <!ENTITY a.silby "Mike Silbersack <email>silby@FreeBSD.org</email>">
 
 <!ENTITY a.simokawa "Hidetoshi Shimokawa <email>simokawa@FreeBSD.org</email>">
 
 <!ENTITY a.simon "Simon L. Nielsen <email>simon@FreeBSD.org</email>">
 
 <!ENTITY a.skv "Sergey Skvortsov <email>skv@FreeBSD.org</email>">
 
 <!ENTITY a.smace "Scott Mace <email>smace@FreeBSD.org</email>">
 
 <!ENTITY a.smkelly "Sean Kelly <email>smkelly@FreeBSD.org</email>">
 
 <!ENTITY a.smpatel "Sujal Patel <email>smpatel@FreeBSD.org</email>">
 
 <!ENTITY a.sobomax "Maxim Sobolev <email>sobomax@FreeBSD.org</email>">
 
 <!ENTITY a.sos "S&oslash;ren Schmidt <email>sos@FreeBSD.org</email>">
 
+<!ENTITY a.ssouhlal "Suleiman Souhlal <email>ssouhlal@FreeBSD.org</email>">
+
 <!ENTITY a.stanislav "G. Adam Stanislav <email>adam@redprince.net</email>">
 
 <!ENTITY a.stark "Gene Stark <email>stark@FreeBSD.org</email>">
 
 <!ENTITY a.stb "Stefan Bethke <email>stb@FreeBSD.org</email>">
 
+<!ENTITY a.stefanf "Stefan Farfeleder <email>stefanf@FreeBSD.org</email>">
+
 <!ENTITY a.stephane "St&eacute;phane Legrand <email>stephane@FreeBSD.org</email>">
 
 <!ENTITY a.steve "Steve Price <email>steve@FreeBSD.org</email>">
 
 <!ENTITY a.sumikawa "Munechika Sumikawa <email>sumikawa@FreeBSD.org</email>">
 
 <!ENTITY a.suz "SUZUKI Shinsuke <email>suz@FreeBSD.org</email>">
 
 <!ENTITY a.swallace "Steven Wallace <email>swallace@FreeBSD.org</email>">
 
+<!ENTITY a.tackerman "Tony Ackerman <email>tackerman@FreeBSD.org</email>">
+
 <!ENTITY a.takawata "Takanori Watanabe <email>takawata@FreeBSD.org</email>">
 
 <!ENTITY a.tanimura "Seigo Tanimura <email>tanimura@FreeBSD.org</email>">
 
 <!ENTITY a.taoka "Satoshi Taoka <email>taoka@FreeBSD.org</email>">
 
 <!ENTITY a.tedm "Ted Mittelstaedt <email>tedm@FreeBSD.org</email>">
 
 <!ENTITY a.tegge "Tor Egge <email>tegge@FreeBSD.org</email>">
 
 <!ENTITY a.tg "Thomas Gellekum <email>tg@FreeBSD.org</email>">
 
 <!ENTITY a.thepish "Peter Hawkins <email>thepish@FreeBSD.org</email>">
 
 <!ENTITY a.thierry "Thierry Thomas <email>thierry@FreeBSD.org</email>">
 
 <!ENTITY a.thomas "Thomas Quinot <email>thomas@FreeBSD.org</email>">
 
 <!ENTITY a.ticso "Bernd Walter <email>ticso@FreeBSD.org</email>">
 
 <!ENTITY a.tjr "Tim J. Robbins <email>tjr@FreeBSD.org</email>">
 
 <!ENTITY a.tmm "Thomas M&ouml;stl <email>tmm@FreeBSD.org</email>">
 
 <!ENTITY a.tobez "Anton Berezin <email>tobez@FreeBSD.org</email>">
 
 <!ENTITY a.tom "Tom Hukins <email>tom@FreeBSD.org</email>">
 
 <!ENTITY a.tomsoft "Thomas-Henning von Kamptz <email>tomsoft@FreeBSD.org</email>">
 
 <!ENTITY a.torstenb "Torsten Blum <email>torstenb@FreeBSD.org</email>">
 
 <!ENTITY a.toshi "Toshihiko Arai <email>toshi@FreeBSD.org</email>">
 
 <!ENTITY a.trevor "Trevor Johnson <email>trevor@FreeBSD.org</email>">
 
 <!ENTITY a.trhodes "Tom Rhodes <email>trhodes@FreeBSD.org</email>">
 
 <!ENTITY a.truckman "Don &ldquo;Truck&rdquo; Lewis <email>truckman@FreeBSD.org</email>">
 
 <!ENTITY a.tshiozak "Takuya SHIOZAKI <email>tshiozak@FreeBSD.org</email>">
 
 <!ENTITY a.uch "Yasushi UCHIYAMA <email>uch@FreeBSD.org</email>">
 
 <!ENTITY a.ue "Udo Erdelhoff <email>ue@FreeBSD.org</email>">
 
 <!ENTITY a.ugen "Ugen J.S.Antsilevich <email>ugen@FreeBSD.org</email>">
 
 <!ENTITY a.uhclem "Frank Durda IV <email>uhclem@FreeBSD.org</email>">
 
 <!ENTITY a.ulf "Ulf Zimmermann <email>ulf@FreeBSD.org</email>">
 
 <!ENTITY a.ume "Hajimu UMEMOTO <email>ume@FreeBSD.org</email>">
 
 <!ENTITY a.unfurl "Bill Swingle <email>unfurl@FreeBSD.org</email>">
 
 <!ENTITY a.vanilla "Vanilla I. Shu <email>vanilla@FreeBSD.org</email>">
 
 <!ENTITY a.viny "Vincent Tougait <email>viny@FreeBSD.org</email>">
 
 <!ENTITY a.vkashyap "Vinod Kashyap <email>vkashyap@FreeBSD.org</email>">
 
 <!ENTITY a.vs "Volker Stolz <email>vs@FreeBSD.org</email>">
 
 <!ENTITY a.wes "Wes Peters <email>wes@FreeBSD.org</email>">
 
 <!ENTITY a.whiteside "Don Whiteside <email>whiteside@acm.org</email>">
 
 <!ENTITY a.wilko "Wilko Bulte <email>wilko@FreeBSD.org</email>">
 
 <!ENTITY a.will "Will Andrews <email>will@FreeBSD.org</email>">
 
 <!ENTITY a.wjv "Johann Visagie <email>wjv@FreeBSD.org</email>">
 
 <!ENTITY a.wollman "Garrett Wollman <email>wollman@FreeBSD.org</email>">
 
 <!ENTITY a.wosch "Wolfram Schneider <email>wosch@FreeBSD.org</email>">
 
 <!ENTITY a.wpaul "Bill Paul <email>wpaul@FreeBSD.org</email>">
 
 <!ENTITY a.wsanchez "Wilfredo S&aacute;nchez <email>wsanchez@FreeBSD.org</email>">
 
 <!ENTITY a.wylie "Wylie Stilwell <email>wylie@magnesium.net</email>">
 
 <!ENTITY a.yar "Yar Tikhiy <email>yar@FreeBSD.org</email>">
 
 <!ENTITY a.yoichi "Yoichi NAKAYAMA <email>yoichi@FreeBSD.org</email>">
 
 <!ENTITY a.yokota "Kazutaka YOKOTA <email>yokota@FreeBSD.org</email>">
 
 <!ENTITY a.zarzycki "Dave Zarzycki <email>zarzycki@FreeBSD.org</email>">
 
 <!ENTITY a.znerd "Ernst de Haan <email>znerd@FreeBSD.org</email>">
 
diff --git a/es_ES.ISO8859-1/share/sgml/catalog b/es_ES.ISO8859-1/share/sgml/catalog
index 421ae49e48..209aa611ff 100644
--- a/es_ES.ISO8859-1/share/sgml/catalog
+++ b/es_ES.ISO8859-1/share/sgml/catalog
@@ -1,29 +1,36 @@
   -- ...................................................................... --
   -- FreeBSD SGML Public Identifiers ...................................... --
 
   -- ...................................................................... --
   -- Spanish specific ..................................................... --
   
   -- $FreeBSD$
-  --
+  -- $FreeBSDes: doc/es_ES.ISO8859-1/share/sgml/catalog,v 1.5 2004/08/05 17:11:47 carvay Exp $
 
 PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
 	"freebsd.dsl"
 
 PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//ES"
 	"mailing-lists.ent"
 
 PUBLIC  "-//FreeBSD//ENTITIES DocBook BookInfo Entities//ES"
         "bookinfo.ent"
 
 PUBLIC  "-//FreeBSD//ENTITIES DocBook Mailing List Entities//ES"
         "mailing-lists.ent"
 
 PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//ES"
         "freebsd.dsl"
 
 PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//ES"
 	"newsgroups.ent"
 
-PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//ES"
+PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN"
 	"trademarks.ent"
+
+PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//ES"
+	"translators.ent"
+
+PUBLIC  "-//FreeBSD//ENTITIES DocBook Spanish Mailing List Entities//ES"
+        "es-mailing-lists.ent"
+
diff --git a/es_ES.ISO8859-1/share/sgml/es-mailing-lists.ent b/es_ES.ISO8859-1/share/sgml/es-mailing-lists.ent
new file mode 100644
index 0000000000..3ff0620530
--- /dev/null
+++ b/es_ES.ISO8859-1/share/sgml/es-mailing-lists.ent
@@ -0,0 +1,18 @@
+<!--
+    Listas de correo oficiales de FreeBSD en castellano.
+
+    $FreeBSD$
+    $FreeBSDes: doc/es_ES.ISO8859-1/share/sgml/es-mailing-lists.ent,v 1.2 2004/08/09 15:33:25 jesusr Exp $
+-->
+
+<!ENTITY a.es.mailman.listinfo "https://listas.es.FreeBSD.org/mailman/listinfo">
+<!ENTITY a.es.mailman.lists "<ulink url='&a.es.mailman.listinfo;'>servidor de listas de FreeBSD en castellano</ulink>">
+<!ENTITY a.es.mailman.lists.link "<ulink url='&a.es.mailman.listinfo;'>&a.es.mailman.listinfo;</ulink>">
+
+<!ENTITY a.es.doc.url "&a.es.mailman.listinfo;/doc">
+<!ENTITY a.es.doc "<ulink url='&a.es.doc.url;'>lista de correo sobre la documentaci&oacute;n de FreeBSD en castellano</ulink>"> 
+<!ENTITY a.es.doc.name "<ulink url='&a.es.doc.url;'>doc</ulink>">
+
+<!ENTITY a.es.freebsd.url "&a.es.mailman.listinfo;/freebsd">
+<!ENTITY a.es.freebsd "<ulink url='&a.es.freebsd.url;'>lista de correo en castellano sobre FreeBSD</ulink>">
+<!ENTITY a.es.freebsd.name "<ulink url='&a.es.freebsd.url;'>doc</ulink>">
diff --git a/es_ES.ISO8859-1/share/sgml/l10n.ent b/es_ES.ISO8859-1/share/sgml/l10n.ent
new file mode 100644
index 0000000000..febafe3091
--- /dev/null
+++ b/es_ES.ISO8859-1/share/sgml/l10n.ent
@@ -0,0 +1,13 @@
+<!-- -*- sgml -*-
+     DocBook Language Specific Entities for Localization (es).
+
+     $FreeBSD$
+     $FreeBSDes: doc/es_ES.ISO8859-1/share/sgml/l10n.ent,v 1.1 2004/08/25 22:55:36 jcamou Exp $
+-->
+
+<!-- docformat navi -->
+<!ENTITY docnavi.single-html "Single HTML">
+<!ENTITY docnavi.split-html  "Split HTML">
+
+<!ENTITY doc.langcode.es "es_ES.ISO8859-1">
+<!ENTITY doc.langcode    "&doc.langcode.es;">
diff --git a/es_ES.ISO8859-1/share/sgml/mailing-lists.ent b/es_ES.ISO8859-1/share/sgml/mailing-lists.ent
index 3cce7e807a..7f3df87712 100755
--- a/es_ES.ISO8859-1/share/sgml/mailing-lists.ent
+++ b/es_ES.ISO8859-1/share/sgml/mailing-lists.ent
@@ -1,113 +1,387 @@
 <!--
-     Names of FreeBSD mailing lists and related software.
+     Nombres de las listas de correo de FreeBSD y software relacionado.
 
-     $FreeBSD: doc/en_US.ISO8859-1/share/sgml/mailing-lists.ent,v 1.1 2001/06/21 03:38:17 chris Exp $
+     $FreeBSD$
+     $FreeBSDes: doc/es_ES.ISO8859-1/share/sgml/mailing-lists.ent,v 1.3 2004/09/02 05:23:40 jcamou Exp $
 -->
 
-<!ENTITY a.advocacy "Lista de promoci&oacute;n de FreeBSD
-  <email>freebsd-advocacy@FreeBSD.org</email>">
+<!ENTITY a.mailman.listinfo "http://lists.FreeBSD.org/mailman/listinfo">
+<!ENTITY a.mailman.lists "<ulink url='&a.mailman.listinfo;'>servidor de listas de FreeBSD</ulink>">
+<!ENTITY a.mailman.lists.link "<ulink url='&a.mailman.listinfo;'>&a.mailman.listinfo;</ulink>">
 
-<!ENTITY a.announce "Lista de anuncions de FreeBSD
-  <email>freebsd-announce@FreeBSD.org</email>">
+<!ENTITY a.acpi.url "&a.mailman.listinfo;/freebsd-acpi">
+<!ENTITY a.acpi "<ulink url='&a.acpi.url;'>lista de correo sobre ACPI en FreeBSD</ulink>">
+<!ENTITY a.acpi.name "<ulink url='&a.acpi.url;'>freebsd-acpi</ulink>">
 
-<!ENTITY a.bugs "Lista de 'Problem Reports' de FreeBSD
-  <email>freebsd-bugs@FreeBSD.org</email>">
+<!ENTITY a.advocacy.url "&a.mailman.listinfo;/freebsd-advocacy">
+<!ENTITY a.advocacy "<ulink url='&a.advocacy.url;'>lista de promoci&oacute;n de FreeBSD</ulink>">
+<!ENTITY a.advocacy.name "<ulink url='&a.advocacy.url;'>freebsd-advocacy</ulink>">
 
-<!ENTITY a.chat "Lista de conversaciones de FreeBSD
-  <email>freebsd-chat@FreeBSD.org</email>">
+<!ENTITY a.afs.url "&a.mailman.listinfo;/freebsd-afs">
+<!ENTITY a.afs "<ulink url='&a.afs.url;'>lista del porte de AFS a FreeBSD</ulink>">
+<!ENTITY a.afs.name "<ulink url='&a.afs.url;'>freebsd-afs</ulink>">
 
-<!ENTITY a.committers "Lista de committers de FreeBSD
-  <email>cvs-committers@FreeBSD.org</email>">
+<!ENTITY a.aic7xxx.url "&a.mailman.listinfo;/aic7xxx">
+<!ENTITY a.aic7xxx "<ulink url='&a.aic7xxx.url;'>lista de discusiones relacionadas con Adaptec AIC7xxx en FreeBSD</ulink>">
+<!ENTITY a.aic7xxx.name "<ulink url='&a.aic7xxx.url;'>freebsd-aic7xxx</ulink>">
 
-<!ENTITY a.core "FreeBSD core team
-  <email>freebsd-core@FreeBSD.org</email>">
+<!ENTITY a.alpha.url "&a.mailman.listinfo;/freebsd-alpha">
+<!ENTITY a.alpha "<ulink url='&a.alpha.url;'>lista de correo del port de FreeBSD para Alpha</ulink>">
+<!ENTITY a.alpha.name "<ulink url='&a.alpha.url;'>freebsd-alpha</ulink>">
 
-<!ENTITY a.current "Lista de FreeBSD-current
-  <email>freebsd-current@FreeBSD.org</email>">
+<!ENTITY a.amd64.url "&a.mailman.listinfo;/freebsd-amd64">
+<!ENTITY a.amd64 "<ulink url='&a.amd64.url;'>lista del porte de FreeBSD a sistemas AMD64</ulink>">
+<!ENTITY a.amd64.name "<ulink url='&a.amd64.url;'>freebsd-amd64</ulink>">
 
-<!ENTITY a.cvsall "Lista de mensajes de commits en el CVS de FreeBSD
-  <email>cvs-all@FreeBSD.org</email>">
+<!ENTITY a.announce.url "&a.mailman.listinfo;/freebsd-announce">
+<!ENTITY a.announce "<ulink url='&a.announce.url;'>lista de avisos importantes del Proyecto FreeBSD</ulink>">
+<!ENTITY a.announce.name "<ulink url='&a.announce.url;'>freebsd-announce</ulink>">
 
-<!ENTITY a.database "Lista de bases de datos basadas en FreeBSD
-  <email>freebsd-database@FreeBSD.org</email>">
+<!ENTITY a.apache.url "&a.mailman.listinfo;/freebsd-apache">
+<!ENTITY a.apache "<ulink url='&a.apache.url;'>lista de Apache en FreeBSD</ulink>">
+<!ENTITY a.apache.name "<ulink url='&a.apache.url;'>freebsd-apache</ulink>">
 
-<!ENTITY a.developers "Lista de desarrolladores de FreeBSD
-  <email>freebsd-developers@FreeBSD.org</email>">
+<!ENTITY a.arch.url "&a.mailman.listinfo;/freebsd-arch">
+<!ENTITY a.arch "<ulink url='&a.arch.url;'>lista de arquitectura y dise&ntilde;o de FreeBSD</ulink>">
+<!ENTITY a.arch.name "<ulink url='&a.arch.url;'>freebsd-arch</ulink>">
 
-<!ENTITY a.doc "Lista del proyecto de documentaci&oacute;n de FreeBSD
-  <email>freebsd-doc@FreeBSD.org</email>">
+<!ENTITY a.arm.url "&a.mailman.listinfo;/freebsd-arm">
+<!ENTITY a.arm "<ulink url='&a.arm.url;'>lista del porte de ARM a FreeBSD</ulink>">
+<!ENTITY a.arm.name "<ulink url='&a.arm.url;'>freebsd-arm</ulink>">
 
-<!ENTITY a.emulation "Lista de emulaci&oacute;n en FreeBSD
-  <email>freebsd-emulation@FreeBSD.org</email>">
+<!ENTITY a.atm.url "&a.mailman.listinfo;/freebsd-atm">
+<!ENTITY a.atm "<ulink url='&a.atm.url;'>lista de networking ATM en FreeBSD</ulink>">
+<!ENTITY a.atm.name "<ulink url='&a.atm.url;'>freebsd-atm</ulink>">
 
-<!ENTITY a.fs "Lista del proyecto de sistemas de archivos de FreeBSD
-  <email>freebsd-fs@FreeBSD.org</email>">
+<!ENTITY a.audit.url "&a.mailman.listinfo;/freebsd-audit">
+<!ENTITY a.audit "<ulink url='&a.audit.url;'>lista para la auditor&iacute;a de c&oacute;digo fuente de FreeBSD</ulink>">
+<!ENTITY a.audit.name "<ulink url='&a.audit.url;'>freebsd-audit</ulink>">
 
-<!ENTITY a.hackers "Lista de discusiones t&eacute;cnicas en FreeBSD
-  <email>freebsd-hackers@FreeBSD.org</email>">
+<!ENTITY a.binup.url "&a.mailman.listinfo;/freebsd-binup">
+<!ENTITY a.binup "<ulink url='&a.binup.url;'>lista del sistema de actualizaci&oacute;n binaria de FreeBSD</ulink>">
+<!ENTITY a.binup.name "<ulink url='&a.binup.url;'>freebsd-binup</ulink>">
 
-<!ENTITY a.hardware "Lista de hardware en FreeBSD
-  <email>freebsd-hardware@FreeBSD.org</email>">
+<!ENTITY a.bugbusters.url "&a.mailman.listinfo;/freebsd-bugbusters">
+<!ENTITY a.bugbusters "<ulink url='&a.bugbusters.url;'>lista de correo de los bugbusters de FreeBSD</ulink>">
+<!ENTITY a.bugbusters.name "<ulink url='&a.bugbusters.url;'>freebsd-bugbusters</ulink>">
 
-<!ENTITY a.isdn "Lista de RDSI/ISDN en FreeBSD
-  <email>freebsd-isdn@FreeBSD.org</email>">
+<!ENTITY a.bugs.url "&a.mailman.listinfo;/freebsd-bugs">
+<!ENTITY a.bugs "<ulink url='&a.bugs.url;'>lista de 'problem reports' de FreeBSD</ulink>">
+<!ENTITY a.bugs.name "<ulink url='&a.bugs.url;'>freebsd-bugs</ulink>">
 
-<!ENTITY a.isp "Lista de proveedores de Internet en FreeBSD
-  <email>freebsd-isp@FreeBSD.org</email>">
+<!ENTITY a.chat.url "&a.mailman.listinfo;/freebsd-chat">
+<!ENTITY a.chat "<ulink url='&a.chat.url;'>lista de charla de FreeBSD</ulink>">
+<!ENTITY a.chat.name "<ulink url='&a.chat.url;'>freebsd-chat</ulink>">
 
-<!ENTITY a.java "Lista del lenguaje JAVA en FreeBSD
-  <email>freebsd-java@FreeBSD.org</email>">
+<!ENTITY a.cluster.url "&a.mailman.listinfo;/freebsd-cluster">
+<!ENTITY a.cluster "<ulink url='&a.cluster.url;'>lista de 'clustering' en FreeBSD</ulink>">
+<!ENTITY a.cluster.name "<ulink url='&a.cluster.url;'>freebsd-cluster</ulink>">
 
-<!ENTITY a.jobs "Lista de empleos en FreeBSD
-  <email>freebsd-jobs@FreeBSD.org</email>">
+<!ENTITY a.committers "lista de correo para 'committers' de FreeBSD">
+<!ENTITY a.committers.name "cvs-committers">
 
-<!ENTITY a.mobile "Lista de port&aacute;tiles en FreeBSD
-  <email>freebsd-mobile@FreeBSD.org</email>">
+<!ENTITY a.config.url "&a.mailman.listinfo;/freebsd-config">
+<!ENTITY a.config "<ulink url='&a.config.url;'>lista de correo de herramientas de instalaci&oacute;n y configuraci&oacute;n de FreeBSD</ulink>">
+<!ENTITY a.config.name "<ulink url='&a.config.url;'>freebsd-config</ulink>">
 
-<!ENTITY a.mozilla "Lista del port de Mozilla en FreeBSD
-  <email>freebsd-mozilla@FreeBSD.org</email>">
+<!ENTITY a.core "FreeBSD core team">
+<!ENTITY a.core.name "freebsd-core">
 
-<!ENTITY a.multimedia "Lista de multimedia en FreeBSD
-  <email>freebsd-multimedia@FreeBSD.org</email>">
+<!ENTITY a.current.url "&a.mailman.listinfo;/freebsd-current">
+<!ENTITY a.current "<ulink url='&a.current.url;'>&os.current; lista de correo</ulink>">
+<!ENTITY a.current.name "<ulink url='&a.current.url;'>freebsd-current</ulink>">
 
-<!ENTITY a.net "Lista de networking en FreeBSD
-  <email>freebsd-net@FreeBSD.org</email>">
+<!ENTITY a.ctm-announce.url "&a.mailman.listinfo;/ctm-announce">
+<!ENTITY a.ctm-announce "<ulink url='&a.ctm-announce.url;'>avisos CTM</ulink>">
+<!ENTITY a.ctm-announce.name "<ulink url='&a.ctm-announce.url;'>ctm-announce</ulink>">
 
-<!ENTITY a.newbies "Lista de nuevos usuarios de FreeBSD
-  <email>freebsd-newbies@FreeBSD.org</email>">
+<!ENTITY a.ctm-cvs-cur.url "&a.mailman.listinfo;/ctm-cvs-cur">
+<!ENTITY a.ctm-cvs-cur "<ulink url='&a.ctm-cvs-cur.url;'>distribuci&oacute;n CTM de ficheros CVS</ulink>">
+<!ENTITY a.ctm-cvs-cur.name "<ulink url='&a.ctm-cvs-cur.url;'>ctm-cvs-cur</ulink>">
 
-<!ENTITY a.newbus "Lista de arquitectura NewBus en FreeBSD
-  <email>new-bus-arch@bostonradio.org</email>">
+<!ENTITY a.ctm-src-4.url "&a.mailman.listinfo;/ctm-src-4">
+<!ENTITY a.ctm-src-4 "<ulink url='&a.ctm-src-4.url;'>lista de correo para la distribuci&oacute;n CTM de src de la rama 4-STABLE</ulink>">
+<!ENTITY a.ctm-src-4.name "<ulink url='&a.ctm-src-4.url;'>ctm-src-4</ulink>">
 
-<!ENTITY a.ports "Lista de ports de FreeBSD
-  <email>freebsd-ports@FreeBSD.org</email>">
+<!ENTITY a.ctm-src-cur.url "&a.mailman.listinfo;/ctm-src-cur">
+<!ENTITY a.ctm-src-cur "<ulink url='&a.ctm-src-cur.url;'>lista de correo para la distribuci&oacute;n CTM de src de la rama -CURRENT</ulink>">
+<!ENTITY a.ctm-src-cur.name "<ulink url='&a.ctm-src-cur.url;'>ctm-src-cur</ulink>">
 
-<!ENTITY a.questions "Lista de preguntas generales de FreeBSD
-  <email>freebsd-questions@FreeBSD.org</email>">
+<!ENTITY a.ctm-users.url "&a.mailman.listinfo;/ctm-users">
+<!ENTITY a.ctm-users "<ulink url='&a.ctm-users.url;'>lista de correo para usuarios de CTM</ulink>">
+<!ENTITY a.ctm-users.name "<ulink url='&a.ctm-users.url;'>ctm-users</ulink>">
 
-<!ENTITY a.scsi "Lista del subsistema SCSI en FreeBSD
-  <email>freebsd-scsi@FreeBSD.org</email>">
+<!ENTITY a.cvsall.url "&a.mailman.listinfo;/cvs-all">
+<!ENTITY a.cvsall "<ulink url='&a.cvsall.url;'>lista de correo de mensajes de committs CVS de FreeBSD</ulink>">
+<!ENTITY a.cvsall.name "<ulink url='&a.cvsall.url;'>cvs-all</ulink>">
 
-<!ENTITY a.security "Lista de seguridad en FreeBSD
-  <email>freebsd-security@FreeBSD.org</email>">
+<!ENTITY a.cvs-doc.url "&a.mailman.listinfo;/cvs-doc">
+<!ENTITY a.cvs-doc "<ulink url='&a.cvs-doc.url;'>lista de correo de mensajes de committs CVS en la documentaci&oacute;n de FreeBSD</ulink>">
+<!ENTITY a.cvs-doc.name "<ulink url='&a.cvs-doc.url;'>cvs-doc</ulink>">
 
-<!ENTITY a.security-notifications "Lista de notificaciones de seguridad de FreeBSD
-  <email>freebsd-security-notifications@FreeBSD.org</email>">
+<!ENTITY a.cvs-ports.url "&a.mailman.listinfo;/cvs-ports">
+<!ENTITY a.cvs-ports "<ulink url='&a.cvs-ports.url;'>lista de correo de mensajes de committs CVS en los ports de FreeBSD</ulink>">
+<!ENTITY a.cvs-ports.name "<ulink url='&a.cvs-ports.url;'>cvs-ports</ulink>">
 
-<!ENTITY a.small "Lista de sistemas 'embeded' en FreeBSD
-  <email>freebsd-small@FreeBSD.org</email>">
+<!ENTITY a.cvs-projects.url "&a.mailman.listinfo;/cvs-projects">
+<!ENTITY a.cvs-projects "<ulink url='&a.cvs-projects.url;'>lista de correo de committs CVS en el &aacute;rbol projects de FreeBSD</ulink>">
+<!ENTITY a.cvs-projects.name "<ulink url='&a.cvs-projects.url;'>cvs-projects</ulink>">
 
-<!ENTITY a.smp "Lista SMP en FreeBSD
-  <email>freebsd-smp@FreeBSD.org</email>">
+<!ENTITY a.cvs-src.url "&a.mailman.listinfo;/cvs-src">
+<!ENTITY a.cvs-src "<ulink url='&a.cvs-src.url;'>lista de correo de mensajes de committs CVS en el &aacute;rbol src de FreeBSD</ulink>">
+<!ENTITY a.cvs-src.name "<ulink url='&a.cvs-src.url;'>cvs-src</ulink>">
 
-<!ENTITY a.stable "Lista de FreeBSD-stable
-  <email>freebsd-stable@FreeBSD.org</email>">
+<!ENTITY a.cvsweb.url "&a.mailman.listinfo;/freebsd-cvsweb">
+<!ENTITY a.cvsweb "<ulink url='&a.cvsweb.url;'>lista de correo de gesti&oacute;n del CVSweb de FreeBSD</ulink>">
+<!ENTITY a.cvsweb.name "<ulink url='&a.cvsweb.url;'>freebsd-cvsweb</ulink>">
 
-<!ENTITY a.tokenring "Lista de tokenring en FreeBSD
-  <email>freebsd-tokenring@FreeBSD.org</email>">
+<!ENTITY a.database.url "&a.mailman.listinfo;/freebsd-database">
+<!ENTITY a.database "<ulink url='&a.database.url;'>lista de correo de bases de datos basadas en FreeBSD</ulink>">
+<!ENTITY a.database.name "<ulink url='&a.database.url;'>freebsd-database</ulink>">
 
-<!ENTITY a.www "Lista de Webmasters de FreeBSD
-  <email>freebsd-www@FreeBSD.org</email>">
+<!ENTITY a.developers "lista de correo de desarrolladores de FreeBSD">
+<!ENTITY a.developers.name "freebsd-developers">
 
-<!ENTITY a.majordomo "<email>majordomo@FreeBSD.org</email>">
+<!ENTITY a.doc.url "&a.mailman.listinfo;/freebsd-doc">
+<!ENTITY a.doc "<ulink url='&a.doc.url;'>lista de correo del proyecto de documentaci&oacute;n de FreeBSD</ulink>">
+<!ENTITY a.doc.name "<ulink url='&a.doc.url;'>freebsd-doc</ulink>">
+
+<!ENTITY a.doc-committers "lista de correo de 'doc/ committers' de FreeBSD">
+<!ENTITY a.doc-committers.name "doc-committers">
+
+<!ENTITY a.doc-developers "lista de correo de 'doc/ developers' de FreeBSD">
+<!ENTITY a.doc-developers.name "doc-developers">
+
+<!ENTITY a.emulation.url "&a.mailman.listinfo;/freebsd-emulation">
+<!ENTITY a.emulation "<ulink url='&a.emulation.url;'>lista de correo sobre emulaci&oacute;n en FreeBSD</ulink>">
+<!ENTITY a.emulation.name "<ulink url='&a.emulation.url;'>freebsd-emulation</ulink>">
+
+<!ENTITY a.firewire.url "&a.mailman.listinfo;/freebsd-firewire">
+<!ENTITY a.firewire "<ulink url='&a.firewire.url;'>lista de correo de FireWire (IEEE 1394) en FreeBSD</ulink>">
+<!ENTITY a.firewire.name "<ulink url='&a.firewire.url;'>freebsd-firewire</ulink>">
+
+<!ENTITY a.fs.url "&a.mailman.listinfo;/freebsd-fs">
+<!ENTITY a.fs "<ulink url='&a.fs.url;'>lista de correo sobre sistemas de ficheros en FreeBSD</ulink>">
+<!ENTITY a.fs.name "<ulink url='&a.fs.url;'>freebsd-fs</ulink>">
+
+<!ENTITY a.geom.url "&a.mailman.listinfo;/freebsd-geom">
+<!ENTITY a.geom "<ulink url='&a.geom.url;'>lista de correo de GEOM en FreeBSD</ulink>">
+<!ENTITY a.geom.name "<ulink url='&a.geom.url;'>freebsd-geom</ulink>">
+
+<!ENTITY a.gnome.url "&a.mailman.listinfo;/freebsd-gnome">
+<!ENTITY a.gnome "<ulink url='&a.gnome.url;'>lista de correo sobre GNOME y aplicaciones GNOME en FreeBSD</ulink>">
+<!ENTITY a.gnome.name "<ulink url='&a.gnome.url;'>freebsd-gnome</ulink>">
+
+<!ENTITY a.hackers.url "&a.mailman.listinfo;/freebsd-hackers">
+<!ENTITY a.hackers "<ulink url='&a.hackers.url;'>lista de discusiones t&eacute;cnicas en FreeBSD</ulink>">
+<!ENTITY a.hackers.name "<ulink url='&a.hackers.url;'>freebsd-hackers</ulink>">
+
+<!ENTITY a.hardware.url "&a.mailman.listinfo;/freebsd-hardware">
+<!ENTITY a.hardware "<ulink url='&a.hardware.url;'>lista sobre hardware en FreeBSD</ulink>">
+<!ENTITY a.hardware.name "<ulink url='&a.hardware.url;'>freebsd-hardware</ulink>">
+
+<!ENTITY a.hubs.url "&a.mailman.listinfo;/freebsd-hubs">
+<!ENTITY a.hubs "<ulink url='&a.hubs.url;'>lista de correo de coordinaci&oacute;n de las r&eacute;plicas de FreeBSD </ulink>">
+<!ENTITY a.hubs.name "<ulink url='&a.hubs.url;'>freebsd-hubs</ulink>">
+
+<!ENTITY a.i18n.url "&a.mailman.listinfo;/freebsd-i18n">
+<!ENTITY a.i18n "<ulink url='&a.i18n.url;'>lista de correo sobre internacionalizaci&oacute;n de FreeBSD</ulink>">
+<!ENTITY a.i18n.name "<ulink url='&a.i18n.url;'>freebsd-i18n</ulink>">
+
+<!ENTITY a.i386.url "&a.mailman.listinfo;/freebsd-i386">
+<!ENTITY a.i386 "<ulink url='&a.i386.url;'>lista de correo espec&iacute;fica sobre i386 y FreeBSD</ulink>">
+<!ENTITY a.i386.name "<ulink url='&a.i386.url;'>freebsd-i386</ulink>">
+
+<!ENTITY a.ia32.url "&a.mailman.listinfo;/freebsd-ia32">
+<!ENTITY a.ia32 "<ulink url='&a.ia32.url;'>lista de correo del porte de IA32 a FreeBSD</ulink>">
+<!ENTITY a.ia32.name "<ulink url='&a.ia32.url;'>freebsd-ia32</ulink>">
+
+<!ENTITY a.ia64.url "&a.mailman.listinfo;/freebsd-ia64">
+<!ENTITY a.ia64 "<ulink url='&a.ia64.url;'>lista de correo de IA64 a FreeBSD</ulink>">
+<!ENTITY a.ia64.name "<ulink url='&a.ia64.url;'>freebsd-ia64</ulink>">
+
+<!ENTITY a.ipfw.url "&a.mailman.listinfo;/freebsd-ipfw">
+<!ENTITY a.ipfw "<ulink url='&a.ipfw.url;'>lista de correo sobre el c&oacute;digo de IPFW de FreeBSD</ulink>">
+<!ENTITY a.ipfw.name "<ulink url='&a.ipfw.url;'>freebsd-ipfw</ulink>">
+
+<!ENTITY a.isdn.url "&a.mailman.listinfo;/freebsd-isdn">
+<!ENTITY a.isdn "<ulink url='&a.isdn.url;'>lista de correo sobre RDSI/ISDN en FreeBSD</ulink>">
+<!ENTITY a.isdn.name "<ulink url='&a.isdn.url;'>freebsd-isdn</ulink>">
+
+<!ENTITY a.isp.url "&a.mailman.listinfo;/freebsd-isp">
+<!ENTITY a.isp "<ulink url='&a.isp.url;'>lista de correo de Proveedores de Servicios de Internet en FreeBSD</ulink>">
+<!ENTITY a.isp.name "<ulink url='&a.isp.url;'>freebsd-isp</ulink>">
+
+<!ENTITY a.java.url "&a.mailman.listinfo;/freebsd-java">
+<!ENTITY a.java "<ulink url='&a.java.url;'>lista de correo sobre el Lenguaje Java en FreeBSD</ulink>">
+<!ENTITY a.java.name "<ulink url='&a.java.url;'>freebsd-java</ulink>">
+
+<!ENTITY a.jobs.url "&a.mailman.listinfo;/freebsd-jobs">
+<!ENTITY a.jobs "<ulink url='&a.jobs.url;'>lista de correo sobre empleos relacionados con FreeBSD</ulink>">
+<!ENTITY a.jobs.name "<ulink url='&a.jobs.url;'>freebsd-jobs</ulink>">
+
+<!ENTITY a.kde.url "http://freebsd.kde.org/mailman/listinfo/kde-freebsd">
+<!ENTITY a.kde "<ulink url='&a.kde.url;'>lista de correo sobre KDE/Qt y aplicaciones KDE en FreeBSD</ulink>">
+<!ENTITY a.kde.name "<ulink url='&a.kde.url;'>freebsd-kde</ulink>">
+
+<!ENTITY a.lfs.url "&a.mailman.listinfo;/freebsd-lfs">
+<!ENTITY a.lfs "<ulink url='&a.lfs.url;'>lista de correo sobre el porte de LFS a FreeBSD</ulink>">
+<!ENTITY a.lfs.name "<ulink url='&a.lfs.url;'>freebsd-lfs</ulink>">
+
+<!ENTITY a.libh.url "&a.mailman.listinfo;/freebsd-libh">
+<!ENTITY a.libh "<ulink url='&a.libh.url;'>lista de correo sobre el sistema de instalaci&oacute;n y empaquetado libh en FreeBSD</ulink>">
+<!ENTITY a.libh.name "<ulink url='&a.libh.url;'>freebsd-libh</ulink>">
+
+<!ENTITY a.mips.url "&a.mailman.listinfo;/freebsd-mips">
+<!ENTITY a.mips "<ulink url='&a.mips.url;'>lista de correo del porte de FreeBSD para MIPS</ulink>">
+<!ENTITY a.mips.name "<ulink url='&a.mips.url;'>freebsd-mips</ulink>">
+
+<!ENTITY a.mirror-announce.url "&a.mailman.listinfo;/mirror-announce">
+<!ENTITY a.mirror-announce "<ulink url='&a.mirror-announce.url;'>lista de coordinaci&oacute;n de administradores de r&eacute;plicas de FreeBSD</ulink>">
+<!ENTITY a.mirror-announce.name "<ulink url='&a.mirror-announce.url;'>mirror-announce</ulink>">
+
+<!ENTITY a.mobile.url "&a.mailman.listinfo;/freebsd-mobile">
+<!ENTITY a.mobile "<ulink url='&a.mobile.url;'>lista de correo sobre FreeBSD y computadoras port&aacute;tiles</ulink>">
+<!ENTITY a.mobile.name "<ulink url='&a.mobile.url;'>freebsd-mobile</ulink>">
+
+<!ENTITY a.mozilla.url "&a.mailman.listinfo;/freebsd-mozilla">
+<!ENTITY a.mozilla "<ulink url='&a.mozilla.url;'>lista de correo del porte del navegador Mozilla a FreeBSD</ulink>">
+<!ENTITY a.mozilla.name "<ulink url='&a.mozilla.url;'>freebsd-mozilla</ulink>">
+
+<!ENTITY a.multimedia.url "&a.mailman.listinfo;/freebsd-multimedia">
+<!ENTITY a.multimedia "<ulink url='&a.multimedia.url;'>lista de correo sobre multimedia en FreeBSD</ulink>">
+<!ENTITY a.multimedia.name "<ulink url='&a.multimedia.url;'>freebsd-multimedia</ulink>">
+
+<!ENTITY a.net.url "&a.mailman.listinfo;/freebsd-net">
+<!ENTITY a.net "<ulink url='&a.net.url;'>lista de correo sobre networking en FreeBSD</ulink>">
+<!ENTITY a.net.name "<ulink url='&a.net.url;'>freebsd-net</ulink>">
+
+<!ENTITY a.newbies.url "&a.mailman.listinfo;/freebsd-newbies">
+<!ENTITY a.newbies "<ulink url='&a.newbies.url;'>lista de correo para reci&eacute;n llegados a FreeBSD</ulink>">
+<!ENTITY a.newbies.name "<ulink url='&a.newbies.url;'>freebsd-newbies</ulink>">
+
+<!ENTITY a.newbus.url "&a.mailman.listinfo;/freebsd-new-bus">
+<!ENTITY a.newbus "<ulink url='&a.newbus.url;'>lista de correo sobre new-bus en FreeBSD</ulink>">
+<!ENTITY a.newbus.name "<ulink url='&a.newbus.url;'>freebsd-new-bus</ulink>">
+
+<!ENTITY a.openoffice.url "&a.mailman.listinfo;/freebsd-openoffice">
+<!ENTITY a.openoffice "<ulink url='&a.openoffice.url;'>lista de correo sobre OpenOffice.org en FreeBSD</ulink>">
+<!ENTITY a.openoffice.name "<ulink url='&a.openoffice.url;'>freebsd-openoffice</ulink>">
 
+<!ENTITY a.performance.url "&a.mailman.listinfo;/freebsd-performance">
+<!ENTITY a.performance "<ulink url='&a.performance.url;'>lista de correo sobre rendimiento de FreeBSD</ulink>">
+<!ENTITY a.performance.name "<ulink url='&a.performance.url;'>freebsd-performance</ulink>">
+
+<!ENTITY a.perl.url "&a.mailman.listinfo;/freebsd-perl">
+<!ENTITY a.perl "<ulink url='&a.perl.url;'>lista de correo sobre Perl en FreeBSD</ulink>">
+<!ENTITY a.perl.name "<ulink url='&a.perl.url;'>freebsd-perl</ulink>">
+
+<!ENTITY a.platforms.url "&a.mailman.listinfo;/freebsd-platforms">
+<!ENTITY a.platforms "<ulink url='&a.platforms.url;'>lista de correo sobre FreeBSD en plataformas no Intel</ulink>">
+<!ENTITY a.platforms.name "<ulink url='&a.platforms.url;'>freebsd-platforms</ulink>">
+
+<!ENTITY a.policy.url "&a.mailman.listinfo;/freebsd-policy">
+<!ENTITY a.policy "<ulink url='&a.policy.url;'>lista de correo del Core Team para las discusiones sobre l&iacute;neas maestras de FreeBSD</ulink>">
+<!ENTITY a.policy.name "<ulink url='&a.policy.url;'>freebsd-policy</ulink>">
+
+<!ENTITY a.ports.url "&a.mailman.listinfo;/freebsd-ports">
+<!ENTITY a.ports "<ulink url='&a.ports.url;'>lista de correo de los ports de FreeBSD</ulink>">
+<!ENTITY a.ports.name "<ulink url='&a.ports.url;'>freebsd-ports</ulink>">
+
+<!ENTITY a.ports-bugs.url "&a.mailman.listinfo;/freebsd-ports-bugs">
+<!ENTITY a.ports-bugs "<ulink url='&a.ports-bugs.url;'>lista de correo sobre errores en los ports de FreeBSD</ulink>">
+<!ENTITY a.ports-bugs.name "<ulink url='&a.ports-bugs.url;'>freebsd-ports-bugs</ulink>">
+
+<!ENTITY a.ports-committers "lista de correo de los 'ports/ committers' de FreeBSD">
+<!ENTITY a.ports-committers.name "ports-committers">
+
+<!ENTITY a.ports-developers "lista de correo de los 'ports/ developers' de FreeBSD">
+<!ENTITY a.ports-developers.name "ports-developers">
+
+<!ENTITY a.ppc.url "&a.mailman.listinfo;/freebsd-ppc">
+<!ENTITY a.ppc "<ulink url='&a.ppc.url;'>lista de correo del porte de FreeBSD a PowerPC</ulink>">
+<!ENTITY a.ppc.name "<ulink url='&a.ppc.url;'>freebsd-ppc</ulink>">
+
+<!ENTITY a.qa.url "&a.mailman.listinfo;/freebsd-qa">
+<!ENTITY a.qa "<ulink url='&a.qa.url;'>lista de correo sobre 'Quality Assurance' en FreeBSD</ulink>">
+<!ENTITY a.qa.name "<ulink url='&a.qa.url;'>freebsd-qa</ulink>">
+
+<!ENTITY a.questions.url "&a.mailman.listinfo;/freebsd-questions">
+<!ENTITY a.questions "<ulink url='&a.questions.url;'>lista de correo para preguntas generales sobre FreeBSD</ulink>">
+<!ENTITY a.questions.name "<ulink url='&a.questions.url;'>freebsd-questions</ulink>">
+
+<!ENTITY a.realtime.url "&a.mailman.listinfo;/freebsd-realtime">
+<!ENTITY a.realtime "<ulink url='&a.realtime.url;'>lista de correo sobre extensiones en tiempo real en FreeBSD</ulink>">
+<!ENTITY a.realtime.name "<ulink url='&a.realtime.url;'>freebsd-realtime</ulink>">
+
+<!ENTITY a.scsi.url "&a.mailman.listinfo;/freebsd-scsi">
+<!ENTITY a.scsi "<ulink url='&a.scsi.url;'>lista de correo sobre el subsistema SCSI de FreeBSD</ulink>">
+<!ENTITY a.scsi.name "<ulink url='&a.scsi.url;'>freebsd-scsi</ulink>">
+
+<!ENTITY a.security.url "&a.mailman.listinfo;/freebsd-security">
+<!ENTITY a.security "<ulink url='&a.security.url;'>lista de correo sobre seguridad en FreeBSD</ulink>">
+<!ENTITY a.security.name "<ulink url='&a.security.url;'>freebsd-security</ulink>">
+
+<!ENTITY a.security-notifications.url "&a.mailman.listinfo;/freebsd-security-notifications">
+<!ENTITY a.security-notifications "<ulink url='&a.security-notifications.url;'>lista de correo para avisos de seguridad que afectan a FreeBSD</ulink>">
+<!ENTITY a.security-notifications.name "<ulink url='&a.security-notifications.url;'>freebsd-security-notifications</ulink>">
+
+<!ENTITY a.small.url "&a.mailman.listinfo;/freebsd-small">
+<!ENTITY a.small "<ulink url='&a.small.url;'>lista de correo sobre FreeBSD embebido</ulink>">
+<!ENTITY a.small.name "<ulink url='&a.small.url;'>freebsd-small</ulink>">
+
+<!ENTITY a.smp.url "&a.mailman.listinfo;/freebsd-smp">
+<!ENTITY a.smp "<ulink url='&a.smp.url;'>lista de correo sobre multiproceso sim&eacute;trico en FreeBSD</ulink>">
+<!ENTITY a.smp.name "<ulink url='&a.smp.url;'>freebsd-smp</ulink>">
+
+<!ENTITY a.sparc.url "&a.mailman.listinfo;/freebsd-sparc64">
+<!ENTITY a.sparc "<ulink url='&a.sparc.url;'>lista de correo del porte de FreeBSD a SPARC</ulink>">
+<!ENTITY a.sparc.name "<ulink url='&a.sparc.url;'>freebsd-sparc64</ulink>">
+
+<!ENTITY a.src-committers "lista de correo de los 'src/ committers' de FreeBSD">
+<!ENTITY a.src-committers.name "freebsd-src-committers">
+
+<!ENTITY a.src-developers "lista de correo de los 'src/ developers' de FreeBSD">
+<!ENTITY a.src-developers.name "freebsd-src-developers">
+
+<!ENTITY a.stable.url "&a.mailman.listinfo;/freebsd-stable">
+<!ENTITY a.stable "<ulink url='&a.stable.url;'>lista de correo sobre &os.stable;</ulink>">
+<!ENTITY a.stable.name "<ulink url='&a.stable.url;'>freebsd-stable</ulink>">
+
+<!ENTITY a.standards.url "&a.mailman.listinfo;/freebsd-standards">
+<!ENTITY a.standards "<ulink url='&a.standards.url;'>lista de correo sobre la conformidad de FreeBSD a los est&aacute;ndares C99 y POSIX</ulink>">
+<!ENTITY a.standards.name "<ulink url='&a.standards.url;'>freebsd-standards</ulink>">
+
+<!ENTITY a.test.url "&a.mailman.listinfo;/freebsd-test">
+<!ENTITY a.test "<ulink url='&a.test.url;'>lista de correo de pruebas del servidor de listas de FreeBSD</ulink>">
+<!ENTITY a.test.name "<ulink url='&a.test.url;'>freebsd-test</ulink>">
+
+<!ENTITY a.testing.url "&a.mailman.listinfo;/freebsd-testing">
+<!ENTITY a.testing "<ulink url='&a.testing.url;'>lista de correo sobre pruebas de rendimiento y estabilidad de FreeBSD</ulink>">
+<!ENTITY a.testing.name "<ulink url='&a.testing.url;'>freebsd-testing</ulink>">
+
+<!ENTITY a.threads.url "&a.mailman.listinfo;/freebsd-threads">
+<!ENTITY a.threads "<ulink url='&a.threads.url;'>lista de correo sobre hilos en FreeBSD</ulink>">
+<!ENTITY a.threads.name "<ulink url='&a.threads.url;'>freebsd-threads</ulink>">
+
+<!ENTITY a.tokenring.url "&a.mailman.listinfo;/freebsd-tokenring">
+<!ENTITY a.tokenring "<ulink url='&a.tokenring.url;'>lista de correo sobre tokenring en FreeBSD</ulink>">
+<!ENTITY a.tokenring.name "<ulink url='&a.tokenring.url;'>freebsd-tokenring</ulink>">
+
+<!ENTITY a.usergroups.url "&a.mailman.listinfo;/freebsd-user-groups">
+<!ENTITY a.usergroups "<ulink url='&a.usergroups.url;'>lista de correo para la coordinaci&oacute;n de grupos de usuarios de FreeBSD</ulink>">
+<!ENTITY a.usergroups.name "<ulink url='&a.usergroups.url;'>freebsd-user-groups</ulink>">
+
+<!ENTITY a.vendors.url "&a.mailman.listinfo;/freebsd-vendors">
+<!ENTITY a.vendors "<ulink url='&a.vendors.url;'>lista de correo para la coordinaci&oacute;n de pre-releases de los distribuidores de FreeBSD</ulink>">
+<!ENTITY a.vendors.name "<ulink url='&a.vendors.url;'>freebsd-vendors</ulink>">
+
+<!ENTITY a.www.url "&a.mailman.listinfo;/freebsd-www">
+<!ENTITY a.www "<ulink url='&a.www.url;'>lista de correo de los Webmasters de FreeBSD</ulink>">
+<!ENTITY a.www.name "<ulink url='&a.www.url;'>freebsd-www</ulink>">
+
+<!ENTITY a.x11.url "&a.mailman.listinfo;/freebsd-x11">
+<!ENTITY a.x11 "<ulink url='&a.x11.url;'>lista de correo sobre X11 en FreeBSD</ulink>">
+<!ENTITY a.x11.name "<ulink url='&a.x11.url;'>freebsd-x11</ulink>">
+
+<!ENTITY a.majordomo "<email>majordomo@FreeBSD.org</email>">
diff --git a/es_ES.ISO8859-1/share/sgml/trademarks.ent b/es_ES.ISO8859-1/share/sgml/trademarks.ent
new file mode 100644
index 0000000000..e7bace5275
--- /dev/null
+++ b/es_ES.ISO8859-1/share/sgml/trademarks.ent
@@ -0,0 +1,356 @@
+<!--
+     Trademark Legend, as required by The Open Group, Sun, etc..
+
+     This file contains entities with trademark attributions for all
+     the companies the FreeBSD documentation references.  It also
+     contains entities for common products with proper trademark
+     symbols.
+
+     Please keep this file sorted.
+
+     $FreeBSD$
+     $FreeBSDes: doc/es_ES.ISO8859-1/share/sgml/trademarks.ent,v 1.2 2004/10/08 19:30:30 jesusr Exp $
+-->
+
+<!ENTITY tm-attrib.3com "<para>3Com and HomeConnect are registered
+  trademarks of 3Com Corporation.</para>">
+<!-- An SGML entity can't start with a number... -->
+<!ENTITY tm.3com "<trademark class='registered'>3Com</trademark>">
+
+<!ENTITY tm-attrib.3ware "<para>3ware and Escalade are registered
+  trademarks of 3ware Inc.</para>">
+<!ENTITY tm.3ware "<trademark class='registered'>3ware</trademark>">
+<!ENTITY escalade "<trademark class='registered'>Escalade</trademark>">
+
+<!-- http://www.adaptec.com/worldwide/company/compeditorial.html?prodkey=legal_copyright -->
+<!ENTITY tm-attrib.adaptec "<para>Adaptec is a registered trademark of
+  Adaptec, Inc.</para>">
+<!ENTITY adaptec "<trademark class='registered'>Adaptec</trademark>">
+
+<!ENTITY tm-attrib.adobe "<para>Adobe, Acrobat, Acrobat Reader, and
+  PostScript are either registered trademarks or trademarks of Adobe
+  Systems Incorporated in the United States and/or other
+  countries.</para>">
+<!ENTITY acrobat "<trademark class='registered'>Acrobat</trademark>">
+<!ENTITY acrobat.reader "<trademark class='registered'>Acrobat&nbsp;Reader</trademark>">
+<!ENTITY adobe "<trademark class='registered'>Adobe</trademark>">
+<!ENTITY postscript "<trademark class='registered'>PostScript</trademark>">
+
+<!-- http://www.amd.com/us-en/Trademarkinformation/0,,1435_1442,00.html -->
+<!ENTITY tm-attrib.amd "<para>AMD, Am486, Am5X86, AMD Athlon, AMD
+  Duron, AMD Opteron, AMD-K6, &Eacute;lan, and PCnet are
+  trademarks of Advanced Micro Devices, Inc.</para>">
+<!ENTITY am486 "<trademark class='registered'>Am486</trademark>">
+<!ENTITY am5x86 "<trademark class='registered'>Am5x86</trademark>">
+<!ENTITY amd.athlon "<trademark>AMD&nbsp;Athlon</trademark>">
+<!ENTITY amd.duron "<trademark>AMD&nbsp;Duron</trademark>">
+<!ENTITY amd.k6 "<trademark class='registered'>AMD-K6</trademark>">
+<!ENTITY amd.opteron "<trademark>AMD&nbsp;Operon</trademark>">
+<!ENTITY elan "<trademark>&Eacute;lan</trademark>">
+
+<!ENTITY tm-attrib.apple "<para>Apple, FireWire, Mac, Macintosh, Mac OS,
+  Quicktime, and TrueType are trademarks of Apple Computer, Inc.,
+  registered in the United States and other countries.</para>">
+<!ENTITY firewire "<trademark class='registered'>FireWire</trademark>">
+<!ENTITY mac "<trademark class='registered'>Mac</trademark>">
+<!ENTITY macintosh "<trademark class='registered'>Macintosh</trademark>">
+<!ENTITY macos "<trademark class='registered'>Mac&nbsp;OS</trademark>">
+<!ENTITY quicktime "<trademark class='registered'>Quicktime</trademark>">
+<!ENTITY truetype "<trademark class='registered'>TrueType</trademark>">
+
+<!ENTITY tm-attrib.arm "<para>ARM is a registered trademark of ARM
+  Limited.</para>">
+<!ENTITY arm "<trademark class='registered'>ARM</trademark>">
+
+<!-- http://www.bluetooth.com/sig/trademark.use.asp -->
+<!ENTITY tm-attrib.bluetooth "<para>The Bluetooth word mark is owned
+  by the Bluetooth SIG, Inc.</para>">
+<!ENTITY bluetooth "<trademark class='registered'>Bluetooth</trademark>">
+
+<!ENTITY tm-attrib.broadcom "<para>Broadcom is a registered trademark
+  of Broadcom Corporation and/or its subsidiaries.</para>">
+<!ENTITY broadcom "<trademark class='registered'>Broadcom</trademark>">
+
+<!-- http://www.checkpoint.com/copyright.html -->
+<!ENTITY tm-attrib.check-point "<para>Check Point, Firewall-1, and
+  VPN-1 are trademarks of Check Point Software Technologies
+  Ltd..</para>">
+
+<!ENTITY tm-attrib.cisco "<para>Cisco, Catalyst, and IOS are
+  registered trademarks of Cisco Systems, Inc. and/or its affiliates
+  in the United States and certain other countries.">
+<!ENTITY catalyst "<trademark class='registered'>Catalyst</trademark>">
+<!ENTITY ios "<trademark class='registered'>IOS</trademark>">
+
+<!ENTITY tm-attrib.corel "<para>Corel and WordPerfect are trademarks
+  or registered trademarks of Corel Corporation and/or its
+  subsidiaries in Canada, the United States and/or other
+  countries.</para>">
+
+<!-- http://www.creative.com/legal.asp -->
+<!ENTITY tm-attrib.creative "<para>Sound Blaster is a trademark of
+  Creative Technology Ltd. in the United States and/or other
+  countries.</para>">
+<!ENTITY soundblaster "<trademark class='registered'>SoundBlaster</trademark>">
+
+<!-- http://www.cvsup.org/ -->
+<!ENTITY tm-attrib.cvsup "<para>CVSup is a registered trademark of
+  John D. Polstra.</para>">
+
+<!-- http://www.dell.com/us/en/gen/misc/policy_007_policy.htm -->
+<!ENTITY tm-attrib.dell "<para>Dell, Dell Precision, Latitude,
+  Optiplex, PowerEdge are trademarks or registered trademarks of Dell
+  Computer Corporation</para>">
+<!ENTITY dell "<trademark>Dell</trademark>">
+<!ENTITY poweredge "<trademark>PowerEdge</trademark>">
+
+<!ENTITY tm-attrib.freebsd "<para>FreeBSD is a registered trademark of
+  Wind River Systems, Inc.  This is expected to change soon.</para>">
+
+<!-- http://www.heidelberg.com/hq/eng/small_print/trademarks.asp -->
+<!ENTITY tm-attrib.heidelberger "<para>Heidelberg, Helvetica,
+  Palatino, and Times Roman are either registered trademarks or
+  trademarks of Heidelberger Druckmaschinen AG in the U.S. and other
+  countries.</para>">
+
+<!ENTITY tm-attrib.ibm "<para>IBM, AIX, EtherJet, Netfinity, OS/2, PowerPC, PS/2, S/390, and ThinkPad are
+  trademarks of International Business Machines Corporation in the
+  United States, other countries, or both.</para>">
+<!ENTITY aix "<trademark class='registered'>AIX</trademark>">
+<!ENTITY etherjet "<trademark>EtherJet</trademark>">
+<!ENTITY netfinity "<trademark class='registered'>Netfinity</trademark>">
+<!ENTITY os2 "<trademark class='registered'>OS/2</trademark>">
+<!ENTITY powerpc "<trademark class='registered'>PowerPC</trademark>">
+<!ENTITY ps2 "<trademark class='registered'>PS/2</trademark>">
+<!ENTITY s390 "<trademark class='registered'>S/390</trademark>">
+<!ENTITY thinkpad "<trademark class='registered'>ThinkPad</trademark>">
+
+<!ENTITY tm-attrib.ieee "<para>IEEE, POSIX, and 802 are registered
+  trademarks of Institute of Electrical and Electronics Engineers,
+  Inc. in the United States.</para>">
+<!ENTITY posix "<trademark class='registered'>POSIX</trademark>">
+
+<!ENTITY tm-attrib.intel "<para>Intel, Celeron, EtherExpress, i386,
+  i486, Itanium, Pentium, and Xeon are trademarks or registered
+  trademarks of Intel Corporation or its subsidiaries in the United
+  States and other countries.</para>">
+<!ENTITY celeron "<trademark class='registered'>Celeron</trademark>">
+<!ENTITY etherexpress "<trademark>EtherExpress</trademark>">
+<!ENTITY i386 "<trademark>i386</trademark>">
+<!ENTITY i486 "<trademark>i486</trademark>">
+<!ENTITY intel "<trademark class='registered'>Intel</trademark>">
+<!ENTITY itanium "<trademark class='registered'>Itanium</trademark>">
+<!ENTITY pentium "<trademark class='registered'>Pentium</trademark>">
+<!ENTITY xeon "<trademark>Xeon</trademark>">
+
+<!-- http://www.quicken.com/support/trademark/ -->
+<!ENTITY tm-attrib.intuit "<para>Intuit and Quicken are registered
+  trademarks and/or registered service marks of Intuit Inc., or one of
+  its subsidiaries, in the United States and other countries.</para>">
+
+<!ENTITY tm-attrib.iomega "<para>Iomega, Zip, and Jaz are either
+  registered trademarks or trademarks of Iomega Corporation in the
+  United States and/or other countries.</para>">
+<!ENTITY iomegazip "<trademark class='registered'>Zip</trademark>">
+<!ENTITY jaz "<trademark class='registered'>Jaz</trademark>">
+
+<!ENTITY tm-attrib.lantronix "<para>Lantronix and EasyIO are
+  trademarks of Lantronix Corporation.</para>">
+<!ENTITY easyio "<trademark>EasyIO</trademark>">
+
+<!ENTITY tm-attrib.linux "<para>Linux is a registered trademark of
+  Linus Torvalds in the United States.</para>">
+
+<!-- http://www.lsilogic.com/trademrk.html -->
+<!ENTITY tm-attrib.lsilogic "<para>LSI Logic, AcceleRAID, eXtremeRAID,
+  MegaRAID and Mylex are trademarks or registered trademarks of LSI
+  Logic Corp.</para>">
+<!ENTITY acceleraid "<trademark>AcceleRAID</trademark>">
+<!ENTITY megaraid "<trademark class='registered'>MegaRAID</trademark>">
+<!ENTITY mylex "<trademark class='registered'>Mylex</trademark>">
+
+<!ENTITY tm-attrib.macromedia "<para>Macromedia, Flash, and Shockwave are
+  trademarks or registered trademarks of Macromedia, Inc. in the
+  United States and/or other countries.</para>">
+<!ENTITY flash "<trademark>Flash</trademark>">
+<!ENTITY macromedia "<trademark class='registered'>Macromedia</trademark>">
+<!ENTITY shockwave "<trademark class='registered'>Shockwave</trademark>">
+
+<!ENTITY tm-attrib.microsoft "<para>Microsoft, FrontPage, MS-DOS,
+  Outlook, Windows, Windows Media, and Windows NT are either
+  registered trademarks or trademarks of Microsoft Corporation in the
+  United States and/or other countries.</para>">
+<!ENTITY microsoft "<trademark class='registered'>Microsoft</trademark>">
+<!ENTITY microsoft.windows "&microsoft;&nbsp;&windows;">
+<!ENTITY ms-dos "<trademark class='registered'>MS-DOS</trademark>">
+<!ENTITY outlook "<trademark class='registered'>Outlook</trademark>">
+<!ENTITY windows "<trademark class='registered'>Windows</trademark>">
+<!ENTITY windows.media "<trademark class='registered'>Windows Media</trademark>">
+<!ENTITY windowsnt "<trademark class='registered'>Windows&nbsp;NT</trademark>">
+
+<!ENTITY tm-attrib.mips "<para>MIPS and R4000 are registered
+  trademarks of MIPS Technologies, Inc. in the United States and other
+  countries.</para>">
+<!ENTITY mips "<trademark class='registered'>MIPS</trademark>">
+
+<!-- http://www.mysql.com/company/trademark.html -->
+<!ENTITY tm-attrib.mysql "<para>MySQL is a registered trademark of
+  MySQL AB in the United States, the European Union and other
+  countries.</para>">
+<!ENTITY mysql "<trademark>MySQL</trademark>">
+
+<!-- http://www.m-sys.com/content/LegalTerms.asp -->
+<!ENTITY tm-attrib.m-systems "<para>M-Systems and DiskOnChip are
+  trademarks or registered trademarks of M-Systems Flash Disk
+  Pioneers, Ltd.</para>">
+<!ENTITY diskonchip "<trademark class='registered'>DiskOnChip</trademark>">
+
+<!ENTITY tm-attrib.netscape "<para>Netscape and the Netscape Navigator
+  are registered trademarks of Netscape Communications Corporation in
+  the U.S. and other countries.</para>">
+<!ENTITY netscape "<trademark class='registered'>Netscape</trademark>">
+<!ENTITY netscape.navigator "<trademark class='registered'>Netscape&nbsp;Navigator</trademark>">
+
+<!-- http://www.nexthop.com/legal.shtml -->
+<!ENTITY tm-attrib.nexthop "<para>GateD and NextHop are registered and
+  unregistered trademarks of NextHop in the U.S. and other
+  countries.</para>">
+<!ENTITY gated "<trademark class='registered'>GateD</trademark>">
+
+<!-- http://www.novell.com/company/legal/trademarks/tmlist.html -->
+<!ENTITY tm-attrib.novell "<para>NetWare, NetWare Loadable Module, and
+  NLM are either registered trademarks or trademarks of Novell,
+  Inc. in the United States and other countries.</para>">
+
+<!ENTITY tm-attrib.opengroup "<para>Motif, OSF/1, and UNIX are
+  registered trademarks and IT DialTone and The Open Group are
+  trademarks of The Open Group in the United States and other
+  countries.</para>">
+<!ENTITY motif "<trademark class='registered'>Motif</trademark>">
+<!ENTITY unix "<trademark class='registered'>UNIX</trademark>">
+
+<!-- http://www.oracle.com/html/trademark.html -->
+<!-- http://www.oracle.com/html/3party.html -->
+<!ENTITY tm-attrib.oracle "<para>Oracle is a registered trademark
+  of Oracle Corporation.</para>">
+<!ENTITY oracle "<trademark class='registered'>Oracle</trademark>">
+
+<!-- http://www.powerquest.com/legal/ -->
+<!ENTITY tm-attrib.powerquest "<para>PowerQuest and PartitionMagic are
+  registered trademarks of PowerQuest Corporation in the United States
+  and/or other countries.</para>">
+<!ENTITY partitionmagic "<trademark class='registered'>PartitionMagic</trademark>">
+
+<!-- http://www.qualcomm.com/main/legal.html -->
+<!ENTITY tm-attrib.qualcomm "<para>QUALCOMM and Eudora are registered
+  trademarks of QUALCOMM Incorporated.</para>">
+<!ENTITY eudora "<trademark class='registered'>Eudora</trademark>">
+
+<!-- http://www.realnetworks.com/company/logos/policy.html -->
+<!ENTITY tm-attrib.realnetworks "<para>RealNetworks, RealPlayer, and
+  RealAudio are the registered trademarks of RealNetworks,
+  Inc.</para>">
+
+<!-- Note: RedHat doesn't use (r)/(tm) for their own trademarks -->
+<!-- http://www.redhat.com/legal/legal_statement.html -->
+<!ENTITY tm-attrib.redhat "<para>Red Hat, RPM, are trademarks or
+  registered trademarks of Red Hat, Inc. in the United States and
+  other countries.</para>">
+
+<!ENTITY tm-attrib.sap "<para>SAP, R/3, and mySAP are trademarks or
+  registered trademarks of SAP AG in Germany and in several other
+  countries all over the world.</para>">
+<!ENTITY r3 "<trademark class='registered'>R/3</trademark>">
+<!ENTITY sap "<trademark class='registered'>SAP</trademark>">
+<!ENTITY sap.r3 "&sap;&nbsp;&r3;">
+
+<!ENTITY tm-attrib.sgi "<para>Silicon Graphics, SGI, and OpenGL are
+  registered trademarks of Silicon Graphics, Inc., in the United
+  States and/or other countries worldwide.</para>">
+<!ENTITY opengl "<trademark class='registered'>OpenGL</trademark>">
+
+<!ENTITY tm-attrib.sparc "<para>Sparc, Sparc64, SPARCEngine, and
+  UltraSPARC are trademarks of SPARC International, Inc in the United
+  States and other countries.  Products bearing SPARC trademarks are
+  based upon architecture developed by Sun Microsystems, Inc.</para>">
+<!ENTITY sparc "<trademark class='registered'>Sparc</trademark>">
+<!ENTITY sparc64 "<trademark class='registered'>Sparc64</trademark>">
+<!ENTITY sparcengine "<trademark class='registered'>SPARCEngine</trademark>">
+<!ENTITY ultrasparc "<trademark class='registered'>UltraSPARC</trademark>">
+
+<!ENTITY tm-attrib.sun "<para>Sun, Sun Microsystems, Java, Java Virtual Machine, JavaServer Pages, JDK, JSP, JVM, Netra, Solaris, StarOffice,
+  Sun Blade, Sun Enterprise, Sun Fire, SunOS, and Ultra are trademarks or registered trademarks of
+  Sun Microsystems, Inc. in the United States and other
+  countries.</para>">
+<!ENTITY java "<trademark>Java</trademark>">
+<!ENTITY java.virtual.machine "<trademark>Java Virtual Machine</trademark>">
+<!ENTITY javaserver.pages "<trademark>JavaServer Pages</trademark>">
+<!ENTITY jdk "<trademark>JDK</trademark>">
+<!ENTITY jsp "<trademark>JSP</trademark>">
+<!ENTITY jvm "<trademark>JVM</trademark>">
+<!ENTITY netra "<trademark>Netra</trademark>">
+<!ENTITY solaris "<trademark>Solaris</trademark>">
+<!ENTITY staroffice "<trademark>StarOffice</trademark>">
+<!ENTITY sun "<trademark>Sun</trademark>">
+<!ENTITY sun.blade "<trademark>Sun&nbsp;Blade</trademark>">
+<!ENTITY sun.enterprise "<trademark>Sun&nbsp;Enterprise</trademark>">
+<!ENTITY sun.fire "<trademark>Sun&nbsp;Fire</trademark>">
+<!ENTITY sun.ultra "Sun&nbsp;<trademark>Ultra</trademark>">
+<!ENTITY sunos "<trademark>SunOS</trademark>">
+
+<!-- http://www.symantec.com/legal/legal_note.html -->
+<!ENTITY tm-attrib.symantec "<para>Symantec and Ghost are registered
+  trademarks of Symantec Corporation in the United States and other
+  countries.</para>">
+
+<!-- http://www.mathworks.com/company/trademarks.shtml -->
+<!ENTITY tm-attrib.themathworks "<para>MATLAB is a registered trademark
+  of The MathWorks, Inc.</para>">
+<!ENTITY matlab "<trademark class='registered'>MATLAB</trademark>">
+
+<!ENTITY tm-attrib.thomson "<para>SpeedTouch is a trademark of
+  Thomson</para>">
+<!ENTITY speedtouch "<trademark>SpeedTouch</trademark>">
+
+<!-- http://www.transmeta.com/about/legal.html -->
+<!ENTITY tm-attrib.transmeta "<para>Transmeta and Crusoe are either
+  trademarks or registered trademarks of Transmeta Corporation in the
+  United States and/or other countries.</para>">
+<!ENTITY crusoe "<trademark>Crusoe</trademark>">
+<!ENTITY transmeta "<trademark>Transmeta</trademark>">
+
+<!-- http://www.usr.com/adbuilder/ab-usage-guidelines.asp -->
+<!-- http://www.usr.com/adbuilder/ab-tips-trade-ref.asp -->
+<!ENTITY tm-attrib.usrobotics "<para>U.S. Robotics and Sportster are
+  registered trademarks of U.S. Robotics Corporation.</para>">
+<!ENTITY sportster "<trademark class='registered'>Sportster</trademark>">
+<!ENTITY usrobotics "<trademark class='registered'>U.S. Robotics</trademark>">
+
+<!-- http://www.maplesoft.com/trademarks.shtml -->
+<!ENTITY tm-attrib.waterloomaple "<para>Waterloo Maple and Maple are
+  trademarks or registered trademarks of Waterloo Maple Inc.</para>">
+<!ENTITY maple "<trademark>Maple</trademark>">
+
+<!-- http://www.wolfram.com/company/terms.html -->
+<!ENTITY tm-attrib.wolframresearch "<para>Mathematica is a registered
+  trademark of Wolfram Research, Inc.</para>">
+<!ENTITY mathematica "<trademark class='registered'>Mathematica</trademark>">
+
+<!-- http://www.vmware.com/legal.html -->
+<!ENTITY tm-attrib.vmware "<para>VMware is a trademark of VMware,
+  Inc.</para>">
+
+<!ENTITY tm-attrib.xfree86 "<para>XFree86 is a trademark of The
+  XFree86 Project, Inc.</para>">
+<!ENTITY xfree86 "<trademark>XFree86</trademark>">
+
+<!-- http://www.xiph.org/ -->
+<!ENTITY tm-attrib.xiph "<para>Ogg Vorbis and Xiph.Org are trademarks
+  of Xiph.Org.</para>">
+
+<!ENTITY tm-attrib.general "<para>Many of the designations used by
+  manufacturers and sellers to distinguish their products are claimed
+  as trademarks.  Where those designations appear in this document,
+  and the FreeBSD Project was aware of the trademark claim, the
+  designations have been followed by the <quote>&trade;</quote> or the
+  <quote>&reg;</quote> symbol.</para>">
diff --git a/es_ES.ISO8859-1/share/sgml/translators.ent b/es_ES.ISO8859-1/share/sgml/translators.ent
new file mode 100644
index 0000000000..cab4a4df30
--- /dev/null
+++ b/es_ES.ISO8859-1/share/sgml/translators.ent
@@ -0,0 +1,31 @@
+<!--
+      The FreeBSD Spanish Documentation Project
+
+      $FreeBSD$
+      $FreeBSDes: doc/es_ES.ISO8859-1/share/sgml/translators.ent,v 1.7 2004/08/25 21:21:40 jcamou Exp $
+-->
+
+<!ENTITY a.es.baz
+  "Jos&eacute; Ram&oacute;n Baz <email>jr_baz@hartu.net</email>">
+<!ENTITY a.es.bazcar
+  "Jos&eacute; Ram&oacute;n Baz <email>jr_baz@hartu.net</email> y Jos&eacute; Vicente Carrasco <email>carvay@es.FreeBSD.org</email>">
+<!ENTITY a.es.carvay
+  "Jos&eacute; Vicente Carrasco Vay&aacute; <email>carvay@es.FreeBSD.org</email>">
+<!ENTITY a.es.cronopio
+  "Luis L&oacute;pez <email>cronopiolopez@terra.es</email>">
+<!ENTITY a.es.jcamou
+  "Jesus R. Camou <email>jcamou@es.FreeBSD.org</email>">
+<!ENTITY a.es.jrh
+  "Juan F. Rodriguez <email>jrh@it.uc3m.es</email>">
+
+
+<!ENTITY trans.es.baz
+  "<para><emphasis>Traducci&oacute;n de &a.es.baz;.</emphasis></para>">
+<!ENTITY trans.es.bazcar
+  "<para><emphasis>Traducci&oacute;n de &a.es.bazcar;.</emphasis></para>">
+<!ENTITY trans.es.carvay
+  "<para><emphasis>Traducci&oacute;n de &a.es.carvay;.</emphasis></para>">
+<!ENTITY trans.es.jcamou
+  "<para><emphasis>Traducci&oacute;n de &a.es.jcamou;.</emphasis></para>">
+<!ENTITY trans.es.jrh
+  "<para><emphasis>Traducci&oacute;n de &a.es.jrh;.</emphasis></para>">