[SCM] Samba Website Repository - branch master updated

Michael Adam obnox at samba.org
Thu Jun 12 04:33:53 MDT 2014


The branch, master has been updated
       via  151d807 Improve content of "Beyond Samba" box.
       via  9494808 Add BEGIN/END comment markers to latest_stable_realease.html include.
       via  85018f2 Extract content of releases box into include file to avoid duplication.
       via  5050308 Extract content of box "beyond samba" to include file to avoid duplication
       via  1d5aa8e Add a proper "support Samba" menu.
       via  f0980a9 Move support/header_support.html to more systematic support_samba_menu.html
       via  d558be9 Make "countries" menu list includable from the top dir
       via  b8534ac Remove duplication in menu_think_samba
       via  4d761ae Remove duplication in menu_talk_samba
       via  5f79d88 Remove duplication in menu_learn_samba
       via  19d360a Remove duplication in menu_hack_samba
       via  82c2019 Remove duplication in menu_contact_samba
       via  38de0a6 Remove duplication in menu_get_samba
       via  e8c5e25 .gitignore: ignore vim backup files
      from  69225f5 Link to my samba.org homepage.

http://gitweb.samba.org/?p=samba-web.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 151d807fca000bcabfb66f002f221ba816d68d58
Author: Michael Adam <obnox at samba.org>
Date:   Thu Jun 12 10:11:00 2014 +0200

    Improve content of "Beyond Samba" box.
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>

commit 9494808b9fe8b0d65ca2dbe4c424ccc819c650cd
Author: Michael Adam <obnox at samba.org>
Date:   Thu Jun 12 11:31:05 2014 +0200

    Add BEGIN/END comment markers to latest_stable_realease.html include.
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>

commit 85018f2468f00bc1d2aacaa8b64e08ee5c49411b
Author: Michael Adam <obnox at samba.org>
Date:   Thu Jun 12 10:09:09 2014 +0200

    Extract content of releases box into include file to avoid duplication.
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>

commit 5050308e0e09e1828c182a1f465bdefa54bd85ad
Author: Michael Adam <obnox at samba.org>
Date:   Thu Jun 12 10:02:09 2014 +0200

    Extract content of box "beyond samba" to include file to avoid duplication
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>

commit 1d5aa8e2156c3f34fe079001e0836644de8ad960
Author: Michael Adam <obnox at samba.org>
Date:   Thu Jun 12 11:13:39 2014 +0200

    Add a proper "support Samba" menu.
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>

commit f0980a94ecc8f18ff0db6fedd9c1bc45f717810c
Author: Michael Adam <obnox at samba.org>
Date:   Thu Jun 12 12:23:38 2014 +0200

    Move support/header_support.html to more systematic support_samba_menu.html
    
    Pair-Programmed-With: Stefan Metzmacher <metze at samba.org>
    Signed-off-by: Michael Adam <obnox at samba.org>
    Signed-off-by: Stefan Metzmacher <metze at samba.org>

commit d558be99c26fc060edf0e05d860c4dc35b406a50
Author: Michael Adam <obnox at samba.org>
Date:   Thu Jun 12 11:05:23 2014 +0200

    Make "countries" menu list includable from the top dir
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>

commit b8534accd5d2019843bacdedb359dea576a99ea9
Author: Michael Adam <obnox at samba.org>
Date:   Thu Jun 12 10:40:25 2014 +0200

    Remove duplication in menu_think_samba
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>

commit 4d761ae65dbe0fc7fc2488d24501ec816e8ced46
Author: Michael Adam <obnox at samba.org>
Date:   Thu Jun 12 10:39:46 2014 +0200

    Remove duplication in menu_talk_samba
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>

commit 5f79d880cfd4c4f5661a7fb567261e7f07dd1eb3
Author: Michael Adam <obnox at samba.org>
Date:   Thu Jun 12 10:38:48 2014 +0200

    Remove duplication in menu_learn_samba
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>

