Looks worse than it is... just touching every file for one change.

Using javascript to dynamically write titles to the header.
This keeps us from having to use multiple headers and
really simplies our header setup now.  Still allows
page specific titles in the browser.

deryck

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

diff --git a/GUI/index.html b/GUI/index.html
index d85f2298005572738960953baea47a5e416215bf..ed089bdec71d88381eb2830c030fb05951f20487 100755 (executable)
--- a/GUI/index.html
+++ b/GUI/index.html
@@ -1,6 +1,4 @@
-<!--#include virtual="/samba/header.html" --> 
-  <title>Samba GUI Information</title>
-<!--#include virtual="header_gui.html" -->
+<!--#include virtual="/samba/header_wide.html" --> 
 
 <h2>Samba GUI page</h2>
 

diff --git a/archive-policy.html b/archive-policy.html
index 5df01e52330990e08ac803ea1b3eb7c9c4d24fe9..5cd7c6187fdafa64f7e251386489bcabc56f4b2c 100644 (file)
--- a/archive-policy.html
+++ b/archive-policy.html
@@ -1,6 +1,4 @@
 <!--#include virtual="/samba/header.html" --> 
-  <title>Samba - Policy for Archiving Mailing Lists</title>
-<!--#include virtual="/samba/header2.html" -->
 
 <h2 align="center">Samba list archive editing policy</h2>
 

diff --git a/archives.html b/archives.html
index 3c661ee09b753c521e040b9edb4992210a4777eb..0d7146babebeab9428c8ace18f05bb2582602856 100755 (executable)
--- a/archives.html
+++ b/archives.html
@@ -1,6 +1,6 @@
 <!--#include virtual="/samba/header.html" --> 
   <title>Samba - Mailing List Archives</title>
-<!--#include virtual="/samba/header2.html" -->
+
 
 <h2>Samba Mailing Lists</h2>
 

diff --git a/books.html b/books.html
index 0a0b5fdf274d94821a34219e5b9d57b59a4022d9..1d88d4c02925667ce9311767ce203e6aab5905a2 100755 (executable)
--- a/books.html
+++ b/books.html
@@ -1,8 +1,6 @@
 <!--#include virtual="/samba/header.html" --> 
-  <title>Books on Samba, by year</title>
-<!--#include virtual="/samba/header2.html" -->
 
-<H2 align="center">Samba books</H2>
+<h2>Samba books</h2>
 
 <p>There are now quite a number of books becoming available for Samba and
 we, the Samba Team, felt that it would be useful if a list of them was

diff --git a/buglist.html b/buglist.html
index ca260102b3d8d238d3e1964c58bce19bfeb5b758..a2a631a244cd5de05dc11ebebe91221b5c85d79c 100755 (executable)
--- a/buglist.html
+++ b/buglist.html
@@ -1,7 +1,6 @@
 <!--#include virtual="/samba/header.html" -->
 
-
-<h2 align="center">Recent bugs list</h2>
+<h2>Recent bugs list</h2>
 
 <br>
 <p>This is a list of the most relevant bugs found in the samba code.<br>

diff --git a/bugreports.html b/bugreports.html
index 971577eb5999013e4159258a1ffb0ca2dc94dca4..ac3a3275474b4b5e727ddeb6b6de1a12f660a504 100755 (executable)
--- a/bugreports.html
+++ b/bugreports.html
@@ -1,8 +1,6 @@
 <!--#include virtual="/samba/header.html" --> 
-  <title>Samba Bug Report HOWTO</title>
-<!--#include virtual="/samba/header2.html" -->
 
