Updates, fixes, adding global support.

git-svn-id: file:///home/svn/samba-web/trunk@1401 44aeb9d7-1cd8-0310-b257-a505e0beeac2

diff --git a/support/brazil.html b/support/brazil.html
index e770e749a163bfebbb0652f88d96c4289e066b4f..2c452b6fed5ba43ab2c1b24bf0cdcd63b212a042 100755 (executable)
--- a/support/brazil.html
+++ b/support/brazil.html
@@ -8,34 +8,18 @@
 
 <!-- Added JHT 20100222 -->
 <hr />
-<h3>TECHMASTER Servi�s em Inform�ica LTDA</h3>
+<h3>Linwork Informática Ltda.</h3>
 <pre><small>
-TECHMASTER Servi�s em Inform�ica LTDA
-Rua do Mercado, 34 sala 402 - Centro
-Rio de Janeiro - RJ - CEP: 20010-120
-Brasil
+Linwork Informática Ltda.
+Rua Mohamad Ibrahin Saleh, 491
+CEP: 08042-130
 
-<a href="http://www.techmaster.com.br">http://www.techmaster.com.br</a>
-55 21 2517-6000
-<a href="http://www.techmaster.com.br">http://www.techmaster.com.br</a>
+<a href="http://www.linwork.com.br">http://www.linwork.com.br</a>
++55-11-3532-2473
+<a href="mailto:solucoes@linwork.com.br">solucoes@linwork.com.br</a>
 </small></pre>
 <p>
-Techmaster works with Unix support, network support (Windows / Novell /
-Unix) Internet, software development, cabling, selling of equipment and
-software and the combined solutions of all those technologies. We have
-been working with samba since 1996 and have already experienced many
-different situations with big and small servers (from 1 to 400 clients per
-server) running on Solaris, FreeBSD, Linux, OSF/1 and other Unix flavors.
-</p><p>
-Techmaster has a new partner company:
-<br><br>
-OpenIT Soluções Tecnológicas LTDA
-Email: info@openit.com.br
-URL: http://www.openit.com.br
-Rua do Mercado, 34 sala 402 - Centro
-Rio de Janeiro - RJ - CEP: 20010-120
-Brasil
-Tel/Fax: 55 21 2517-6000
+We provide technical support and consulting about SAMBA and services integration in heterogeneous enviroments, as well Samba with LDAP, Kerberos, etc.
 </p>
 
 
@@ -58,20 +42,37 @@ Working with Samba in all distributed platform, including LDAP integration
 and MICROSOFT Active Directory integration .
 </p>
 
+
 <!-- Added JHT 20100222 -->
 <hr />
-<h3>Linwork Informática Ltda.</h3>
+<h3>TECHMASTER Servi�s em Inform�ica LTDA</h3>
 <pre><small>
-Linwork Informática Ltda.
-Rua Mohamad Ibrahin Saleh, 491
-CEP: 08042-130
+TECHMASTER Servi�s em Inform�ica LTDA
+Rua do Mercado, 34 sala 402 - Centro
+Rio de Janeiro - RJ - CEP: 20010-120
+Brasil
 
-<a href="http://www.linwork.com.br">http://www.linwork.com.br</a>
-+55-11-3532-2473
-<a href="mailto:solucoes@linwork.com.br">solucoes@linwork.com.br</a>
+<a href="http://www.techmaster.com.br">http://www.techmaster.com.br</a>
+55 21 2517-6000
+<a href="http://www.techmaster.com.br">http://www.techmaster.com.br</a>
 </small></pre>
 <p>
-We provide technical support and consulting about SAMBA and services integration in heterogeneous enviroments, as well Samba with LDAP, Kerberos, etc.
+Techmaster works with Unix support, network support (Windows / Novell /
+Unix) Internet, software development, cabling, selling of equipment and
+software and the combined solutions of all those technologies. We have
+been working with samba since 1996 and have already experienced many
+different situations with big and small servers (from 1 to 400 clients per
+server) running on Solaris, FreeBSD, Linux, OSF/1 and other Unix flavors.
+</p><p>
+Techmaster has a new partner company:
+<br><br>
+OpenIT Soluções Tecnológicas LTDA
+Email: info@openit.com.br
+URL: http://www.openit.com.br
+Rua do Mercado, 34 sala 402 - Centro
+Rio de Janeiro - RJ - CEP: 20010-120
+Brasil
+Tel/Fax: 55 21 2517-6000
 </p>
 
 

