update contact information

diff --git a/support/germany.html b/support/germany.html
index e5bd92f118990d9e8f93f282111b2733f12e3b34..5efbb461b91e508d5bb488c345806c71260a361b 100644 (file)
--- a/support/germany.html
+++ b/support/germany.html
@@ -52,12 +52,13 @@ Specialty samba capabilities:We move Windows Shares to Samba automaticly.  We tr
 <!-- Added JHT 20100222 -->
 <!-- last change 20160418 -->
 <hr />
-<h3><a href="https://www.sernet.de/de/">SerNet</a></h3>
+<h3>SerNet</h3>
 <pre><small>
 SerNet GmbH
 Bahnhofsallee 1b
 37081 G&ouml;ttingen
 Germany
+<a href="https://www.sernet.de/">https://www.sernet.de/</a>
 phone: +49-551-370000-0
 mail:  <a href="mailto:samba@sernet.com">samba@sernet.com</a>
 </small></pre>
@@ -66,28 +67,27 @@ SerNet ist eine der f&uuml;hrenden Anbieterinnen von Dienstleistungen und Produk
 </p><p>
 SerNet bietet Support f&uuml;r Samba auf Basis von SLAs (Service Level Agreements) weltweit an.
 </p><p>
-Mit SAMBA+ bietet SerNet eigene und immer aktuelle Samba-Pakete f&uuml;r verschiedene Linux- und Unix-Systeme an - 
+Mit SAMBA+ bietet SerNet eigene und immer aktuelle Samba-Pakete f&uuml;r alle wichtigen Linux-Systeme und IBM AIX an - 
 f&uuml;r alle Plattformen aus der gleichen Quelle und mit gleicher Konfiguration und damit weitgehend identischem Verhalten.
-Alle verf&uuml;gbaren ActiveDirectory-Optionen und verschiedene Cluster-File-Systeme wie IBMs GPFS werden unterst&uuml;tzt.
+Alle wichtigen ActiveDirectory-Optionen und verschiedene Cluster-File-Systeme wie IBMs GPFS werden unterst&uuml;tzt.
 </p><p>
-SerNet veranstaltet mit der <a href="http://www.sambaXP.org/">sambaXP</a> die einzige internationale Entwickler- und Anwender-Konferenz zu Samba
+SerNet veranstaltet mit der <a href="http://www.sambaXP.org/">sambaXP</a> die einzige internationale Entwickler:innen- und Anwender:innen-Konferenz zu Samba
 jedes Jahr im Mai seit 2002.
 </p><p>
 Mitglieder aus dem internationalen <a href="http://samba.TEAM" target=_blank>samba.TEAM</a> arbeiten bei SerNet:
 <br>
-<a href=mailto:vl@samba.org>Volker Lendecke</a> war eines der ersten Mitglieder im Sambateam und Mitgr&uuml;nder der SerNet.
+Jule Anger ist die Release-Managerin des Samba-Teams.
 <br>
-<a href=mailto:metze@samba.org>Stefan Metzmacher</a> ist AD- und
-Sicherheitsspezialist und  einer der Hauptautoren von Samba 4.
+Bj&ouml;rn Baumbach ist Maintainer von SAMBA+ und behebt diverse Samba-Bugs.
 <br>
-<a href=mailto:rb@samba.org>Ralph B&ouml;hme</a> kam &uuml;ber Netatalk zu Samba.
+Ralph B&ouml;hme kam &uuml;ber Netatalk zu Samba.
 <br>
-<a href=mailto:ks@samba.org>Karolin Seeger</a> ist die Release-Managerin des Sambateams.
+Bj&ouml;rn Jacke integriert Samba in Netzwerke aller Gr&ouml;&szlig;enordnungen.
 <br>
-<a href=mailto:bj@samba.org>Bj&ouml;rn Jacke</a> integriert Samba in Netzwerke aller Gr&ouml;&szlig;enordnungen.
+Volker Lendecke war eines der ersten Mitglieder im Sambateam und Mitgr&uuml;nder der SerNet.
 <br>
-<a href=mailto:bb@samba.org>Bj&ouml;rn Baumbach</a> ist Maintainer von SAMBA+
-und behebt diverse Samba-Bugs.
+Stefan Metzmacher ist AD- und
+Sicherheitsspezialist und  einer der Hauptautoren von Samba 4.
 <br>
 </p><p>
 Weitere Informationen &uuml;ber SerNet finden Sie unter:<br>

diff --git a/support/globalsupport.html b/support/globalsupport.html
index 765aadb90f1335ddf56ff4812c659515278a29a2..bb03db9d76ace994897865686404f2c788923bbd 100644 (file)
--- a/support/globalsupport.html
+++ b/support/globalsupport.html
@@ -57,45 +57,76 @@ Specialty samba capabilities: World-leaders in IPv6 and Windows - Unix integrati
 <!-- Added JHT 20100222 -->
 <!-- last change 20160418 -->
 <hr />