-<H2 align="center">Bug Reports, Patches  &amp; contacting the Samba Team</H2>
+<h2>Bug Reports, Patches  &amp; contacting the Samba Team</h2>
 
 <BR><p> The Samba Team have recently implemented an
 improved Bug Tracking System (using <A

diff --git a/colophon.html b/colophon.html
index 5944e5709a7adfffc3f7b0c00d28744732a0ef40..ed67368e8e70bb47224317ed23632a29e7054be1 100755 (executable)
--- a/colophon.html
+++ b/colophon.html
@@ -1,6 +1,4 @@
 <!--#include virtual="/samba/header.html" -->
-<title>samba.org, version 3</title>
-<!--#include virtual="/samba/header2.html" -->
 
     <h2>A Redesigned samba.org</h2>
     

diff --git a/contacts.html b/contacts.html
index 75e809fcd98d98b9729a2b1cee994cb22b12eb09..81036036393c1f60514b31ac70e9400e30087c8f 100755 (executable)
--- a/contacts.html
+++ b/contacts.html
@@ -1,6 +1,6 @@
 <!--#include virtual="/samba/header.html" --> 
   <title>Samba Contacts</title>
-<!--#include virtual="/samba/header2.html" -->
+
 
 <h2>Contacts for...</h2>
 

diff --git a/courses.html b/courses.html
index f6419916eb6f3afa5462f3c4ddf39d19d104d525..4f81aa4ba05d526145900ffdb3ce2cce674042ea 100755 (executable)
--- a/courses.html
+++ b/courses.html
@@ -1,14 +1,15 @@
 <!--#include virtual="/samba/header.html" -->
 
-<H2 align="center">Samba Courses</H2>
+<h2>Samba Courses</h2>
 There are now a number of people offering Samba courses.  Here we list those 
 that we are aware of.  If you are aware of any other Samba course, please
-send mail to <A HREF="mailto:rsharpe@ns.aus.com">Richard Sharpe</A>.
+send mail to <a href="mailto:rsharpe@ns.aus.com">Richard Sharpe</a>.
 <p>
 We will insert a reference here to the web site that describes the courses.  
 The Samba team in no way endorses any of these courses.
 <ul>
-<li>Two 1-day Samba courses, by Richard Sharpe
-<li>A German-language Samba course, by Volker Lendecke
+<li>Two 1-day Samba courses, by Richard Sharpe</li>
+<li>A German-language Samba course, by Volker Lendecke</li>
 </ul>
+
 <!--#include virtual="/samba/footer.html" -->

diff --git a/cvs.html b/cvs.html
index bdc4c4587d181466753149ad9409855b1226f85d..16c539447068e1e75934b8ad9b6bd4bcbbaac836 100755 (executable)
--- a/cvs.html
+++ b/cvs.html
@@ -1,9 +1,6 @@
 <!--#include virtual="/samba/header.html" --> 
-  <title>Samba - CVS Instructions</title>
-<!--#include virtual="/samba/header2.html" -->
 
-
-<h2 align="center">CVS Access to pserver.samba.org</h2>
+<h2>CVS Access to pserver.samba.org</h2>
 
 
 <H1>samba development changed to subversion</H1>

diff --git a/devel/TODO.html b/devel/TODO.html
index 86be5297d495cd3880580ca4b63aab07bee70b21..d30f99f2b9287fb1f612dd39c548fdc4497032c5 100755 (executable)
--- a/devel/TODO.html
+++ b/devel/TODO.html
@@ -1,8 +1,6 @@
 <!--#include virtual="/samba/header.html" --> 
-  <title>Samba Development TODO List</title>
-<!--#include virtual="/samba/header2.html" -->
 
-<H2 ALIGN=CENTER>Development List of Projects</H2>
+<h2>Development List of Projects</h2>
 
 <p>Samba is developed by hard work from a world-wide team of volunteers.  This page provides a list of on-going projects within Samba development, and offers information about how to get involved.  Be sure to read the <a href="/samba/devel/">development page</a> regarding responsibly submitting patches.</p>  
 <br />

diff --git a/devel/header_devel.html b/devel/header_devel.html
deleted file mode 100755 (executable)
index 3fc5167..0000000
--- a/devel/header_devel.html
+++ /dev/null
@@ -1,133 +0,0 @@
-<link rel="stylesheet" href="/samba/style/common.css" type="text/css" media="all" />
-<link rel="stylesheet" href="/samba/style/wide.css" type="text/css" media="all" />
-<link rel="shortcut icon" href="/samba/images/favicon.ico" />
-
-<!--[if gte IE 5.5]>
-        <style type="text/css">
-        /*<![CDATA[*/
-        .logo_hack {
-filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='/samba/images/log
-o.png',sizingMethod='scale');
-        }
-        /*]]>*/
-        </style>
-<![endif]-->
-
-<!--[if lte IE 5]>
-        <style type="text/css">
-        /*<![CDATA[*/
-        .logo_hack {
-        background-image:url(/samba/images/logo.gif);
-        background-position:center;
-        background-repeat:no-repeat;
-        top:23.5px;
-        left:-10px;
-        }
-        /*]]>*/
-        </style>
-<![endif]-->
-
-<script type="text/javascript">
-<!-- Hide from old browsers
-   function changeMirror(mirrorChoice) {
-        mirrorSite = mirrorChoice.options[mirrorChoice.selectedIndex].value
-
-        if (mirrorSite != "") {
-                document.location.href = mirrorSite
-                }
-   }
-// end hide -->
-</script>
-
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta http-equiv="Content-Language" content="en-us" />
-<meta name="keywords" content="Samba SMB CIFS" />
-<meta name="description" content="Home of Samba, the SMB file server" />
-
-</head>
-
-
-<body onload="document.mirrorForm.mirrorLocation.selectedIndex=0">
-
-<div id="banner">
-  <div class="stripe"></div>
-
-  <div class="srch">
-  <h5>search samba.org:</h5>
-  <form method="post" action="http://de.samba.org/cgi-bin/htsearch">
-  <input type="text" size="15" name="words" value="" />
-  <input type="submit" value="Go" />
-  </form>
-  <span>|</span>
-  <form action="no_script_required.cgi" name="mirrorForm">
-    <select name="mirrorLocation" onchange="changeMirror(this.form.mirrorLocation)">
-    <option selected="selected">Choose A Mirror</option>
-    <!--#include virtual="/samba/menu_options.html" -->
-    </select>
-   </form>
-  </div>
-</div>
-
-<div id="logo">
-  <div class="logo_hack"><a href="/samba/"><img src="/samba/images/linkpad.gif" alt="Samba" /></a></div>
-</div>
-
-<div class="slogan">
-  <h4>Opening Windows to a Wider World</h4>
-</div>
-
-<div class="nav">
-
-  <img src="/samba/images/think.png" alt="think samba" />
-  <ul>
-  <li><a href="/samba/what_is_samba.html">What Is Samba?</a></li>
-  <li><a href="http://news.samba.org/">Latest News</a></li>
-  <li><a href="/samba/docs/FAQ/">FAQ</a></li>
-  </ul>
-
-  <img src="/samba/images/get.png" alt="get samba" />
-  <ul>
-  <li><a href="/samba/download/">Download Info</a></li>
-  <li><a href="/samba/ftp/Binary_Packages/">Binaries</a></li>
-  <li><a href="/samba/docs/man/Samba-HOWTO-Collection/install.html">How To Install</a></li>
-  <li><a href="/samba/GUI/">GUIs</a></li>
-  </ul>
-
-  <img src="/samba/images/learn.png" alt="learn samba" />
-  <ul>
-  <li><a href="/samba/docs/man/Samba-HOWTO-Collection/">Official HOWTO</a></li>
-  <li><a href="/samba/docs/man/Samba-Guide/">By Example</a></li>
-  <li><a href="/samba/docs/using_samba/toc.html">Using Samba</a></li>
-  <li><a href="/samba/docs/">Docs And Books</a></li>
-  </ul>
-
-  <img src="/samba/images/talk.png" alt="talk samba" />
-  <ul>
-  <li><a href="http://lists.samba.org">List Subscribe</a></li>
-  <li><a href="/samba/archives.html">List Archives</a></li>
-  <li><a href="/samba/irc.html">IRC</a></li>
-  <li><a href="/samba/ml-etiquette.html">Etiquette</a></li>
-  </ul>
-
-  <img src="/samba/images/hack.png" alt="hack samba" />
-  <ul>
-  <li><a href="/samba/devel/">Devel Overview</a></li>
-  <li><a href="http://websvn.samba.org">SVN Source</a></li>
-  <li><a href="http://cvs.samba.org/cgi-bin/cvsweb/">Historical CVS Source</a></li>
-  <li><a href="http://build.samba.org/">Build Farm</a></li>
-  <li><a href="https://bugzilla.samba.org">Bug Reports</a></li>
-  </ul>
-
-  <img src="/samba/images/contact.png" alt="contact samba" />
-  <ul>
-  <li><a href="/samba/team/">Samba Team</a></li>
-  <li><a href="/samba/donations.html">Donations</a></li>
-  <li><a href="/samba/team/tshirt.html">T-shirts, etc</a></li>
-  <li><a href="/samba/contacts.html">Contacts For...</a></li>
-  </ul>
-
-</div>
-
-<div id="content">
-  <div class="center">
-

diff --git a/devel/index.html b/devel/index.html
index 089fc6d889b633248c4e14993c002a93694b6c62..8f94f3d51622ae82c87cca8ba9bae13aea89826a 100644 (file)
--- a/devel/index.html
+++ b/devel/index.html
@@ -1,6 +1,5 @@
-<!--#include virtual="/samba/header.html" --> 
-  <title>Samba Development</title>
-<!--#include virtual="header_devel.html" -->
+<!--#include virtual="/samba/header_wide.html" --> 
+
 <h2>Development</h2>
 
 <p>devel.samba.org contains information about the current state of Samba development. It should be of interest to those developing Samba as well as to those following Samba development.</p>

diff --git a/devel/roadmap-3.html b/devel/roadmap-3.html
index 6cd92df4a4df3f69d12de8b254630dc82c28c703..f74235e5d80c09f03c3409e4b15b3c4e25f4c6ad 100755 (executable)
--- a/devel/roadmap-3.html
+++ b/devel/roadmap-3.html
@@ -1,8 +1,6 @@
 <!--#include virtual="/samba/header.html" --> 
-  <title>Samba 3.0 Roadmap</title>
-<!--#include virtual="/samba/header2.html" -->
 
-<h3>Current development branches</h3>
+<h2>Current development branches</h2>
 
 <p>At the moment, development is ongoing in the following CVS branches: 
 <ul>

diff --git a/devel/roadmap-4.0.html b/devel/roadmap-4.0.html
index 076390ab51949c015e6c4b613e5838f1c5e66962..77fb3dac81ec8c09a8bbd87f69690c5e530a821d 100644 (file)
--- a/devel/roadmap-4.0.html
+++ b/devel/roadmap-4.0.html
@@ -1,8 +1,6 @@
 <!--#include virtual="/samba/header.html" --> 
-  <title>Samba 4.0 Roadmap</title>
-<!--#include virtual="/samba/header2.html" -->
 
-<h2 align="center">Roadmap to Samba 4.0.0</h2>         
+<h2>Roadmap to Samba 4.0.0</h2>                
 
 <p align="right"><em>Page Last Updated</em>: 24 February 2005</p>
 

diff --git a/docs/10years.html b/docs/10years.html
index ac890a415ba155bb0529bbfe866372764e53bfbf..25f1bb2166c9dd63de2f725b78d9ed04de316006 100755 (executable)
--- a/docs/10years.html
+++ b/docs/10years.html
@@ -1,6 +1,6 @@
 <!--#include virtual="/samba/header.html" -->
 
-<H2 align="center">10 years of Samba!</H2>
+<h2>10 years of Samba!</h2>
 
 Who would have believed that <a
 href="http://groups.google.com/groups?q=tridge&scoring=d&as_drrb=b&as_mind=1&as_minm=1&as_miny=1992&as_maxd=17&as_maxm=1&as_maxy=1992&selm=1992Jan10.091323.17768%40newshost.anu.edu.au&rnum=5">this

diff --git a/docs/FAQ/index.html b/docs/FAQ/index.html
index b8cd1dea7bb4d129158bf5acf32944a5017c59b8..a0b81ae4e5840175fd4cc540c69e1639ea55e0ab 100755 (executable)
--- a/docs/FAQ/index.html
+++ b/docs/FAQ/index.html
@@ -1,7 +1,4 @@
 <!--#include virtual="/samba/header.html" --> 
-  <title>Samba FAQ </title>
-<!--#include virtual="/samba/header2.html" -->
-
 
 <h2>Frequently Asked Questions</h2>
 

diff --git a/docs/GPL.html b/docs/GPL.html
index 6cff72234812130a9b0348396951ec257d6c52ab..994f1aa72e5e807911db1157c1e7553e9ab69207 100755 (executable)
--- a/docs/GPL.html
+++ b/docs/GPL.html
@@ -1,6 +1,4 @@
 <!--#include virtual="/samba/header.html" -->
-<title>GPL on Samba.org</title>
-<!--#include virtual="/samba/header2.html" -->
 
 <pre>
 <!--#include virtual="/samba/ftp/COPYING" -->

diff --git a/docs/anecdotes.html b/docs/anecdotes.html
index 9f1bc95639200a7c3b08f8b3ac27717729a87567..582a75aa0c2c567cb16c3aa0156ca92512bc9a80 100755 (executable)
--- a/docs/anecdotes.html
+++ b/docs/anecdotes.html
@@ -1,6 +1,6 @@
 <!--#include virtual="/samba/header.html" -->
 
-<H2 ALIGN="CENTER">Samba Anecdotes!</H2>
+<h2>Samba Anecdotes!</h2>
 
 <H3 ALIGN=CENTER>...regarding the Linux Penguin mascot</H3>
 

diff --git a/docs/header_docs.html b/docs/header_docs.html
deleted file mode 100755 (executable)
index 7c9246f..0000000
--- a/docs/header_docs.html
+++ /dev/null
@@ -1,135 +0,0 @@
-
-<link rel="stylesheet" href="/samba/style/common.css" type="text/css" media="all" />
-<link rel="stylesheet" href="/samba/style/wide.css" type="text/css" media="all" />
-<link rel="shortcut icon" href="/samba/images/favicon.ico" />
-
-<!--[if gte IE 5.5]>
-       <style type="text/css">
-       /*<![CDATA[*/
-       .logo_hack {
-filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='/samba/images/log
-o.png',sizingMethod='scale');
-       }
-       /*]]>*/ 
-       </style>
-<![endif]-->
-
-<!--[if lte IE 5]>
-       <style type="text/css">
-       /*<![CDATA[*/
-       .logo_hack {
-       background-image:url(/samba/images/logo.gif);
-       background-position:center;
-       background-repeat:no-repeat;
-       top:23.5px;
-       left:-10px;
-       }
-       /*]]>*/
-        </style>
-<![endif]-->
-
-<script type="text/javascript">
-<!-- Hide from old browsers
-   function changeMirror(mirrorChoice) {
-       mirrorSite = mirrorChoice.options[mirrorChoice.selectedIndex].value 
-       
-       if (mirrorSite != "") { 
-               document.location.href = mirrorSite 
-               } 
-   }
-// end hide -->
-</script>
-
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta http-equiv="Content-Language" content="en-us" />
-<meta name="keywords" content="Samba SMB CIFS" />
-<meta name="description" content="Home of Samba, the SMB file server" />
-
-</head>
-
-
-<body onload="document.mirrorForm.mirrorLocation.selectedIndex=0">
-
-<div id="banner">
-  <div class="stripe"></div>
-  
-  <div class="srch">
-  <h5>search samba.org:</h5>
-  <form method="post" action="http://de.samba.org/cgi-bin/htsearch">
-  <input type="text" size="15" name="words" value="" />
-  <input type="submit" value="Go" />
-  </form>
-  <span>|</span>
-  <form action="no_script_required.cgi" name="mirrorForm">
-    <select name="mirrorLocation" onchange="changeMirror(this.form.mirrorLocation)">
-    <option selected="selected">Choose A Mirror</option>
-    <!--#include virtual="/samba/menu_options.html" --> 
-    </select>
-   </form>
-  </div>
-</div>
-
-<div id="logo">
-  <div class="logo_hack"><a href="/samba/"><img src="/samba/images/linkpad.gif" alt="Samba" /></a></div>
-</div>
-
-<div class="slogan">
-  <h4>Opening Windows to a Wider World</h4>
-</div>
-
-<div class="nav">
-  
-  <img src="/samba/images/think.png" alt="think samba" />
-  <ul>
-  <li><a href="/samba/what_is_samba.html">What Is Samba?</a></li>
-  <li><a href="http://news.samba.org/">Latest News</a></li>
-  <li><a href="/samba/docs/FAQ/">FAQ</a></li>
-  </ul>
-    
-  <img src="/samba/images/get.png" alt="get samba" />
-  <ul>  
-  <li><a href="/samba/download/">Download Info</a></li>
-  <li><a href="/samba/ftp/Binary_Packages/">Binaries</a></li>
-  <li><a href="/samba/docs/man/Samba-HOWTO-Collection/install.html">How To Install</a></li>
-  <li><a href="/samba/GUI/">GUIs</a></li>
-  </ul>
-    
-  <img src="/samba/images/learn.png" alt="learn samba" />
-  <ul>
-  <li><a href="/samba/docs/man/Samba-HOWTO-Collection/">Official HOWTO</a></li>
-  <li><a href="/samba/docs/man/Samba-Guide/">By Example</a></li>
-  <li><a href="/samba/docs/using_samba/toc.html">Using Samba</a></li>
-  <li><a href="/samba/docs/">Docs and Books</a></li>
-  </ul>
-    
-  <img src="/samba/images/talk.png" alt="talk samba" />
-  <ul>
-  <li><a href="http://lists.samba.org">List Subscribe</a></li>
-  <li><a href="/samba/archives.html">List Archives</a></li>
-  <li><a href="/samba/irc.html">IRC</a></li>
-  <li><a href="/samba/ml-etiquette.html">Etiquette</a></li>
-  </ul>
-    
-  <img src="/samba/images/hack.png" alt="hack samba" />
-  <ul>
-  <li><a href="/samba/devel/">Devel Overview</a></li>
-  <li><a href="http://websvn.samba.org">SVN Source</a></li>
-  <li><a href="http://cvs.samba.org/cgi-bin/cvsweb/">Historical CVS Source</a></li>
-  <li><a href="http://build.samba.org/">Build Farm</a></li>
-  <li><a href="https://bugzilla.samba.org">Bug Reports</a></li>
-  </ul>
-    
-  <img src="/samba/images/contact.png" alt="contact samba" />
-  <ul>
-  <li><a href="/samba/team/">Samba Team</a></li>
-  <li><a href="/samba/donations.html">Donations</a></li>
-  <li><a href="/samba/team/tshirt.html">T-shirts, etc</a></li>
-  <li><a href="/samba/contacts.html">Contacts For...</a></li>
-  </ul>
-    
-</div>
-
- 
-<div id="content">
-  <div class="center">
-

diff --git a/docs/index.html b/docs/index.html
index 36af317bd192da8249c875aa987446a4eba22bef..08a28a87a47ee34acb93cef044d12c2e0de71d99 100755 (executable)
--- a/docs/index.html
+++ b/docs/index.html
@@ -1,6 +1,4 @@
-<!--#include virtual="/samba/header.html" --> 
-  <title>Samba Documentation</title>
-<!--#include virtual="header_docs.html" -->
+<!--#include virtual="/samba/header_wide.html" --> 
 
 <!-- $Revision: 1.76 $ -->
 

diff --git a/docs/myths_about_samba.html b/docs/myths_about_samba.html
index 98a3d32d5d098ba3cc213fb72f23dd830410ce10..a1f6df81d82b430435cf3d156ed72f105afec0fd 100755 (executable)
--- a/docs/myths_about_samba.html
+++ b/docs/myths_about_samba.html
@@ -1,6 +1,4 @@
 <!--#include virtual="/samba/header.html" -->
-  <title>Myths About Samba</title>
-<!--#include virtual="header_docs.html" -->
 
     <h3><b>Myths About Samba</b></h3>
 

diff --git a/docs/server_security.html b/docs/server_security.html
index 3b8cd1a7cc60f6e465ca1b13568ad9b06b598a96..cf1f7d361ae75deac08e0947a0d981f5d4810bb0 100755 (executable)
--- a/docs/server_security.html
+++ b/docs/server_security.html
@@ -1,6 +1,4 @@
-<!--#include virtual="/samba/header.html" -->
-<title>Samba Server Security</title>
-<!--#include virtual="header_docs.html" -->
+<!--#include virtual="/samba/header_wide.html" -->
 
   <h2>Protecting an unpatched Samba server</h2>
 

diff --git a/docs/swat_ssl.html b/docs/swat_ssl.html
index af929131c4b28df1acc59331b523865db74fed1a..a97d2820fe95e934d4eaa9394a7d0ccfc0522abe 100755 (executable)
--- a/docs/swat_ssl.html
+++ b/docs/swat_ssl.html
@@ -1,6 +1,6 @@
 <!--#include virtual="/samba/header.html" -->
 
-<h2 align="center">SWAT and SSL</h2>
+<h2>SWAT and SSL</h2>
 
 Lots of people have asked about how to setup SWAT with SSL to allow
 for secure remote administration of Samba. Here is a method that

diff --git a/donations.html b/donations.html
index e1bf5aa9b0656dbd6d84376e77f3024d2dcd48a5..1a3bd5ab55b8967a46a12cfc4f96cd1e332f5f82 100755 (executable)
--- a/donations.html
+++ b/donations.html
@@ -1,6 +1,6 @@
 <!--#include virtual="/samba/header.html" --> 
   <title>Donations to Help Support Samba</title>
-<!--#include virtual="/samba/header2.html" -->
+
 
 <h2>samba.org donations</h2>
 

diff --git a/download/ftp_mirrors.html b/download/ftp_mirrors.html
index 45e50c854d85c93e89e3d088c0926c7b2224ed79..385e7574f3c0362ed5fadfb4e2a472c5b013f201 100755 (executable)
--- a/download/ftp_mirrors.html
+++ b/download/ftp_mirrors.html
@@ -1,6 +1,4 @@
 <!--#include virtual="/samba/header.html" --> 
-  <title>Samba Download Sites</title>
-<!--#include virtual="header_download.html" -->
 
 <h2>ftp Mirror Sites</h2>
 

diff --git a/download/header_download.html b/download/header_download.html
deleted file mode 100755 (executable)
index bfdcc21..0000000
--- a/download/header_download.html
+++ /dev/null
@@ -1,137 +0,0 @@
-
-<link rel="stylesheet" href="/samba/style/common.css" type="text/css" media="all" />
-<link rel="stylesheet" href="/samba/style/wide.css" type="text/css" media="all" />
-<link rel="shortcut icon" href="/samba/images/favicon.ico" />
-
-<!--[if gte IE 5.5]>
-       <style type="text/css">
-       /*<![CDATA[*/
-       .logo_hack {
-filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='/samba/images/log
-o.png',sizingMethod='scale');
-       }
-       /*]]>*/ 
-       </style>
-<![endif]-->
-
-<!--[if lte IE 5]>
-       <style type="text/css">
-       /*<![CDATA[*/
-       .logo_hack {
-       background-image:url(/samba/images/logo.gif);
-       background-position:center;
-       background-repeat:no-repeat;
-       top:23.5px;
-       left:-10px;
-       }
-       /*]]>*/
-        </style>
-<![endif]-->
-
-<script language="Javascript" type="text/javascript">
-<!-- Hide from old browsers
-   function changeMirror(mirrorChoice) {
-       mirrorSite = mirrorChoice.options[mirrorChoice.selectedIndex].value 
-       
-       if (mirrorSite != "") { 
-               document.location.href = mirrorSite 
-               } 
-   }
-// end hide -->
-</script>
-
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta http-equiv="Content-Language" content="en-us" />
-<meta name="keywords" content="Samba SMB CIFS" />
-<meta name="description" content="Home of Samba, the SMB file server" />
-
-</head>
-
-
-<body onload="document.mirrorForm.mirrorLocation.selectedIndex=0">
-
-<div id="banner">
-  <div class="stripe"></div>
-  
-  <div class="srch">
-  <h5>search samba.org:</h5>
-  <form method="post" action="http://de.samba.org/cgi-bin/htsearch">
-  <input type="text" size="15" name="words" value="" />
-  <input type="submit" value="Go" />
-  </form>
-  <span>|</span>
-  <form action="no_script_required.cgi" name="mirrorForm">
-    <select name="mirrorLocation" onchange="changeMirror(this.form.mirrorLocation)">
-    <option selected="selected">Choose A Mirror</option>
-    <!--#include virtual="/samba/menu_options.html" --> 
-    </select>
-   </form>
-  </div>
-</div>
-
-<div id="logo">
-  <div class="logo_hack"><a href="/samba/"><img src="/samba/images/linkpad.gif" alt="Samba" /></a></div>
-</div>
-
-<div class="slogan">
-  <h4>Opening Windows to a Wider World</h4>
-</div>
-
-<div id="left_border"></div>
-  
-<div class="nav">
-  
-  <img src="/samba/images/think.png" alt="think samba" />
-  <ul>
-  <li><a href="/samba/what_is_samba.html">What Is Samba?</a></li>
-  <li><a href="http://news.samba.org/">Latest News</a></li>
-  <li><a href="/samba/docs/FAQ/">FAQ</a></li>
-  </ul>
-    
-  <img src="/samba/images/get.png" alt="get samba" />
-  <ul>  
-  <li><a href="/samba/download/">Download Info</a></li>
-  <li><a href="/samba/ftp/Binary_Packages/">Binaries</a></li>
-  <li><a href="/samba/docs/man/Samba-HOWTO-Collection/install.html">How To Install</a></li>
-  <li><a href="/samba/GUI/">GUIs</a></li>
-  </ul>
-    
-  <img src="/samba/images/learn.png" alt="learn samba" />
-  <ul>
-  <li><a href="/samba/docs/man/Samba-HOWTO-Collection/">Official HOWTO</a></li>
-  <li><a href="/samba/docs/man/Samba-Guide/">By Example</a></li>
-  <li><a href="/samba/docs/using_samba/toc.html">Using Samba</a></li>
-  <li><a href="/samba/docs/">Docs and Books</a></li>
-  </ul>
-    
-  <img src="/samba/images/talk.png" alt="talk samba" />
-  <ul>
-  <li><a href="http://lists.samba.org">List Subscribe</a></li>
-  <li><a href="/samba/archives.html">List Archives</a></li>
-  <li><a href="/samba/irc.html">IRC</a></li>
-  <li><a href="/samba/ml-etiquette.html">Etiquette</a></li>
-  </ul>
-    
-  <img src="/samba/images/hack.png" alt="hack samba" />
-  <ul>
-  <li><a href="/samba/devel/">Devel Overview</a></li>
-  <li><a href="http://websvn.samba.org">SVN Source</a></li>
-  <li><a href="http://cvs.samba.org/cgi-bin/cvsweb/">Historical CVS Source</a></li>
-  <li><a href="http://build.samba.org/">Build Farm</a></li>
-  <li><a href="https://bugzilla.samba.org/">Bug Reports</a></li>
-  </ul>
-    
-  <img src="/samba/images/contact.png" alt="contact samba" />
-  <ul>
-  <li><a href="/samba/team/">Samba Team</a></li>
-  <li><a href="/samba/donations.html">Donations</a></li>
-  <li><a href="/samba/team/tshirt.html">T-shirts, etc</a></li>
-  <li><a href="/samba/contacts.html">Contacts For...</a></li>
-  </ul>
-    
-</div>
-
-
-<div id="content">
-  <div class="center">
-

diff --git a/download/index.html b/download/index.html
index f9a978c73278c27b40c7b1cbf7435f940779f2f1..4414ca2d9f919a28de9f02e7148b7608e0126c8e 100755 (executable)
--- a/download/index.html
+++ b/download/index.html
@@ -1,6 +1,5 @@
-<!--#include virtual="/samba/header.html" --> 
-  <title>Download Samba</title>
-<!--#include virtual="header_download.html" -->
+<!--#include virtual="/samba/header_wide.html" --> 
+
 <h2>Download</h2>
 
 <p>The Samba source code is distributed via ftp and http.  View the download

diff --git a/ghindex.html b/ghindex.html
index 020090ead068fcb15daf055521734d65e40e2913..bae3094715120d12d50868eed7b7997c56c974d3 100755 (executable)
--- a/ghindex.html
+++ b/ghindex.html
@@ -1,6 +1,6 @@
 <!--#include virtual="/samba/header.html" -->
 
-<H2 align="center">Search the Samba Web Pages</H2>
+<h2>Search the Samba Web Pages</h2>
 
 <FORM ACTION="http://samba.org/cgi-bin/smbaglimpse/01">
 

diff --git a/header.html b/header.html
index efeda16939e5575056dbe303b9ce09a30dd2464e..00229bdb510007ab2b5f33beaa3a2589ea994d64 100755 (executable)
--- a/header.html
+++ b/header.html
@@ -3,3 +3,191 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 
 <head>
+
+<link rel="stylesheet" href="/samba/style/common.css" type="text/css" media="all" />
+<link rel="stylesheet" href="/samba/style/main.css" type="text/css" media="all" />
+<link rel="shortcut icon" href="/samba/images/favicon.ico" />
+<link rel="alternate" href="/samba/news/sambanews.xml" type="application/rss+xml" title="Samba News" />
+
+<!--[if gte IE 5.5]>
+       <style type="text/css">
+       /*<![CDATA[*/
+       .logo_hack {
+filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='/samba/images/logo.png',sizingMethod='scale');
+       }
+       /*]]>*/ 
+       </style>
+<![endif]-->
+
+<!--[if lte IE 5]>
+       <style type="text/css">
+       /*<![CDATA[*/
+       .logo_hack {
+       background-image:url(/samba/images/logo.gif);
+       background-position:center;
+       background-repeat:no-repeat;
+       top:23.5px;
+       left:-10px;
+       }
+       /*]]>*/
+        </style>
+<![endif]-->
+
+<script src="/samba/js/siteWide.js" type="text/javascript"></script>
+<script src="/samba/js/initPage.js" type="text/javascript"></script>
+
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta http-equiv="Content-Language" content="en-us" />
+<meta name="keywords" content="Samba SMB CIFS" />
+<meta name="description" content="Home of Samba, the SMB file server" />
+
+</head>
+
+
+<body>
+
+<div id="banner">
+  <div class="stripe"></div>
+  
+  <div class="srch">
+  <h5>search samba.org:</h5>
+  <form method="post" action="http://de.samba.org/cgi-bin/htsearch">
+  <input type="text" size="15" name="words" value="" />
+  <input type="submit" value="Go" />
+  </form>
+  <span>|</span>
+  <form action="no_script_yet.cgi" name="mirrorForm">
+    <select name="mirrorLocation" onchange="changeMirror(this.form.mirrorLocation)">
+    <option selected="selected">Choose A Mirror</option>
+    <!--#include virtual="/samba/menu_options.html" --> 
+    </select>
+    <noscript>
+    <input type="submit" value="Go" />
+    </noscript>
+   </form>
+  </div>
+</div>
+
+<div id="logo">
+  <div class="logo_hack"><a href="/samba/"><img src="/samba/images/linkpad.gif" alt="Samba" /></a></div>
+</div>
+
+<div class="slogan">
+  <h4>Opening Windows to a Wider World</h4>
+</div>
+
+<div class="nav">
+  
+  <img src="/samba/images/think.png" alt="think samba" />
+  <ul>
+  <li><a href="/samba/what_is_samba.html">What Is Samba?</a></li>
+  <li><a href="http://news.samba.org/">Latest News</a></li>
+  <li><a href="/samba/docs/FAQ/">FAQ</a></li> 
+  </ul>
+    
+  <img src="/samba/images/get.png" alt="get samba" />
+  <ul>  
+  <li><a href="/samba/download/">Download Info</a></li>
+  <li><a href="/samba/ftp/Binary_Packages/">Binaries</a></li>
+  <li><a href="/samba/docs/man/Samba-HOWTO-Collection/install.html">How To Install</a></li>
+  <li><a href="/samba/GUI/">GUIs</a></li>
+  </ul>
+    
+  <img src="/samba/images/learn.png" alt="learn samba" />
+  <ul>
+  <li><a href="/samba/docs/man/Samba-HOWTO-Collection/">Official HOWTO</a></li>
+  <li><a href="/samba/docs/man/Samba-Guide/">By Example</a></li>
+  <li><a href="/samba/docs/using_samba/toc.html">Using Samba</a></li>
+  <li><a href="/samba/docs/">Docs And Books</a></li>
+  </ul>
+    
+  <img src="/samba/images/talk.png" alt="talk samba" />
+  <ul>
+  <li><a href="http://lists.samba.org">List Subscribe</a></li>
+  <li><a href="/samba/archives.html">List Archives</a></li>
+  <li><a href="/samba/irc.html">IRC</a></li>
+  <li><a href="/samba/ml-etiquette.html">Etiquette</a></li>
+  </ul>
+    
+  <img src="/samba/images/hack.png" alt="hack samba" />
+  <ul>
+  <li><a href="/samba/devel/">Devel Overview</a></li>
+  <li><a href="http://websvn.samba.org">SVN Source</a></li>
+  <li><a href="http://cvs.samba.org/cgi-bin/cvsweb/">Historical CVS Source</a></li>
+  <li><a href="http://build.samba.org/">Build Farm</a></li>
+  <li><a href="https://bugzilla.samba.org">Bug Reports</a></li>
+  </ul>
+    
+  <img src="/samba/images/contact.png" alt="contact samba" />
+  <ul>
+  <li><a href="/samba/team/">Samba Team</a></li>
+  <li><a href="/samba/donations.html">Donations</a></li>
+  <li><a href="/samba/team/tshirt.html">T-shirts, etc</a></li>
+  <li><a href="/samba/contacts.html">Contacts For...</a></li>
+  </ul>
+    
+</div>
+
+<div id="links">
+
+  <div class="releases">
+    <h4>Current Stable Releases</h4>
+    <ul>
+    <li><a href="/samba/ftp/samba-3.0.14a.tar.gz">Samba 3.0.14a (gzipped)</a></li>
+    <li><a href="/samba/history/samba-3.0.14a.html">Release Notes</a></li>
+    <li><a href="/samba/ftp/stable/samba-3.0.14a.tar.asc">Signature</a></li>
+    </ul>
+    
+    <h4>Historical</h4>
+    <ul>
+    <li><a href="/samba/ftp/stable/samba-2.2.12.tar.gz">Samba 2.2.12
+(gzipped)</a></li>
+    <li><a href="/samba/history/samba-2.2.12.html">Release Notes</a></li>
+    <li><a href="/samba/ftp/stable/samba-2.2.12.tar.asc">Signature</a></li>
+    </ul>
+       
+    <p><a href="/samba/history/">Release History</a></p>
+    
+    <p><a href="/samba/history/security.html">Security Updates</a></p>
+  </div>
+  
+  <div class="beyond">
+    <h4>Beyond samba.org</h4>
+    <ul>
+    <li><a href="/samba/support/">Commercial Support</a></li>
+    <li><a href="/samba/vendors/">Samba-related Products</a></li>
+    <li><a href="/samba/mirroring.html">Mirroring Info</a></li>
+    <li><a href="/samba/colophon.html">Samba-Web, version 3</a></li>
+    <li><a href="http://www.sambaxp.org/">sambaXP 2005</a></li>
+    </ul>
+  </div>
+  
+  <div class="related">
+    <h4>Related Sites</h4>
+    <ul>
+    <li><a href="http://linux-cifs.samba.org/">linux-cifs.samba.org</a></li>
+    <li><a href="http://samba-survey.sernet.de/">survey.samba.org</a></li>
+    <li><a href="http://jcifs.samba.org/">jcifs.samba.org</a></li>
+    <li><a href="http://rsync.samba.org/">rsync.samba.org</a></li>
+    <li><a href="http://ccache.samba.org/">ccache.samba.org</a></li>
+    <li><a href="http://distcc.samba.org/">distcc.samba.org</a></li>
+    <li><a href="http://ppp.samba.org/">ppp.samba.org</a></li>
+    </ul>
+  </div>
+
+  <div class="intl">
+    <h4>International Sites</h4>
+    <ul>
+    <li> Deutsch: <a href="http://samba.sernet.de/">samba.sernet.de</a></li>
+    <li> Italiano: <a href="http://samba.xsec.it/">samba.xsec.it</a></li>
+    <li> Hebrew: <a href="http://linux.israel.net/samba/samba.html">linux.israel.net</a></li>
+    <li> Chinese: <a href="http://hk.samba.org/">hk.samba.org</a></li>
+    </ul>
+  </div>
+    
+</div>
+
+ 
+<div id="content">
+  <div class="center">
+