commit 19d360a8ba21c79cf6a0188ca7fb5a2e806ac1a3
Author: Michael Adam <obnox at samba.org>
Date:   Thu Jun 12 10:37:56 2014 +0200

    Remove duplication in menu_hack_samba
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>

commit 82c2019b10ca704c89122ed488eefc978221831a
Author: Michael Adam <obnox at samba.org>
Date:   Thu Jun 12 10:36:31 2014 +0200

    Remove duplication in menu_contact_samba
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>

commit 38de0a623a132a52208ebe8b4477ed41b3225bdf
Author: Michael Adam <obnox at samba.org>
Date:   Thu Jun 12 10:35:18 2014 +0200

    Remove duplication in menu_get_samba
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>

commit e8c5e25ef192d83a2feb99305bf2cc9e123e8dae
Author: Michael Adam <obnox at samba.org>
Date:   Thu Jun 12 11:12:39 2014 +0200

    .gitignore: ignore vim backup files
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 .gitignore                                  |    1 +
 box_beyond_samba.html                       |   21 ++++++
 box_releases.html                           |   16 +++++
 contact_samba_menu.html                     |    1 +
 footer.html                                 |   26 +-------
 get_samba_menu.html                         |    1 +
 hack_samba_menu.html                        |    1 +
 index.html                                  |   26 +-------
 latest_stable_release.html                  |    2 +
 learn_samba_menu.html                       |    1 +
 menu_contact_samba_open.html                |    2 +-
 menu_get_samba_open.html                    |    2 +-
 menu_hack_samba_open.html                   |    2 +-
 menu_learn_samba_open.html                  |    2 +-
 menu_support_samba_closed.html              |    1 +
 menu_support_samba_open.html                |    4 +
 menu_support_samba_raw.html                 |    1 +
 menu_talk_samba_open.html                   |    2 +-
 menu_think_samba_open.html                  |    2 +-
 support/argentina.html                      |    2 +-
 support/australia.html                      |    2 +-
 support/austria.html                        |    2 +-
 support/belgium.html                        |    2 +-
 support/brazil.html                         |    2 +-
 support/bulgaria.html                       |    2 +-
 support/canada.html                         |    2 +-
 support/colombia.html                       |    2 +-
 support/costarica.html                      |    2 +-
 support/countries.html                      |   90 +++++++++++++-------------
 support/country_template                    |    2 +-
 support/czechrepublic.html                  |    2 +-
 support/denmark.html                        |    2 +-
 support/egypt.html                          |    2 +-
 support/finland.html                        |    2 +-
 support/france.html                         |    2 +-
 support/germany.html                        |    2 +-
 support/globalsupport.html                  |    2 +-
 support/greece.html                         |    2 +-
 support/header_support.html                 |   19 ------
 support/hongkong.html                       |    2 +-
 support/hungary.html                        |    2 +-
 support/index.html                          |    2 +-
 support/india.html                          |    2 +-
 support/ireland.html                        |    2 +-
 support/italy.html                          |    2 +-
 support/latvia.html                         |    2 +-
 support/malaysia.html                       |    2 +-
 support/netherlands.html                    |    2 +-
 support/newzealand.html                     |    2 +-
 support/pakistan.html                       |    2 +-
 support/poland.html                         |    2 +-
 support/portugal.html                       |    2 +-
 support/romania.html                        |    2 +-
 support/saudiarabia.html                    |    2 +-
 support/scotland.html                       |    2 +-
 support/serbia.html                         |    2 +-
 support/singapore.html                      |    2 +-
 support/slovakia.html                       |    2 +-
 support/slovenia.html                       |    2 +-
 support/southafrica.html                    |    2 +-
 support/spain.html                          |    2 +-
 support/support_template                    |    2 +-
 support/sweden.html                         |    2 +-
 support/switzerland.html                    |    2 +-
 support/turkey.html                         |    2 +-
 support/uk.html                             |    2 +-
 support/us.html                             |    2 +-
 support/venezuela.html                      |    2 +-
 global_menu.html => support_samba_menu.html |    2 +-
 talk_samba_menu.html                        |    1 +
 think_samba_menu.html                       |    1 +
 71 files changed, 155 insertions(+), 166 deletions(-)
 create mode 100644 box_beyond_samba.html
 create mode 100644 box_releases.html
 create mode 100644 menu_support_samba_closed.html
 create mode 100644 menu_support_samba_open.html
 create mode 100644 menu_support_samba_raw.html
 delete mode 100644 support/header_support.html
 copy global_menu.html => support_samba_menu.html (91%)