-<h3><a href="https://www.sernet.de/en/">SerNet</a></h3>
-<pre><small>
-SerNet GmbH
-Bahnhofsallee 1b
-37081 G&ouml;ttingen
-Germany
-phone: +49-551-370000-0
-mail:  <a href="mailto:samba@sernet.com">samba@sernet.com</a>
-</small></pre>
-<p>
-<a href="https://www.sernet.com/" target=_blank>SerNet</a> is a leading service provider for Samba, Linux and and OpenSource related topics
-and offers SLA support contracts with 24/7 support including guaranteed reaction times.
-</p><p>
-<a href="https://samba.plus/" target=_blank>SAMBA+</a> is available via software subscription and offers up-to-date Samba for various platforms from one source including 
-enhanced ActiveDirectory support and file systems support for IBM's GPFS and more.
-</p><p>
-SerNet also organizes the annual <a href="http://www.sambaXP.org/">sambaXP</a>, the international Samba conference for users and developers in Germany.
-</p><p>
-Members of the core <a href="http://samba.TEAM" target=_blank>samba.TEAM</a> work with SerNet:
+<h3>SerNet, Inc.</h3>
+<pre>
+<small>
+<table width=100%>
+<tr>
+<td>SerNet, Inc.  </td>
+<td>SerNet GmbH</td>
+</tr>
+<tr>
+<td>101 Montgomery St.
+<td>Bahnhofsallee 1b
+</tr>
+<tr>
+<td>San Francisco, CA 94104</td>
+<td>37081 G&ouml;ttingen</td>
+</tr>
+<tr>
+<td>USA
+<td>Germany
+</tr>
+<tr>
+<td>
+<a href="https://www.sernet.com/">https://www.sernet.com/</a>
+<td>
+<a href="https://www.sernet.de/">https://www.sernet.de/</a>
+</tr>
+<tr>
+<td>phone: +1(415)248-7818
+<td>phone: +49-551-370000-0
+</tr>
+<tr>
+<td>mail: <a href="mailto:samba@sernet.com">samba@sernet.com</a>
+<td>mail: <a href="mailto:samba@sernet.de">samba@sernet.de</a>
+</tr>
+</table>
+</small>
+</pre>
+
+<p>SerNet is a leading service provider for Samba, Linux and OpenSource
+related topics and offers SLA support contracts with 24/7 support.</p><p>
+
+SAMBA+ is available via software subscription and offers up-to-date Samba for
+all major Linux platforms and IBM AIX from one source including enhanced
+ActiveDirectory support and file systems support for IBM's GPFS and more.
+SerNet also organizes sambaXP, the annual international Samba conference for
+users and developers in Germany.</p>
+
+<p>Members of the core samba.TEAM work with SerNet:
 <br>
-<a href=mailto:ja@samba.org>Jule Anger</a> works as release manager for the Samba team.
+Jule Anger works as release manager for the Samba team.
 <br>
-<a href=mailto:bb@samba.org>Bj&ouml;rn Baumbach</a> is maintainer of SAMBA+ and
-fixes numerous Samba bugs.
+Björn Baumbach is maintainer of SAMBA+ and fixes numerous Samba bugs.
 <br>
-<a href=mailto:slow@samba.org>Ralph B&ouml;hme</a> works on the Samba fileserver and is the team lead of the SerNet Samba team.
+Ralph Böhme works on the Samba fileserver and is the team lead of the SerNet
+Samba team.
 <br>
-<a href=mailto:bj@samba.org>Bj&ouml;rn Jacke</a> is Samba expert since almost ever and integrated Samba in networks of all sizes.
+Björn Jacke is Samba expert since almost ever and integrated Samba in networks
+of all sizes.
 <br>
-<a href=mailto:vl@samba.org>Volker Lendecke</a>, one of the first Samba Team members, is one of the founders of SerNet.
+Volker Lendecke, one of the first Samba Team members, is one of the founders
+of SerNet.
 <br>
-<a href=mailto:metze@samba.org>Stefan Metzmacher</a> works on ActiveDirectory and security, he is one of the main Samba 4 authors.
+Stefan Metzmacher works on ActiveDirectory and security, he is one of the main
+Samba 4 authors.
 <br>
 </p><p>
-Links: 
-<br>
-<a href="https://www.sernet.com/" target=_blank>https://www.sernet.com</a> - 
-<a href="https://samba.plus/" target=_blank>https://samba.plus</a> - 
+<a href="https://www.sernet.com/" target=_blank>https://www.sernet.com</a> -
+<a href="https://samba.plus/" target=_blank>https://samba.plus</a> -
 <a href="https://sambaXP.org/" target=_blank>https://sambaXP.org</a>
 </p>
 
+
 <!--#include virtual="footer_support.html" -->

diff --git a/support/us.html b/support/us.html
index ea4d6cf39505b5cd8a248c307f2ffa66ec3d6d5c..cea2b523013f76050e6b465ca8d6747e5b695988 100644 (file)
--- a/support/us.html
+++ b/support/us.html
@@ -4,62 +4,6 @@
 <!--#include virtual="/samba/support_samba_menu.html" -->
 <h2 align="center">Commercial Support - United States</h2>
 