diff --git a/header2.html b/header2.html
index 46f82af3a8d1dbd738b8eb91579e20a9498eea84..d7280a7e4934455c83ba0798ccba15b37cc6ef59 100755 (executable)
--- a/header2.html
+++ b/header2.html
@@ -28,17 +28,8 @@ filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='/samba/images/log
         </style>
 <![endif]-->
 
-<script type="text/javascript">
-<!-- Hide from old browsers
-   function changeMirror(mirrorChoice) {
-       mirrorSite = mirrorChoice.options[mirrorChoice.selectedIndex].value 
-       
-       if (mirrorSite != "") { 
-               document.location.href = mirrorSite 
-               } 
-   }
-// end hide -->
-</script>
+<script src="/samba/scripts/siteWide.js" type="text/javascript"></script>
+<script src="/samba/scripts/initPage.js" type="text/javascript"></script>
 
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta http-equiv="Content-Language" content="en-us" />
@@ -48,7 +39,7 @@ filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='/samba/images/log
 </head>
 
 
-<body onload="document.mirrorForm.mirrorLocation.selectedIndex=0">
+<body>
 
 <div id="banner">
   <div class="stripe"></div>

diff --git a/GUI/header_gui.html b/header_wide.html
similarity index 83%
rename from GUI/header_gui.html
rename to header_wide.html
index 7c9246f3cb1b379655b9014097e679ed69aab01c..2f8ccf8b1a71113232cf525e9c9458a93b52ebe7 100755 (executable)
--- a/GUI/header_gui.html
+++ b/header_wide.html
@@ -1,14 +1,19 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+
+<head>
 
 <link rel="stylesheet" href="/samba/style/common.css" type="text/css" media="all" />
 <link rel="stylesheet" href="/samba/style/wide.css" type="text/css" media="all" />
 <link rel="shortcut icon" href="/samba/images/favicon.ico" />