Changeset truncated at 500 lines:

diff --git a/.gitignore b/.gitignore
index 90ec22b..4e69724 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 .svn
+*~
diff --git a/box_beyond_samba.html b/box_beyond_samba.html
new file mode 100644
index 0000000..03f55f2
--- /dev/null
+++ b/box_beyond_samba.html
@@ -0,0 +1,21 @@
+<!-- BEGIN: box_beyond_samba.html -->
+<h5>Commercial Support</h5>
+<p>
+<a href="/samba/support/globalsupport.html">global</a>
+&middiot;
+<a href="/samba/support/">by country</a>
+<br />
+<a href="http://www.enterprisesamba.com" target="_blank">EnterpriseSamba</a>
+</p>
+
+<h5>Conferences</h5>
+<p>
+<a href="http://www.sambaxp.org" target="_blank">sambaXP</a>
+by
+<a href="http://www.sernet.de/en/" target="_blank">SerNet</a>
+<br />
+<a href="http://www.snia.org/events/storage-developer" target="_blank">SDC</a>
+by
+<a href="http://www.snia.org" target="_blank">SNIA</a>
+</p>
+<!-- END: box_beyond_samba.html -->
diff --git a/box_releases.html b/box_releases.html
new file mode 100644
index 0000000..c07c20c
--- /dev/null
+++ b/box_releases.html
@@ -0,0 +1,16 @@
+<!-- BEGIN: box_releases.html -->
+<h5>Current stable release</h5>
+<!--#include virtual="/samba/latest_stable_release.html" -->
+
+<h5>Release History</h5>
+<p>
+	<a href="/samba/history/">Versions & Notes</a>
+</p>
+
+<h5>Maintenance</h5>
+<p>
+	<a href="/samba/patches/">Patches</a> ·
+	<a href="/samba/history/security.html">Security Updates</a> ·
+	<a href="/samba/ftp/samba-pubkey.asc">GPG Key</a>
+</p>
+<!-- END: box_releases.html -->
diff --git a/contact_samba_menu.html b/contact_samba_menu.html
index 63ca4e8..1427812 100644
--- a/contact_samba_menu.html
+++ b/contact_samba_menu.html
@@ -12,6 +12,7 @@
 		<!--#include virtual="/samba/menu_talk_samba_closed.html" -->
 		<!--#include virtual="/samba/menu_hack_samba_closed.html" -->
 		<!--#include virtual="/samba/menu_contact_samba_open.html" -->
+		<!--#include virtual="/samba/menu_support_samba_closed.html" -->
 	</ul>
 </div>
 
diff --git a/footer.html b/footer.html
index 97d8f42..721f249 100755
--- a/footer.html
+++ b/footer.html
@@ -19,16 +19,7 @@
 							<div class="specialBoxContent">
 								<h4>Beyond Samba</h4>
 
-								<h5>Find help to make Samba fly!</h5>
-								<p>
-									You won't be alone with your problem
-								</p>
-								<ul>
-									<li><a href="/samba/support/">Commercial Support</a></li>
-									<li><a href="/samba/vendors/">Samba-related Products</a></li>
-									<li><a href="http://www.sambaxp.org/" target="_blank">Samba eXPerience</a></li>
-									<li><a href="http://ctdb.samba.org/">Clustering with CTDB</a></li>
-								</ul>
+								<!--#include virtual="/samba/box_beyond_samba.html" -->
 							</div>
 							<div class="specialBoxBottom"></div>
 						</div>
