diff --git a/fr/commercial/consulting.raw b/fr/commercial/consulting.raw
index c65336a305..caff1f27ec 100644
--- a/fr/commercial/consulting.raw
+++ b/fr/commercial/consulting.raw
@@ -1,3 +1,12 @@
+# $FreeBSD: www/en/commercial/consulting.raw,v 1.98 2004/01/07 21:57:13 ceri Exp $
+
+<!-- NAME="757 Technologies" CAT="consulting" SUBCAT="NAMERICA" -->
+<STRONG><A HREF="http://www.757tech.net">757 Technologies</A></STRONG>
+offer installation and integration of FreeBSD, as well as FreeBSD
+co-location and maintenance. Serving the Hampton Roads area of Virginia.
+Please contact us at <A HREF="mailto:info@757tech.net">info@757tech.net</A>
+for more information. We can also be reached by telephone at (757) 233-9460.
+
<!-- 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
@@ -9,6 +18,21 @@ FreeBSD, Apache, mod_perl, and MySQL/Oracle. Please email us at
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="Achean" CAT="consulting" SUBCAT="EUROPE" -->
+<STRONG><A HREF="http://www.achean.com/">Achean</A></STRONG> is a consultancy
+dedicated to helping our customers achieve better use of organisational
+information and real cost savings through the use of open source software.
+The <A HREF="http://www.achean.com/HardwareSoftware/AcheanFramework/">Achean
+Framework</A> explains our holistic approach to implementing solutions. We
+work with several open source operating systems, and many desktop and server
+based <A HREF="http://www.achean.com/HardwareSoftware/Applications/">applications</A>.
+Where necessary, we can provide custom built servers, workstations and diskless
+clients. We also provide support and training services for our customers.
+Based in the UK, Achean can be contacted through our
+<A HREF="http://www.achean.com/Contact/">contact page</A>. If you are
+looking for a new job, please take a look at our
+<A HREF="http://www.achean.com/Careers/">careers</A> section.
+
<!-- NAME="Adimus GmbH & Co. KG" CAT="consulting" SUBCAT="EUROPE" -->
<strong><A href="http://www.adimus.de/">Adimus GmbH &
Co. KG</a></strong> is a company based in Bochum, Germany. As a
@@ -60,6 +84,31 @@ Usage on our applications ranges from 1 to 20,000,000 hits per day. For
more information, email us at <a
href="mailto:info@atlase.com">info@atlase.com</a>.
+<!-- NAME="AYN & Associates" CAT="consulting" SUBCAT="NAMERICA" -->
+<STRONG><A HREF="http://www.aynassociates.com">AYN & Associates</A></STRONG>,
+based in Austin, TX, is a software and internet consulting company specializing
+in FreeBSD. We provide a full range of services including setting up FreeBSD
+servers, LAN setups, setting up internet services such as mail and news
+servers, proxies, web servers. We also provide custom programming solutions
+in most operating systems.
+
+<!-- NAME="BITNETS Inc." CAT="consulting" SUBCAT="NAMERICA" -->
+<STRONG><A HREF="http://www.bitnets.ca">BITNETS Inc.</A></STRONG> specializes
+in BIND, Apache, Postfix, Courier-IMAP and a variety of server components
+running on FreeBSD with emphasis on security and stability. Services include
+<A HREF="http://www.netguru.ca">consulting</A> on server evaluation, installation
+and configuration and FreeBSD-based managed
+<A HREF="http://www.mailhosting.ca">secure e-mail hosting</A>.
+BITNETS sells commercial <A HREF="http://www.mailservers.ca">mail servers</A>,
+retail boxed computer peripherals and
+<A HREF="http://www.pcx.bitnets.ca">platform-independent network appliances</A>
+at discounted prices. We are located at <A HREF="http://www.cityplaza.ca">City
+Plaza</A> in St. Albert, serving the Edmonton area of Alberta, Canada.
+Call us at +1 (780) 418-5151, toll-free in North America at 1-877-BITNETS
+(1-877-248-6387) for general enquiries or 1-877-NETGURU (1-877-638-4878) for
+tech support, or <A HREF="https://secure.bitnets.com/message/">e-mail us</A>.
+Winners of the chamber of commerce InfoTech Award of Distinction.
+
<!-- NAME="Brevik, Peter" CAT="consulting" SUBCAT="EUROPE" -->
<STRONG><A HREF="http://users.lindesign.se/~pb/">Brevik, Peter</A></STRONG>
Provides custom programming in C, Pascal, Sh/Csh, Perl, X-window, Assembler.
@@ -108,6 +157,12 @@ 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="Codeangels Solutions" CAT="consulting" SUBCAT="EUROPE" -->
+<STRONG><A HREF="http://www.codeangels.com">Codeangels Solutions GmbH</A></STRONG>
+based in Switzerland, region Zürich. Offers its customers a range of IT
+Security, Network and UNIX Services. We utilize and support FreeBSD in our
+services and solutions.
+
<!-- NAME="CodeGen Inc." CAT="consulting" SUBCAT="NAMERICA" -->
<strong><a href="http://www.codegen.com/">CodeGen, Inc.</a></strong>
provide consulting and programming services, specializing in embedded
@@ -127,6 +182,17 @@ headquartered in Austin, Texas, with 19 offices nationwide. For more
information, visit <A HREF="http://www.colltech.com">our website</A>
or e-mail us at <A HREF="mailto:contact@colltech.com">contact@colltech.com</A>.
+<!-- NAME="Computer Mavericks" CAT="consulting" SUBCAT="NAMERICA" -->
+<STRONG><A HREF="http://mavericks.critesclan.com">Computer Mavericks</A></STRONG>
+is a full-spectrum UNIX consulting company, since 1987, serving the entire Texas
+Panhandle from our office in Canyon, Texas. We feature FreeBSD as our
+operating system of choice. We can provide you with a complete enterprise
+solution tailored to your needs. We do hardware, software solutions, web
+development, firewalls, security, and more. We convert the world to FreeBSD,
+one happy client at a time! Email <A
+HREF="mailto:mavericks@critesclan.com">Lee Crites</A> or call 806-655-2250
+and discover what it is like to be a satisfied client.
+
<!-- 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
@@ -137,12 +203,22 @@ network administration as well as consulting. Check out our
and
<a href="http://www.iserve.com/">http://www.iserve.com/</a>.
+<!-- NAME="Core Digital" CAT="consulting" SUBCAT="AUSTRALIA" -->
+<STRONG><A HREF="http://www.core-digital.com">Core Digital</A></STRONG>
+is based in Perth, Western Australia. We are a consulting company
+specializing in OpenBSD, FreeBSD, Linux and Windows. We work with
+firewalls, Virtual Private Networks, Database Servers, Email and Web
+Servers, Security, WAN/LAN implementations, Multi OS networks. For more
+information please contact
+<A HREF="mailto:info@core-digital.com">info@core-digital.com</A> or visit
+our <A HREF="http://www.core-digital.com">website</A>.
+
<!-- NAME="Daemon Technologies" CAT="consulting" SUBCAT="NAMERICA" -->
<STRONG><A HREF="http://www.daemontech.com">Daemon Technologies</A></STRONG>
is located
in the heart of Silicon Valley, California and provides a full range of systems
and network consulting specializing in the needs of ISP's and those building a
-web presence. We can provide unix support and administration contracts and
+web presence. We can provide UNIX support and administration contracts and
on-site training. We also offer custom built, high performance, fault tolerant,
X86 based workstations and servers tailored to your needs or choose a
pre-configured package ready with FreeBSD pre-installed to your specifications.
@@ -182,6 +258,14 @@ 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="Die Webmaster Gmbh" CAT="consulting" SUBCAT="EUROPE" -->
+<STRONG><A HREF="http://www.diewebmaster.at">Die Webmaster Gmbh</A></STRONG>
+- We are a consulting company from Linz, Austria and offer a wide range of
+FreeBSD based services: FreeBSD installation, integration, troubleshooting,
+maintenance, FreeBSD based hosting (for example jail servers), serverhousing,
+hardware selection, configuration and support.
+e-mail: <A HREF="mailto:info@diewebmaster.at">info@diewebmaster.at</A>
+
<!-- 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
@@ -213,14 +297,6 @@ based on FreeBSD. We also specialize in setting up internet
gateways/firewalls. For more information send us an email to
<A HREF="mailto:info@networks.nq.nu">info@networks.nq.nu</A>.
-<!-- NAME="Fred Fahnert" CAT="consulting" SUBCAT="NAMERICA" -->
-<STRONG><A HREF="http://www.netfinances.com/fred/consulting.html">Fred
-Fahnert</A></STRONG> offers FreeBSD and UNIX consulting. Including
-everything from setting up the equipment whether it will be a
-firewall, a file server, or a workstation. Also designing
-implementation of custom applications including cgi and database
-applications.
-
<!-- NAME="Frigate Networks" CAT="consulting" SUBCAT="NAMERICA" -->
<STRONG><A HREF="http://www.frigate.com/">frigate networks</A>
</STRONG> provides network troubleshooting, system administration,
@@ -251,16 +327,23 @@ 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="GNUTEC, Inc." CAT="consulting" SUBCAT="NAMERICA" -->
-<STRONG><A HREF="http://www.gnutec.com/">GNUTEC,
+<!-- NAME="Gurix Web Professionals" CAT="consulting" SUBCAT="NAMERICA" -->
+<STRONG><A HREF="http://www.gurix.com">Gurix Web Professionals</A>:</STRONG>
+Web Development, design, and custom application programming using both
+open source and proprietary environments. Services also include private
+consulting, emergency response coordination and various IT solutions to
+maximize the effectiveness of your business.
+
+<!-- NAME="BackWatcher, Inc." CAT="consulting" SUBCAT="NAMERICA" -->
+<STRONG><A HREF="http://www.backwatcher.com/">BackWatcher,
Inc.</A></STRONG>, while specializing in security (firewalls, VPNs,
security audits, intrusion detection systems, etc.), handles
installation and configuration, systems integration, performance
tuning, disaster recovery, network architecture and programming
-on FreeBSD, NetBSD, OpenBSD, Linux and many commercial unix
+on FreeBSD, NetBSD, OpenBSD, Linux and many commercial UNIX
systems. For additional information, visit our website at
-<A HREF="http://www.gnutec.com/">www.gnutec.com</A>, email
-<A HREF="mailto:info@gnutec.com">info@gnutec.com</A> or call
+<A HREF="http://www.backwatcher.com/">www.backwatcher.com</A>, email
+<A HREF="mailto:info@backwatcher.com">info@backwatcher.com</A> or call
813-979-1633.
<!-- NAME="HCS Hanseatischer Computerservice GmbH" CAT="consulting" SUBCAT="EUROPE" -->
@@ -281,7 +364,7 @@ training services. For more information email us at
<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
+<STRONG><A HREF="http://www.lemis.com/~grog/">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
@@ -295,6 +378,15 @@ 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="IKTech" CAT="consulting" SUBCAT="EUROPE" -->
+<STRONG><A HREF="http://www.iktech.net">IKTech Dipl.-Ing. Gernot Schmied</A></STRONG>
+is a high-end systems integrator and UNIX competence center located in Vienna,
+Austria. We especially focus on telecommunications, networking and security
+aspects for NPO, corporate and Service Provider/Carrier customers. We use
+selected commercial products as well as FreeBSD, OpenBSD, NetBSD, Linux and
+Solaris and are the premier competence center with regards to advanced routing gateways.
+For inquiries please contact <A HREF="mailto:office@iktech.net?subject=IKTech%20inquiry%20with%20regards%20to%20www.freebsd.org%20listing">office@iktech.net</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
@@ -327,19 +419,26 @@ contact us by email at: <a
href="mailto:info@interact.se">info@interact.se</a>, or phone Sweden
on +46 (0)920-888 03
-<!-- NAME="Internet Access H.K.Limited" CAT="consulting" SUBCAT="ASIA" -->
-<STRONG><A HREF="http://www.ia.com.hk">Internet Access H.K.Limited</A></STRONG>
-implements Internet and Intranet solutions to corporate clients. With
-intensive research and development in the computer telephone integration,
-multimedia and publishing technology, electronic commerce, network and system
-integration, IAHK target is to provide a reliable Internet environment for
-business users with value-added features.
-'<A HREF="http://www.ia.com.hk/EOffice">e-Office</A>' and
-'<A HREF="http://www.ia.com.hk/EmailVoice/">EmailVoice</A>'
-are two examples of innovative products to help customers on business
-management. For more information, please contact
-<A HREF="mailto:info@ia.com.hk">info@ia.com.hk</A>
-or visit our website at <A HREF="http://www.ia.com.hk">www.ia.com.hk</A>.
+<!-- NAME="inTEXT Communications" CAT="consulting" SUBCAT="NAMERICA" -->
+<STRONG><A HREF="http://www.networkinformation.com">inTEXT Communications</A></STRONG>
+was founded in 1994 as a Unix Management Provider. We support FreeBSD, BSDi,
+Solaris and other Unix variants. Services include co-location, tele-commuting,
+and on-site service anywhere in North America. We support Government and
+Industry as well as the private sector.
+<A HREF="http://www.networkinformation.com/contact_info.php">Email</A> or
+call us for more information (toll free within USA on 800.309.8996 or
+internationally on 604.484.2426).
+
+<!-- NAME="Jens Schweikhardt" CAT="consulting" SUBCAT="EUROPE" -->
+<STRONG><A HREF="http://www.schweikhardt.net/">Jens Schweikhardt</A></STRONG>,
+located near <b>Stuttgart/Germany</b>, is a FreeBSD committer with 20
+years of Unix experience who won several national and international
+programming contests. If you have a problem that can be solved using
+the Unix toolbox (preferably C, perl, shell) he is the one to make it
+happen. With his background in Unix Standardization he will make sure
+your investment runs portably and efficiently on all the Unices you
+care for. Contact him via
+<A HREF="mailto:schweikh@FreeBSD.org">schweikh@FreeBSD.org</A>.
<!-- NAME="John Polstra" CAT="consulting" SUBCAT="NAMERICA" -->
<STRONG><A HREF="http://www.polstra.com/">John Polstra</A></STRONG>,
@@ -352,9 +451,9 @@ 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><A HREF="http://www.berklix.com/~jhs/">Julian Stacey</A>
</STRONG> maintains a
-<A HREF="http://www.freebsd.org/~jhs/freebsd/consultants.html">FreeBSD
+<A HREF="http://www.berklix.com/~jhs/consultants.html">FreeBSD
Commercial Consultants Index</A>. Be sure to visit his page!
<!-- NAME="MediaCenter" CAT="consulting" SUBCAT="EUROPE" -->
@@ -421,6 +520,14 @@ integration, network security, and set-up of internet services. Custom
application design is also available. Contact him
<A HREF="mailto:omar@heedme.com">via email</A>.
+<!-- NAME="Omniscient Technologies" CAT="consulting" SUBCAT="NAMERICA" -->
+<STRONG><A HREF="http://www.omniscient.com/">Omniscient Technologies</A></STRONG>
+is a Washington D.C. based consulting group with a broad array of experience
+in *BSD, Solaris, Linux and many other varieties of UNIX specializing in
+highly scalable systems, systems integration and network security.
+Custom application design also available. Contact via
+<A HREF="mailto:info@omniscient.com">info@omniscient.com</A>.
+
<!-- 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.
@@ -433,6 +540,18 @@ 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="Puryear Information Technology, LLC" CAT="consulting" SUBCAT="NAMERICA" -->
+<STRONG><A HREf="http://www.puryear-it.com">Puryear Information Technology,
+LLC</A></STRONG> provides open source application support, integration services,
+and technology management expertise to the Southeastern United States. Our
+company plays a pivotal role in the design and deployment of open source
+solutions--we have worked with companies to design and manage FreeBSD and
+Linux web farms; deployed open source-based clustering software to ensure
+high availability of critical network services; performed critical
+performance tuning and software integration for a popular spam filter
+appliance; and integrated Samba into Internet-accessible, VPN-based file
+services. Phone: +1-225-343-3056.
+
<!-- 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
@@ -441,6 +560,13 @@ 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="PHB Solutions" CAT="consulting" SUBCAT="EUROPE" -->
+<STRONG><A HREF="http://www.phbsolutions.com">PHB Solutions</A></STRONG>, based
+in Belgium, provides *BSD installation, maintenance, support and consulting
+services (file servers, web servers, mail servers, database servers, routers).
+For more information, please contact <A
+HREF="mailto:philippe.bresoux@phbsolutions.com">philippe.bresoux@phbsolutions.com</A>.
+
<!-- NAME="Phil Budne" CAT="consulting" SUBCAT="NAMERICA" -->
<STRONG><A HREF="http://www.ultimate.com/phil/resume.html">Phil
Budne</A></STRONG> is a Boston area consultant who has worked
@@ -466,7 +592,7 @@ 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="Potential Technology"> CAT="consulting" SUBCAT="NAMERICA" -->
+<!-- NAME="Potential Technology" CAT="consulting" SUBCAT="NAMERICA" -->
<STRONG><A HREF="http://www.potentialtech.com/">Potential Technology</A></STRONG>
is based in Ohio and western Pennsylvania. We specialize in FreeBSD-based
solutions and have experience integrating FreeBSD with Apple, Microsoft and
@@ -476,9 +602,15 @@ HREF="mailto:moreinfo@potentialtech.com">moreinfo@potentialtech.com</A>, visit
our <A HREF="http://www.potentialtech.com/">website</A> or call
1-412-793-4257.
+<!-- NAME="Potter Systems" CAT="consulting" SUBCAT="NAMERICA" -->
+<STRONG><A HREF="http://www.pottersystems.com/">Matthew R. Potter</A></STRONG>
+has over 8 years in UNIX IP Networks, specializes in BSD, OS X and Network
+Consulting and is located in Northern Virginia. You can reach him via
+email at <A HREF="mailto:mpotter@pottersystems.net">Matthew R. Potter</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
+</STRONG> has over 12 years in UNIX & Networks, and is a former 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
@@ -499,7 +631,7 @@ http://www.ServeTheWeb.com</A> for additional information on this product.
<P>
R & D Associates, Inc. is an application development firm specializing
in client/server app. dev. We use FreeBSD running Apache and utilizing
-PHP's and MySQL (As well as NT with ASP's and SQL/Access).
+PHP and MySQL (As well as NT with ASP and SQL/Access).
</P>
<!-- NAME="Secnetix GmbH and Co KG" CAT="consulting" SUBCAT="EUROPE" -->
@@ -519,6 +651,19 @@ 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="Southern Gazer" CAT="consulting" SUBCAT="AUSTRALIA" -->
+<STRONG><A HREF="http://www.southerngazer.com">Southern Gazer</A></STRONG> is
+a consulting company with 20 years PC technical support experience based in
+Sydney's idyllic Sutherland Shire. Our focus is helping businesses get their
+computers working right while spending as little as possible on IT. We're
+passionate supporters of Open Source products and can help the average business
+save money and gain reliability by using systems such as FreeBSD on their file
+servers, print servers, e-mail systems plus lots more. We also supply a
+complete range of Linux and BSD CD's at ultra low prices. Please drop by our
+<A HREF="http://www.southerngazer.com">website</A>, email us at
+<A HREF="mailto:info@southerngazer.com">info@southerngazer.com</A>, or call us
+on 02 9532 1217 to have a chat.
+
<!-- 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
@@ -857,6 +1002,13 @@ and space for your servers at low costs as well. Visit our websites at
Please contact us by <A HREF="mailto:info@parcproductions.com">email</A>
or by telephone: +31-204892456.
+<!-- NAME="Worria Affordable Web Hosting" CAT="consulting" SUBCAT="ASIA" -->
+<STRONG><A HREF="http://worria.com/en/hosting.shtml">Worria Affordable Web
+Hosting</A></STRONG> is a privately owned company in Hong Kong. We offer
+FreeBSD web hosting related consulting services, such as server administration
+and website management. For more details, please email
+<A HREF="mailto:sales@worria.com">our sales team</A>.
+
<!-- NAME="Xensia LLP" CAT="consulting" SUBCAT="EUROPE" -->
<STRONG><A HREF="http://www.xensia.com/">Xensia LLP</A></STRONG>
provide UNIX systems/admin/security/networking consultancy services within
diff --git a/fr/commercial/misc.raw b/fr/commercial/misc.raw
index 4608b22005..b8cdb4ebc6 100644
--- a/fr/commercial/misc.raw
+++ b/fr/commercial/misc.raw
@@ -1,3 +1,5 @@
+# $FreeBSD: www/en/commercial/misc.raw,v 1.15 2003/12/07 19:57:19 ceri Exp $
+
<!-- NAME="Bookpool" CAT="misc" SUBCAT="" -->
<STRONG><A HREF="http://www.bookpool.com/"
>The Bookpool</A></STRONG>
@@ -28,16 +30,15 @@ Are you new to FreeBSD?
Or, perhaps you've been using it for years?
We have something for you.
We have the latest FreeBSD CDROMs,
-helpful books, colorful shirts and hats,
-and online copies of the FreeBSD Newsletter.
+helpful books, and colorful shirts and hats.
Stay current with FreeBSD and put it to work for you!
<!-- NAME="Liebscher & Partner" CAT="misc" SUBCAT="" -->
<STRONG><A HREF="http://www.freibergnet.de"
>Liebscher & Partner</A></STRONG>
are now shipping the BSD
-<A HREF="http://www.freibergnet.de">Stuffed Daemon</A>!<BR>
-<img alt="stuffed daemon" src="../../gifs/plueschtier-tiny.jpg">
+<A HREF="http://lem.freibergnet.de/cgi-bin/fanshop/scan/sf=category/se=BSD">Stuffed Daemon</A>!<BR>
+<img alt="stuffed daemon" src="../gifs/plueschtier-tiny.jpg">
<!-- NAME="ScotGold Products" CAT="misc" SUBCAT="" -->
<STRONG><A HREF="http://www.scotgold.com/daemon.htm"
@@ -45,3 +46,20 @@ are now shipping the BSD
design and manufacture PC case badges,
including a BSD daemon badge
with the permission and blessing of Kirk McKusick.
+
+<!-- NAME="Fultus FODL" CAT="misc" SUBCAT="" -->
+<STRONG><A HREF="http://www.fultus.com/"
+ >Fultus</A></STRONG>
+presents <A HREF="http://elibrary.fultus.com/mergedProjects/FreeBSD%20Documentation/index.htm">FreeBSD Open Documentation Library</A>.
+This is the <B>full up-to-date</B> FreeBSD documentation collection available
+online in the Technical Literature section of the Fultus <A HREF="http://elibrary.fultus.com/">eLibrary</A> and Fultus Online Book <A HREF="http://store.fultus.com/advanced_search_result.php?keywords=FreeBSD">Superstore</A> in the following formats:
+<UL>
+ <LI>Online Web Help (searchable through all documents) (Mozilla,
+ Netscape Navigator & IE compatible);</LI>
+ <LI>Searchable Adobe PDF format with Bookmark link page (for desktop
+ and PDA);</LI>
+ <LI>Compiled HTML format (chm) (for Windows).</LI>
+</UL>
+Interested?<BR>
+Read about FreeBSD eBooks and download examples on the <A HREF="http://www.fultus.com/free/documentation.phtml">FreeBSD Documentation</A> page of the <A HREF="http://www.fultus.com/">Fultus</A> web site.
+
diff --git a/fr/commercial/software.raw b/fr/commercial/software.raw
index 30a21540d6..7f6b3db6c7 100644
--- a/fr/commercial/software.raw
+++ b/fr/commercial/software.raw
@@ -1,3 +1,5 @@
+# $FreeBSD: www/en/commercial/software.raw,v 1.90 2004/02/10 15:01:25 stephane Exp $
+
<!-- NAME="Acadix Another Programmers Editor" CAT="software" SUBCAT="DEV" -->
<STRONG><A HREF="http://www.execpc.com/~acadix"
>Another Programmer's Editor (APE)</A></STRONG>
@@ -111,31 +113,34 @@ and runs quite well under FreeBSD.
<!-- NAME="Brown Bear Software" CAT="software" SUBCAT="MISC" -->
-<STRONG><A HREF="http://www.brownbearsoftware.com"
+<STRONG><A HREF="http://www.brownbearsw.com"
>Brown Bear Software</A></STRONG>
produces and supports
-<A HREF="http://www.brownbearsoftware.com/calcium/">Calcium</a>,
+<A HREF="http://www.brownbearsw.com/calcium/">Calcium</a>,
an interactive <B>Web Calendar server</B> you use via your browser.
Features include:
dynamic calendar merging
-(events from one calendar can be included in another),
multiple views and formats; repeating events,
-email support,
+email notification and reminders,
+iCalendar support,
+Palm Pilot synchronization,
color and font customization,
support for full HTML in event text and calendar headers and footers,
popup text associated with any event,
searching & filtering,
multi-language support,
-flexible security model, and more.
+flexible security model, <a href="http://www.brownbearsw.com/calcium/FeaturesList.html">and more</a>.
Calcium is very easy to use and fully supported.
It runs anywhere that supports Perl CGIs;
no non-standard Perl modules are necessary.
A live <A
HREF="http://www.brownbearsoftware.com/cgi-bin/Calcium?CalendarName=Demo"
- >On-Line Demo</a> is available,
-and you can download an
-<A HREF="http://www.brownbearsoftware.com/calcium/download"
- >evaluation copy</A> (fully functional, but limited to a single calendar.)
+ >On-Line Demo</a> is available;
+you can download an
+<A HREF="http://www.brownbearsw.com/calcium/download"
+ >evaluation copy</A> (fully functional, but limited to a single calendar), or
+try your own <a href="http://www.brownbearsw.com/calcium/onlineTrial.html">private
+demo on our servers</a>.
<!-- NAME="C-Forge" CAT="software" SUBCAT="DEV" -->
@@ -342,6 +347,15 @@ EasyStat will then display all it gathers in an elegant fashion,
a demo of which is available on its site.
+<!-- NAME="Eiffel Software" CAT="software" SUBCAT="DEV" -->
+<STRONG><A HREF="http://www.eiffel.com/"
+ >Eiffel Studio</A></STRONG>
+is an Integrated Development Environment (IDE) designed for the
+Eiffel object-oriented application development language.
+Beside the Enterprise Edition, a Free Edition for non-commercial
+use only is freely available for download.
+
+
<!-- NAME="Elego" CAT="software" SUBCAT="DEV" -->
<STRONG><A HREF="http://www.elego.de/"
>Elego ComPact Configuration Management</A></STRONG>.
@@ -882,6 +896,16 @@ To download Open Motif for FreeBSD,
please visit <A HREF="http://www.motifdeveloper.com/"
>www.motifdeveloper.com</A>.
+<!-- NAME="Muonics" CAT="software" SUBCAT="DEV" -->
+<STRONG><A HREF="http://www.muonics.com/Products/MIBSmithy/"> Muonics' MIB
+Smithy </A></STRONG> is a software product for Simple Network Management Protocol
+(SNMP) developers, Management Information Base (MIB) designers and
+internet-draft authors providing a Visual GUI-based environment for
+designing, editing and compiling MIB modules according to the SMIv1 and
+SMIv2 (Structure of Management Information) standards. MIB Smithy is
+supported on several platforms, including FreeBSD. More information and a
+15-day limited evaluation version can be obtained from
+<A HREF="http://www.muonics.com/">www.muonics.com</A>.
<!-- NAME="NAG, Ltd." CAT="software" SUBCAT="SCIENTIFIC" -->
<STRONG><A HREF="http://www.nag.co.uk/"
@@ -1158,17 +1182,16 @@ visit <A HREF="http://www.polyserve.com/">www.polyserve.com</A>.
<!-- NAME="Quantified Systems, Inc." CAT="software" SUBCAT="SYSADMIN" -->
<STRONG><A HREF="http://www.urchin.com/"
- >Urchin</A></STRONG>
-from Quantified is the fastest, most scalable
-website-visitor reporting package on the market.
-Using Urchin, a website owner can determine
-which ads, search engines, and keywords
-are bringing visitors to a site,
-the total number of visitors, pageviews, and dollars spent
-on the site,
-the browsers and platforms visitors are using, and much more.
-A free, 30-day trial of Urchin is available at
-<A HREF="http://www.urchin.com/download/">www.urchin.com/download</A>.
+ >Urchin 5</A></STRONG>
+About Urchin Web Analytics Software:
+Urchin 5 is a web analytics software solution that provides detailed
+metrics and marketing intelligence about how visitors interact with
+your website. Urchin provides detailed conversion metrics for online
+marketing initiatives in colorful and easy to read graphs. It is
+essential for anyone interested in the marketing, design or success
+of a website. Urchin for FreeBSD and all platforms can be downloaded
+from
+<A HREF="http://www.urchin.com/">www.urchin.com/</A>.
<!-- NAME="RealNetworks, Inc." CAT="software" SUBCAT="MULTIMEDIA" -->
@@ -1241,13 +1264,15 @@ present:
</UL>
-<!-- NAME="Replicon Inc." CAT="software" SUBCAT="SYSADMIN" -->
-<STRONG><A HREF="http://www.replicon.com"
- >Replicon Web TimeSheet</A></STRONG>
-products offer organizations a convenient and easy way
-to report time and expenses
-for project tracking, payroll management, and client billing -
-anytime, anywhere.
+<!-- NAME="Revolution" CAT="software" SUBCAT="DEV" -->
+<STRONG><A HREF="http://www.runrev.com/"
+ >Revolution</A></STRONG>
+is a multi-platform software development tool that enables developers
+to easily and quickly create powerful applications for OS X, classic
+Mac OS, Windows, Linux, and popular Unix systems (including FreeBSD)...
+with native look and feel on all platforms.
+For more information or to download a free 30-day trial evaluation
+edition, visit <A HREF="http://www.runrev.com/">www.runrev.com</A>.
<!-- NAME="RTD" CAT="software" SUBCAT="SYSADMIN" -->
@@ -1310,6 +1335,15 @@ For more information, send email to
<A HREF="mailto:info@shpink.com">info@shpink.com</A>
or call us at +1.888.I.WANT.NSH (Toll Free) or +1.650.525.1537.
+<!-- NAME="SiamScan.NET" CAT="software" SUBCAT="ECOMMERCE" -->
+<STRONG><A HREF="http://www.siamscan.net/">SiamScan.NET</A></STRONG>,
+a Bangkok based company offers commercial web application software, CPA
+- Collaborative Portable Accounting. CPA is web accounting software
+designed to be easy enough for non accountants to use. Also, we offer
+service on maintenance and implementation of FreeBSD systems. For more
+information, email <A HREF="mailto:sale@siamscan.net">sale@siamscan.net</A>,
+visit <A HREF="http://www.siamscan.net/">SiamScan.NET</A> Website, call
++66 2532 9068-70, or fax +66 2533 4167.
<!-- NAME="Sleepycat Software" CAT="software" SUBCAT="DATABASE" -->
<STRONG><A HREF="http://www.sleepycat.com"
@@ -1345,6 +1379,14 @@ based on individual preferences and preferred coding styles.
Visit <A HREF="http://www.slickedit.com/">www.slickedit.com</A>
for more information or to download a demo.
+<!-- NAME="SoftMaker Software GmbH" CAT="software" SUBCAT="MISC" -->
+<STRONG><A HREF="http://www.softmaker.de/tml_en.htm">TextMaker</A></STRONG>
+is the fast, efficient Microsoft Word-compatible word processor for FreeBSD.
+It provides all the features of a modern high-end word processor, reads and
+writes Microsoft Word documents seamlessly, and is available on <A
+HREF="http://www.softmaker.de/tm_en.htm">multiple platforms</A> (FreeBSD,
+Linux, Windows, Pocket PCs, Handheld PCs).
+<A HREF="http://www.softmaker.de/tmldemo_en.htm">Free trial</A> available.
<!-- NAME="Software2Go, LLC" CAT="software" SUBCAT="MULTIMEDIA" -->
<STRONG><A HREF="http://www.apps2go.com"
@@ -1358,8 +1400,7 @@ from <A HREF="http://www.apps2go.com">www.apps2go.com</A>.
Native ports to other Free UNIX's are also available.
-<!-- NAME="Solid Information Technology Ltd" CAT="software"
- SUBCAT="DATABASE" -->
+<!-- NAME="Solid Information Technology Ltd" CAT="software" SUBCAT="DATABASE" -->
<STRONG><A HREF="http://www.solidtech.com/"
>Solid Information Technology Ltd</A></STRONG>
is the maker of a unique data management product,
@@ -1497,6 +1538,15 @@ Contact L & A
at <A HREF="mailto:sales@lundeen.com">sales@lundeen.com</A>,
+1.510.521.5855 (Voice), or +1.510.522.6647 (Fax).
+<!-- NAME="WebHostWorks.net" CAT="software" SUBCAT="ECOMMERCE" -->
+<STRONG><A HREF="http://www.webhostworks.net/">WebHostWorks.net</A></STRONG>
+is a small and thriving web development firm specializing in e-commerce
+integration for small and medium sized businesses. Our proprietary E-Cart
+commerce package supports extraordinarily usable shopping cart services
+with backend product list management, order processing, executive summary
+reports, customer review processing, and inventory projections. See <A
+HREF="http://www.webhostworks.net">webhostworks.net</A> for more
+information.
<!-- NAME="WebEvent" CAT="software" SUBCAT="NETWORK" -->
<STRONG><A HREF="http://www.matadordesign.com/"
@@ -1593,3 +1643,20 @@ commercial grade web server
designed with exceptional performance,
minimal machine resource requirements, and ease of administration in mind.
FREE evaluation copies may be <A HREF="http://www.zeus.co.uk/">downloaded</A>.
+
+<!-- NAME="PortaOne" CAT="software" SUBCAT="NETWORK" -->
+<STRONG><A HREF="http://www.portaone.com">PortaOne</A></STRONG> is a
+VoIP billing solutions company. We enable Internet Telephony Service
+Providers (ITSP's) and the operators of voice networks to quickly and
+efficiently implement, manage, and deliver a wide range of billing
+solutions for IP telephony.
+<p>
+Our flagship product <a
+href="http://www.portaone.com/solutions/">PortaBilling100</a> is an
+extremely flexible customer management and billing platform that enables
+the providers of IP Telephony services to launch, price, and provision
+an array of VoIP services.
+<p>
+For further information, please see <a
+href="http://www.portaone.com">www.portaone.com</a>
+