+<link rel="alternate" href="/samba/news/sambanews.xml" type="application/rss+xml" title="Samba News" />
 
 <!--[if gte IE 5.5]>
        <style type="text/css">
        /*<![CDATA[*/
        .logo_hack {
-filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='/samba/images/log
-o.png',sizingMethod='scale');
+filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='/samba/images/logo.png',sizingMethod='scale');
        }
        /*]]>*/ 
        </style>
@@ -28,17 +33,8 @@ o.png',sizingMethod='scale');
         </style>
 <![endif]-->
 
-<script type="text/javascript">
-<!-- Hide from old browsers
-   function changeMirror(mirrorChoice) {
-       mirrorSite = mirrorChoice.options[mirrorChoice.selectedIndex].value 
-       
-       if (mirrorSite != "") { 
-               document.location.href = mirrorSite 
-               } 
-   }
-// end hide -->
-</script>
+<script src="/samba/js/siteWide.js" type="text/javascript"></script>
+<script src="/samba/js/initPage.js" type="text/javascript"></script>
 
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta http-equiv="Content-Language" content="en-us" />
@@ -48,7 +44,7 @@ o.png',sizingMethod='scale');
 </head>
 
 
-<body onload="document.mirrorForm.mirrorLocation.selectedIndex=0">
+<body>
 
 <div id="banner">
   <div class="stripe"></div>
