diff --git a/en/commercial/consulting.raw b/en/commercial/consulting.raw
index 8cd371c0dd..08d135bf73 100644
--- a/en/commercial/consulting.raw
+++ b/en/commercial/consulting.raw
@@ -1,358 +1,360 @@
 <!-- NAME="Aaronsen Group, Ltd" CAT="consulting" SUBCAT="NAMERICA" -->
 <STRONG><A HREF="http://www.aaronsen.com/freebsd/">Aaronsen Group, Ltd.</A>
 </STRONG> advises on and implements a wide range of internetworking 
 technologies, including remote access, wide area networks, international 
 telecommunications, Intranetworking, web applications and local area 
 services.  Many of our custom web-enabled solutions are engineered using 
 FreeBSD, Apache, mod_perl, and MySQL/Oracle.  Please email us at 
 <A HREF="mailto:info@aaronsen.com">info@aaronsen.com</A>. Our web site is 
 at <A HREF="http://www.aaronsen.com">http://www.aaronsen.com</A> and we 
 can be reached via telephone at +1.412.391.6000.
 
 <!-- NAME="Adimus GmbH & Co. KG" CAT="consulting" SUBCAT="EUROPE" -->
 <strong><A href="http://www.adimus.de/">Adimus GmbH &amp;
 Co. KG</a></strong> is a company based in Bochum, Germany. As a
 consulting partner we provide services in system administration for
 all flavours of Unix and Microsoft Windows, design and maintenance of
 LANs and WANs, IT security auditing and database management. Solutions
 for intra- and internet servers as well as our firewall toolkit are
 based on FreeBSD and third-party products from Compaq, Peacock, Cisco
 and Ascend. For more information please contact <A
 href="mailto:info@adimus.de">info@adimus.de</A> or visit our <A
 href="http://www.adimus.de/">website</A>.
 
 <!-- NAME="Advance Systems Group" CAT="consulting" SUBCAT="NAMERICA" -->
 <STRONG><A HREF="http://www.advansys.net/">Advance Systems Group</A>
 </STRONG> builds, administrates, and maintains Intranet/Internet
 networks using FreeBSD and other UNIX operating systems.  ASG also
 provides a variety of other services including domain name hosting, web
 site construction, and software training.  For more information, please
 phone us at +1.317.507.4229, e-mail 
 <A HREF="mailto:sales@advansys.net">sales@advansys.net</A>, or 
 <A HREF="http://www.advansys.net/">visit our web site</A>.
 
 <!-- NAME="ASG Technologies" CAT="consulting" SUBCAT="NAMERICA" -->
 <STRONG><A HREF="http://www.asgtechnologies.com/">ASG Technologies'</A>
 </STRONG> Professional Services division offers network security
 management products and services. Staffed by experienced information
 technology and systems professionals, ASG Professional Services has
 in-depth experience in network systems design, integration and
 management across diverse computing platforms. For more information,
 please phone us at +1.506.460.5400, e-mail <A HREF=
 "mailto:consulting@asgtechnologies.com">consulting@asgtechnologies.com</A>, 
 or <A HREF="http://www.asgtechnologies.com/">visit our web site</A>
 and follow the Professional Serices Links.
 
 <!-- NAME="AlphaZed, Ltd" CAT="consulting" SUBCAT="EUROPE" -->
 <STRONG><A HREF="http://uk.AlphaZed.COM/">AlphaZed, Ltd</A></STRONG>
 offers UNIX consulting, system administration and programming, with primary
 focus on FreeBSD. We have over a decade of UNIX and networking experience. 
 Available for anything from C programming to system administration, and 
 networking to web site building and hosting. We are located in SE London. 
 For more information, please email us at
 <A HREF="mailto:info@uk.AlphaZed.COM">info@uk.AlphaZed.COM</A>
 
 <!-- NAME="B.M.K. Industries" CAT="consulting" SUBCAT="AUSTRALIA" -->
 <strong><a href="http://www.bmk.com.au">B.M.K. Industries</a></strong>
 is located in Melbourne Australia and specialises in setting up low cost 
 routers and servers (Web, E-Mail, FTP, DNS and Secure Web Servers ) all 
 using FreeBSD.  Setting up Permanent Modem & ISDN Internet Connections is 
 also a specialty. <a href="http://www.bmk.com.au">Please visit our web 
 page.</a>
 
 <!-- NAME="Boulder Labs" CAT="consulting" SUBCAT="NAMERICA" -->
 <STRONG><A HREF="http://www.boulderlabs.com/">Boulder Labs</A></STRONG>
 (Colorado) is a software consulting company specializing in
 FreeBSD, embedded systems, digital processing, security and
 system administration.  We have built products requiring
 numerous device drivers, disk optimization up through elaborate
 GUIs and specialized applications.  Bi-monthly we publish Source
 Code Unix articles in ";login:" magazine and on our web server.
 Please contact us at +1.303.530.2056 or <A
 HREF="mailto:info@boulderlabs.com">info@boulderlabs.com</A>.
 
 <!-- NAME="Clue Computing, Inc." CAT="consulting" SUBCAT="NAMERICA" -->
 <STRONG><A HREF="http://www.clue.com/">Clue Computing, Inc.</A>
 </STRONG> has over 10 years of UNIX experience, specializing in system 
 administration, networking, and security. Custom application development 
 and testing available, including device drivers, kernel work, etc. We
 offer sales, assembly, and installation of FreeBSD systems for any 
 application. For more information, email 
 <A HREF="mailto:info@clue.com">info@clue.com</A>.
 
 <!-- NAME="CodeGen Inc." CAT="consulting" SUBCAT="NAMERICA" -->
 <strong><a href="http://www.codegen.com/">CodeGen, Inc.</a></strong>
 provide consulting and programming services, specialising in embedded
 systems.  For more information, email <a 
 href="mailto:info@codegen.com">info@codegen.com</a>.
 
 <!-- NAME="Connections USA" CAT="consulting" SUBCAT="NAMERICA" -->
 <strong><a href="http://www.connectionsusa.com/">Connections, USA</a></strong>
 is a FreeBSD-based Internet Service provider. We provide hosting
 and co-location services and web site development. Other
 FreeBSD-based services are available as well, including system and
 network administration as well as consulting. Check out our
 <a href="http://www.connectionsusa.com/">corporate Web page</a>
 and
 <a href="http://www.iserve.com/">http://www.iserve.com/</a>.
 
 <!-- NAME="DaemonWare" CAT="consulting" SUBCAT="SAMERICA" -->
 <STRONG><A HREF="http://www.daemonware.com.ar/">DaemonWare</A></STRONG>
  offers UNIX consulting, system administration, network solution,
 programming and security; with several UNIX systems: FreebSD, OpenBSD,
 Linux and others.  We have over 5 years of UNIX and networking
 experience and programming experience. Specialized for Internet
 services.  For further information, please visit <A
 HREF="http://www.daemonware.com.ar/"> ower web </A>site or email us at
 <A HREF="mailto:info@daemonware.com.ar">info@daemonware.com.ar</A>.
 
 
 <!-- NAME="Dextra Solu&ccedil;&otilde;es em Inform&aacute;tica" CAT="consulting" SUBCAT="SAMERICA" -->
 <STRONG><A HREF="http://www.dextra.com.br/">Dextra
 Solu&ccedil;&otilde;es em Inform&aacute;tica</A></STRONG>. Specialized
 consulting in TCP/IP networks, capacity and contingency planning, UNIX
 systems and network administration, system security and firewalls,
 VPNs implementation, Internet/Intranets projects. For more
 information, please phone us at +55.19.251.3644 (Brazil), e-mail <A
 HREF="mailto:staff@dextra.com.br">staff@dextra.com.br</A>, or
 <A HREF="http://www.dextra.com.br/">visit our web site</A> (in Portuguese).
 
 <!-- NAME="Essenz Consulting" CAT="consulting" SUBCAT="NAMERICA" -->
 <strong><a href="http://www.essenz.com">Essenz Consulting</a></strong> is 
 a web services and products provider. We offer custom built 
 High-Performance Intel based <a 
 href="http://www.essenz.com/open.html">Workstations</a> and <a 
 href="http://www.essenz.com/server.html">Servers</a>.  These systems are
 100% FreeBSD compatible. Our systems feature Ultra2-LVD SCSI, high speed
 networking, Dual Pentium III and Dual Pentium III XEON processors, and many
 other fault tolerant and backup features. For more information contact <a
 href="mailto:sales@essenz.com">sales@essenz.com</a> or visit us at <a
 href="http://www.essenz.com">http://www.essenz.com</a>.
 
 <!-- NAME="The FreeBSD Mall" CAT="consulting" SUBCAT="NAMERICA" -->
 <STRONG><A HREF="http://www.freebsdmall.com/">The FreeBSD Mall</A></STRONG>
 offers support contracts for FreeBSD through
 <STRONG><A HREF="http://www.cdrom.com/">Walnut Creek CDROM</A></STRONG>.
 Support is available on a case-by-case basis, or as a convenient,
 extensible annual contract. Our highly trained technical support staff
 will handle your requests in a professional and efficient manner and
 will provide detailed responses to your needs by phone, fax, or email.
 For more information, please see
 <A HREF="http://www.freebsdmall.com/support/">our support page</A>.
 
 <!-- NAME="Frigate Networks" CAT="consulting" SUBCAT="NAMERICA" -->
 <STRONG><A HREF="http://www.frigate.com/">frigate networks</A>
 </STRONG> provides network troubleshooting, system administration,
 kernel development and ports of BSD software to commercial products
 such as routers and firewalls.  Our Email, DNS, and WWW servers run
 FreeBSD.  We also provide network management solutions based on HTTP
 and tcl.  For more information please
 <A HREF="http://www.frigate.com/">visit our web site</A>, call us
 at +1.650.903.2266,
 or send email to <A HREF="mailto:info@frigate.com">info@frigate.com></A>.
 
 <!-- NAME="FSC Internet" CAT="consulting" SUBCAT="NAMERICA" -->
 <STRONG><A HREF="http://www.fscinternet.com/">FSC Internet</A>
 </STRONG> is Canada's largest FreeBSD consulting firm.  FSC's clients
 include numerous top-tier corporations (e.g. Mazda, Heinz), as well as
 mid-sized companies (e.g. the Vermont Telephone Company) and the public
 sector.  FSC provides full consulting, implementation, support, and
 training services for all FreeBSD applications, including a special
 focus on security, high-performance Web applications, and Intranets.
 Please email us at
 <A HREF="mailto:info@fscinternet.com">info@fscinternet.com</A> or call
 us at +1.416.921.4280 for further information.
 
 <!-- NAME="Faster Raster Systems" CAT="consulting" SUBCAT="NAMERICA" -->
 <STRONG><A HREF="http://cessna.tippecanoe.com/fastrr.htm">Faster
 Raster Systems</A></STRONG> is a FreeBSD, X11, Graphics, Hardware
 drivers consulting company.  For further details, please
 <A HREF="http://cessna.tippecanoe.com/fastrr.htm">visit our web site</A>,
 or email us at <A HREF="mailto:jay@tippecanoe.com">jay@tippecanoe.com</A>
 
 <!-- NAME="GB Data Systems" CAT="consulting" SUBCAT="NAMERICA" -->
 <STRONG><A HREF="http://www.gbdata.com/">GB Data Systems</A>
 </STRONG> is a FreeBSD/Internet consulting company. Located in Texas,
 we offer a wide range of services to ISPs and small businesses. For
 further details, please <A HREF="http://www.gbdata.com/">visit our web
 site</A>, or email us at
 <A HREF="mailto:sales@main.gbdata.com">sales@gbdata.com</A>
 
 <!-- NAME="HCS Hanseatischer Computerservice GmbH" CAT="consulting" SUBCAT="EUROPE" -->
 <STRONG><A HREF="http://www.hcs.de/">HCS Hanseatischer
 Computerservice GmbH</A></STRONG>. Located in Hamburg, Germany,
 we offer professional FreeBSD support, consulting and programming,
 as well as system setup, administration and maintenance.  For more
 information, please contact us at +49.40.55974770, e-mail
 <A HREF="mailto:support@hcs.de">support@hcs.de</A> , or
 <A HREF="http://www.freebsd-support.de/">visit our web site</A>.
 
 <!-- NAME="Herrin Software Development" CAT="consulting" SUBCAT="NAMERICA" -->
 <STRONG><A HREF="http://www.hsdi.com/">Herrin Software Development,
 Inc.</A></STRONG>, creator of <EM>Qddb</EM>, provides custom software
 development, internet consulting, general computer consulting, and
 training services.  For more information email us at
 <A HREF="mailto:info@hsdi.com">info@hsdi.com</A> or
 <A HREF="http://www.hsdi.com/">visit our web site</A>.
 
 <!-- NAME="Greg Lehey" CAT="consulting" SUBCAT="AUSTRALIA" -->
