Finish merging support.

Also, fix link to bugzilla images in bugzilla.css.

--deryck

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

diff --git a/style/bugzilla.css b/style/bugzilla.css
index cb1fcda63043a456fddac8b29f4063fb48493dd0..eb262ffd3ef31a4560160fbcd6b34337384aaf4a 100644 (file)
--- a/style/bugzilla.css
+++ b/style/bugzilla.css
@@ -20,12 +20,12 @@
 
 /*PNG transparency across browsers*/
 #logo>.bug_logo {
-        background-image:url(http://tmp.vlankhaar.dyndns.org/samba/images/bugzilla/bug_logo.png);
+        background-image:url(http://master.samba.org/samba/images/bugzilla/bug_logo.png);
         background-position:center;
         background-repeat:no-repeat;
 }
 #logo>.bug_logo_small {
-        background-image:url(http://tmp.vlankhaar.dyndns.org/samba/images/bugzilla/bug_logo_small.png);
+        background-image:url(http://master.samba.org/samba/images/bugzilla/bug_logo_small.png);
         background-position:center;
         background-repeat:no-repeat;
 }

diff --git a/support/australia.html b/support/australia.html
index 5a3ba4fcdf1ec95aa1a79e7eb822586653fffa79..c9ddcf822d1ba13fcbcbdc0d1938d965a62f13e0 100755 (executable)
--- a/support/australia.html
+++ b/support/australia.html
@@ -64,4 +64,4 @@ SCO, Solaris, Linux with all Windows clients.
 </small></pre>
 
 
-<!--#include virtual="/samba/footer.html" -->
+<!--#include virtual="footer_support.html" -->

diff --git a/support/austria.html b/support/austria.html
index 65ca45cf848620018270006f71267c36479756da..74c77f9c6919c6d1d224b189c2754e98194b0952 100755 (executable)
--- a/support/austria.html
+++ b/support/austria.html
@@ -106,5 +106,4 @@ SAMBA, AMANDA, Unix, Linux, WinXP, W2k, W9X, Support, Consulting,
 Installation, System Administration, Backup, Documentation
 </small></pre>
 
-
-<!--#include virtual="/samba/footer.html" -->
+<!--#include virtual="footer_support.html" -->

diff --git a/support/belgium.html b/support/belgium.html
index 5f9ec0faf2a87656d38101864e1dfacd7c61a1f3..49654a271c2c0a35956929eed21af54a5485c685 100755 (executable)
--- a/support/belgium.html
+++ b/support/belgium.html
@@ -85,5 +85,4 @@ ARAFOX - Your GNU/Linux partner
         Mail : <a href="maito:sales@arafox.com">sales@arafox.com</a>
 </small></pre>
 
-
-<!--#include virtual="/samba/footer.html" -->
+<!--#include virtual="footer_support.html" -->

diff --git a/support/brazil.html b/support/brazil.html
index 32f6c2abfa2c61445a6e5662e940f2f67a1ad252..58217183dad9666a703237c4555933bc943e0eb0 100755 (executable)
--- a/support/brazil.html
+++ b/support/brazil.html
@@ -53,5 +53,4 @@ Tel/Fax: 55 21 2517-6000
 </small></pre>
 
 
-
-<!--#include virtual="/samba/footer.html" -->
+<!--#include virtual="footer_support.html" -->

diff --git a/support/canada.html b/support/canada.html
index 68e5f34aed2bfada7b501fb9b6dfa21407c3376c..32303b4357652911b1eefbeceda67b092d0895bb 100755 (executable)
--- a/support/canada.html
+++ b/support/canada.html
@@ -118,5 +118,4 @@ secure and fast.  Please contact us for a quote.  Please visit our site
 at <a href="http://www.third-net.com">www.third-net.com</a> for more information.
 </small></pre>
 
-
-<!--#include virtual="/samba/footer.html" -->
+<!--#include virtual="footer_support.html" -->

diff --git a/support/colombia.html b/support/colombia.html
index 8e349fb6e981bfcfafaa4fef3ca1d5d03ca03200..a6a5f3fd3765ae03c232718d4ef26613e2bfc446 100755 (executable)
--- a/support/colombia.html
+++ b/support/colombia.html
@@ -31,4 +31,5 @@ email: <a href="mailto:soporte@lectorsystems.com">soporte@lectorsystems.com</a>
 web: <a href="http://www.lectorsystems.com/">www.lectorsystems.com</a>
 </small></pre>
 
-<!--#include virtual="/samba/footer.html" -->
+
+<!--#include virtual="footer_support.html" -->

diff --git a/support/france.html b/support/france.html
index a2c5233f0679e0ecb9cde52546c7f2f74dbdc51e..d2ab272491f7a857624e72eef43799f83235e82a 100755 (executable)
--- a/support/france.html
+++ b/support/france.html
@@ -45,5 +45,5 @@ smbldap-tools and currently develop the SAM replication code in Samba 3
 to help support legacy PDC-BDC synchronisation.
 </small></pre>
 
-    
-<!--#include virtual="/samba/footer.html" -->
+   
+<!--#include virtual="footer_support.html" --> 

diff --git a/support/germany.html b/support/germany.html
index 74b53286ff07ce06e113ea99f82b747bc8489767..99b031f444380728f601c99fb25ec893b89eeb28 100755 (executable)
--- a/support/germany.html
+++ b/support/germany.html
@@ -329,4 +329,4 @@ Linux- und Windows-Plattformen.
 </small></pre>
 
 
-<!--#include virtual="/samba/footer.html" -->
+<!--#include virtual="footer_support.html" -->

diff --git a/support/greece.html b/support/greece.html
index baa3781f8cab63e0ce68ae8759fe5f3864f16032..16db51b5d00b4956d4d91eff802a013aea225072 100755 (executable)
--- a/support/greece.html
+++ b/support/greece.html
@@ -16,5 +16,4 @@ throughout the whole of Greece: Windows 3.11/95/NT, Ultrix, HP-UX,
 NetBSD, OpenBSD, SunOS, Solaris, Linux, Irix.
 </small></pre>
 
-
-<!--#include virtual="/samba/footer.html" -->
+<!--#include virtual="footer_support.html" -->

diff --git a/support/hongkong.html b/support/hongkong.html
index 4c347247ced475708d90035229f4e9ce95566fb9..10533992e5f020c5af77a58b3efc094485fbbc7a 100755 (executable)
--- a/support/hongkong.html
+++ b/support/hongkong.html
@@ -27,4 +27,6 @@ Clients : Windows 95/98/NT, Windows for Workgroups 3.11 and OS/2
 We have experience in setup and troubleshooting samba. Quick On-site 
 service is provided.
 </small></pre>
-<!--#include virtual="/samba/footer.html" -->
+
+
+<!--#include virtual="footer_support.html" -->

diff --git a/support/hungary.html b/support/hungary.html
index c7f5fd050c1b63d90b542f991d2ccb8d46afcf06..1473961d01862b046721c5e29ed6079c6f292aaf 100755 (executable)
--- a/support/hungary.html
+++ b/support/hungary.html
@@ -20,4 +20,4 @@ World Wide Web: <a href="http://www.math.u-szeged.hu/">http://www.math.u-szeged.
 </small></pre>
 
 
-<!--#include virtual="/samba/footer.html" -->
+<!--#include virtual="footer_support.html" -->

diff --git a/support/italy.html b/support/italy.html
index bbc73b624024c20c5489efc2962c15f236a5a277..310f305e95778411e772a682a2e5118bdecf6b21 100755 (executable)
--- a/support/italy.html
+++ b/support/italy.html
@@ -94,4 +94,4 @@ Tel. +39/055/4481808 - GSM +39/339/2265274
 </small></pre> 
 
 
-<!--#include virtual="/samba/footer.html" -->
+<!--#include virtual="footer_support.html" -->

diff --git a/support/latvia.html b/support/latvia.html
index 78cba3e869161bbcb1e421bafde1db2318675dd7..2cf09a0a154e8d10cf585495627db690faa253d5 100755 (executable)
--- a/support/latvia.html
+++ b/support/latvia.html
@@ -20,4 +20,4 @@ Linux/Samba--Windows networks.
 </small></pre>
 
 
-<!--#include virtual="/samba/footer.html" -->
+<!--#include virtual="footer_support.html" -->

diff --git a/support/netherlands.html b/support/netherlands.html
index 1c1b77d6e40eb5d5b7fbccb35502e8b3ec0d5294..95c58fa1deb38948cde8b91ae8d9920993a1e2e8 100755 (executable)
--- a/support/netherlands.html
+++ b/support/netherlands.html
@@ -35,4 +35,4 @@ UNO Automatiseringsdiensten
 </small></pre>
 
 
-<!--#include virtual="/samba/footer.html" -->
+<!--#include virtual="footer_support.html" -->

diff --git a/support/newzealand.html b/support/newzealand.html
index 8ce18b31524f0fcacacb6c233f099a8c264e414d..92f2273f9964d5bc49b80d03cef47fb5363de5d3 100755 (executable)
--- a/support/newzealand.html
+++ b/support/newzealand.html
@@ -24,4 +24,4 @@ Linux software development, servers and network support.
 </small></pre>
 
 
-<!--#include virtual="/samba/footer.html" -->
+<!--#include virtual="footer_support.html" -->

diff --git a/support/pakistan.html b/support/pakistan.html
index 5c717f70e151adb96b2a1f2279e48ffa02e10beb..8fb348463cb971ac940a972e62b84dc7f409c222 100755 (executable)
--- a/support/pakistan.html
+++ b/support/pakistan.html
@@ -24,4 +24,4 @@ Email: <a href="mailto:info@iinix.com">info@iinix.com</a>
 </small></pre>
 
 
-<!--#include virtual="/samba/footer.html" -->
+<!--#include virtual="footer_support.html" -->

diff --git a/support/romania.html b/support/romania.html
index 61da760ecc4299122e0d3039257e48972eea9527..c73a2bb813f6e1c236ecafeeeeb8b43e2c0f7f48 100755 (executable)
--- a/support/romania.html
+++ b/support/romania.html
@@ -21,4 +21,5 @@ Clients: MS Client for DOS 3.0, LanMan Client 2.xx,
          WfW, Windows'95, Windows NT 
 </small></pre>
 
-<!--#include virtual="/samba/footer.html" -->
+
+<!--#include virtual="footer_support.html" -->

diff --git a/support/scotland.html b/support/scotland.html
index 85fe388e7077e3a18d9bf9e4642a9354fe8ea853..469b8cbf4ec826bd93b0ab560c385ca7af1d2183 100755 (executable)
--- a/support/scotland.html
+++ b/support/scotland.html
@@ -37,4 +37,5 @@ using the details above.
 Open Source. Open Solutions.
 </small></pre>
 
-<!--#include virtual="/samba/footer.html" -->
+
+<!--#include virtual="footer_support.html" -->

diff --git a/support/singapore.html b/support/singapore.html
index a6b0b8855bc14bea7306d5bd554e03bd2b8df928..23011fb0a4d66b8292a6fd1fd4677ce09268ea1c 100755 (executable)
--- a/support/singapore.html
+++ b/support/singapore.html
@@ -36,4 +36,5 @@ servers in Singapore. If you are looking at alternatives to Win NT
 or Win2K office servers, do drop us a call.
 </small></pre>
 
-<!--#include virtual="/samba/footer.html" -->
+
+<!--#include virtual="footer_support.html" -->

diff --git a/support/slovakia.html b/support/slovakia.html
index ac709fa0e7c9596ee0c512db0d90d255135507ac..839b4708a4240d45ddae5fa55de1d6b0a19fc228 100755 (executable)
--- a/support/slovakia.html
+++ b/support/slovakia.html
@@ -19,4 +19,5 @@ Sladkovicova 33
 <a href="mailto:boris@alto.sk">boris@alto.sk</a>
 </small></pre>
 
-<!--#include virtual="/samba/footer.html" -->
+
+<!--#include virtual="footer_support.html" -->

diff --git a/support/slovenia.html b/support/slovenia.html
index 344c46db4ac888a1608b1f41b5b3a5dd0f5219e4..0378b764296e3cce3b8f8b3c276affceccade5da 100755 (executable)
--- a/support/slovenia.html
+++ b/support/slovenia.html
@@ -23,4 +23,5 @@ end business to business electronic commerce systems. Further details
 can be found at <a href="http://www.intelicom.si">http://www.intelicom.si</a>.
 </small></pre>
 
-<!--#include virtual="/samba/footer.html" -->
+
+<!--#include virtual="footer_support.html" -->

diff --git a/support/southafrica.html b/support/southafrica.html
index da1479ea3655602bca3b697fd759d58c7c042498..0b80f97e8e8d1ec7b3ac872ec772ad6039c1b983 100755 (executable)
--- a/support/southafrica.html
+++ b/support/southafrica.html
@@ -49,4 +49,5 @@ networking.
 For futher information, please consult our website <a href="http://www.obsidian.co.za">www.obsidian.co.za</a>
 </small></pre>
 
-<!--#include virtual="/samba/footer.html" -->
+
+<!--#include virtual="footer_support.html" -->

diff --git a/support/spain.html b/support/spain.html
index c2cc3559249cbd4da5023cb0c0421b9fdefcb258..220886244756153b390531912c816b1a59375a9c 100755 (executable)
--- a/support/spain.html
+++ b/support/spain.html
@@ -86,4 +86,5 @@ We have be working with Samba since 1997 and have experienced with samba
 servers  running on Linux, FreeBSD, Solaris and other Unix flavors.
 </small></pre>
 
-<!--#include virtual="/samba/footer.html" -->
+
+<!--#include virtual="footer_support.html" -->

diff --git a/support/sweden.html b/support/sweden.html
index 9f6141dd30cc283fe56b2775e0ef27047fb31feb..fb3f229b6657c9362b0a21d7082c0272e0169506 100755 (executable)
--- a/support/sweden.html
+++ b/support/sweden.html
@@ -18,4 +18,4 @@ Gelbjutarev�en 5                <a href="mailto:support@southpole.se">support@
 </small></pre>
 
 
-<!--#include virtual="/samba/footer.html" -->
+<!--#include virtual="footer_support.html" -->

diff --git a/support/switzerland.html b/support/switzerland.html
index 292da6048168f6c9fea8505bfadb721a226b44f4..568d55d08142c5e9c3df30031fb2430acf780efa 100755 (executable)
--- a/support/switzerland.html
+++ b/support/switzerland.html
@@ -23,4 +23,5 @@ offering includes planing, configuration, installation as well as
 maintenance and troubleshooting.
 </small></pre>
 
-<!--#include virtual="/samba/footer.html" -->
+
+<!--#include virtual="footer_support.html" -->

diff --git a/support/turkey.html b/support/turkey.html
index 79f8d44020c80388d3979e23d586ae7da607ee9c..c5766e1d8c2e4bdd199c0ce185900123932a62f8 100755 (executable)
--- a/support/turkey.html
+++ b/support/turkey.html
@@ -20,4 +20,4 @@ Samba'nin da, tum Linux projelerinin oldugu gibi ticari destegini
 </small></pre>
 
 
-<!--#include virtual="/samba/footer.html" -->
+<!--#include virtual="footer_support.html" -->

diff --git a/support/uk.html b/support/uk.html
index 62f83aeb2ebdcdeadd3204b3298c172ee0ec5a5c..b94e769334d79c3472324f8ea43763281156bf01 100755 (executable)
--- a/support/uk.html
+++ b/support/uk.html
@@ -77,4 +77,4 @@ more information about our services, please visit our website
 </pre></small>
 
 
-<!--#include virtual="/samba/footer.html" -->
+<!--#include virtual="footer_support.html" -->

diff --git a/support/us.html b/support/us.html
index 28f60985848761a211791c995cfd77e95bbbfb14..0246c2da4b3feaddeae872dae17531b400e3f650 100755 (executable)
--- a/support/us.html
+++ b/support/us.html
@@ -1133,5 +1133,4 @@ E-mail: admin@pdsnorth.com
 
 
 
-
-<!--#include virtual="/samba/footer.html" -->
+<!--#include virtual="footer_support.html" -->