@@ -60,11 +56,14 @@ o.png',sizingMethod='scale');
   <input type="submit" value="Go" />
   </form>
   <span>|</span>
-  <form action="no_script_required.cgi" name="mirrorForm">
+  <form action="no_script_yet.cgi" name="mirrorForm">
     <select name="mirrorLocation" onchange="changeMirror(this.form.mirrorLocation)">
     <option selected="selected">Choose A Mirror</option>
     <!--#include virtual="/samba/menu_options.html" --> 
     </select>
+    <noscript>
+    <input type="submit" value="Go" />
+    </noscript>
    </form>
   </div>
 </div>
@@ -83,7 +82,7 @@ o.png',sizingMethod='scale');
   <ul>
   <li><a href="/samba/what_is_samba.html">What Is Samba?</a></li>
   <li><a href="http://news.samba.org/">Latest News</a></li>
-  <li><a href="/samba/docs/FAQ/">FAQ</a></li>
+  <li><a href="/samba/docs/FAQ/">FAQ</a></li> 
   </ul>
     
   <img src="/samba/images/get.png" alt="get samba" />
@@ -99,7 +98,7 @@ o.png',sizingMethod='scale');
   <li><a href="/samba/docs/man/Samba-HOWTO-Collection/">Official HOWTO</a></li>
   <li><a href="/samba/docs/man/Samba-Guide/">By Example</a></li>
   <li><a href="/samba/docs/using_samba/toc.html">Using Samba</a></li>
-  <li><a href="/samba/docs/">Docs and Books</a></li>
+  <li><a href="/samba/docs/">Docs And Books</a></li>
   </ul>
     
   <img src="/samba/images/talk.png" alt="talk samba" />