diff --git a/support/canada.html b/support/canada.html
index b73b17d02d57ec75151212b373f38ca0eb297eb1..45f9dfb22f9a41415f6b0a752221feeb8a44ff60 100755 (executable)
--- a/support/canada.html
+++ b/support/canada.html
@@ -117,7 +117,7 @@ Special Notes: We have 2 other offices in Canada : in Quebec City : 275, rue du
 <hr />
 <h3>Reality Infyormation Systems</h3>
 <pre><small>
-Reality Infyormation Systems
+Reality Information Systems
 42 rue Guy
 Vaudreuil,  QC
 

diff --git a/support/countries.html b/support/countries.html
index 5b6b9f712c13f2932cd69dd2ab404e3dccf31583..728e9250aaf7592269b42b378a0bacee1faeb294 100755 (executable)
--- a/support/countries.html
+++ b/support/countries.html
@@ -1,8 +1,9 @@
 <div id="countries">
 <h4>Support Available From:</h4>
 <ul>
+ <li><a href="globalsupport.html">Global Support</a></li>
+<br><br>
 <!--  <li><a href="argentina.html">Argentina</a></li> -->
-
  <li><a href="australia.html">Australia</a></li>
  <li><a href="austria.html">Austria</a></li>
  <li><a href="belgium.html">Belgium</a></li>

diff --git a/support/globalsupport.html b/support/globalsupport.html
new file mode 100644 (file)
index 0000000..399eaef
--- /dev/null
+++ b/support/globalsupport.html
@@ -0,0 +1,84 @@
+<!--#include virtual="/samba/header.html" -->
+<title>Samba Support -- Global Support</title>
+
+<!--#include virtual="header_support.html" -->
+<h2 align="center">Commercial Support - Global Support</h2>
+
+
+<!-- Added JHT 20100222 -->
+<hr />
+<h3>PrimaStasys, Inc.</h3>
+<pre><small>
+PrimaStasys, Inc.
+900 Cherry Avenue, Suite 300
+San Bruno, California 94066
+
+<a href="http://www.primastasys.com">http://www.primastasys.com</a>
+512-970-0256 (Mobile) - Austin, Texas
+John Terpstra
+650-291-9254 (Mobile) - San Francisco (Bay Area)
+Dennis Fullalove
+<a href="mailto:info@primastasys.com">info@primastasys.com</a>
+<a href="http://www.primastasys.com/index.php/about-us-general/contact-us.html">Request Assistance Now</a>
+</small></pre>
+<p>
+Our founder and CTO, John H Terpstra, (<a href="mailto:jht@samba.org">jht@samba.org</a>)
+is one of the early Samba Team members (since 1995) and the key author of the official
+Samba documentation that forms a core part of the Samba project.  John has been in the
+professional network management and support business for over 20 years. He has worked
+extensively with Windows networking technology across a broad spectrum of sites and
+installations.  He has worked with Samba for over 10 years and has assisted many large
+sites to obtain more reliable and scalable Windows network solutions.
+</p><p>
+We support large corporate users and provide third-level support to resellers, integrators and managed services providers. Our support offerings can meet your needs when you need it, where you need it.
+</p><p>
+Specialty samba capabilities: Network design, deployment of Samba environment including CTDB clusters, training. For help in planning your MS Windows Network Architecture, Unix implementations, TCP/IP networks, or just to get your IT infrastructure right - Call PrimaStasys.  If you are a VAR and want help in managing your Samba using accounts call now, don't delay - we are ready to help you meet your customer's needs more effectively.
+</p>
+
+<!-- Added JHT 20100222 -->
+<hr />
+<h3>SerNet</h3>
+<pre><small>
+Service Network GmbH
+Bahnhofsallee 1b
+37081 G&ouml;ttingen
+Germany
+
+<a href="http://www.sernet.de/">http://www.sernet.de</a>
++49-551-370000-0, Fax: +49-551-370000-9
+<a href="mailto:samba@sernet.de">samba@sernet.de</a>
+Support
+</small></pre>
+<p>
+Die SerNet Service Network GmbH (SerNet) ist Europas technologischer
+Marktf&uuml;hrer bei Leistungen rund um die OpenSource-Software SAMBA und eines
+der f&uuml;hrenden Linux-System-H&auml;user in Deutschland.  SerNet bietet
+ihren Service f&uuml;r Netzwerksicherheit, Linux und andere OpenSource-Software
+in ganz Europa an.
+</p><p>
+Volker Lendecke - eines der ersten Samba-Team-Mitglieder - gr&uuml;ndete 1997
+die SerNet um professionellen und kommerziellen Support f&uuml;r diese
+wichtigste Freie Alternative zu propriet&auml;ren SMB-Servern (Windows(TM))
+anzubieten.
+</p><p>
+SerNet ist der europaweit einzige Anbieter von 3rd-Level-Support f&uuml;r Samba
+auf Basis von SLAs (Service Level Agreements). Kunden der SerNet sind sind
+&uuml;ber 1000 Endkunden und System-Integratoren weltweit.
+</p><p>
+SerNet bietet als einziger Anbieter weltweit gebrauchsfertige Bin&auml;rpakete
+f&uuml;r Enterprise-Linux von Novell (SLES) und Red Hat (RHEL) sowie f&uuml;r
+Debian Linux an. Dabei werden alle verf&uuml;gbaren Hardware-Plattformen auf
+Anfrage unterst&uuml;tzt.
+</p><p>
+SerNet veranstaltet die einzige internationale Entwickler- und Anwender-
+Konferenz zu Samba - die &quot;samba eXPerience&quot; - in G&ouml;ttingen. Jedes
+Jahr treffen sich dazu mehr als 2^7 Menschen aus 2^4 Nationen :-)
+</p><p>
+Weitere Informationen &uuml;ber SerNet finden Sie unter:<br><a
+href="http://www.sernet.de/">www.SerNet.de</a> - <a
+href="http://www.sambaXP.org">www.sambaXP.org</a> - <a
+href="http://www.EnterpriseSamba.com">www.EnterpriseSamba.com</a>
+</p>
+
+
+<!--#include virtual="footer_support.html" -->