-<!-- Added JHT 20100316 at request of Chuck Fletcher -->
-<hr />
-<h3>Advanced Software Technologies, Inc</h3>
-<pre><small>
-8547 South Kostner Avenue
-Chicago, Illinois  60652
-
-<a href="http://www.advsoftech.com">http://www.advsoftech.com</a>
-(773) 948-4870
-<a href="mailto:sales@advsoftech.com">sales@advsoftech.com</a>
-Chuck Fletcher
-</small></pre>
-<p>
-Since Samba's inception, Advanced Software Technologies has been
-supporting Samba and Samba-TNG on multiple platforms.  Besides Samba
-support, we also offer support for the multitude of other operating systems
-and environments including all of Microsoft's operating systems, Mac OS 10,
-Linux(RedHat, SuSE, Fedora, Ubuntu, Debian, Gentoo), FreeBSD, Solaris, AIX,
-SCO and most other flavors of Unix.
-</p>
-<p><pre>
-Our other services include:
-       - Multiple O/S Support
-       - Outsourced System Administration
-       - Web development/hosting &amp; support
-       - Anti-Virus Prevention &amp; Recovery
-       - Hardware/Software Installation and Support
-       - Custom Application Development(Inter/Intra-Net)
-       - Security Planning, Implementation &amp; Forensics
-       - Development of O/S Support Utilities
-       - Custom Mobile Device Programming &amp; Integration
-       - MS SQL Server &amp; Exchange Support
-       - Network Visualization &amp; Implementation
-       - Multi-database development/integration including: Informix, MySQL MS SQL Server, Sqlite, and Foxpro
-       - Customized E-Commerce solutions utilizing our own ESDE solution
-</pre></p>
-
-<!-- Added JHT 20100222 -->
-<hr />
-<h3>Ansotech Inc.</h3>
-<pre><small>
-5517 N. Cumberland Ave, Suite 910
-Chicago, IL
-
-<a href="http://www.ansotech.com/linuxsupport">http://www.ansotech.com/linuxsupport</a>
-877-389-8728
-<a href="mailto:support@ansotech.com">support@ansotech.com</a>
-Antonio Sosa
-</small></pre>
-<p>
-Ansotech provides installation, maintenance and upgrade support for samba
-installation on Fedora, SUSE, AIX, Ubuntu, Debian, PCLinuxOS, BSD, Windows
-and MAC clients.
-</p>
-
-
 <!-- Added JHT 20100222 -->
 <hr />
 <h3>BCS Technology Limited</h3>
@@ -190,7 +134,7 @@ Support contracts available with four hour response SLA.
 
 
 <hr />
-<h3>Pantek Inc.</h3>
+<h3>Pantek, Inc.</h3>
 <pre><small>
 4401 Rockside Road #205
 Independence, OH 44131
@@ -215,6 +159,53 @@ within one hour.
 </p>
 
 
+<!-- Added BJ 20230103 -->
+<hr />
+<h3>SerNet, Inc.</h3>
+<pre><small>
+SerNet, Inc.
+101 Montgomery St.
+San Francisco, CA 94104
+USA
+<a href="https://www.sernet.com/">https://www.sernet.com/</a>
+phone: +1(415)248-7818
+email: <a href="mailto:samba@sernet.com">samba@sernet.com</a>
+</small></pre>
+
+<p>SerNet is a leading service provider for Samba, Linux and OpenSource
+related topics and offers SLA support contracts with 24/7 support.</p><p>
+
+SAMBA+ is available via software subscription and offers up-to-date Samba for
+all major Linux platforms and IBM AIX from one source including enhanced
+ActiveDirectory support and file systems support for IBM's GPFS and more.
+SerNet also organizes sambaXP, the annual international Samba conference for
+users and developers in Germany.</p>
+
+<p>Members of the core samba.TEAM work with SerNet:
+<br>
+Jule Anger works as release manager for the Samba team.
+<br>
+Björn Baumbach is maintainer of SAMBA+ and fixes numerous Samba bugs.
+<br>
+Ralph Böhme works on the Samba fileserver and is the team lead of the SerNet
+Samba team.
+<br>
+Björn Jacke is Samba expert since almost ever and integrated Samba in networks
+of all sizes.
+<br>
+Volker Lendecke, one of the first Samba Team members, is one of the founders
+of SerNet.
+<br>
+Stefan Metzmacher works on ActiveDirectory and security, he is one of the main
+Samba 4 authors.
+<br>
+</p><p>
+<a href="https://www.sernet.com/" target=_blank>https://www.sernet.com</a> -
+<a href="https://samba.plus/" target=_blank>https://samba.plus</a> -
+<a href="https://sambaXP.org/" target=_blank>https://sambaXP.org</a>
+</p>
+
+
 <!-- Added JHT 20100222 -->
 <hr />
 <h3>VirCIO</h3>