The branch, master has been updated via bf2c180 support: Update Catalyst entry and add primary global offices from 666fa9c NEWS[badlock]: Upcoming security releases
https://git.samba.org/?p=samba-web.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit bf2c1806284fa77c0d6b1ea309d7d2eea803f573 Author: Andrew Bartlett <abart...@samba.org> Date: Fri Apr 1 14:07:47 2016 +1300 support: Update Catalyst entry and add primary global offices Catalyst provides Samba support out of these offices as well Signed-off-by: Andrew Bartlett <abart...@samba.org> ----------------------------------------------------------------------- Summary of changes: support/australia.html | 29 +++++++++++++++++++++++++++++ support/globalsupport.html | 25 +++++++++++++------------ support/uk.html | 31 +++++++++++++++++++++++++++++++ 3 files changed, 73 insertions(+), 12 deletions(-) Changeset truncated at 500 lines: diff --git a/support/australia.html b/support/australia.html index 665998e..32b1d8e 100644 --- a/support/australia.html +++ b/support/australia.html @@ -4,6 +4,35 @@ <!--#include virtual="/samba/support_samba_menu.html" --> <h2 align="center">Commercial Support - Australia</h2> +<hr /> +<h3>Catalyst</h3> +<pre><small> +<a href="http://catalyst.net.nz/what-we-offer/enterprise-solutions/samba">http://catalyst.net.nz/what-we-offer/enterprise-solutions/samba</a> ++61 2 8203 9777 +<a href="mailto:enquir...@catalyst-au.net">enquir...@catalyst-au.net</a> +Suite 501-504, 89 York St +Sydney NSW 2000 +</small></pre> +<p> +Catalyst are the open source specialists. We're known for our +contributions to free and open source projects worldwide. +</p><p> +Our work includes consultancy, software development, system +integration, hosting and training. We have more than 200 staff across +New Zealand, Australia and UK. +</p><p> +We're proud to offer Samba support and development services, with a +special focus on the Samba Active Directory Domain Controller. Our +ongoing support services are backed by a Service Level Agreement +(SLA). +</p><p> +Andrew Bartlett has more than ten years' experience on the Samba Team +and leads our Samba consultancy group. Andrew has been a key developer +on the "Samba4" Active Directory Domain Controller project since its +inception in 2005 through to its production release in Samba 4.0 and +beyond. +</p> + <!-- Added JHT 20100301 --> <hr /> <h3>Cyber IT Solutions Pty. Ltd.</h3> diff --git a/support/globalsupport.html b/support/globalsupport.html index 1b308ba..d1ecc98 100644 --- a/support/globalsupport.html +++ b/support/globalsupport.html @@ -6,7 +6,7 @@ <hr /> -<h3>Catalyst IT Ltd</h3> +<h3>Catalyst</h3> <pre><small> <a href="http://catalyst.net.nz/what-we-offer/enterprise-solutions/samba">http://catalyst.net.nz/what-we-offer/enterprise-solutions/samba</a> +64 4 499 2267 @@ -15,20 +15,21 @@ Catalyst House, 150 Willis Street Wellington, New Zealand </small></pre> <p> -Catalyst is an open source specialist and is known for a number of -valuable contributions to free and open source projects worldwide. Our -main lines of business are consultancy, software development, system -integration, hosting and training. We have 180+ staff members and -offices in New Zealand, Australia and UK. +Catalyst are the open source specialists. We're known for our +contributions to free and open source projects worldwide. </p><p> -Catalyst is now proud to offer Samba support and development services, -with a particular focus on the Samba Active Directory Domain Controller. -Our ongoing support services are backed by a Service Level Agreement +Our work includes consultancy, software development, system +integration, hosting and training. We have more than 200 staff across +New Zealand, Australia and UK. +</p><p> +We're proud to offer Samba support and development services, with a +special focus on the Samba Active Directory Domain Controller. Our +ongoing support services are backed by a Service Level Agreement (SLA). </p><p> -Andrew Bartlett brings over a decade of experience on the Samba Team and -leads our Samba consultancy group. Andrew has been a key developer on -the "Samba4" Active Directory Domain Controller project since its +Andrew Bartlett has more than ten years' experience on the Samba Team +and leads our Samba consultancy group. Andrew has been a key developer +on the "Samba4" Active Directory Domain Controller project since its inception in 2005 through to its production release in Samba 4.0 and beyond. </p> diff --git a/support/uk.html b/support/uk.html index 21b0238..498c6de 100644 --- a/support/uk.html +++ b/support/uk.html @@ -56,6 +56,37 @@ benefits our clients, as we only provide the very best this industry has to offer.</p> +<hr /> +<h3>Catalyst</h3> +<pre><small> +<a href="http://catalyst.net.nz/what-we-offer/enterprise-solutions/samba">http://catalyst.net.nz/what-we-offer/enterprise-solutions/samba</a> ++44 (0) 1273 929450 +<a href="mailto:i...@catalyst-eu.net">i...@catalyst-eu.net</a> +Friese-Greene House +15-17 Middle Street +Brighton BN1 1AL, United Kingdom +</small></pre> +<p> +Catalyst are the open source specialists. We're known for our +contributions to free and open source projects worldwide. +</p><p> +Our work includes consultancy, software development, system +integration, hosting and training. We have more than 200 staff across +New Zealand, Australia and UK. +</p><p> +We're proud to offer Samba support and development services, with a +special focus on the Samba Active Directory Domain Controller. Our +ongoing support services are backed by a Service Level Agreement +(SLA). +</p><p> +Andrew Bartlett has more than ten years' experience on the Samba Team +and leads our Samba consultancy group. Andrew has been a key developer +on the "Samba4" Active Directory Domain Controller project since its +inception in 2005 through to its production release in Samba 4.0 and +beyond. +</p> + + <!-- Added JHT 20100222 --> <hr /> <h3>Erion Ltd</h3> -- Samba Website Repository