diff --git a/support/us.html b/support/us.html
index f1547374ac85fbbc88fdab540b1627a25dca4253..ce46f45f4d70bd11f1ddb1e10b9de194a55d0991 100755 (executable)
--- a/support/us.html
+++ b/support/us.html
@@ -12,9 +12,9 @@ Ansotech Inc.
 5517 N. Cumberland Ave, Suite 910
 Chicago, IL
 
-http://www.ansotech.com/linuxsupport
+<a href="http://www.ansotech.com/linuxsupport">http://www.ansotech.com/linuxsupport</a>
 877-389-8728
-support@ansotech.com
+<a href="mailto:support@ansotech.com">support@ansotech.com</a>
 Antonio Sosa
 </small></pre>
 <p>
@@ -32,9 +32,9 @@ BCS Technology Limited
 805 Archer Ln
 Elwood, IL 60421
 
-http://bcstechnology.net
+<a href="http://bcstechnology.net">http://bcstechnology.net</a>
 815-423-5458
-steggy@bcstechnology.net
+<a href="mailto:steggy@bcstechnology.net">steggy@bcstechnology.net</a>
 Bill Brier
 </small></pre>
 <p>
@@ -56,9 +56,9 @@ Byte Harmony, Inc.
 1410 S 72nd St
 Milwaukee, WI
 
-http://www.byteharmony.com
+<a href="http://www.byteharmony.com">http://www.byteharmony.com</a>
 414-443-9594
-contact@byteharmony.com
+<a href="mailto:contact@byteharmony.com">contact@byteharmony.com</a>
 Brian Kerhin
 </small></pre>
 <p>
@@ -81,9 +81,9 @@ Celestial Software LLC
 6641 East Mercer Way; PO Box 820
 Mercer Island, Washington
 
-http://www.celestial.com
+<a href="http://www.celestial.com">http://www.celestial.com</a>
 206-236-1676
-support@celestial.com
+<a href="mailto:support@celestial.com">support@celestial.com</a>
 Bill Campbell
 </small></pre>
 <p>
@@ -102,9 +102,9 @@ ClearCenter, Corp.
 1145 South 800 East, Ste 300
 Orem, Utah
 
-http://www.clearcenter.com
+<a href="http://www.clearcenter.com">http://www.clearcenter.com</a>
 800-977-0574
-sales@clearcenter.com
+<a href="mailto:sales@clearcenter.com">sales@clearcenter.com</a>
 David Loper
 </small></pre>
 <p>