@@ -36,20 +27,7 @@
 							<div class="specialBoxContent">
 								<h4>Releases</h4>
 
-								<h5>Current stable release</h5>
-								<!--#include virtual="/samba/latest_stable_release.html" -->
-
-								<h5>Release History</h5>
-								<p>
-									<a href="/samba/history/">Versions & Notes</a>
-								</p>
-
-								<h5>Maintenance</h5>
-								<p>
-									<a href="/samba/patches/">Patches</a> ·
-									<a href="/samba/history/security.html">Security Updates</a> ·
-									<a href="/samba/ftp/samba-pubkey.asc">GPG Key</a>
-								</p>
+								<!--#include virtual="/samba/box_releases.html" -->
 							</div>
 							<div class="specialBoxBottom"></div>
 						</div>
diff --git a/get_samba_menu.html b/get_samba_menu.html
index 21a3039..bcba4d0 100644
--- a/get_samba_menu.html
+++ b/get_samba_menu.html
@@ -12,6 +12,7 @@
 		<!--#include virtual="/samba/menu_talk_samba_closed.html" -->
 		<!--#include virtual="/samba/menu_hack_samba_closed.html" -->
 		<!--#include virtual="/samba/menu_contact_samba_closed.html" -->
+		<!--#include virtual="/samba/menu_support_samba_closed.html" -->
 	</ul>
 </div>
 
diff --git a/hack_samba_menu.html b/hack_samba_menu.html
index 0951024..3b7b189 100644
--- a/hack_samba_menu.html
+++ b/hack_samba_menu.html
@@ -12,6 +12,7 @@
 		<!--#include virtual="/samba/menu_talk_samba_closed.html" -->
 		<!--#include virtual="/samba/menu_hack_samba_open.html" -->
 		<!--#include virtual="/samba/menu_contact_samba_closed.html" -->
+		<!--#include virtual="/samba/menu_support_samba_closed.html" -->
 	</ul>
 </div>
 
diff --git a/index.html b/index.html
index da827be..6603673 100644
--- a/index.html
+++ b/index.html
@@ -27,36 +27,14 @@
 <div class="mainBox" id="mainBoxReleases">
 	<h3>Releases</h3>
 	<div class="mainBoxContent">
-		<h5>Current stable release</h5>
-		<!--#include virtual="/samba/latest_stable_release.html" -->
-
-		<h5>Release History</h5>
-		<p>
-			<a href="/samba/history/">Versions & Notes</a>
-		</p>
-
-		<h5>Maintenance</h5>
-		<p>
-			<a href="/samba/patches/">Patches</a> ·
-			<a href="/samba/history/security.html">Security Updates</a> ·
-			<a href="/samba/ftp/samba-pubkey.asc">GPG Key</a>
-		</p>
+		<!--#include virtural="/samba/box_releases.html" -->
 	</div>
 	<div class="mainBoxBottom"></div>
 </div>
 <div class="mainBox" id="mainBoxBeyondSamba">
 	<h3>Beyond Samba</h3>
 	<div class="mainBoxContent">
-		<h5>Find help to make Samba fly!</h5>
-		<p>
-			You won't be alone with your problem
-		</p>
-		<ul>
-			<li><a href="/samba/support/">Commercial Support</a></li>
-			<li><a href="/samba/vendors/">Samba-related Products</a></li>
-			<li><a href="http://www.sambaxp.org/" target="_blank">Samba eXPerience</a></li>
-			<li><a href="http://ctdb.samba.org/">Clustering with CTDB</a></li>
-		</ul>
+		<!--#include virtual="/samba/box_beyond_samba.html" -->
 	</div>
 	<div class="mainBoxBottom"></div>
 </div>
diff --git a/latest_stable_release.html b/latest_stable_release.html
index 81f3ed2..b7589ee 100644
--- a/latest_stable_release.html
+++ b/latest_stable_release.html
@@ -1,5 +1,7 @@
+<!-- BEGIN: latest_stable_release.html -->
 <p>
 	<a href="/samba/ftp/stable/samba-4.1.8.tar.gz">Samba 4.1.8 (gzipped)</a><br>
 	<a href="/samba/history/samba-4.1.8.html">Release Notes</a> ·
 	<a href="/samba/ftp/stable/samba-4.1.8.tar.asc">Signature</a>
 </p>
