Merge the following changes:

o Move NetFence from the ISP list to the consultancy list
  after more clear feedback arrived. [1]
o Move ExaVault from the ISP list to the MISC list. [2]
o Add Ultranix Consulting Ltd to the Consult list. [3]

PR:			www/99590 [1]
			www/98685 [2]
			www/100086 [3]

Submitted by:		Andrea Venturoli <freebsd at netfence dot it> [ 1]
			David Ordal <david at ordal dot com> [2]
			J Heckford <jah at ultranix dot co dot uk> [3]

en/commercial/consult.xml

@@ -8,7 +8,7 @@
 <entries>
   <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
     <cvs:keyword name="freebsd">
-      $FreeBSD: www/en/commercial/consult.xml,v 1.72 2006/05/17 21:20:09 keramida Exp $
+      $FreeBSD: www/en/commercial/consult.xml,v 1.73 2006/07/02 11:40:56 remko Exp $
     </cvs:keyword>
   </cvs:keywords>
 
@@ -2323,4 +2323,33 @@
       telephone at (512) 351-7783.
     </description>
   </entry>
+
+  <entry id="netfence" continent="europe">
+    <name>NetFence</name>
+    <url>http://www.netfence.it</url>
+    <description>
+      NetFence deploys and maintains Internet/intranet servers based on
+      FreeBSD and other open source software (including Apache web
+      server, Squid, Samba, Cyrus IMAP, PostgreSQL, OpenVPN and others).
+      Network and client-side hardware/software/support is also offered,
+      as well as custom programming and security coverage.  It is
+      located in Bologna, Italy and can be reached at <a
+	href="mailto:freebsd@netfence.it">freebsd@netfence.it</a>.
+    </description>
+  </entry>
+
+  <entry id="ultranix" continent="europe">
+    <name>Ultranix Consulting Ltd.</name>
+    <url>http://www.ultranix.co.uk</url>
+    <description>
+      UltraNIX is a network and IT systems consultancy based close to
+      Gatwick in the South East of England.  We specialise in all
+      aspects of FreeBSD consultancy, including remote support /
+      installations / upgrades.  Also provide FreeBSD based hosting
+      solutions, tailored to your needs.  Visit <a
+	href="http://www.ultranix.co.uk/">http://www.ultranix.co.uk/</a>
+      or email <a
+	href="mailto:enquire@ultranix.co.uk">enquire@ultranix.co.uk</a>
+    </description>
+  </entry>
 </entries>

en/commercial/isp.xml

@@ -4,7 +4,7 @@
 <entries>
   <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
     <cvs:keyword name="freebsd">
-      $FreeBSD: www/en/commercial/isp.xml,v 1.52 2006/07/02 11:40:56 remko Exp $
+      $FreeBSD: www/en/commercial/isp.xml,v 1.53 2006/07/02 15:55:54 remko Exp $
     </cvs:keyword>
   </cvs:keywords>
 
@@ -548,20 +548,6 @@
     </description>
   </entry>
 
-  <entry id="exavault">
-    <name>ExaVault</name>
-    <url>http://www.exavault.com</url>
-    <description>
-      ExaVault provides inexpensive online remote backup space that is
-      accessible via open, industry standard protocols, including rsync,
-      FTP and SFTP. It's ideal for small and medium businesses, web
-      hosting companies and others that need a quick, transparent,
-      maintenance-free way of mirroring a copy of their data to a remote
-      backup server. We're fully FreeBSD compatible, and provide full
-      support for getting things setup on your FreeBSD system. 
-    </description>
-  </entry>
-
   <entry id="transip">
     <name>TransIP</name>
     <url>http://www.transip.nl</url>
@@ -589,20 +575,6 @@
     </description>
   </entry>
 
-  <entry id="netfence">
-    <name>NetFence</name>
-    <url>http://www.netfence.it</url>
-    <description>
-      NetFence deploys and maintains Internet/intranet servers based on
-      FreeBSD and other open source software (including Apache web
-      server, Squid, Samba, Cyrus IMAP, PostgreSQL, OpenVPN and others).
-      Network and client-side hardware/software/support is also offered,
-      as well as custom programming and security coverage.  It is
-      located in Bologna, Italy and can be reached at <a
-	href="mailto:freebsd@netfence.it">freebsd@netfence.it</a>.
-    </description>
-  </entry>
-
   <entry id="kionic">
     <name>Kionic.com Web Hosting</name>
     <url>http://www.kionic.com</url>

en/commercial/misc.xml

@@ -4,7 +4,7 @@
 <entries>
   <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
     <cvs:keyword name="freebsd">
-      $FreeBSD: www/en/commercial/misc.xml,v 1.3 2004/09/03 13:11:36 josef Exp $
+      $FreeBSD: www/en/commercial/misc.xml,v 1.4 2006/05/17 21:20:09 keramida Exp $
     </cvs:keyword>
   </cvs:keywords>
 
@@ -100,4 +100,18 @@
       we have low shipping rates, no hidden cost, and friendly service!
     </description>
   </entry>  
+
+  <entry id="exavault">
+    <name>ExaVault</name>
+    <url>http://www.exavault.com</url>
+    <description>
+      ExaVault provides inexpensive online remote backup space that is
+      accessible via open, industry standard protocols, including rsync,
+      FTP and SFTP.  It is ideal for small and medium businesses, web
+      hosting companies and others that need a quick, transparent,
+      maintenance-free way of mirroring a copy of their data to a remote
+      backup server.  We are fully FreeBSD compatible, and provide full
+      support for getting things setup on your FreeBSD system. 
+    </description>
+  </entry>
 </entries>