@@ -132,9 +132,9 @@ DENTAR, INC.
 PO BOX 36447
 CINCINNATI, OHIO 45236
 
-http://www.dentar.com
+<a href="http://www.dentar.com">http://www.dentar.com</a>
 513-312-6673
-tom@dentar.com
+<a href="mailto:tom@dentar.com">tom@dentar.com</a>
 THOMAS GLASCOCK
 </small></pre>
 <p>
@@ -156,9 +156,9 @@ Edoceo, Inc.
 PO Box 70867,
 Seattle, WA 98127
 
-http://edoceo.com/
+<a href="http://edoceo.com/">http://edoceo.com/</a>
 206-282-6500
-samba@edoceo.com
+<a href="mailto:samba@edoceo.com">samba@edoceo.com</a>
 David Busby
 </small></pre>
 <p>
@@ -190,9 +190,9 @@ Pantek Inc.
 6133 Rockside Road #301
 Cleveland, Ohio
 
-http://www.pantek.com
+<a href="http://www.pantek.com">http://www.pantek.com</a>
 877-LINUX-FIX, (216)344-1614
-support@pantek.com
+<a href="mailto:support@pantek.com">support@pantek.com</a>
 Expert IT Services
 </small></pre>
 <p>
@@ -224,33 +224,26 @@ PrimaStasys, Inc.
 900 Cherry Avenue, Suite 300
 San Bruno, California 94066
 
-http://www.primastasys.com
+<a href="http://www.primastasys.com">http://www.primastasys.com</a>
 512-970-0256 (Mobile) - Austin, Texas
-info@primastasys.com  (jht@samba.org)
 John Terpstra
 650-291-9254 (Mobile) - San Francisco (Bay Area)
-info@primastasys.com
 Dennis Fullalove
+<a href="mailto:info@primastasys.com">info@primastasys.com</a>
+<a href="http://www.primastasys.com/index.php/about-us-general/contact-us.html">Request Assistance Now</a>
 </small></pre>
 <p>
-We support large corporate users and provide third-level support to resellers,
-integrators and managed services providers. Our support offerings can meet
-your needs when you need it, where you need it.
+Our founder and CTO, John H Terpstra, (<a href="mailto:jht@samba.org">jht@samba.org</a>)
+is one of the early Samba Team members (since 1995) and the key author of the official
+Samba documentation that forms a core part of the Samba project.  John has been in the
+professional network management and support business for over 20 years. He has worked
+extensively with Windows networking technology across a broad spectrum of sites and
+installations.  He has worked with Samba for over 10 years and has assisted many large
+sites to obtain more reliable and scalable Windows network solutions.
 </p><p>
-John H Terpstra, CTO, is one of the early Samba Team members (since 1995)
-and the key author of the official Samba documentation that forms a core part
-of the Samba project.  John has been in the professional network management
-and support business for over 20 years. He has worked extensively with Windows
-networking technology across a broad spectrum of sites and installations. 
-He has worked with Samba for over 10 years and has assisted many large sites
-to obtain more reliable and scalable Windows network solutions.
+We support large corporate users and provide third-level support to resellers, integrators and managed services providers. Our support offerings can meet your needs when you need it, where you need it.
 </p><p>
-Specialty samba capabilities: Network design, deployment of Samba environment
-including CTDB clusters, training. For help in planning your MS Windows Network
-Architecture, Unix implementations, TCP/IP networks, or just to get your IT
-infrastructure right - Call PrimaStasys.  If you are a VAR and want help in
-managing your Samba using accounts call now, don't delay - we can show you
-how to make more money in your business.
+Specialty samba capabilities: Network design, deployment of Samba environment including CTDB clusters, training. For help in planning your MS Windows Network Architecture, Unix implementations, TCP/IP networks, or just to get your IT infrastructure right - Call PrimaStasys.  If you are a VAR and want help in managing your Samba using accounts call now, don't delay - we are ready to help you meet your customer's needs more effectively.
 </p>
 
 
@@ -262,9 +255,9 @@ VirCIO
 4314 Avenue C
 Austin, Texas
 
-http://www.vircio.com
+<a href="http://www.vircio.com">http://www.vircio.com</a>
 512-374-0500
-information@vircio.com
+<a href="mailto:information@vircio.com">information@vircio.com</a>
 Bo Kersey
 </small></pre>
 <p>