+<!-- END: latest_stable_release.html -->
diff --git a/learn_samba_menu.html b/learn_samba_menu.html
index 8574bc2..dd2b809 100644
--- a/learn_samba_menu.html
+++ b/learn_samba_menu.html
@@ -12,6 +12,7 @@
 		<!--#include virtual="/samba/menu_talk_samba_closed.html" -->
 		<!--#include virtual="/samba/menu_hack_samba_closed.html" -->
 		<!--#include virtual="/samba/menu_contact_samba_closed.html" -->
+		<!--#include virtual="/samba/menu_support_samba_closed.html" -->
 	</ul>
 </div>
 
diff --git a/menu_contact_samba_open.html b/menu_contact_samba_open.html
index 8a00cb8..7ae3f8c 100644
--- a/menu_contact_samba_open.html
+++ b/menu_contact_samba_open.html
@@ -1,4 +1,4 @@
-<li><a href="/samba/team/">contact Samba</a></li>
+<!--#include virtual="/samba/menu_contact_samba_closed.html" -->
 <li class="navSub">
 <!--#include virtual="/samba/menu_contact_samba_raw.html" -->
 </li>
diff --git a/menu_get_samba_open.html b/menu_get_samba_open.html
index a9071a9..ec09d21 100644
--- a/menu_get_samba_open.html
+++ b/menu_get_samba_open.html
@@ -1,4 +1,4 @@
-<li><a href="/samba/download/">get Samba</a></li>
+<!--#include virtual="/samba/menu_get_samba_closed.html" -->
 <li class="navSub">
 <!--#include virtual="/samba/menu_get_samba_raw.html" -->
 </li>
diff --git a/menu_hack_samba_open.html b/menu_hack_samba_open.html
index 6848e58..5f6a6f1 100644
--- a/menu_hack_samba_open.html
+++ b/menu_hack_samba_open.html
@@ -1,4 +1,4 @@
-<li><a href="/samba/devel/">hack Samba</a></li>
+<!--#include virtual="/samba/menu_hack_samba_closed.html" -->
 <li class="navSub">
 <!--#include virtual="/samba/menu_hack_samba_raw.html" -->
 </li>
diff --git a/menu_learn_samba_open.html b/menu_learn_samba_open.html
index cc27cc3..cd04763 100644
--- a/menu_learn_samba_open.html
+++ b/menu_learn_samba_open.html
@@ -1,4 +1,4 @@
-<li><a href="/samba/docs/">learn Samba</a></li>
+<!--#include virtual="/samba/menu_learn_samba_closed.html" -->
 <li class="navSub">
 <!--#include virtual="/samba/menu_learn_samba_raw.html" -->
 </li>
diff --git a/menu_support_samba_closed.html b/menu_support_samba_closed.html
new file mode 100644
index 0000000..1d4ad00
--- /dev/null
+++ b/menu_support_samba_closed.html
@@ -0,0 +1 @@
+<li><a href="/samba/support/">support Samba</a></li>
diff --git a/menu_support_samba_open.html b/menu_support_samba_open.html
new file mode 100644
index 0000000..161022d
--- /dev/null
+++ b/menu_support_samba_open.html
@@ -0,0 +1,4 @@
+<!--#include virtual="/samba/menu_support_samba_closed.html" -->
+<li class="navSub">
+<!--#include virtual="/samba/menu_support_samba_raw.html" -->
+</li>
diff --git a/menu_support_samba_raw.html b/menu_support_samba_raw.html
new file mode 100644
index 0000000..a384581
--- /dev/null
+++ b/menu_support_samba_raw.html
@@ -0,0 +1 @@
+<!--#include virtual="/samba/support/countries.html" -->
diff --git a/menu_talk_samba_open.html b/menu_talk_samba_open.html
index b1640f0..6fe6945 100644
--- a/menu_talk_samba_open.html
+++ b/menu_talk_samba_open.html
@@ -1,4 +1,4 @@
-<li><a href="/samba/archives.html">talk Samba</a></li>
+<!--#include virtual="/samba/menu_talk_samba_closed.html" -->
 <li class="navSub">
 <!--#include virtual="/samba/menu_talk_samba_raw.html" -->
 </li>