-<STRONG><A HREF="http://www.freebsd.org/~grog/grog.html">Greg Lehey</A>
-</STRONG> has over 20 years industry experience in all system programming
-and systems administration disciplines, including device drivers, kernel
-debugging, compilers, libraries, performance analysis, and site planning.
-He is the author of
+<STRONG><A HREF="http://www.freebsd.org/~grog/grog.html">Greg
+Lehey</A> </STRONG> has over 20 years industry experience in all
+system programming and systems administration disciplines, including
+device drivers, kernel debugging, compilers, libraries, performance
+analysis, and site planning.  He is the author of <A HREF=
+"http://www.lemis.com/vinum.html">The Vinum Volume Manager</a>, a
+virtual disk driver which includes software RAID, and also the books
 <A HREF= "http://www.ora.com/catalog/port/noframes.html">Porting UNIX
-Software</A>,
-and
-<A HREF="http://www.cdrom.com/titles/freebsd/bsdbook.phtml">The Complete
-FreeBSD</A>. To contact Greg, please send email to <A HREF=
-"mailto:grog@freebsd.org">grog@FreeBSD.org</A>
+Software</A> and <A
+HREF="http://www.cdrom.com/titles/freebsd/bsdbook.phtml">The Complete
+FreeBSD</A>.  Contact him <A HREF= "mailto:grog@FreeBSD.org">via
+Email</A>, or visit his <A HREF= "http://www.lemis.com/~grog">web
+site</A>.
 
 <!-- NAME="Inform System Inc." CAT="consulting" SUBCAT="ASIA" -->
 <STRONG><A HREF="http://www.inform.co.jp/">Inform System Inc.</A>
 </STRONG> is a FreeBSD/Internet/DataBase consulting company. Located
 in Osaka Japan, we offer a wide range of services to school and small
 businesses. For further details, please
 <A HREF="http://www.inform.co.jp/">visit our web site</A>, or send email
 to <A HREF="mailto:info@inform.co.jp">info@inform.co.jp</A>
 
 <!-- NAME="InterACT" CAT="consulting" SUBCAT="EUROPE" -->
 <a href="http://www.interact.se">InterACT</a> is a Sweden based
 provider of Consultancy and Custom Development Services.
 Principal consultant <a href="mailto:cl@interact.se">Chris
 Lindbergh</a> has over10 years<br> system software development
 experience on BSD based platforms. Areas of expertise<br> include
 Firewall and Networking System setup, custom development in C and C++,
 and<br> supply of turnkey solutions. <br><br> For further information,
 contact us by email at: <a
 href="mailto:info@interact.se">info@interact.se</a>, or phone Sweden<br>
 on +46 (0)920-888 03 <br>
 
 <!-- NAME="John Polstra" CAT="consulting" SUBCAT="NAMERICA" -->
 <STRONG><A HREF="http://www.polstra.com/">John Polstra</A></STRONG>,
 of Polstra &amp; Co., Inc., has been a UNIX developer since 1978, and
 is a FreeBSD Core Team member. Developer of the <EM>CVSup</EM> network
 software update package and the <EM>ElfKit</EM> ELF tool set, his
 specialties include network protocols, language tools, UNIX internals,
 and UNIX applications. For more information, please send email to
 <A HREF="mailto:jdp@polstra.com">jdp@polstra.com</A>.
 
 <!-- NAME="Julian Stacey" CAT="consulting" SUBCAT="EUROPE" -->
 <STRONG><A HREF="http://www.freebsd.org/~jhs/">Julian Stacey</A>
 </STRONG> maintains a
 <A HREF="http://www.freebsd.org/~jhs/freebsd/consultants.html">FreeBSD
 Commercial Consultants Index</A>. Be sure to visit his page!
 
 <!-- NAME="MediaCenter" CAT="consulting" SUBCAT="EUROPE" -->
 <STRONG><A HREF="http://www.umc.se/">MediaCenter</A></STRONG>,
 Umeå, Sweden. Located in northern Sweden we offer professional consulting
 and programming for secure inter/intranet solutions using FreeBSD and
 UNIX(-like) operating systems. We also work high performance database
 programming, primarily using PostgreSQL.<br>
 For more information, please send email to
 <A HREF="mailto:info@umc.se">info@umc.se</A>, or visit our website
 (<a href="http://www.umc.se/">http://www.umc.se/</a>)
 
 <!-- NAME="MindStep Corp." CAT="consulting" SUBCAT="NAMERCIA" -->
 <strong><a href="http://www.mindstep.com/">MindStep Corp.</a></strong>
 configure and maintain Intranet/Internet networks using FreeBSD and
 other Unix operating systems.  MindStep also offers products and provides
 software development services customized to fit the needs of coroporations
 of any size.
 
 <!-- NAME="OpenWorld" CAT="consulting" SUBCAT="NAMERICA" -->
 <STRONG><A HREF="http://www.stdio.com/">OpenWorld</A></STRONG> has
 been providing computer, network, and security consulting since 1994.
 Our clients?  range from Fortune 500 companies to regional small
 businesses.  Our engineers each have at least 10 years of experience
 in Unix systems and networks.  We provide full service consulting,
 implementation, installation, security, and support for FreeBSD, SUN
 Solaris, SCO Unixware, SCO OpenServer, SGI Irix, IBM AIX, Compaq
 Digital Unix, and Cisco IOS. Please email us at <A
 HREF="mailto:info@stdio.com">info@stdio.com</A> or call us at
 606-514-1800 for further information.
 
 <!-- NAME="Peter Dufault" CAT="consulting" SUBCAT="NAMERICA" -->
 <STRONG><A HREF="mailto:dufault@hda.com">Peter Dufault</A></STRONG>,
 of HD Associates. Peter has over 15 years experience in medical device
 control, high performance simulation systems, digital closed-loop feedback
 systems, realtime UNIX-like systems, and UNIX device drivers. For more
 information, please send email to
 <A HREF= "mailto:dufault@hda.com">dufault@hda.com</A>
 
 <!-- NAME="Pine Internet" CAT="consulting" SUBCAT="EUROPE" -->
 <a href="http://www.pine.nl/">Pine Internet</a> implements LAN, WAN and
 remote access solutions, offers Unix support and administration
 contracts and advises ISP's and other corporate cusomers concerning
 their network and server setup. Pine specializes in <a
 href="http://security.pine.nl/">Internet security</a>,
 performs security auditing services on demand, and offers firewall
 solutions based on FreeBSD. Other products we offer are webhosting,
 facility management and leased lines.  Among the products we use are
 FreeBSD, Cisco routers, PHP, Apache, Perl, Solaris and MySQL. Pine has
 8+ years of Unix and Internet experience.  We feature some of the
 largest ISP's in the Netherlands as our customers.  For more
 information, please contact <a
 href="mailto:info@pine.nl">info@pine.nl</a> or visit our website at <a
 href="http://www.pine.nl/">www.pine.nl</a>.
 
 <!-- NAME="Poul-Henning Kamp" CAT="consulting" SUBCAT="EUROPE" -->
 <STRONG><A HREF="http://www.freebsd.org/~phk/">Poul-Henning Kamp</A>
 </STRONG> has over 12 years in UNIX & Networks, and is a FreeBSD Core Team
 member. Poul developed <EM>phkmalloc</EM>, <EM>tcl_nm</EM>, <EM>tcl_db</EM>,
 <EM>tcl_snmp</EM> and more, and was the Release Engineer for several
 FreeBSD releases. Poul resides in Denmark, and can be reached via
 email at <A HREF="mailto:phk@FreeBSD.org">phk@FreeBSD.org</A>
 
 <!-- NAME="Brian Somers" CAT="consulting" SUBCAT="EUROPE" -->
 <STRONG><A HREF="http://www.Awfulhak.org/brian/">Brian Somers</A>
 </STRONG> has over 10 years in UNIX, Networks, C & C++.  Brian is
 responsible for the <EM>PPP</EM> code in FreeBSD, and located in
 NW London.  You can reach him via email at
 <A HREF="mailto:brian@Awfulhak.org">brian@Awfulhak.org</A>
 
 <!-- NAME="Syntonet Ltd" CAT="consulting" SUBCAT="EUROPE" -->
 <STRONG><A HREF="http://www.syntonet.co.uk/">Syntonet
 Ltd</A></STRONG> is UK based provider of Consultancy and Custom
 Development Services. Principal consultant <A
 HREF="mailto:rob@syntonet.co.uk">Rob Pickering</A> has over 10 years
 system software development experience on BSD based platforms. Areas
 of expertise include firewall and networking system setup, custom
 development in C and C++, and supply of turnkey solutions. For further
 information, contact us by email at
 <A HREF="mailto:info@syntonet.co.uk">info@syntonet.co.uk</A>, call
 +44.870.166.4400 (Voice) or +44.870.166.4411 (Fax).
 
 <!-- NAME="SysConfig Consulting" CAT="consulting" SUBCAT="NAMERICA" -->
 <STRONG><A HREF="http://www.sysconfig.com/">SysConfig Consulting</A>
 </STRONG> designs, configures, and installs FreeBSD based email gateway
 solutions, Dial-on-Demand ISDN, and T-1 Network to Network, Network to
 Internet Connections for businesses in the Southeastern United States.
 For more information, please send e-mail to
 <A HREF="mailto:info@sysconfig.com">info@sysconfig.com</A>, or
 <A HREF="http://www.sysconfig.com/">visit our web site</A>.
 
 <!-- NAME="Ten 26" CAT="consulting" SUBCAT="NAMERICA" -->
 <STRONG><A HREF="http://www.ten26.com/">Ten 26</A></STRONG>
 Enterprises is your source for high performance, fault tolerant
 FreeBSD workstations and servers.  Choose a pre-configured
 package or create your own custom machine from our list of well-tested
 components.  All machines carry a 2 year warranty.  For more
 information, visit <A HREF="http://www.ten26.com/">Ten 26</A> or
 e-mail <A HREF="mailto:info@ten26.com">info@ten26.com</A>.
 
 <!-- NAME="CSR Corporation" CAT="consulting" SUBCAT="NAMERICA" -->
 <STRONG><A HREF="http://www.comsys.com/">CSR Corporation</A>
 </STRONG> is a Portland, OR, based consulting company with offices in
 Portland, OR; San Jose, CA; and Vero Beach, FL.  CSR specializes
 in network applications for IPSs and CLECs, applying open network
 technologies for complete customer solutions. CSR has been in
 business since 1986.  Telephone: 503-708-4330.
 
 <!-- NAME="Systunix Technologies, LLC." CAT="consulting" SUBCAT="NAMERICA" -->
 <STRONG><A HREF="http://www.syntunix.com/">Syntunix Technologies,
 LLC.</A></STRONG> specializes in the development of enterprise solutions
 to integrate Microsoft's Windows NT with UNIX operating systems. The team
 is comprised of individuals with extensive knowledge of both Windows NT
 and UNIX committed to developing productivity tools for System
 Administrators and IT management in mixed OS environments.