@@ -129,7 +128,7 @@ o.png',sizingMethod='scale');
     
 </div>
 
- 
+
 <div id="content">
   <div class="center">
 

diff --git a/history/header_history.html b/history/header_history.html
index 52e1f15c37738d4297d3f66d00bf55f7118cdd65..5ff53b39a590fcf922896609032753a2fec5a807 100755 (executable)
--- a/history/header_history.html
+++ b/history/header_history.html
@@ -1,3 +1,8 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+
+<head>
 
 <link rel="stylesheet" href="/samba/style/common.css" type="text/css" media="all" />
 <link rel="stylesheet" href="/samba/style/history.css" type="text/css" media="all" />
@@ -20,18 +25,8 @@
        </style>
 <![endif]-->
 
-<script type="text/javascript">
-<!-- Hide from old browsers
-   function changeMirror(mirrorChoice) {
-        mirrorSite = mirrorChoice.options[mirrorChoice.selectedIndex].value
-
-        if (mirrorSite != "") {
-                document.location.href = mirrorSite
-                }
-   }
-// end hide -->
-</script>
-
+<script src="/samba/js/siteWide.js" type="text/javascript"></script>
+<script src="/samba/js/initPage.js" type="text/javascript"></script>
 
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 <meta http-equiv="Content-Language" content="en-us" />

diff --git a/history/index.html b/history/index.html
index e26ae6e615fbd4f373dd98b4af1be914a72a263e..7e1e57fab78786758b06132247d7e0ed89256bad 100755 (executable)
--- a/history/index.html
+++ b/history/index.html
@@ -1,5 +1,3 @@
-<!--#include virtual="/samba/header.html" --> 
-  <title>Samba Release History</title>
 <!--#include virtual="header_history.html" -->
 
 <p>Previous release announcements are archived here for historical purposes.</p>

diff --git a/history/security.html b/history/security.html
index 03966df9029b88ffb50c4aab8e324c721ad90923..0c5f2adbb405a4d53e3c965037e5408948da903b 100755 (executable)
--- a/history/security.html
+++ b/history/security.html
@@ -1,5 +1,3 @@
-<!--#include virtual="/samba/header.html" --> 
-  <title>Samba - Security Updates and Information</title>
 <!--#include virtual="header_history.html" -->
 
 <h2>Samba Security Releases</h2>

diff --git a/index.html b/index.html
index f59b959df491b71e0271a92514f4fe3365ad63e6..61b3263930f21a3069535a8136722b7e5de53b07 100755 (executable)
--- a/index.html
+++ b/index.html
@@ -1,6 +1,4 @@
 <!--#include virtual="/samba/header.html" --> 
-  <title>Samba - opening windows to a wider world</title>
-<!--#include virtual="/samba/header2.html" -->
 
 <div id="noswp">
 <a href="http://nosoftwarepatents.com/"><img src="/samba/images/noswp_banner.jpg" alt="No Software Patents!" /></a>

diff --git a/irc.html b/irc.html
index 0174c2867016617dc3c01edb4b6cbd17f7bd1873..cb09d24c7a71c3d224eaf893e83aee88abb137c4 100644 (file)
--- a/irc.html
+++ b/irc.html
@@ -1,6 +1,6 @@
 <!--#include virtual="/samba/header.html" --> 
   <title>Samba IRC Channels</title>
-<!--#include virtual="/samba/header2.html" -->
+
 
 <h2>Samba IRC Channels</h2>
 

diff --git a/mirroring.html b/mirroring.html
index 56119a5d824361de8de65a55ffeb9c905a905dea..54e3912411b4a7af90b71ac6d0b3cab76ac60bf3 100755 (executable)
--- a/mirroring.html
+++ b/mirroring.html
@@ -1,6 +1,4 @@
-<!--#include virtual="/samba/header.html" --> 
-  <title>Mirroring Samba</title>
-<!--#include virtual="/samba/download/header_download.html" -->
+<!--#include virtual="/samba/header_wide.html" --> 
 
 <h2>Mirroring Samba</h2>
 

diff --git a/ml-etiquette.html b/ml-etiquette.html
index 9f91fd508491d0fa4b880b3cda18cf3bd1bd7fa5..7ad151fa3e2039b55c3b4fa7b76f24137808fdec 100755 (executable)
--- a/ml-etiquette.html
+++ b/ml-etiquette.html
@@ -1,6 +1,6 @@
 <!--#include virtual="/samba/header.html" --> 
   <title>Samba - Mailing List Etiquette</title>
-<!--#include virtual="/samba/header2.html" -->
+
 
 <h2>Mailing List Etiquette</h2>
 

diff --git a/ms_license.html b/ms_license.html
index c283bfde0588dee7967c1861c026856c1ce8d5f7..60d9bf7eda5a11386e1dbd087a2385c2591d6112 100755 (executable)
--- a/ms_license.html
+++ b/ms_license.html
@@ -1,6 +1,4 @@
 <!--#include virtual="/samba/header.html" --> 
-  <title>Samba - MS Liscense overview</title>
-<!--#include virtual="/samba/header2.html" -->
 
 <h2>CIFS, Microsoft and the Samba Team</h2>
 

diff --git a/ntsystems.html b/ntsystems.html
index b50ddc44cf28a1822aa6ca5562b85b3e6a4c1494..a6dfdb175306a46d4b82053d83b9e1d6abc4400e 100755 (executable)
--- a/ntsystems.html
+++ b/ntsystems.html
@@ -1,8 +1,6 @@
 <!--#include virtual="/samba/header.html" --> 
-  <title>Samba - NT Systems Magazine Award</title>
-<!--#include virtual="/samba/header2.html" -->
 
-<H2 align="center">Award from NT Systems Magazine</H2>
+<h2>Award from NT Systems Magazine</h2>
 
 We got an award and a trophy from <A
 HREF="http://www.ntsystems.com">NT Systems Magazine</A> for

diff --git a/search.html b/search.html
index 606d01109936f9513990c5c7be598e2b91a5c504..d5506cbbfc9a983ec4b140b65443da2b33192886 100755 (executable)
--- a/search.html
+++ b/search.html
@@ -1,8 +1,6 @@
 <!--#include virtual="/samba/header.html" --> 
-  <title>Search Samba.org</title>
-<!--#include virtual="/samba/header2.html" -->
 
-  <h2 align="center">Search</h2>
+<h2>Search</h2>
 
 <p>
 Searchable mailing list archives are available at <a

diff --git a/security/index.html b/security/index.html
index 9ee2a0b0a648fb707c64b41c6a77414b3b553682..6486a5b4a2c43c9707a110cf4724b93ee4b2e138 100644 (file)
--- a/security/index.html
+++ b/security/index.html
@@ -1,8 +1,6 @@
-<!--#include virtual="/samba/header.html" -->
-<title>You are being redirected...</title>
-
+<html>
+<head>
 <meta http-equiv="refresh" content="0;url=/samba/history/security.html" />
-
 <head>
 <body>
 </body>

diff --git a/smbfs/index.html b/smbfs/index.html
index d3ddeab4de9a43e56aecd64204115915a6e99b0e..5657f6cfc8b8bca50566d5d59bf3691a7584112b 100755 (executable)
--- a/smbfs/index.html
+++ b/smbfs/index.html
@@ -1,6 +1,6 @@
 <!--#include virtual="/samba/header.html" -->
 
-<h2 align=center>The smbfs filesystem</h2>
+<h2>The smbfs filesystem</h2>
 
 The smbfs filesystem is a mountable SMB filesystem for Linux. It does
 not run on any other systems.<p>

diff --git a/subversion.html b/subversion.html
index d7314b2a239f0c99a1293c6292eedeafc0e57402..4cb2899927b9a08858e962d1524587a96ff7130b 100755 (executable)
--- a/subversion.html
+++ b/subversion.html
@@ -1,6 +1,4 @@
-<!--#include virtual="/samba/header.html" --> 
-  <title>Samba - Subversion Instructions</title>
-<!--#include virtual="/samba/download/header_download.html" -->
+<!--#include virtual="/samba/header_wide.html" --> 
 
 <h2 align="center">Subversion access to svnanon.samba.org</h2>
 

diff --git a/support/header_support.html b/support/header_support.html
index fb2f346ce7244a60e5e2280b7eddd47439ee95b4..4af4f3145a867e9b9cf5b63b9573b65d694ed06f 100755 (executable)
--- a/support/header_support.html
+++ b/support/header_support.html
@@ -1,3 +1,8 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+
+<head>
 
 <link rel="stylesheet" href="/samba/style/common.css" type="text/css" media="all" />
 <link rel="stylesheet" href="/samba/style/support.css" type="text/css" media="all" />
@@ -20,17 +25,8 @@
        </style>
 <![endif]-->
 
-<script type="text/javascript">
-<!-- Hide from old browsers
-   function changeMirror(mirrorChoice) {
-        mirrorSite = mirrorChoice.options[mirrorChoice.selectedIndex].value
-
-        if (mirrorSite != "") {
-                document.location.href = mirrorSite
-                }
-   }
-// end hide -->
-</script>
+<script src="/samba/js/siteWide.js" type="text/javascript"></script>
+<script src="/samba/js/initPage.js" type="text/javascript"></script>
 
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 <meta http-equiv="Content-Language" content="en-us" />