diff --git a/menu_think_samba_open.html b/menu_think_samba_open.html
index 03ebf3e..0d22416 100644
--- a/menu_think_samba_open.html
+++ b/menu_think_samba_open.html
@@ -1,4 +1,4 @@
-<li><a href="/samba/what_is_samba.html">think Samba</a></li>
+<!--#include virtual="/samba/menu_think_samba_closed.html" -->
 <li class="navSub">
 <!--#include virtual="/samba/menu_think_samba_raw.html" -->
 </li>
diff --git a/support/argentina.html b/support/argentina.html
index 4881a0f..f6b8c55 100644
--- a/support/argentina.html
+++ b/support/argentina.html
@@ -1,6 +1,6 @@
 <!--#include virtual="/samba/header.html" --> 
   <title>Samba Support -- Argentina</title>
-<!--#include virtual="header_support.html" -->
+<!--#include virtual="/samba/support_samba_menu.html" -->
 
 <h2>Commercial Support - Argentina</h2>
 <hr />
diff --git a/support/australia.html b/support/australia.html
index 80a46b5..665998e 100644
--- a/support/australia.html
+++ b/support/australia.html
@@ -1,7 +1,7 @@
 <!--#include virtual="/samba/header.html" -->
 <title>Samba Support -- Australia</title>
 
-<!--#include virtual="header_support.html" -->
+<!--#include virtual="/samba/support_samba_menu.html" -->
 <h2 align="center">Commercial Support - Australia</h2>
 
 <!-- Added JHT 20100301 -->
diff --git a/support/austria.html b/support/austria.html
index d23794e..92780d0 100644
--- a/support/austria.html
+++ b/support/austria.html
@@ -1,7 +1,7 @@
 <!--#include virtual="/samba/header.html" -->
 <title>Samba Support -- Austria</title>
 
-<!--#include virtual="header_support.html" -->
+<!--#include virtual="/samba/support_samba_menu.html" -->
 <h2 align="center">Commercial Support - Austria</h2>
 
 <!-- Added JHT 20100222 -->
diff --git a/support/belgium.html b/support/belgium.html
index 84a8d8b..a089af8 100644
--- a/support/belgium.html
+++ b/support/belgium.html
@@ -1,7 +1,7 @@
 <!--#include virtual="/samba/header.html" -->
 <title>Samba Support -- Belgium</title>
 
-<!--#include virtual="header_support.html" -->
+<!--#include virtual="/samba/support_samba_menu.html" -->
 <h2 align="center">Commercial Support - Belgium</h2>
 
 <!-- Added JHT 20100222 -->
diff --git a/support/brazil.html b/support/brazil.html
index c842617..687378f 100644
--- a/support/brazil.html
+++ b/support/brazil.html
@@ -1,6 +1,6 @@
 <!--#include virtual="/samba/header.html" --> 
   <title>Samba Support -- Brazil</title>
-<!--#include virtual="header_support.html" -->  
+<!--#include virtual="/samba/support_samba_menu.html" -->  
 
 <h2 align="center">Commercial Support - BRAZIL</h2>
 <hr />
diff --git a/support/bulgaria.html b/support/bulgaria.html
index b29e045..489c079 100644
--- a/support/bulgaria.html
+++ b/support/bulgaria.html
@@ -1,6 +1,6 @@
 <!--#include virtual="/samba/header.html" --> 
   <title>Samba Support -- Bulgaria</title>
-<!--#include virtual="header_support.html" -->
+<!--#include virtual="/samba/support_samba_menu.html" -->
 
 <h2>Commercial Support - Bulgaria</h2>
 <hr />
