The branch, master has been updated via a62a3ab Add Catalyst IT of nz as supporting company via cc40086 Merge branch 'master' of git+ssh://git.samba.org/data/git/samba-web via e1ddbe1 Use always the same amount of hyphens in the title from fbce6bd Announce Samba 4.0.9.
http://gitweb.samba.org/?p=samba-web.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit a62a3ab1112e516a682e399a089e8fb8d50e8c61 Author: Lars Müller <l...@samba.org> Date: Tue Sep 3 14:37:28 2013 +0200 Add Catalyst IT of nz as supporting company commit cc400864452f7546f3f5de6eb15ddbf890d26ecb Merge: e1ddbe1e15a6299704283c1c7703c1e3921975bb fbce6bd30bc64acf159500ab6698309a17045c71 Author: Lars Müller <l...@samba.org> Date: Tue Sep 3 14:01:05 2013 +0200 Merge branch 'master' of git+ssh://git.samba.org/data/git/samba-web commit e1ddbe1e15a6299704283c1c7703c1e3921975bb Author: Lars Müller <l...@samba.org> Date: Fri May 10 17:28:04 2013 +0200 Use always the same amount of hyphens in the title ----------------------------------------------------------------------- Summary of changes: support/argentina.html | 2 +- support/brazil.html | 2 +- support/bulgaria.html | 2 +- support/czechrepublic.html | 2 +- support/denmark.html | 2 +- support/egypt.html | 2 +- support/greece.html | 2 +- support/hongkong.html | 2 +- support/hungary.html | 2 +- support/ireland.html | 2 +- support/latvia.html | 2 +- support/malaysia.html | 2 +- support/netherlands.html | 2 +- support/newzealand.html | 29 +++++++++++++++++++++++++++++ support/romania.html | 2 +- support/saudiarabia.html | 2 +- support/serbia.html | 2 +- support/singapore.html | 2 +- support/slovakia.html | 2 +- support/sweden.html | 2 +- support/turkey.html | 2 +- 21 files changed, 49 insertions(+), 20 deletions(-) Changeset truncated at 500 lines: diff --git a/support/argentina.html b/support/argentina.html index 01dd519..4881a0f 100644 --- a/support/argentina.html +++ b/support/argentina.html @@ -1,5 +1,5 @@ <!--#include virtual="/samba/header.html" --> - <title>Samba Support--Argentina</title> + <title>Samba Support -- Argentina</title> <!--#include virtual="header_support.html" --> <h2>Commercial Support - Argentina</h2> diff --git a/support/brazil.html b/support/brazil.html index 05026e2..85c334a 100644 --- a/support/brazil.html +++ b/support/brazil.html @@ -1,5 +1,5 @@ <!--#include virtual="/samba/header.html" --> - <title>Samba Support--Brazil</title> + <title>Samba Support -- Brazil</title> <!--#include virtual="header_support.html" --> <h2 align="center">Commercial Support - BRAZIL</h2> diff --git a/support/bulgaria.html b/support/bulgaria.html index 3f7f44f..a158225 100644 --- a/support/bulgaria.html +++ b/support/bulgaria.html @@ -1,5 +1,5 @@ <!--#include virtual="/samba/header.html" --> - <title>Samba Support--Bulgaria</title> + <title>Samba Support -- Bulgaria</title> <!--#include virtual="header_support.html" --> <h2>Commercial Support - Bulgaria</h2> diff --git a/support/czechrepublic.html b/support/czechrepublic.html index 800e375..33affc8 100644 --- a/support/czechrepublic.html +++ b/support/czechrepublic.html @@ -1,5 +1,5 @@ <!--#include virtual="/samba/header.html" --> - <title>Samba Support--Czech Republic</title> + <title>Samba Support -- Czech Republic</title> <!--#include virtual="header_support.html" --> <h2>Commercial Support - Czech Republic</h2> diff --git a/support/denmark.html b/support/denmark.html index 0e04d29..a5f02c3 100644 --- a/support/denmark.html +++ b/support/denmark.html @@ -1,5 +1,5 @@ <!--#include virtual="/samba/header.html" --> - <title>Samba Support--Denmark</title> + <title>Samba Support -- Denmark</title> <!--#include virtual="header_support.html" --> <h2>Commercial Support - Denmark</h2> diff --git a/support/egypt.html b/support/egypt.html index 1a4ea67..2c66d5c 100644 --- a/support/egypt.html +++ b/support/egypt.html @@ -1,5 +1,5 @@ <!--#include virtual="/samba/header.html" --> - <title>Samba Support--Egypt</title> + <title>Samba Support -- Egypt</title> <!--#include virtual="header_support.html" --> <h2>Commercial Support - Egypt</h2> diff --git a/support/greece.html b/support/greece.html index 86b0118..88740bc 100644 --- a/support/greece.html +++ b/support/greece.html @@ -1,5 +1,5 @@ <!--#include virtual="/samba/header.html" --> - <title>Samba Support--Greece</title> + <title>Samba Support -- Greece</title> <!--#include virtual="header_support.html" --> <h2 align="center">Commercial Support - Greece</h2> diff --git a/support/hongkong.html b/support/hongkong.html index ed2ff86..15b3708 100644 --- a/support/hongkong.html +++ b/support/hongkong.html @@ -1,5 +1,5 @@ <!--#include virtual="/samba/header.html" --> - <title>Samba Support--Hong Kong/China</title> + <title>Samba Support -- Hong Kong/China</title> <!--#include virtual="header_support.html" --> <h2 align="center">Commercial Support - Hong Kong/China</h2> diff --git a/support/hungary.html b/support/hungary.html index d063623..83025ec 100644 --- a/support/hungary.html +++ b/support/hungary.html @@ -1,5 +1,5 @@ <!--#include virtual="/samba/header.html" --> - <title>Samba Support--Hungary</title> + <title>Samba Support -- Hungary</title> <!--#include virtual="header_support.html" --> <h2 align="center">Commercial Support - Hungary</h2> diff --git a/support/ireland.html b/support/ireland.html index 85e7257..46dd85e 100644 --- a/support/ireland.html +++ b/support/ireland.html @@ -1,5 +1,5 @@ <!--#include virtual="/samba/header.html" --> - <title>Samba Support--Ireland</title> + <title>Samba Support -- Ireland</title> <!--#include virtual="header_support.html" --> <h2>Commercial Support -- Ireland</h2> diff --git a/support/latvia.html b/support/latvia.html index 8093c44..647bcd2 100644 --- a/support/latvia.html +++ b/support/latvia.html @@ -1,5 +1,5 @@ <!--#include virtual="/samba/header.html" --> - <title>Samba Support--Latvia</title> + <title>Samba Support -- Latvia</title> <!--#include virtual="header_support.html" --> <h2 align="center">Commercial Support - Latvia</h2> diff --git a/support/malaysia.html b/support/malaysia.html index 7ae56ce..942e871 100644 --- a/support/malaysia.html +++ b/support/malaysia.html @@ -1,5 +1,5 @@ <!--#include virtual="/samba/header.html" --> - <title>Samba Support--Malaysia</title> + <title>Samba Support -- Malaysia</title> <!--#include virtual="header_support.html" --> <h2>Commercial Support - Malaysia</h2> diff --git a/support/netherlands.html b/support/netherlands.html index 8298f8a..c193c13 100644 --- a/support/netherlands.html +++ b/support/netherlands.html @@ -1,5 +1,5 @@ <!--#include virtual="/samba/header.html" --> - <title>Samba Support--Netherlands</title> + <title>Samba Support -- Netherlands</title> <!--#include virtual="header_support.html" --> <h2>Commercial Support - Netherlands</h2> diff --git a/support/newzealand.html b/support/newzealand.html index a3d61ed..7a23659 100644 --- a/support/newzealand.html +++ b/support/newzealand.html @@ -4,6 +4,35 @@ <!--#include virtual="header_support.html" --> <h2 align="center">Commercial Support - New Zealand</h2> +<hr /> +<h3>Catalyst IT Ltd</h3> +<pre><small> +<a href="http://www.catalyst.net.nz/">http://www.catalyst.net.nz</a> ++64 4 499 2267 +<a href="mailto:i...@catalyst.net.nz">i...@catalyst.net.nz</a> +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. +</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 +(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 +inception in 2005 through to its production release in Samba 4.0 and +beyond. +</p> + + <!-- Added JHT 20100222 --> <hr /> <h3>Commercial IT Services Ltd</h3> diff --git a/support/romania.html b/support/romania.html index ecee4b3..94429e3 100644 --- a/support/romania.html +++ b/support/romania.html @@ -1,5 +1,5 @@ <!--#include virtual="/samba/header.html" --> - <title>Samba Support--Romania</title> + <title>Samba Support -- Romania</title> <!--#include virtual="header_support.html" --> <h2 align="center">Commercial Support - Romania</h2> diff --git a/support/saudiarabia.html b/support/saudiarabia.html index 54a7eaa..cc7380d 100644 --- a/support/saudiarabia.html +++ b/support/saudiarabia.html @@ -1,5 +1,5 @@ <!--#include virtual="/samba/header.html" --> - <title>Samba Support--Saudi Arabia</title> + <title>Samba Support -- Saudi Arabia</title> <!--#include virtual="header_support.html" --> <h2>Commercial Support - Saudi Arabia</h2> diff --git a/support/serbia.html b/support/serbia.html index 53c5b48..25cd769 100644 --- a/support/serbia.html +++ b/support/serbia.html @@ -1,5 +1,5 @@ <!--#include virtual="/samba/header.html" --> - <title>Samba Support--Serbia</title> + <title>Samba Support -- Serbia</title> <!--#include virtual="header_support.html" --> <h2>Commercial Support - Serbia</h2> diff --git a/support/singapore.html b/support/singapore.html index 9bd78b2..a1dee71 100644 --- a/support/singapore.html +++ b/support/singapore.html @@ -1,5 +1,5 @@ <!--#include virtual="/samba/header.html" --> - <title>Samba Support--Singapore</title> + <title>Samba Support -- Singapore</title> <!--#include virtual="header_support.html" --> <h2 align="center">Commercial Support - Singapore</h2> diff --git a/support/slovakia.html b/support/slovakia.html index 839b470..0d40358 100644 --- a/support/slovakia.html +++ b/support/slovakia.html @@ -1,5 +1,5 @@ <!--#include virtual="/samba/header.html" --> - <title>Samba Support--Slovakia</title> + <title>Samba Support -- Slovakia</title> <!--#include virtual="header_support.html" --> <h2 align="center">Commercial Support - Slovakia</h2> diff --git a/support/sweden.html b/support/sweden.html index a3f4b5c..2bf6428 100644 --- a/support/sweden.html +++ b/support/sweden.html @@ -1,5 +1,5 @@ <!--#include virtual="/samba/header.html" --> - <title>Samba Support--Sweden</title> + <title>Samba Support -- Sweden</title> <!--#include virtual="header_support.html" --> <h2 align="center">Commercial Support - Sweden</h2> diff --git a/support/turkey.html b/support/turkey.html index c5766e1..5fe9481 100644 --- a/support/turkey.html +++ b/support/turkey.html @@ -1,5 +1,5 @@ <!--#include virtual="/samba/header.html" --> - <title>Samba Support--Turkey</title> + <title>Samba Support -- Turkey</title> <!--#include virtual="header_support.html" --> <h2 align="center">Commercial Support - Turkey</h2> -- Samba Website Repository