diff --git a/support/index.html b/support/index.html
index cbd6052c19bbaae2826271baecc85e08d22d7633..2ab35e5c5d99d173066a4bcf66ff097d5b911fce 100755 (executable)
--- a/support/index.html
+++ b/support/index.html
@@ -1,5 +1,3 @@
-<!--#include virtual="/samba/header.html" --> 
-  <title>Samba Commercial Support Providers</title>
 <!--#include virtual="header_support.html" -->
 
 There are a number of areas for you to look when searching for Samba support:
@@ -19,4 +17,4 @@ There are a number of areas for you to look when searching for Samba support:
 
 
 
-<!--#include virtual="footer_support.html"-->
\ No newline at end of file
+<!--#include virtual="footer_support.html"-->

diff --git a/team/header_team.html b/team/header_team.html
deleted file mode 100755 (executable)
index 7c9246f..0000000
--- a/team/header_team.html
+++ /dev/null
@@ -1,135 +0,0 @@
-
-<link rel="stylesheet" href="/samba/style/common.css" type="text/css" media="all" />
-<link rel="stylesheet" href="/samba/style/wide.css" type="text/css" media="all" />
-<link rel="shortcut icon" href="/samba/images/favicon.ico" />
-
-<!--[if gte IE 5.5]>
-       <style type="text/css">
-       /*<![CDATA[*/
-       .logo_hack {
-filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='/samba/images/log
-o.png',sizingMethod='scale');
-       }
-       /*]]>*/ 
-       </style>
-<![endif]-->
-
-<!--[if lte IE 5]>
-       <style type="text/css">
-       /*<![CDATA[*/
-       .logo_hack {
-       background-image:url(/samba/images/logo.gif);
-       background-position:center;
-       background-repeat:no-repeat;
-       top:23.5px;
-       left:-10px;
-       }
-       /*]]>*/
-        </style>
-<![endif]-->
-
-<script type="text/javascript">
-<!-- Hide from old browsers
-   function changeMirror(mirrorChoice) {
-       mirrorSite = mirrorChoice.options[mirrorChoice.selectedIndex].value 
-       
-       if (mirrorSite != "") { 
-               document.location.href = mirrorSite 
-               } 
-   }
-// end hide -->
-</script>
-
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta http-equiv="Content-Language" content="en-us" />
-<meta name="keywords" content="Samba SMB CIFS" />
-<meta name="description" content="Home of Samba, the SMB file server" />
-
-</head>
-
-
-<body onload="document.mirrorForm.mirrorLocation.selectedIndex=0">
-
-<div id="banner">
-  <div class="stripe"></div>
-  
-  <div class="srch">
-  <h5>search samba.org:</h5>
-  <form method="post" action="http://de.samba.org/cgi-bin/htsearch">
-  <input type="text" size="15" name="words" value="" />
-  <input type="submit" value="Go" />
-  </form>
-  <span>|</span>
-  <form action="no_script_required.cgi" name="mirrorForm">
-    <select name="mirrorLocation" onchange="changeMirror(this.form.mirrorLocation)">
-    <option selected="selected">Choose A Mirror</option>
-    <!--#include virtual="/samba/menu_options.html" --> 
-    </select>
-   </form>
-  </div>
-</div>
-
-<div id="logo">
-  <div class="logo_hack"><a href="/samba/"><img src="/samba/images/linkpad.gif" alt="Samba" /></a></div>
-</div>
-
-<div class="slogan">
-  <h4>Opening Windows to a Wider World</h4>
-</div>
-
-<div class="nav">
-  
-  <img src="/samba/images/think.png" alt="think samba" />
-  <ul>
-  <li><a href="/samba/what_is_samba.html">What Is Samba?</a></li>
-  <li><a href="http://news.samba.org/">Latest News</a></li>
-  <li><a href="/samba/docs/FAQ/">FAQ</a></li>
-  </ul>
-    
-  <img src="/samba/images/get.png" alt="get samba" />
-  <ul>  
-  <li><a href="/samba/download/">Download Info</a></li>
-  <li><a href="/samba/ftp/Binary_Packages/">Binaries</a></li>
-  <li><a href="/samba/docs/man/Samba-HOWTO-Collection/install.html">How To Install</a></li>
-  <li><a href="/samba/GUI/">GUIs</a></li>
-  </ul>
-    
-  <img src="/samba/images/learn.png" alt="learn samba" />
-  <ul>
-  <li><a href="/samba/docs/man/Samba-HOWTO-Collection/">Official HOWTO</a></li>
-  <li><a href="/samba/docs/man/Samba-Guide/">By Example</a></li>
-  <li><a href="/samba/docs/using_samba/toc.html">Using Samba</a></li>
-  <li><a href="/samba/docs/">Docs and Books</a></li>
-  </ul>
-    
-  <img src="/samba/images/talk.png" alt="talk samba" />
-  <ul>
-  <li><a href="http://lists.samba.org">List Subscribe</a></li>
-  <li><a href="/samba/archives.html">List Archives</a></li>
-  <li><a href="/samba/irc.html">IRC</a></li>
-  <li><a href="/samba/ml-etiquette.html">Etiquette</a></li>
-  </ul>
-    
-  <img src="/samba/images/hack.png" alt="hack samba" />
-  <ul>
-  <li><a href="/samba/devel/">Devel Overview</a></li>
-  <li><a href="http://websvn.samba.org">SVN Source</a></li>
-  <li><a href="http://cvs.samba.org/cgi-bin/cvsweb/">Historical CVS Source</a></li>
-  <li><a href="http://build.samba.org/">Build Farm</a></li>
-  <li><a href="https://bugzilla.samba.org">Bug Reports</a></li>
-  </ul>
-    
-  <img src="/samba/images/contact.png" alt="contact samba" />
-  <ul>
-  <li><a href="/samba/team/">Samba Team</a></li>
-  <li><a href="/samba/donations.html">Donations</a></li>
-  <li><a href="/samba/team/tshirt.html">T-shirts, etc</a></li>
-  <li><a href="/samba/contacts.html">Contacts For...</a></li>
-  </ul>
-    
-</div>
-
- 
-<div id="content">
-  <div class="center">
-

diff --git a/team/index.html b/team/index.html
index 5b63a7dbb342cece1a4d2cfc64660ba1674d2c4d..0a0fab56b4bdad7e17852de0d26877798480d167 100755 (executable)
--- a/team/index.html
+++ b/team/index.html
@@ -1,6 +1,4 @@
-<!--#include virtual="/samba/header.html" --> 
-  <title>The Samba Team</title>
-<!--#include virtual="header_team.html" -->
+<!--#include virtual="/samba/header_wide.html" --> 
 
 <h2>The Samba Team</h2>
 

diff --git a/team/team2002.html b/team/team2002.html
index 1ef400fbcfcdd5f6d1c250a0dc1ae3b372955fce..8c5634dd72eef7b3778a3155856ff88b4eb56502 100755 (executable)
--- a/team/team2002.html
+++ b/team/team2002.html
@@ -1,8 +1,6 @@
-<!--#include virtual="/samba/header.html" --> 
-  <title>Samba - Photo from CIFS 2002</title>
-<!--#include virtual="header_team.html" -->
+<!--#include virtual="/samba/header_wide.html" --> 
 
-<H2 align="center">The Samba Team</H2>
+<h2>The Samba Team</h2>
 
 <P>Here is a photo of some of us at the CIFS conference in 2002:
 

diff --git a/team/team98.html b/team/team98.html
index 3a8b9e9d9a5673e8e72265c5e3f37869a32d4b6d..2d91d7df080535dfeb2b6b5c7ccef59523dbd7e8 100755 (executable)
--- a/team/team98.html
+++ b/team/team98.html
@@ -1,6 +1,4 @@
-<!--#include virtual="/samba/header.html" --> 
-  <title>Samba - Photo from CIFS 1998</title>
-<!--#include virtual="header_team.html" -->
+<!--#include virtual="/samba/header_wide.html" --> 
 
 <H2 align="center">The Samba Team</H2>
 

diff --git a/team/tshirt.html b/team/tshirt.html
index a1139e0e97dd97923802dccd3bdaac257505ee51..58ed501f264ff7b140ebf12073bec77e3ed34ce9 100755 (executable)
--- a/team/tshirt.html
+++ b/team/tshirt.html
@@ -1,6 +1,5 @@
-<!--#include virtual="/samba/header.html" --> 
-  <title>T-shirts and other Samba gear</title>
-<!--#include virtual="header_team.html" -->
+<!--#include virtual="/samba/header_wide.html" --> 
+
 
 <P>
 <CENTER>
@@ -14,7 +13,7 @@
 
 <P>
 <A NAME="shirts"> </A>
-<H1 ALIGN=CENTER>Samba T-Shirts!</H1>
+<h2>Samba T-Shirts!</h2>
 
 <CENTER>
 <TABLE BORDER=0 WIDTH=532>