diff --git a/support/canada.html b/support/canada.html
index f9a811e..80330f0 100644
--- a/support/canada.html
+++ b/support/canada.html
@@ -1,7 +1,7 @@
 <!--#include virtual="/samba/header.html" -->
 <title>Samba Support -- Canada</title>
 
-<!--#include virtual="header_support.html" -->
+<!--#include virtual="/samba/support_samba_menu.html" -->
 <h2 align="center">Commercial Support - Canada</h2>
 
 <!-- Added JHT 20100222 -->
diff --git a/support/colombia.html b/support/colombia.html
index ff817f7..26b046d 100644
--- a/support/colombia.html
+++ b/support/colombia.html
@@ -1,7 +1,7 @@
 <!--#include virtual="/samba/header.html" -->
 <title>Samba Support -- Columbia</title>
 
-<!--#include virtual="header_support.html" -->
+<!--#include virtual="/samba/support_samba_menu.html" -->
 <h2 align="center">Commercial Support - Columbia</h2>
 
 
diff --git a/support/costarica.html b/support/costarica.html
index 1c19c2c..ca27d48 100644
--- a/support/costarica.html
+++ b/support/costarica.html
@@ -1,7 +1,7 @@
 <!--#include virtual="/samba/header.html" -->
 <title>Samba Support -- Costa Rica</title>
 
-<!--#include virtual="header_support.html" -->
+<!--#include virtual="/samba/support_samba_menu.html" -->
 <h2 align="center">Commercial Support - Costa Rica</h2>
 
 
diff --git a/support/countries.html b/support/countries.html
index b53945d..e24bcf2 100644
--- a/support/countries.html
+++ b/support/countries.html
@@ -1,50 +1,50 @@
 <div id="countries">
 <ul>
- <li><a href="globalsupport.html">Global Support</a></li>
+ <li><a href="/samba/support/globalsupport.html">Global Support</a></li>
  <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>