diff --git a/testpage.html b/testpage.html
index 7df9bbf27d4bc1b56d738003ae853becc9513b61..d65aa278fdba831161afbafb7e61fad4e87e16db 100755 (executable)
--- a/testpage.html
+++ b/testpage.html
@@ -1,8 +1,6 @@
 <!--#include virtual="/samba/header.html" -->
-<title>Test Page</title>
-<!--#include virtual="/samba/header2.html" -->
 
-<H1 align="center">This is a test page</H1>
+<h2>This is a test page</h2>
 
 If this page does not display correctly (with the Samba logo at the
 top) then this web server probably doesn't support server side

diff --git a/thanks.html b/thanks.html
index ee0ee343d0671deb145ac3e979bf921aecd67e50..8bf8df1dc73b3d0d1c90291b9ae33dc48ee4bdbe 100755 (executable)
--- a/thanks.html
+++ b/thanks.html
@@ -1,8 +1,6 @@
 <!--#include virtual="/samba/header.html" --> 
-  <title>Samba Thank Yous</title>
-<!--#include virtual="/samba/header2.html" -->
 
-<H2 align="center">Thanks</H2>
+<h2>Thanks</h2>
 
 There are a great many people and organisations that
 have contributed to the developement of Samba, and in the words

diff --git a/tng.html b/tng.html
index 1644ff22d73019cb23fb151ffa192b383a628307..3a3295eb7ee7620771c6905d3300a9a8fb686ec7 100755 (executable)
--- a/tng.html
+++ b/tng.html
@@ -1,8 +1,7 @@
 <!--#include virtual="/samba/header.html" --> 
-  <title>Samba/Samba-TNG Explained</title>
-<!--#include virtual="/samba/header2.html" -->
 
-<H2 align="center">Samba-TNG fork</H2>
+<h2>Samba/Samba-TNG Explained</h2>
+
 Everyone pretty much knows now that the Samba codebase has forked,
 with the TNG branch being split off into a new set of
 releases. Despite some <a

diff --git a/top_level_template b/top_level_template
index 5b50fa0309d7c6e56987e701cdcb7bc1bc1e3f2a..7505e961d67406bf7a509b188ba44a2ed1983118 100644 (file)
--- a/top_level_template
+++ b/top_level_template
@@ -1,9 +1,5 @@
 <!--#include virtual="/samba/header.html" --> 
-  <title>PAGE_SPECIFIC_TITLE_GOES_HERE</title>
-<!--#include virtual="/samba/header2.html" -->
-
 
 PLACE_YOUR _CONTENT_HERE
 
-
 <!--#include virtual="/samba/footer.html" -->

diff --git a/vendors/header_vendors.html b/vendors/header_vendors.html
deleted file mode 100755 (executable)
index 7c9246f..0000000
--- a/vendors/header_vendors.html
+++ /dev/null
@@ -1,135 +0,0 @@
-
-<link rel="stylesheet" href="/samba/style/common.css" type="text/css" media="all" />
-<link rel="stylesheet" href="/samba/style/wide.css" type="text/css" media="all" />
-<link rel="shortcut icon" href="/samba/images/favicon.ico" />
-
-<!--[if gte IE 5.5]>
-       <style type="text/css">
-       /*<![CDATA[*/
-       .logo_hack {
-filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='/samba/images/log
-o.png',sizingMethod='scale');
-       }
-       /*]]>*/ 
-       </style>
-<![endif]-->
-
-<!--[if lte IE 5]>
-       <style type="text/css">
-       /*<![CDATA[*/
-       .logo_hack {
-       background-image:url(/samba/images/logo.gif);
-       background-position:center;
-       background-repeat:no-repeat;
-       top:23.5px;
-       left:-10px;
-       }
-       /*]]>*/
-        </style>
-<![endif]-->
-
-<script type="text/javascript">
-<!-- Hide from old browsers
-   function changeMirror(mirrorChoice) {
-       mirrorSite = mirrorChoice.options[mirrorChoice.selectedIndex].value 
-       
-       if (mirrorSite != "") { 
-               document.location.href = mirrorSite 
-               } 
-   }
-// end hide -->
-</script>
-
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta http-equiv="Content-Language" content="en-us" />
-<meta name="keywords" content="Samba SMB CIFS" />
-<meta name="description" content="Home of Samba, the SMB file server" />
-
-</head>
-
-
-<body onload="document.mirrorForm.mirrorLocation.selectedIndex=0">
-
-<div id="banner">
-  <div class="stripe"></div>
-  
-  <div class="srch">
-  <h5>search samba.org:</h5>
-  <form method="post" action="http://de.samba.org/cgi-bin/htsearch">
-  <input type="text" size="15" name="words" value="" />
-  <input type="submit" value="Go" />
-  </form>
-  <span>|</span>
-  <form action="no_script_required.cgi" name="mirrorForm">
-    <select name="mirrorLocation" onchange="changeMirror(this.form.mirrorLocation)">
-    <option selected="selected">Choose A Mirror</option>
-    <!--#include virtual="/samba/menu_options.html" --> 
-    </select>
-   </form>
-  </div>
-</div>
-
-<div id="logo">
-  <div class="logo_hack"><a href="/samba/"><img src="/samba/images/linkpad.gif" alt="Samba" /></a></div>
-</div>
-
-<div class="slogan">
-  <h4>Opening Windows to a Wider World</h4>
-</div>
-
-<div class="nav">
-  
-  <img src="/samba/images/think.png" alt="think samba" />
-  <ul>
-  <li><a href="/samba/what_is_samba.html">What Is Samba?</a></li>
-  <li><a href="http://news.samba.org/">Latest News</a></li>
-  <li><a href="/samba/docs/FAQ/">FAQ</a></li>
-  </ul>
-    
-  <img src="/samba/images/get.png" alt="get samba" />
-  <ul>  
-  <li><a href="/samba/download/">Download Info</a></li>
-  <li><a href="/samba/ftp/Binary_Packages/">Binaries</a></li>
-  <li><a href="/samba/docs/man/Samba-HOWTO-Collection/install.html">How To Install</a></li>
-  <li><a href="/samba/GUI/">GUIs</a></li>
-  </ul>
-    
-  <img src="/samba/images/learn.png" alt="learn samba" />
-  <ul>
-  <li><a href="/samba/docs/man/Samba-HOWTO-Collection/">Official HOWTO</a></li>
-  <li><a href="/samba/docs/man/Samba-Guide/">By Example</a></li>
-  <li><a href="/samba/docs/using_samba/toc.html">Using Samba</a></li>
-  <li><a href="/samba/docs/">Docs and Books</a></li>
-  </ul>
-    
-  <img src="/samba/images/talk.png" alt="talk samba" />
-  <ul>
-  <li><a href="http://lists.samba.org">List Subscribe</a></li>
-  <li><a href="/samba/archives.html">List Archives</a></li>
-  <li><a href="/samba/irc.html">IRC</a></li>
-  <li><a href="/samba/ml-etiquette.html">Etiquette</a></li>
-  </ul>
-    
-  <img src="/samba/images/hack.png" alt="hack samba" />
-  <ul>
-  <li><a href="/samba/devel/">Devel Overview</a></li>
-  <li><a href="http://websvn.samba.org">SVN Source</a></li>
-  <li><a href="http://cvs.samba.org/cgi-bin/cvsweb/">Historical CVS Source</a></li>
-  <li><a href="http://build.samba.org/">Build Farm</a></li>
-  <li><a href="https://bugzilla.samba.org">Bug Reports</a></li>
-  </ul>
-    
-  <img src="/samba/images/contact.png" alt="contact samba" />
-  <ul>
-  <li><a href="/samba/team/">Samba Team</a></li>
-  <li><a href="/samba/donations.html">Donations</a></li>
-  <li><a href="/samba/team/tshirt.html">T-shirts, etc</a></li>
-  <li><a href="/samba/contacts.html">Contacts For...</a></li>
-  </ul>
-    
-</div>
-
- 
-<div id="content">
-  <div class="center">
-

diff --git a/vendors/index.html b/vendors/index.html
index cd14eb78ea753eab35814e879550e60fc1aeaaeb..4f8fcadb81fd8c74542d45ca26e7a67e72de5bc8 100755 (executable)
--- a/vendors/index.html
+++ b/vendors/index.html
@@ -1,8 +1,6 @@
-<!--#include virtual="/samba/header.html" -->
-  <title>Samba-based Commercial Products</title>
-<!--#include virtual="header_vendors.html" -->
+<!--#include virtual="/samba/header_wide.html" -->
 
-<H2 align="center">Samba Vendors</H2>
+<h2>Samba Vendors</h2>
 
 <P>Quite a few vendors use Samba as part of a larger product. This gives
 them a top-quality SMB server with the flexibility to modify the server to

diff --git a/what_is_samba.html b/what_is_samba.html
index 046aa8541ceee48f8608857d97a69eec94c62fcf..6068fbb538c22e9e743d2f2e76316f54d87499d5 100755 (executable)
--- a/what_is_samba.html
+++ b/what_is_samba.html
@@ -1,6 +1,6 @@
 <!--#include virtual="/samba/header.html" --> 
   <title>What is Samba?</title>
-<!--#include virtual="/samba/header2.html" -->
+
 
 <h2>What is Samba?</h2>