- <li><a href="brazil.html">Brazil</a></li>
- <li><a href="bulgaria.html">Bulgaria</a></li>
- <li><a href="czechrepublic.html">Czech Republic</a></li>
- <li><a href="canada.html">Canada</a></li>
- <li><a href="colombia.html">Colombia</a></li>
- <li><a href="costarica.html">Costa Rica</a></li>
- <li><a href="denmark.html">Denmark</a></li>
- <li><a href="egypt.html">Egypt</a></li>
- <li><a href="finland.html">Finland</a></li>
- <li><a href="france.html">France</a></li>
- <li><a href="germany.html">Germany</a></li>
-<!--  <li><a href="greece.html">Greece</a></li> -->
- <li><a href="netherlands.html">Holland</a></li>
- <li><a href="hongkong.html">Hong Kong - China</a></li>
- <li><a href="hungary.html">Hungary</a></li>
- <li><a href="india.html">India</a></li>  
- <li><a href="ireland.html">Ireland</a></li>    
- <li><a href="italy.html">Italy</a></li>
- <li><a href="latvia.html">Latvia</a></li>
- <li><a href="malaysia.html">Malaysia</a></li>
-<!-- <li><a href="netherlands.html">Netherlands</a></li> -->
- <li><a href="newzealand.html">New Zealand</a></li>
- <li><a href="pakistan.html">Pakistan</a></li>
- <li><a href="poland.html">Poland</a></li>
- <li><a href="portugal.html">Portugal</a></li>
- <li><a href="romania.html">Romania</a></li>
-<!--  <li><a href="saudiarabia.html">Saudi Arabia</a></li> -->
- <li><a href="scotland.html">Scotland</a></li>
-<!--  <li><a href="serbia.html">Serbia</a></li> -->
-<!-- <li><a href="singapore.html">Singapore</a></li> -->
-<!--  <li><a href="slovakia.html">Slovakia</a></li> -->
- <li><a href="slovenia.html">Slovenia</a></li>
- <li><a href="southafrica.html">South Africa</a></li>
- <li><a href="spain.html">Spain</a></li>
- <li><a href="sweden.html">Sweden</a></li>
- <li><a href="switzerland.html">Switzerland</a></li>
-<!-- <li><a href="turkey.html">Turkey</a></li> -->
- <li><a href="uk.html">United Kingdom</a></li>
- <li><a href="us.html">United States</a></li>
- <li><a href="venezuela.html">Venezuela</a></li>
+<!--  <li><a href="/samba/support/argentina.html">Argentina</a></li> -->
+ <li><a href="/samba/support/australia.html">Australia</a></li>
+ <li><a href="/samba/support/austria.html">Austria</a></li>
+ <li><a href="/samba/support/belgium.html">Belgium</a></li>
+ <li><a href="/samba/support/brazil.html">Brazil</a></li>
+ <li><a href="/samba/support/bulgaria.html">Bulgaria</a></li>
+ <li><a href="/samba/support/czechrepublic.html">Czech Republic</a></li>
+ <li><a href="/samba/support/canada.html">Canada</a></li>
+ <li><a href="/samba/support/colombia.html">Colombia</a></li>
+ <li><a href="/samba/support/costarica.html">Costa Rica</a></li>
+ <li><a href="/samba/support/denmark.html">Denmark</a></li>
+ <li><a href="/samba/support/egypt.html">Egypt</a></li>
+ <li><a href="/samba/support/finland.html">Finland</a></li>
+ <li><a href="/samba/support/france.html">France</a></li>
+ <li><a href="/samba/support/germany.html">Germany</a></li>
+<!--  <li><a href="/samba/support/greece.html">Greece</a></li> -->
+ <li><a href="/samba/support/netherlands.html">Holland</a></li>
+ <li><a href="/samba/support/hongkong.html">Hong Kong - China</a></li>
+ <li><a href="/samba/support/hungary.html">Hungary</a></li>
+ <li><a href="/samba/support/india.html">India</a></li>
+ <li><a href="/samba/support/ireland.html">Ireland</a></li>
+ <li><a href="/samba/support/italy.html">Italy</a></li>
+ <li><a href="/samba/support/latvia.html">Latvia</a></li>
+ <li><a href="/samba/support/malaysia.html">Malaysia</a></li>
+<!-- <li><a href="/samba/support/netherlands.html">Netherlands</a></li> -->
+ <li><a href="/samba/support/newzealand.html">New Zealand</a></li>
+ <li><a href="/samba/support/pakistan.html">Pakistan</a></li>
+ <li><a href="/samba/support/poland.html">Poland</a></li>
+ <li><a href="/samba/support/portugal.html">Portugal</a></li>
+ <li><a href="/samba/support/romania.html">Romania</a></li>
+<!--  <li><a href="/samba/support/saudiarabia.html">Saudi Arabia</a></li> -->
+ <li><a href="/samba/support/scotland.html">Scotland</a></li>
+<!--  <li><a href="/samba/support/serbia.html">Serbia</a></li> -->
+<!-- <li><a href="/samba/support/singapore.html">Singapore</a></li> -->
+<!--  <li><a href="/samba/support/slovakia.html">Slovakia</a></li> -->
+ <li><a href="/samba/support/slovenia.html">Slovenia</a></li>
+ <li><a href="/samba/support/southafrica.html">South Africa</a></li>
+ <li><a href="/samba/support/spain.html">Spain</a></li>
+ <li><a href="/samba/support/sweden.html">Sweden</a></li>
+ <li><a href="/samba/support/switzerland.html">Switzerland</a></li>
+<!-- <li><a href="/samba/support/turkey.html">Turkey</a></li> -->
+ <li><a href="/samba/support/uk.html">United Kingdom</a></li>
+ <li><a href="/samba/support/us.html">United States</a></li>
+ <li><a href="/samba/support/venezuela.html">Venezuela</a></li>
 </ul>


-- 
Samba Website Repository


More information about the samba-cvs mailing list