empire-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From doeb...@apache.org
Subject svn commit: r1245208 [2/4] - in /empire-db/site: ./ community/ css/ documentation/ downloads/ empiredb/ images/ images/diagrams/ images/logos/ images/mail/ images/menu/ struts2ext/ support/
Date Thu, 16 Feb 2012 22:14:22 GMT
Modified: empire-db/site/documentation/class_overview.htm
URL: http://svn.apache.org/viewvc/empire-db/site/documentation/class_overview.htm?rev=1245208&r1=1245207&r2=1245208&view=diff
==============================================================================
--- empire-db/site/documentation/class_overview.htm (original)
+++ empire-db/site/documentation/class_overview.htm Thu Feb 16 22:14:20 2012
@@ -21,6 +21,23 @@
 	<link rel="stylesheet" href="../css/layout.css" type="text/css" />
 	<!-- #BeginEditable "stylesheets" -->
 <style type="text/css">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 <!-- Wegen großem Bild muss Mindestbreite erhöht werden -->
 </style>
 	<!-- #EndEditable -->
@@ -35,8 +52,8 @@
 			<img src="../images/logos/empire-db-logo.gif" alt="Empire-db: The relational data persistence component." />
 		</div>
 		<div id="asf">
-			<a target="_blank" href="http://incubator.apache.org/">
-			<img src="../images/logos/apache-incubator-logo.png" alt="Apache Incubator" /></a>
+			<a id="asfhome" target="_blank" href="http://www.apache.org"><img src="../images/logos/feather-small.gif" alt="The Apache Software Foundation" /></a>
+			<label for="asfhome" >The Apache Software Foundation</label>
 		</div>
 		<div style="clear:both"></div>
 	</div>
@@ -53,69 +70,55 @@
 					<ul id="mainMenu">
 						<li id="menu_home"><a href="../index.html">Home</a></li>
 						<li id="menu_news"><a href="../news.htm">News</a></li>
-						<li id="menu_empiredb">
-						<a href="../empiredb/empiredb.htm">Empire-db</a>
+						<li id="menu_empiredb"><a href="../empiredb/empiredb.htm">Empire-db</a>
 								<ul class="subMenu">
-									<li id="menu_empiredb_extending_pattern">
-									<a href="../empiredb/pattern.htm">The Empire DAO-<br />pattern</a></li>
-									<li id="menu_empiredb_handling_metadata">
-									<a href="../empiredb/metadata.htm">Handling data and metadata</a></li>
-									<li id="menu_empiredb_wrong">
-									<a href="../empiredb/hibernate.htm">What's wrong with Hibernate and JPA</a></li>
-									<li id="menu_empiredb_stringfree">
-									<a href="../empiredb/stringfree.htm">The principle of<br/>string-free coding</a></li>
-									<li id="menu_empiredb_faq">
-									<a href="../empiredb/faq.htm">FAQ</a></li>
+									<li id="menu_empiredb_extending_pattern"><a href="../empiredb/pattern.htm">The Empire DAO-<br />pattern</a></li>
+									<li id="menu_empiredb_handling_metadata"><a href="../empiredb/metadata.htm">Handling data and metadata</a></li>
+									<li id="menu_empiredb_wrong"><a href="../empiredb/hibernate.htm">What's wrong with Hibernate and JPA</a></li>
+									<li id="menu_empiredb_stringfree"><a href="../empiredb/stringfree.htm">The principle of<br/>string-free coding</a></li>
+									<li id="menu_empiredb_faq"><a href="../empiredb/faq.htm">FAQ</a></li>
 								</ul>
 						</li>
-						<li id="menu_struts2ext">
-						<a href="../struts2ext/struts2ext.htm">Empire-db and Struts2</a>
+						<li id="menu_struts2ext"><a href="../struts2ext/struts2ext.htm">Empire-db and Struts2</a>
 							<ul class="subMenu">
-								<li id="menu_struts2ext_forms_controls">
-								<a href="../struts2ext/forms_controls.htm">Forms and controls</a></li>
-								<li id="menu_struts2ext_rendering_parsing">
-								<a href="../struts2ext/rendering_parsing.htm">Rendering and parsing</a></li>
+								<li id="menu_struts2ext_forms_controls"><a href="../struts2ext/forms_controls.htm">Forms and controls</a></li>
+								<li id="menu_struts2ext_rendering_parsing"><a href="../struts2ext/rendering_parsing.htm">Rendering and parsing</a></li>
 								<!--<li id="menu_struts2ext_tag_reference"><a href="struts2ext/tag_reference.htm">Tag reference</a></li>-->
-								<li id="menu_struts2ext_input_controls">
-								<a href="../struts2ext/input_controls.htm">Input controls</a></li>
+								<li id="menu_struts2ext_input_controls"><a href="../struts2ext/input_controls.htm">Input controls</a></li>
 							</ul>
 						</li>
-						<li id="menu_downloads">
-						<a href="../downloads/latest.htm">Downloads</a>
+						<li id="menu_downloads"><a href="../downloads/latest.htm">Downloads</a>
 								<ul class="subMenu">
-									<li id="menu_downloads_previous">
-									<a href="../downloads/previous.htm">Previous releases</a></li>
-									<li id="menu_downloads_license">
-									<a href="../downloads/license.htm">License</a></li>
+									<li id="menu_downloads_previous"><a href="../downloads/previous.htm">Previous releases</a></li>
+									<li id="menu_downloads_license"><a href="../downloads/license.htm">License</a></li>
 								</ul>
 						</li>
 						<li id="menu_documentation"><a href="documentation.htm">Documentation</a>					
 							<ul class="subMenu">
-								<li id="menu_documentation_class_overview">
-								<a href="class_overview.htm">Empire-db class<br />overview</a></li>
-								<li id="menu_documentation_tutorials">
-								<a href="tutorial.htm">Tutorial</a></li>
-								<li id="menu_documentation_getting_started">
-								<a href="getting_started.htm">Getting started</a></li>
-								<li id="menu_documentation_api">
-								<a href="api.htm">API</a></li>
+								<li id="menu_documentation_class_overview"><a href="class_overview.htm">Empire-db class<br />overview</a></li>
+								<li id="menu_documentation_tutorials"><a href="tutorial.htm">Tutorial</a></li>
+								<li id="menu_documentation_getting_started"><a href="getting_started.htm">Getting started</a></li>
+								<li id="menu_documentation_api"><a href="api.htm">API</a></li>
 							</ul>
 						</li>
-						<li id="menu_community">
-						<a href="../community/community.htm">Community</a>					
+						<li id="menu_community"><a href="../community/community.htm">Community</a>					
 							<ul class="subMenu">
-								<li id="menu_community_mailing_lists">
-								<a href="../community/mailing_lists.htm">Mailing lists</a></li>
-								<li id="menu_community_source_code">
-								<a href="../community/source_code.htm">Source code</a></li>
-								<li id="menu_community_jira">
-								<a href="../community/jira.htm">Ticketing &amp; Wiki</a></li>
+								<li id="menu_community_mailing_lists"><a href="../community/mailing_lists.htm">Mailing lists</a></li>
+								<li id="menu_community_source_code"><a href="../community/source_code.htm">Source code</a></li>
+								<li id="menu_community_jira"><a href="../community/jira.htm">Ticketing &amp; Wiki</a></li>
 								<!--<li id="menu_community_road_map"><a href="community/road_map.htm">Road map</a></li>-->
-								<li id="menu_community_contributors">
-								<a href="../community/contributors.htm">Contributors</a></li>
+								<li id="menu_community_contributors"><a href="../community/contributors.htm">Contributors</a></li>
 							</ul>
 						</li>
-						<li id="menu_disclaimer"><a href="../disclaimer.htm">Disclaimer</a></li>
+						<li id="menu_apache"><a href="../apache.htm">About Apache</a>
+							<ul class="subMenu">
+								<li id="menu_apache_home"><a href="http://www.apache.org">Apache home<span class="asflink">&nbsp;</span></a></li>
+								<li id="menu_apache_donate"><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship<span class="asflink">&nbsp;</span></a></li>
+								<li id="menu_apache_thanks"><a href="http://www.apache.org/foundation/thanks.html">Foundation thanks<span class="asflink">&nbsp;</span></a></li>
+								<li id="menu_apache_security"><a href="http://www.apache.org/security/">Security<span class="asflink">&nbsp;</span></a></li>
+							</ul>
+						</li>
+						<li id="menu_disclaimer"><a href="http://www.apache.org/licenses/">License<span class="asflink">&nbsp;</span></a></li>
 					</ul>
 				</div>
 				
@@ -288,8 +291,7 @@
 				</div>
 				<div id="nav_next">
 					&nbsp;
-					<a id="next" href="">Next Page 
-					<img src="../images/next.gif" alt="" /></a>
+					<a id="next" href="">Next Page <img src="../images/next.gif" alt="" /></a>
 				</div>
 				<div style="clear: both;"></div>
 			</div>
@@ -328,15 +330,12 @@
 	
 	<!-- Footer -->		
 	<div id="footer">
-		<small>Copyright &copy; 2008-2011, The Apache Software Foundation</small>&nbsp;<!--<p style="padding-right: 25px; text-align: right;">
-	    <a href="http://validator.w3.org/check?uri=referer">
-		<img
-	        src="images/valid-xhtml10.png"
-	        alt="Valid XHTML 1.0 Transitional" height="31" width="88" /></a>
-	 	</p>--></div>
+		<div class="cr"><small>Copyright &copy; 2008-2012, The Apache Software Foundation</small></div>
+		<div class="tm"><small>Apache Empire-db, Empire-db, Apache, the Apache feather logo, and the Apache Empire-db project logo are trademarks of The Apache Software Foundation</small></div>
+	</div>
 
 </div>
 
 </body>
 <!-- #EndTemplate -->
-</html>
+</html>
\ No newline at end of file

Modified: empire-db/site/documentation/documentation.htm
URL: http://svn.apache.org/viewvc/empire-db/site/documentation/documentation.htm?rev=1245208&r1=1245207&r2=1245208&view=diff
==============================================================================
--- empire-db/site/documentation/documentation.htm (original)
+++ empire-db/site/documentation/documentation.htm Thu Feb 16 22:14:20 2012
@@ -32,8 +32,8 @@
 			<img src="../images/logos/empire-db-logo.gif" alt="Empire-db: The relational data persistence component." />
 		</div>
 		<div id="asf">
-			<a target="_blank" href="http://incubator.apache.org/">
-			<img src="../images/logos/apache-incubator-logo.png" alt="Apache Incubator" /></a>
+			<a id="asfhome" target="_blank" href="http://www.apache.org"><img src="../images/logos/feather-small.gif" alt="The Apache Software Foundation" /></a>
+			<label for="asfhome" >The Apache Software Foundation</label>
 		</div>
 		<div style="clear:both"></div>
 	</div>
@@ -50,69 +50,55 @@
 					<ul id="mainMenu">
 						<li id="menu_home"><a href="../index.html">Home</a></li>
 						<li id="menu_news"><a href="../news.htm">News</a></li>
-						<li id="menu_empiredb">
-						<a href="../empiredb/empiredb.htm">Empire-db</a>
+						<li id="menu_empiredb"><a href="../empiredb/empiredb.htm">Empire-db</a>
 								<ul class="subMenu">
-									<li id="menu_empiredb_extending_pattern">
-									<a href="../empiredb/pattern.htm">The Empire DAO-<br />pattern</a></li>
-									<li id="menu_empiredb_handling_metadata">
-									<a href="../empiredb/metadata.htm">Handling data and metadata</a></li>
-									<li id="menu_empiredb_wrong">
-									<a href="../empiredb/hibernate.htm">What's wrong with Hibernate and JPA</a></li>
-									<li id="menu_empiredb_stringfree">
-									<a href="../empiredb/stringfree.htm">The principle of<br/>string-free coding</a></li>
-									<li id="menu_empiredb_faq">
-									<a href="../empiredb/faq.htm">FAQ</a></li>
+									<li id="menu_empiredb_extending_pattern"><a href="../empiredb/pattern.htm">The Empire DAO-<br />pattern</a></li>
+									<li id="menu_empiredb_handling_metadata"><a href="../empiredb/metadata.htm">Handling data and metadata</a></li>
+									<li id="menu_empiredb_wrong"><a href="../empiredb/hibernate.htm">What's wrong with Hibernate and JPA</a></li>
+									<li id="menu_empiredb_stringfree"><a href="../empiredb/stringfree.htm">The principle of<br/>string-free coding</a></li>
+									<li id="menu_empiredb_faq"><a href="../empiredb/faq.htm">FAQ</a></li>
 								</ul>
 						</li>
-						<li id="menu_struts2ext">
-						<a href="../struts2ext/struts2ext.htm">Empire-db and Struts2</a>
+						<li id="menu_struts2ext"><a href="../struts2ext/struts2ext.htm">Empire-db and Struts2</a>
 							<ul class="subMenu">
-								<li id="menu_struts2ext_forms_controls">
-								<a href="../struts2ext/forms_controls.htm">Forms and controls</a></li>
-								<li id="menu_struts2ext_rendering_parsing">
-								<a href="../struts2ext/rendering_parsing.htm">Rendering and parsing</a></li>
+								<li id="menu_struts2ext_forms_controls"><a href="../struts2ext/forms_controls.htm">Forms and controls</a></li>
+								<li id="menu_struts2ext_rendering_parsing"><a href="../struts2ext/rendering_parsing.htm">Rendering and parsing</a></li>
 								<!--<li id="menu_struts2ext_tag_reference"><a href="struts2ext/tag_reference.htm">Tag reference</a></li>-->
-								<li id="menu_struts2ext_input_controls">
-								<a href="../struts2ext/input_controls.htm">Input controls</a></li>
+								<li id="menu_struts2ext_input_controls"><a href="../struts2ext/input_controls.htm">Input controls</a></li>
 							</ul>
 						</li>
-						<li id="menu_downloads">
-						<a href="../downloads/latest.htm">Downloads</a>
+						<li id="menu_downloads"><a href="../downloads/latest.htm">Downloads</a>
 								<ul class="subMenu">
-									<li id="menu_downloads_previous">
-									<a href="../downloads/previous.htm">Previous releases</a></li>
-									<li id="menu_downloads_license">
-									<a href="../downloads/license.htm">License</a></li>
+									<li id="menu_downloads_previous"><a href="../downloads/previous.htm">Previous releases</a></li>
+									<li id="menu_downloads_license"><a href="../downloads/license.htm">License</a></li>
 								</ul>
 						</li>
 						<li id="menu_documentation"><a href="documentation.htm">Documentation</a>					
 							<ul class="subMenu">
-								<li id="menu_documentation_class_overview">
-								<a href="class_overview.htm">Empire-db class<br />overview</a></li>
-								<li id="menu_documentation_tutorials">
-								<a href="tutorial.htm">Tutorial</a></li>
-								<li id="menu_documentation_getting_started">
-								<a href="getting_started.htm">Getting started</a></li>
-								<li id="menu_documentation_api">
-								<a href="api.htm">API</a></li>
+								<li id="menu_documentation_class_overview"><a href="class_overview.htm">Empire-db class<br />overview</a></li>
+								<li id="menu_documentation_tutorials"><a href="tutorial.htm">Tutorial</a></li>
+								<li id="menu_documentation_getting_started"><a href="getting_started.htm">Getting started</a></li>
+								<li id="menu_documentation_api"><a href="api.htm">API</a></li>
 							</ul>
 						</li>
-						<li id="menu_community">
-						<a href="../community/community.htm">Community</a>					
+						<li id="menu_community"><a href="../community/community.htm">Community</a>					
 							<ul class="subMenu">
-								<li id="menu_community_mailing_lists">
-								<a href="../community/mailing_lists.htm">Mailing lists</a></li>
-								<li id="menu_community_source_code">
-								<a href="../community/source_code.htm">Source code</a></li>
-								<li id="menu_community_jira">
-								<a href="../community/jira.htm">Ticketing &amp; Wiki</a></li>
+								<li id="menu_community_mailing_lists"><a href="../community/mailing_lists.htm">Mailing lists</a></li>
+								<li id="menu_community_source_code"><a href="../community/source_code.htm">Source code</a></li>
+								<li id="menu_community_jira"><a href="../community/jira.htm">Ticketing &amp; Wiki</a></li>
 								<!--<li id="menu_community_road_map"><a href="community/road_map.htm">Road map</a></li>-->
-								<li id="menu_community_contributors">
-								<a href="../community/contributors.htm">Contributors</a></li>
+								<li id="menu_community_contributors"><a href="../community/contributors.htm">Contributors</a></li>
 							</ul>
 						</li>
-						<li id="menu_disclaimer"><a href="../disclaimer.htm">Disclaimer</a></li>
+						<li id="menu_apache"><a href="../apache.htm">About Apache</a>
+							<ul class="subMenu">
+								<li id="menu_apache_home"><a href="http://www.apache.org">Apache home<span class="asflink">&nbsp;</span></a></li>
+								<li id="menu_apache_donate"><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship<span class="asflink">&nbsp;</span></a></li>
+								<li id="menu_apache_thanks"><a href="http://www.apache.org/foundation/thanks.html">Foundation thanks<span class="asflink">&nbsp;</span></a></li>
+								<li id="menu_apache_security"><a href="http://www.apache.org/security/">Security<span class="asflink">&nbsp;</span></a></li>
+							</ul>
+						</li>
+						<li id="menu_disclaimer"><a href="http://www.apache.org/licenses/">License<span class="asflink">&nbsp;</span></a></li>
 					</ul>
 				</div>
 				
@@ -176,8 +162,7 @@
 				</div>
 				<div id="nav_next">
 					&nbsp;
-					<a id="next" href="">Next Page 
-					<img src="../images/next.gif" alt="" /></a>
+					<a id="next" href="">Next Page <img src="../images/next.gif" alt="" /></a>
 				</div>
 				<div style="clear: both;"></div>
 			</div>
@@ -216,15 +201,12 @@
 	
 	<!-- Footer -->		
 	<div id="footer">
-		<small>Copyright &copy; 2008-2011, The Apache Software Foundation</small>&nbsp;<!--<p style="padding-right: 25px; text-align: right;">
-	    <a href="http://validator.w3.org/check?uri=referer">
-		<img
-	        src="images/valid-xhtml10.png"
-	        alt="Valid XHTML 1.0 Transitional" height="31" width="88" /></a>
-	 	</p>--></div>
+		<div class="cr"><small>Copyright &copy; 2008-2012, The Apache Software Foundation</small></div>
+		<div class="tm"><small>Apache Empire-db, Empire-db, Apache, the Apache feather logo, and the Apache Empire-db project logo are trademarks of The Apache Software Foundation</small></div>
+	</div>
 
 </div>
 
 </body>
 <!-- #EndTemplate -->
-</html>
+</html>
\ No newline at end of file

Modified: empire-db/site/documentation/getting_started.htm
URL: http://svn.apache.org/viewvc/empire-db/site/documentation/getting_started.htm?rev=1245208&r1=1245207&r2=1245208&view=diff
==============================================================================
--- empire-db/site/documentation/getting_started.htm (original)
+++ empire-db/site/documentation/getting_started.htm Thu Feb 16 22:14:20 2012
@@ -1,5 +1,5 @@
 <!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-gb" lang="en-gb" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office" >
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-gb" lang="en-gb" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:v="urn:schemas-microsoft-com:vml" >
 <!-- #BeginTemplate "../main.dwt" -->
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
@@ -23,6 +23,23 @@
 	<!-- #BeginEditable "stylesheets" -->
 <style type="text/css">
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 ul.sublist {
 	margin-top:8px;
 }
@@ -40,8 +57,8 @@ ul.sublist {
 			<img src="../images/logos/empire-db-logo.gif" alt="Empire-db: The relational data persistence component." />
 		</div>
 		<div id="asf">
-			<a target="_blank" href="http://incubator.apache.org/">
-			<img src="../images/logos/apache-incubator-logo.png" alt="Apache Incubator" /></a>
+			<a id="asfhome" target="_blank" href="http://www.apache.org"><img src="../images/logos/feather-small.gif" alt="The Apache Software Foundation" /></a>
+			<label for="asfhome" >The Apache Software Foundation</label>
 		</div>
 		<div style="clear:both"></div>
 	</div>
@@ -58,69 +75,55 @@ ul.sublist {
 					<ul id="mainMenu">
 						<li id="menu_home"><a href="../index.html">Home</a></li>
 						<li id="menu_news"><a href="../news.htm">News</a></li>
-						<li id="menu_empiredb">
-						<a href="../empiredb/empiredb.htm">Empire-db</a>
+						<li id="menu_empiredb"><a href="../empiredb/empiredb.htm">Empire-db</a>
 								<ul class="subMenu">
-									<li id="menu_empiredb_extending_pattern">
-									<a href="../empiredb/pattern.htm">The Empire DAO-<br />pattern</a></li>
-									<li id="menu_empiredb_handling_metadata">
-									<a href="../empiredb/metadata.htm">Handling data and metadata</a></li>
-									<li id="menu_empiredb_wrong">
-									<a href="../empiredb/hibernate.htm">What's wrong with Hibernate and JPA</a></li>
-									<li id="menu_empiredb_stringfree">
-									<a href="../empiredb/stringfree.htm">The principle of<br/>string-free coding</a></li>
-									<li id="menu_empiredb_faq">
-									<a href="../empiredb/faq.htm">FAQ</a></li>
+									<li id="menu_empiredb_extending_pattern"><a href="../empiredb/pattern.htm">The Empire DAO-<br />pattern</a></li>
+									<li id="menu_empiredb_handling_metadata"><a href="../empiredb/metadata.htm">Handling data and metadata</a></li>
+									<li id="menu_empiredb_wrong"><a href="../empiredb/hibernate.htm">What's wrong with Hibernate and JPA</a></li>
+									<li id="menu_empiredb_stringfree"><a href="../empiredb/stringfree.htm">The principle of<br/>string-free coding</a></li>
+									<li id="menu_empiredb_faq"><a href="../empiredb/faq.htm">FAQ</a></li>
 								</ul>
 						</li>
-						<li id="menu_struts2ext">
-						<a href="../struts2ext/struts2ext.htm">Empire-db and Struts2</a>
+						<li id="menu_struts2ext"><a href="../struts2ext/struts2ext.htm">Empire-db and Struts2</a>
 							<ul class="subMenu">
-								<li id="menu_struts2ext_forms_controls">
-								<a href="../struts2ext/forms_controls.htm">Forms and controls</a></li>
-								<li id="menu_struts2ext_rendering_parsing">
-								<a href="../struts2ext/rendering_parsing.htm">Rendering and parsing</a></li>
+								<li id="menu_struts2ext_forms_controls"><a href="../struts2ext/forms_controls.htm">Forms and controls</a></li>
+								<li id="menu_struts2ext_rendering_parsing"><a href="../struts2ext/rendering_parsing.htm">Rendering and parsing</a></li>
 								<!--<li id="menu_struts2ext_tag_reference"><a href="struts2ext/tag_reference.htm">Tag reference</a></li>-->
-								<li id="menu_struts2ext_input_controls">
-								<a href="../struts2ext/input_controls.htm">Input controls</a></li>
+								<li id="menu_struts2ext_input_controls"><a href="../struts2ext/input_controls.htm">Input controls</a></li>
 							</ul>
 						</li>
-						<li id="menu_downloads">
-						<a href="../downloads/latest.htm">Downloads</a>
+						<li id="menu_downloads"><a href="../downloads/latest.htm">Downloads</a>
 								<ul class="subMenu">
-									<li id="menu_downloads_previous">
-									<a href="../downloads/previous.htm">Previous releases</a></li>
-									<li id="menu_downloads_license">
-									<a href="../downloads/license.htm">License</a></li>
+									<li id="menu_downloads_previous"><a href="../downloads/previous.htm">Previous releases</a></li>
+									<li id="menu_downloads_license"><a href="../downloads/license.htm">License</a></li>
 								</ul>
 						</li>
 						<li id="menu_documentation"><a href="documentation.htm">Documentation</a>					
 							<ul class="subMenu">
-								<li id="menu_documentation_class_overview">
-								<a href="class_overview.htm">Empire-db class<br />overview</a></li>
-								<li id="menu_documentation_tutorials">
-								<a href="tutorial.htm">Tutorial</a></li>
-								<li id="menu_documentation_getting_started">
-								<a href="getting_started.htm">Getting started</a></li>
-								<li id="menu_documentation_api">
-								<a href="api.htm">API</a></li>
+								<li id="menu_documentation_class_overview"><a href="class_overview.htm">Empire-db class<br />overview</a></li>
+								<li id="menu_documentation_tutorials"><a href="tutorial.htm">Tutorial</a></li>
+								<li id="menu_documentation_getting_started"><a href="getting_started.htm">Getting started</a></li>
+								<li id="menu_documentation_api"><a href="api.htm">API</a></li>
 							</ul>
 						</li>
-						<li id="menu_community">
-						<a href="../community/community.htm">Community</a>					
+						<li id="menu_community"><a href="../community/community.htm">Community</a>					
 							<ul class="subMenu">
-								<li id="menu_community_mailing_lists">
-								<a href="../community/mailing_lists.htm">Mailing lists</a></li>
-								<li id="menu_community_source_code">
-								<a href="../community/source_code.htm">Source code</a></li>
-								<li id="menu_community_jira">
-								<a href="../community/jira.htm">Ticketing &amp; Wiki</a></li>
+								<li id="menu_community_mailing_lists"><a href="../community/mailing_lists.htm">Mailing lists</a></li>
+								<li id="menu_community_source_code"><a href="../community/source_code.htm">Source code</a></li>
+								<li id="menu_community_jira"><a href="../community/jira.htm">Ticketing &amp; Wiki</a></li>
 								<!--<li id="menu_community_road_map"><a href="community/road_map.htm">Road map</a></li>-->
-								<li id="menu_community_contributors">
-								<a href="../community/contributors.htm">Contributors</a></li>
+								<li id="menu_community_contributors"><a href="../community/contributors.htm">Contributors</a></li>
 							</ul>
 						</li>
-						<li id="menu_disclaimer"><a href="../disclaimer.htm">Disclaimer</a></li>
+						<li id="menu_apache"><a href="../apache.htm">About Apache</a>
+							<ul class="subMenu">
+								<li id="menu_apache_home"><a href="http://www.apache.org">Apache home<span class="asflink">&nbsp;</span></a></li>
+								<li id="menu_apache_donate"><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship<span class="asflink">&nbsp;</span></a></li>
+								<li id="menu_apache_thanks"><a href="http://www.apache.org/foundation/thanks.html">Foundation thanks<span class="asflink">&nbsp;</span></a></li>
+								<li id="menu_apache_security"><a href="http://www.apache.org/security/">Security<span class="asflink">&nbsp;</span></a></li>
+							</ul>
+						</li>
+						<li id="menu_disclaimer"><a href="http://www.apache.org/licenses/">License<span class="asflink">&nbsp;</span></a></li>
 					</ul>
 				</div>
 				
@@ -267,8 +270,7 @@ ul.sublist {
 				</div>
 				<div id="nav_next">
 					&nbsp;
-					<a id="next" href="">Next Page 
-					<img src="../images/next.gif" alt="" /></a>
+					<a id="next" href="">Next Page <img src="../images/next.gif" alt="" /></a>
 				</div>
 				<div style="clear: both;"></div>
 			</div>
@@ -307,15 +309,12 @@ ul.sublist {
 	
 	<!-- Footer -->		
 	<div id="footer">
-		<small>Copyright &copy; 2008-2011, The Apache Software Foundation</small>&nbsp;<!--<p style="padding-right: 25px; text-align: right;">
-	    <a href="http://validator.w3.org/check?uri=referer">
-		<img
-	        src="images/valid-xhtml10.png"
-	        alt="Valid XHTML 1.0 Transitional" height="31" width="88" /></a>
-	 	</p>--></div>
+		<div class="cr"><small>Copyright &copy; 2008-2012, The Apache Software Foundation</small></div>
+		<div class="tm"><small>Apache Empire-db, Empire-db, Apache, the Apache feather logo, and the Apache Empire-db project logo are trademarks of The Apache Software Foundation</small></div>
+	</div>
 
 </div>
 
 </body>
 <!-- #EndTemplate -->
-</html>
+</html>
\ No newline at end of file

Modified: empire-db/site/documentation/tutorial.htm
URL: http://svn.apache.org/viewvc/empire-db/site/documentation/tutorial.htm?rev=1245208&r1=1245207&r2=1245208&view=diff
==============================================================================
--- empire-db/site/documentation/tutorial.htm (original)
+++ empire-db/site/documentation/tutorial.htm Thu Feb 16 22:14:20 2012
@@ -21,6 +21,23 @@
 	<link rel="stylesheet" href="../css/layout.css" type="text/css" />
 	<!-- #BeginEditable "stylesheets" -->
 	<style type="text/css">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 .style1 {
 	color: #0000FF;
 }
@@ -43,8 +60,8 @@
 			<img src="../images/logos/empire-db-logo.gif" alt="Empire-db: The relational data persistence component." />
 		</div>
 		<div id="asf">
-			<a target="_blank" href="http://incubator.apache.org/">
-			<img src="../images/logos/apache-incubator-logo.png" alt="Apache Incubator" /></a>
+			<a id="asfhome" target="_blank" href="http://www.apache.org"><img src="../images/logos/feather-small.gif" alt="The Apache Software Foundation" /></a>
+			<label for="asfhome" >The Apache Software Foundation</label>
 		</div>
 		<div style="clear:both"></div>
 	</div>
@@ -61,69 +78,55 @@
 					<ul id="mainMenu">
 						<li id="menu_home"><a href="../index.html">Home</a></li>
 						<li id="menu_news"><a href="../news.htm">News</a></li>
-						<li id="menu_empiredb">
-						<a href="../empiredb/empiredb.htm">Empire-db</a>
+						<li id="menu_empiredb"><a href="../empiredb/empiredb.htm">Empire-db</a>
 								<ul class="subMenu">
-									<li id="menu_empiredb_extending_pattern">
-									<a href="../empiredb/pattern.htm">The Empire DAO-<br />pattern</a></li>
-									<li id="menu_empiredb_handling_metadata">
-									<a href="../empiredb/metadata.htm">Handling data and metadata</a></li>
-									<li id="menu_empiredb_wrong">
-									<a href="../empiredb/hibernate.htm">What's wrong with Hibernate and JPA</a></li>
-									<li id="menu_empiredb_stringfree">
-									<a href="../empiredb/stringfree.htm">The principle of<br/>string-free coding</a></li>
-									<li id="menu_empiredb_faq">
-									<a href="../empiredb/faq.htm">FAQ</a></li>
+									<li id="menu_empiredb_extending_pattern"><a href="../empiredb/pattern.htm">The Empire DAO-<br />pattern</a></li>
+									<li id="menu_empiredb_handling_metadata"><a href="../empiredb/metadata.htm">Handling data and metadata</a></li>
+									<li id="menu_empiredb_wrong"><a href="../empiredb/hibernate.htm">What's wrong with Hibernate and JPA</a></li>
+									<li id="menu_empiredb_stringfree"><a href="../empiredb/stringfree.htm">The principle of<br/>string-free coding</a></li>
+									<li id="menu_empiredb_faq"><a href="../empiredb/faq.htm">FAQ</a></li>
 								</ul>
 						</li>
-						<li id="menu_struts2ext">
-						<a href="../struts2ext/struts2ext.htm">Empire-db and Struts2</a>
+						<li id="menu_struts2ext"><a href="../struts2ext/struts2ext.htm">Empire-db and Struts2</a>
 							<ul class="subMenu">
-								<li id="menu_struts2ext_forms_controls">
-								<a href="../struts2ext/forms_controls.htm">Forms and controls</a></li>
-								<li id="menu_struts2ext_rendering_parsing">
-								<a href="../struts2ext/rendering_parsing.htm">Rendering and parsing</a></li>
+								<li id="menu_struts2ext_forms_controls"><a href="../struts2ext/forms_controls.htm">Forms and controls</a></li>
+								<li id="menu_struts2ext_rendering_parsing"><a href="../struts2ext/rendering_parsing.htm">Rendering and parsing</a></li>
 								<!--<li id="menu_struts2ext_tag_reference"><a href="struts2ext/tag_reference.htm">Tag reference</a></li>-->
-								<li id="menu_struts2ext_input_controls">
-								<a href="../struts2ext/input_controls.htm">Input controls</a></li>
+								<li id="menu_struts2ext_input_controls"><a href="../struts2ext/input_controls.htm">Input controls</a></li>
 							</ul>
 						</li>
-						<li id="menu_downloads">
-						<a href="../downloads/latest.htm">Downloads</a>
+						<li id="menu_downloads"><a href="../downloads/latest.htm">Downloads</a>
 								<ul class="subMenu">
-									<li id="menu_downloads_previous">
-									<a href="../downloads/previous.htm">Previous releases</a></li>
-									<li id="menu_downloads_license">
-									<a href="../downloads/license.htm">License</a></li>
+									<li id="menu_downloads_previous"><a href="../downloads/previous.htm">Previous releases</a></li>
+									<li id="menu_downloads_license"><a href="../downloads/license.htm">License</a></li>
 								</ul>
 						</li>
 						<li id="menu_documentation"><a href="documentation.htm">Documentation</a>					
 							<ul class="subMenu">
-								<li id="menu_documentation_class_overview">
-								<a href="class_overview.htm">Empire-db class<br />overview</a></li>
-								<li id="menu_documentation_tutorials">
-								<a href="tutorial.htm">Tutorial</a></li>
-								<li id="menu_documentation_getting_started">
-								<a href="getting_started.htm">Getting started</a></li>
-								<li id="menu_documentation_api">
-								<a href="api.htm">API</a></li>
+								<li id="menu_documentation_class_overview"><a href="class_overview.htm">Empire-db class<br />overview</a></li>
+								<li id="menu_documentation_tutorials"><a href="tutorial.htm">Tutorial</a></li>
+								<li id="menu_documentation_getting_started"><a href="getting_started.htm">Getting started</a></li>
+								<li id="menu_documentation_api"><a href="api.htm">API</a></li>
 							</ul>
 						</li>
-						<li id="menu_community">
-						<a href="../community/community.htm">Community</a>					
+						<li id="menu_community"><a href="../community/community.htm">Community</a>					
 							<ul class="subMenu">
-								<li id="menu_community_mailing_lists">
-								<a href="../community/mailing_lists.htm">Mailing lists</a></li>
-								<li id="menu_community_source_code">
-								<a href="../community/source_code.htm">Source code</a></li>
-								<li id="menu_community_jira">
-								<a href="../community/jira.htm">Ticketing &amp; Wiki</a></li>
+								<li id="menu_community_mailing_lists"><a href="../community/mailing_lists.htm">Mailing lists</a></li>
+								<li id="menu_community_source_code"><a href="../community/source_code.htm">Source code</a></li>
+								<li id="menu_community_jira"><a href="../community/jira.htm">Ticketing &amp; Wiki</a></li>
 								<!--<li id="menu_community_road_map"><a href="community/road_map.htm">Road map</a></li>-->
-								<li id="menu_community_contributors">
-								<a href="../community/contributors.htm">Contributors</a></li>
+								<li id="menu_community_contributors"><a href="../community/contributors.htm">Contributors</a></li>
 							</ul>
 						</li>
-						<li id="menu_disclaimer"><a href="../disclaimer.htm">Disclaimer</a></li>
+						<li id="menu_apache"><a href="../apache.htm">About Apache</a>
+							<ul class="subMenu">
+								<li id="menu_apache_home"><a href="http://www.apache.org">Apache home<span class="asflink">&nbsp;</span></a></li>
+								<li id="menu_apache_donate"><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship<span class="asflink">&nbsp;</span></a></li>
+								<li id="menu_apache_thanks"><a href="http://www.apache.org/foundation/thanks.html">Foundation thanks<span class="asflink">&nbsp;</span></a></li>
+								<li id="menu_apache_security"><a href="http://www.apache.org/security/">Security<span class="asflink">&nbsp;</span></a></li>
+							</ul>
+						</li>
+						<li id="menu_disclaimer"><a href="http://www.apache.org/licenses/">License<span class="asflink">&nbsp;</span></a></li>
 					</ul>
 				</div>
 				
@@ -693,8 +696,7 @@ reader.open(cmd, conn);
 				</div>
 				<div id="nav_next">
 					&nbsp;
-					<a id="next" href="">Next Page 
-					<img src="../images/next.gif" alt="" /></a>
+					<a id="next" href="">Next Page <img src="../images/next.gif" alt="" /></a>
 				</div>
 				<div style="clear: both;"></div>
 			</div>
@@ -733,15 +735,12 @@ reader.open(cmd, conn);
 	
 	<!-- Footer -->		
 	<div id="footer">
-		<small>Copyright &copy; 2008-2011, The Apache Software Foundation</small>&nbsp;<!--<p style="padding-right: 25px; text-align: right;">
-	    <a href="http://validator.w3.org/check?uri=referer">
-		<img
-	        src="images/valid-xhtml10.png"
-	        alt="Valid XHTML 1.0 Transitional" height="31" width="88" /></a>
-	 	</p>--></div>
+		<div class="cr"><small>Copyright &copy; 2008-2012, The Apache Software Foundation</small></div>
+		<div class="tm"><small>Apache Empire-db, Empire-db, Apache, the Apache feather logo, and the Apache Empire-db project logo are trademarks of The Apache Software Foundation</small></div>
+	</div>
 
 </div>
 
 </body>
 <!-- #EndTemplate -->
-</html>
+</html>
\ No newline at end of file

Modified: empire-db/site/downloads/latest.htm
URL: http://svn.apache.org/viewvc/empire-db/site/downloads/latest.htm?rev=1245208&r1=1245207&r2=1245208&view=diff
==============================================================================
--- empire-db/site/downloads/latest.htm (original)
+++ empire-db/site/downloads/latest.htm Thu Feb 16 22:14:20 2012
@@ -1,5 +1,5 @@
 <!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-gb" lang="en-gb" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office" >
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-gb" lang="en-gb" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:v="urn:schemas-microsoft-com:vml" >
 <!-- #BeginTemplate "../main.dwt" -->
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
@@ -21,6 +21,23 @@
 	<link rel="stylesheet" href="../css/layout.css" type="text/css" />
 	<!-- #BeginEditable "stylesheets" -->
 <style type="text/css">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 table.downloads {
 	margin-left: 80px;
     width: 600px;
@@ -63,8 +80,8 @@ pre span.tag {
 			<img src="../images/logos/empire-db-logo.gif" alt="Empire-db: The relational data persistence component." />
 		</div>
 		<div id="asf">
-			<a target="_blank" href="http://incubator.apache.org/">
-			<img src="../images/logos/apache-incubator-logo.png" alt="Apache Incubator" /></a>
+			<a id="asfhome" target="_blank" href="http://www.apache.org"><img src="../images/logos/feather-small.gif" alt="The Apache Software Foundation" /></a>
+			<label for="asfhome" >The Apache Software Foundation</label>
 		</div>
 		<div style="clear:both"></div>
 	</div>
@@ -81,69 +98,55 @@ pre span.tag {
 					<ul id="mainMenu">
 						<li id="menu_home"><a href="../index.html">Home</a></li>
 						<li id="menu_news"><a href="../news.htm">News</a></li>
-						<li id="menu_empiredb">
-						<a href="../empiredb/empiredb.htm">Empire-db</a>
+						<li id="menu_empiredb"><a href="../empiredb/empiredb.htm">Empire-db</a>
 								<ul class="subMenu">
-									<li id="menu_empiredb_extending_pattern">
-									<a href="../empiredb/pattern.htm">The Empire DAO-<br />pattern</a></li>
-									<li id="menu_empiredb_handling_metadata">
-									<a href="../empiredb/metadata.htm">Handling data and metadata</a></li>
-									<li id="menu_empiredb_wrong">
-									<a href="../empiredb/hibernate.htm">What's wrong with Hibernate and JPA</a></li>
-									<li id="menu_empiredb_stringfree">
-									<a href="../empiredb/stringfree.htm">The principle of<br/>string-free coding</a></li>
-									<li id="menu_empiredb_faq">
-									<a href="../empiredb/faq.htm">FAQ</a></li>
+									<li id="menu_empiredb_extending_pattern"><a href="../empiredb/pattern.htm">The Empire DAO-<br />pattern</a></li>
+									<li id="menu_empiredb_handling_metadata"><a href="../empiredb/metadata.htm">Handling data and metadata</a></li>
+									<li id="menu_empiredb_wrong"><a href="../empiredb/hibernate.htm">What's wrong with Hibernate and JPA</a></li>
+									<li id="menu_empiredb_stringfree"><a href="../empiredb/stringfree.htm">The principle of<br/>string-free coding</a></li>
+									<li id="menu_empiredb_faq"><a href="../empiredb/faq.htm">FAQ</a></li>
 								</ul>
 						</li>
-						<li id="menu_struts2ext">
-						<a href="../struts2ext/struts2ext.htm">Empire-db and Struts2</a>
+						<li id="menu_struts2ext"><a href="../struts2ext/struts2ext.htm">Empire-db and Struts2</a>
 							<ul class="subMenu">
-								<li id="menu_struts2ext_forms_controls">
-								<a href="../struts2ext/forms_controls.htm">Forms and controls</a></li>
-								<li id="menu_struts2ext_rendering_parsing">
-								<a href="../struts2ext/rendering_parsing.htm">Rendering and parsing</a></li>
+								<li id="menu_struts2ext_forms_controls"><a href="../struts2ext/forms_controls.htm">Forms and controls</a></li>
+								<li id="menu_struts2ext_rendering_parsing"><a href="../struts2ext/rendering_parsing.htm">Rendering and parsing</a></li>
 								<!--<li id="menu_struts2ext_tag_reference"><a href="struts2ext/tag_reference.htm">Tag reference</a></li>-->
-								<li id="menu_struts2ext_input_controls">
-								<a href="../struts2ext/input_controls.htm">Input controls</a></li>
+								<li id="menu_struts2ext_input_controls"><a href="../struts2ext/input_controls.htm">Input controls</a></li>
 							</ul>
 						</li>
 						<li id="menu_downloads"><a href="latest.htm">Downloads</a>
 								<ul class="subMenu">
-									<li id="menu_downloads_previous">
-									<a href="previous.htm">Previous releases</a></li>
-									<li id="menu_downloads_license">
-									<a href="license.htm">License</a></li>
+									<li id="menu_downloads_previous"><a href="previous.htm">Previous releases</a></li>
+									<li id="menu_downloads_license"><a href="license.htm">License</a></li>
 								</ul>
 						</li>
-						<li id="menu_documentation">
-						<a href="../documentation/documentation.htm">Documentation</a>					
+						<li id="menu_documentation"><a href="../documentation/documentation.htm">Documentation</a>					
 							<ul class="subMenu">
-								<li id="menu_documentation_class_overview">
-								<a href="../documentation/class_overview.htm">Empire-db class<br />overview</a></li>
-								<li id="menu_documentation_tutorials">
-								<a href="../documentation/tutorial.htm">Tutorial</a></li>
-								<li id="menu_documentation_getting_started">
-								<a href="../documentation/getting_started.htm">Getting started</a></li>
-								<li id="menu_documentation_api">
-								<a href="../documentation/api.htm">API</a></li>
+								<li id="menu_documentation_class_overview"><a href="../documentation/class_overview.htm">Empire-db class<br />overview</a></li>
+								<li id="menu_documentation_tutorials"><a href="../documentation/tutorial.htm">Tutorial</a></li>
+								<li id="menu_documentation_getting_started"><a href="../documentation/getting_started.htm">Getting started</a></li>
+								<li id="menu_documentation_api"><a href="../documentation/api.htm">API</a></li>
 							</ul>
 						</li>
-						<li id="menu_community">
-						<a href="../community/community.htm">Community</a>					
+						<li id="menu_community"><a href="../community/community.htm">Community</a>					
 							<ul class="subMenu">
-								<li id="menu_community_mailing_lists">
-								<a href="../community/mailing_lists.htm">Mailing lists</a></li>
-								<li id="menu_community_source_code">
-								<a href="../community/source_code.htm">Source code</a></li>
-								<li id="menu_community_jira">
-								<a href="../community/jira.htm">Ticketing &amp; Wiki</a></li>
+								<li id="menu_community_mailing_lists"><a href="../community/mailing_lists.htm">Mailing lists</a></li>
+								<li id="menu_community_source_code"><a href="../community/source_code.htm">Source code</a></li>
+								<li id="menu_community_jira"><a href="../community/jira.htm">Ticketing &amp; Wiki</a></li>
 								<!--<li id="menu_community_road_map"><a href="community/road_map.htm">Road map</a></li>-->
-								<li id="menu_community_contributors">
-								<a href="../community/contributors.htm">Contributors</a></li>
+								<li id="menu_community_contributors"><a href="../community/contributors.htm">Contributors</a></li>
 							</ul>
 						</li>
-						<li id="menu_disclaimer"><a href="../disclaimer.htm">Disclaimer</a></li>
+						<li id="menu_apache"><a href="../apache.htm">About Apache</a>
+							<ul class="subMenu">
+								<li id="menu_apache_home"><a href="http://www.apache.org">Apache home<span class="asflink">&nbsp;</span></a></li>
+								<li id="menu_apache_donate"><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship<span class="asflink">&nbsp;</span></a></li>
+								<li id="menu_apache_thanks"><a href="http://www.apache.org/foundation/thanks.html">Foundation thanks<span class="asflink">&nbsp;</span></a></li>
+								<li id="menu_apache_security"><a href="http://www.apache.org/security/">Security<span class="asflink">&nbsp;</span></a></li>
+							</ul>
+						</li>
+						<li id="menu_disclaimer"><a href="http://www.apache.org/licenses/">License<span class="asflink">&nbsp;</span></a></li>
 					</ul>
 				</div>
 				
@@ -292,8 +295,7 @@ pre span.tag {
 				</div>
 				<div id="nav_next">
 					&nbsp;
-					<a id="next" href="">Next Page 
-					<img src="../images/next.gif" alt="" /></a>
+					<a id="next" href="">Next Page <img src="../images/next.gif" alt="" /></a>
 				</div>
 				<div style="clear: both;"></div>
 			</div>
@@ -332,15 +334,12 @@ pre span.tag {
 	
 	<!-- Footer -->		
 	<div id="footer">
-		<small>Copyright &copy; 2008-2011, The Apache Software Foundation</small>&nbsp;<!--<p style="padding-right: 25px; text-align: right;">
-	    <a href="http://validator.w3.org/check?uri=referer">
-		<img
-	        src="images/valid-xhtml10.png"
-	        alt="Valid XHTML 1.0 Transitional" height="31" width="88" /></a>
-	 	</p>--></div>
+		<div class="cr"><small>Copyright &copy; 2008-2012, The Apache Software Foundation</small></div>
+		<div class="tm"><small>Apache Empire-db, Empire-db, Apache, the Apache feather logo, and the Apache Empire-db project logo are trademarks of The Apache Software Foundation</small></div>
+	</div>
 
 </div>
 
 </body>
 <!-- #EndTemplate -->
-</html>
+</html>
\ No newline at end of file

Modified: empire-db/site/downloads/license.htm
URL: http://svn.apache.org/viewvc/empire-db/site/downloads/license.htm?rev=1245208&r1=1245207&r2=1245208&view=diff
==============================================================================
--- empire-db/site/downloads/license.htm (original)
+++ empire-db/site/downloads/license.htm Thu Feb 16 22:14:20 2012
@@ -21,6 +21,23 @@
 	<link rel="stylesheet" href="../css/layout.css" type="text/css" />
 	<!-- #BeginEditable "stylesheets" -->
 <style type="text/css">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 table.downloads {
 	margin-left: 100px;
 }
@@ -49,8 +66,8 @@ table.downloads td.md5 {
 			<img src="../images/logos/empire-db-logo.gif" alt="Empire-db: The relational data persistence component." />
 		</div>
 		<div id="asf">
-			<a target="_blank" href="http://incubator.apache.org/">
-			<img src="../images/logos/apache-incubator-logo.png" alt="Apache Incubator" /></a>
+			<a id="asfhome" target="_blank" href="http://www.apache.org"><img src="../images/logos/feather-small.gif" alt="The Apache Software Foundation" /></a>
+			<label for="asfhome" >The Apache Software Foundation</label>
 		</div>
 		<div style="clear:both"></div>
 	</div>
@@ -67,69 +84,55 @@ table.downloads td.md5 {
 					<ul id="mainMenu">
 						<li id="menu_home"><a href="../index.html">Home</a></li>
 						<li id="menu_news"><a href="../news.htm">News</a></li>
-						<li id="menu_empiredb">
-						<a href="../empiredb/empiredb.htm">Empire-db</a>
+						<li id="menu_empiredb"><a href="../empiredb/empiredb.htm">Empire-db</a>
 								<ul class="subMenu">
-									<li id="menu_empiredb_extending_pattern">
-									<a href="../empiredb/pattern.htm">The Empire DAO-<br />pattern</a></li>
-									<li id="menu_empiredb_handling_metadata">
-									<a href="../empiredb/metadata.htm">Handling data and metadata</a></li>
-									<li id="menu_empiredb_wrong">
-									<a href="../empiredb/hibernate.htm">What's wrong with Hibernate and JPA</a></li>
-									<li id="menu_empiredb_stringfree">
-									<a href="../empiredb/stringfree.htm">The principle of<br/>string-free coding</a></li>
-									<li id="menu_empiredb_faq">
-									<a href="../empiredb/faq.htm">FAQ</a></li>
+									<li id="menu_empiredb_extending_pattern"><a href="../empiredb/pattern.htm">The Empire DAO-<br />pattern</a></li>
+									<li id="menu_empiredb_handling_metadata"><a href="../empiredb/metadata.htm">Handling data and metadata</a></li>
+									<li id="menu_empiredb_wrong"><a href="../empiredb/hibernate.htm">What's wrong with Hibernate and JPA</a></li>
+									<li id="menu_empiredb_stringfree"><a href="../empiredb/stringfree.htm">The principle of<br/>string-free coding</a></li>
+									<li id="menu_empiredb_faq"><a href="../empiredb/faq.htm">FAQ</a></li>
 								</ul>
 						</li>
-						<li id="menu_struts2ext">
-						<a href="../struts2ext/struts2ext.htm">Empire-db and Struts2</a>
+						<li id="menu_struts2ext"><a href="../struts2ext/struts2ext.htm">Empire-db and Struts2</a>
 							<ul class="subMenu">
-								<li id="menu_struts2ext_forms_controls">
-								<a href="../struts2ext/forms_controls.htm">Forms and controls</a></li>
-								<li id="menu_struts2ext_rendering_parsing">
-								<a href="../struts2ext/rendering_parsing.htm">Rendering and parsing</a></li>
+								<li id="menu_struts2ext_forms_controls"><a href="../struts2ext/forms_controls.htm">Forms and controls</a></li>
+								<li id="menu_struts2ext_rendering_parsing"><a href="../struts2ext/rendering_parsing.htm">Rendering and parsing</a></li>
 								<!--<li id="menu_struts2ext_tag_reference"><a href="struts2ext/tag_reference.htm">Tag reference</a></li>-->
-								<li id="menu_struts2ext_input_controls">
-								<a href="../struts2ext/input_controls.htm">Input controls</a></li>
+								<li id="menu_struts2ext_input_controls"><a href="../struts2ext/input_controls.htm">Input controls</a></li>
 							</ul>
 						</li>
 						<li id="menu_downloads"><a href="latest.htm">Downloads</a>
 								<ul class="subMenu">
-									<li id="menu_downloads_previous">
-									<a href="previous.htm">Previous releases</a></li>
-									<li id="menu_downloads_license">
-									<a href="license.htm">License</a></li>
+									<li id="menu_downloads_previous"><a href="previous.htm">Previous releases</a></li>
+									<li id="menu_downloads_license"><a href="license.htm">License</a></li>
 								</ul>
 						</li>
-						<li id="menu_documentation">
-						<a href="../documentation/documentation.htm">Documentation</a>					
+						<li id="menu_documentation"><a href="../documentation/documentation.htm">Documentation</a>					
 							<ul class="subMenu">
-								<li id="menu_documentation_class_overview">
-								<a href="../documentation/class_overview.htm">Empire-db class<br />overview</a></li>
-								<li id="menu_documentation_tutorials">
-								<a href="../documentation/tutorial.htm">Tutorial</a></li>
-								<li id="menu_documentation_getting_started">
-								<a href="../documentation/getting_started.htm">Getting started</a></li>
-								<li id="menu_documentation_api">
-								<a href="../documentation/api.htm">API</a></li>
+								<li id="menu_documentation_class_overview"><a href="../documentation/class_overview.htm">Empire-db class<br />overview</a></li>
+								<li id="menu_documentation_tutorials"><a href="../documentation/tutorial.htm">Tutorial</a></li>
+								<li id="menu_documentation_getting_started"><a href="../documentation/getting_started.htm">Getting started</a></li>
+								<li id="menu_documentation_api"><a href="../documentation/api.htm">API</a></li>
 							</ul>
 						</li>
-						<li id="menu_community">
-						<a href="../community/community.htm">Community</a>					
+						<li id="menu_community"><a href="../community/community.htm">Community</a>					
 							<ul class="subMenu">
-								<li id="menu_community_mailing_lists">
-								<a href="../community/mailing_lists.htm">Mailing lists</a></li>
-								<li id="menu_community_source_code">
-								<a href="../community/source_code.htm">Source code</a></li>
-								<li id="menu_community_jira">
-								<a href="../community/jira.htm">Ticketing &amp; Wiki</a></li>
+								<li id="menu_community_mailing_lists"><a href="../community/mailing_lists.htm">Mailing lists</a></li>
+								<li id="menu_community_source_code"><a href="../community/source_code.htm">Source code</a></li>
+								<li id="menu_community_jira"><a href="../community/jira.htm">Ticketing &amp; Wiki</a></li>
 								<!--<li id="menu_community_road_map"><a href="community/road_map.htm">Road map</a></li>-->
-								<li id="menu_community_contributors">
-								<a href="../community/contributors.htm">Contributors</a></li>
+								<li id="menu_community_contributors"><a href="../community/contributors.htm">Contributors</a></li>
 							</ul>
 						</li>
-						<li id="menu_disclaimer"><a href="../disclaimer.htm">Disclaimer</a></li>
+						<li id="menu_apache"><a href="../apache.htm">About Apache</a>
+							<ul class="subMenu">
+								<li id="menu_apache_home"><a href="http://www.apache.org">Apache home<span class="asflink">&nbsp;</span></a></li>
+								<li id="menu_apache_donate"><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship<span class="asflink">&nbsp;</span></a></li>
+								<li id="menu_apache_thanks"><a href="http://www.apache.org/foundation/thanks.html">Foundation thanks<span class="asflink">&nbsp;</span></a></li>
+								<li id="menu_apache_security"><a href="http://www.apache.org/security/">Security<span class="asflink">&nbsp;</span></a></li>
+							</ul>
+						</li>
+						<li id="menu_disclaimer"><a href="http://www.apache.org/licenses/">License<span class="asflink">&nbsp;</span></a></li>
 					</ul>
 				</div>
 				
@@ -371,8 +374,7 @@ table.downloads td.md5 {
 				</div>
 				<div id="nav_next">
 					&nbsp;
-					<a id="next" href="">Next Page 
-					<img src="../images/next.gif" alt="" /></a>
+					<a id="next" href="">Next Page <img src="../images/next.gif" alt="" /></a>
 				</div>
 				<div style="clear: both;"></div>
 			</div>
@@ -411,12 +413,9 @@ table.downloads td.md5 {
 	
 	<!-- Footer -->		
 	<div id="footer">
-		<small>Copyright &copy; 2008-2009, The Apache Software Foundation</small>&nbsp;<!--<p style="padding-right: 25px; text-align: right;">
-	    <a href="http://validator.w3.org/check?uri=referer">
-		<img
-	        src="images/valid-xhtml10.png"
-	        alt="Valid XHTML 1.0 Transitional" height="31" width="88" /></a>
-	 	</p>--></div>
+		<div class="cr"><small>Copyright &copy; 2008-2012, The Apache Software Foundation</small></div>
+		<div class="tm"><small>Apache Empire-db, Empire-db, Apache, the Apache feather logo, and the Apache Empire-db project logo are trademarks of The Apache Software Foundation</small></div>
+	</div>
 
 </div>
 

Modified: empire-db/site/downloads/previous.htm
URL: http://svn.apache.org/viewvc/empire-db/site/downloads/previous.htm?rev=1245208&r1=1245207&r2=1245208&view=diff
==============================================================================
--- empire-db/site/downloads/previous.htm (original)
+++ empire-db/site/downloads/previous.htm Thu Feb 16 22:14:20 2012
@@ -21,6 +21,23 @@
 	<link rel="stylesheet" href="../css/layout.css" type="text/css" />
 	<!-- #BeginEditable "stylesheets" -->
 <style type="text/css">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 table.downloads {
 	margin-left: 80px;
     width: 600px;
@@ -60,8 +77,8 @@ table.downloads td.md5 {
 			<img src="../images/logos/empire-db-logo.gif" alt="Empire-db: The relational data persistence component." />
 		</div>
 		<div id="asf">
-			<a target="_blank" href="http://incubator.apache.org/">
-			<img src="../images/logos/apache-incubator-logo.png" alt="Apache Incubator" /></a>
+			<a id="asfhome" target="_blank" href="http://www.apache.org"><img src="../images/logos/feather-small.gif" alt="The Apache Software Foundation" /></a>
+			<label for="asfhome" >The Apache Software Foundation</label>
 		</div>
 		<div style="clear:both"></div>
 	</div>
@@ -78,69 +95,55 @@ table.downloads td.md5 {
 					<ul id="mainMenu">
 						<li id="menu_home"><a href="../index.html">Home</a></li>
 						<li id="menu_news"><a href="../news.htm">News</a></li>
-						<li id="menu_empiredb">
-						<a href="../empiredb/empiredb.htm">Empire-db</a>
+						<li id="menu_empiredb"><a href="../empiredb/empiredb.htm">Empire-db</a>
 								<ul class="subMenu">
-									<li id="menu_empiredb_extending_pattern">
-									<a href="../empiredb/pattern.htm">The Empire DAO-<br />pattern</a></li>
-									<li id="menu_empiredb_handling_metadata">
-									<a href="../empiredb/metadata.htm">Handling data and metadata</a></li>
-									<li id="menu_empiredb_wrong">
-									<a href="../empiredb/hibernate.htm">What's wrong with Hibernate and JPA</a></li>
-									<li id="menu_empiredb_stringfree">
-									<a href="../empiredb/stringfree.htm">The principle of<br/>string-free coding</a></li>
-									<li id="menu_empiredb_faq">
-									<a href="../empiredb/faq.htm">FAQ</a></li>
+									<li id="menu_empiredb_extending_pattern"><a href="../empiredb/pattern.htm">The Empire DAO-<br />pattern</a></li>
+									<li id="menu_empiredb_handling_metadata"><a href="../empiredb/metadata.htm">Handling data and metadata</a></li>
+									<li id="menu_empiredb_wrong"><a href="../empiredb/hibernate.htm">What's wrong with Hibernate and JPA</a></li>
+									<li id="menu_empiredb_stringfree"><a href="../empiredb/stringfree.htm">The principle of<br/>string-free coding</a></li>
+									<li id="menu_empiredb_faq"><a href="../empiredb/faq.htm">FAQ</a></li>
 								</ul>
 						</li>
-						<li id="menu_struts2ext">
-						<a href="../struts2ext/struts2ext.htm">Empire-db and Struts2</a>
+						<li id="menu_struts2ext"><a href="../struts2ext/struts2ext.htm">Empire-db and Struts2</a>
 							<ul class="subMenu">
-								<li id="menu_struts2ext_forms_controls">
-								<a href="../struts2ext/forms_controls.htm">Forms and controls</a></li>
-								<li id="menu_struts2ext_rendering_parsing">
-								<a href="../struts2ext/rendering_parsing.htm">Rendering and parsing</a></li>
+								<li id="menu_struts2ext_forms_controls"><a href="../struts2ext/forms_controls.htm">Forms and controls</a></li>
+								<li id="menu_struts2ext_rendering_parsing"><a href="../struts2ext/rendering_parsing.htm">Rendering and parsing</a></li>
 								<!--<li id="menu_struts2ext_tag_reference"><a href="struts2ext/tag_reference.htm">Tag reference</a></li>-->
-								<li id="menu_struts2ext_input_controls">
-								<a href="../struts2ext/input_controls.htm">Input controls</a></li>
+								<li id="menu_struts2ext_input_controls"><a href="../struts2ext/input_controls.htm">Input controls</a></li>
 							</ul>
 						</li>
 						<li id="menu_downloads"><a href="latest.htm">Downloads</a>
 								<ul class="subMenu">
-									<li id="menu_downloads_previous">
-									<a href="previous.htm">Previous releases</a></li>
-									<li id="menu_downloads_license">
-									<a href="license.htm">License</a></li>
+									<li id="menu_downloads_previous"><a href="previous.htm">Previous releases</a></li>
+									<li id="menu_downloads_license"><a href="license.htm">License</a></li>
 								</ul>
 						</li>
-						<li id="menu_documentation">
-						<a href="../documentation/documentation.htm">Documentation</a>					
+						<li id="menu_documentation"><a href="../documentation/documentation.htm">Documentation</a>					
 							<ul class="subMenu">
-								<li id="menu_documentation_class_overview">
-								<a href="../documentation/class_overview.htm">Empire-db class<br />overview</a></li>
-								<li id="menu_documentation_tutorials">
-								<a href="../documentation/tutorial.htm">Tutorial</a></li>
-								<li id="menu_documentation_getting_started">
-								<a href="../documentation/getting_started.htm">Getting started</a></li>
-								<li id="menu_documentation_api">
-								<a href="../documentation/api.htm">API</a></li>
+								<li id="menu_documentation_class_overview"><a href="../documentation/class_overview.htm">Empire-db class<br />overview</a></li>
+								<li id="menu_documentation_tutorials"><a href="../documentation/tutorial.htm">Tutorial</a></li>
+								<li id="menu_documentation_getting_started"><a href="../documentation/getting_started.htm">Getting started</a></li>
+								<li id="menu_documentation_api"><a href="../documentation/api.htm">API</a></li>
 							</ul>
 						</li>
-						<li id="menu_community">
-						<a href="../community/community.htm">Community</a>					
+						<li id="menu_community"><a href="../community/community.htm">Community</a>					
 							<ul class="subMenu">
-								<li id="menu_community_mailing_lists">
-								<a href="../community/mailing_lists.htm">Mailing lists</a></li>
-								<li id="menu_community_source_code">
-								<a href="../community/source_code.htm">Source code</a></li>
-								<li id="menu_community_jira">
-								<a href="../community/jira.htm">Ticketing &amp; Wiki</a></li>
+								<li id="menu_community_mailing_lists"><a href="../community/mailing_lists.htm">Mailing lists</a></li>
+								<li id="menu_community_source_code"><a href="../community/source_code.htm">Source code</a></li>
+								<li id="menu_community_jira"><a href="../community/jira.htm">Ticketing &amp; Wiki</a></li>
 								<!--<li id="menu_community_road_map"><a href="community/road_map.htm">Road map</a></li>-->
-								<li id="menu_community_contributors">
-								<a href="../community/contributors.htm">Contributors</a></li>
+								<li id="menu_community_contributors"><a href="../community/contributors.htm">Contributors</a></li>
 							</ul>
 						</li>
-						<li id="menu_disclaimer"><a href="../disclaimer.htm">Disclaimer</a></li>
+						<li id="menu_apache"><a href="../apache.htm">About Apache</a>
+							<ul class="subMenu">
+								<li id="menu_apache_home"><a href="http://www.apache.org">Apache home<span class="asflink">&nbsp;</span></a></li>
+								<li id="menu_apache_donate"><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship<span class="asflink">&nbsp;</span></a></li>
+								<li id="menu_apache_thanks"><a href="http://www.apache.org/foundation/thanks.html">Foundation thanks<span class="asflink">&nbsp;</span></a></li>
+								<li id="menu_apache_security"><a href="http://www.apache.org/security/">Security<span class="asflink">&nbsp;</span></a></li>
+							</ul>
+						</li>
+						<li id="menu_disclaimer"><a href="http://www.apache.org/licenses/">License<span class="asflink">&nbsp;</span></a></li>
 					</ul>
 				</div>
 				
@@ -425,8 +428,7 @@ table.downloads td.md5 {
 				</div>
 				<div id="nav_next">
 					&nbsp;
-					<a id="next" href="">Next Page 
-					<img src="../images/next.gif" alt="" /></a>
+					<a id="next" href="">Next Page <img src="../images/next.gif" alt="" /></a>
 				</div>
 				<div style="clear: both;"></div>
 			</div>
@@ -465,15 +467,12 @@ table.downloads td.md5 {
 	
 	<!-- Footer -->		
 	<div id="footer">
-		<small>Copyright &copy; 2008-2011, The Apache Software Foundation</small>&nbsp;<!--<p style="padding-right: 25px; text-align: right;">
-	    <a href="http://validator.w3.org/check?uri=referer">
-		<img
-	        src="images/valid-xhtml10.png"
-	        alt="Valid XHTML 1.0 Transitional" height="31" width="88" /></a>
-	 	</p>--></div>
+		<div class="cr"><small>Copyright &copy; 2008-2012, The Apache Software Foundation</small></div>
+		<div class="tm"><small>Apache Empire-db, Empire-db, Apache, the Apache feather logo, and the Apache Empire-db project logo are trademarks of The Apache Software Foundation</small></div>
+	</div>
 
 </div>
 
 </body>
 <!-- #EndTemplate -->
-</html>
+</html>
\ No newline at end of file

Modified: empire-db/site/empiredb/empiredb.htm
URL: http://svn.apache.org/viewvc/empire-db/site/empiredb/empiredb.htm?rev=1245208&r1=1245207&r2=1245208&view=diff
==============================================================================
--- empire-db/site/empiredb/empiredb.htm (original)
+++ empire-db/site/empiredb/empiredb.htm Thu Feb 16 22:14:20 2012
@@ -32,8 +32,8 @@
 			<img src="../images/logos/empire-db-logo.gif" alt="Empire-db: The relational data persistence component." />
 		</div>
 		<div id="asf">
-			<a target="_blank" href="http://incubator.apache.org/">
-			<img src="../images/logos/apache-incubator-logo.png" alt="Apache Incubator" /></a>
+			<a id="asfhome" target="_blank" href="http://www.apache.org"><img src="../images/logos/feather-small.gif" alt="The Apache Software Foundation" /></a>
+			<label for="asfhome" >The Apache Software Foundation</label>
 		</div>
 		<div style="clear:both"></div>
 	</div>
@@ -52,67 +52,53 @@
 						<li id="menu_news"><a href="../news.htm">News</a></li>
 						<li id="menu_empiredb"><a href="empiredb.htm">Empire-db</a>
 								<ul class="subMenu">
-									<li id="menu_empiredb_extending_pattern">
-									<a href="pattern.htm">The Empire DAO-<br />pattern</a></li>
-									<li id="menu_empiredb_handling_metadata">
-									<a href="metadata.htm">Handling data and metadata</a></li>
-									<li id="menu_empiredb_wrong">
-									<a href="hibernate.htm">What's wrong with Hibernate and JPA</a></li>
-									<li id="menu_empiredb_stringfree">
-									<a href="stringfree.htm">The principle of<br/>string-free coding</a></li>
-									<li id="menu_empiredb_faq">
-									<a href="faq.htm">FAQ</a></li>
+									<li id="menu_empiredb_extending_pattern"><a href="pattern.htm">The Empire DAO-<br />pattern</a></li>
+									<li id="menu_empiredb_handling_metadata"><a href="metadata.htm">Handling data and metadata</a></li>
+									<li id="menu_empiredb_wrong"><a href="hibernate.htm">What's wrong with Hibernate and JPA</a></li>
+									<li id="menu_empiredb_stringfree"><a href="stringfree.htm">The principle of<br/>string-free coding</a></li>
+									<li id="menu_empiredb_faq"><a href="faq.htm">FAQ</a></li>
 								</ul>
 						</li>
-						<li id="menu_struts2ext">
-						<a href="../struts2ext/struts2ext.htm">Empire-db and Struts2</a>
+						<li id="menu_struts2ext"><a href="../struts2ext/struts2ext.htm">Empire-db and Struts2</a>
 							<ul class="subMenu">
-								<li id="menu_struts2ext_forms_controls">
-								<a href="../struts2ext/forms_controls.htm">Forms and controls</a></li>
-								<li id="menu_struts2ext_rendering_parsing">
-								<a href="../struts2ext/rendering_parsing.htm">Rendering and parsing</a></li>
+								<li id="menu_struts2ext_forms_controls"><a href="../struts2ext/forms_controls.htm">Forms and controls</a></li>
+								<li id="menu_struts2ext_rendering_parsing"><a href="../struts2ext/rendering_parsing.htm">Rendering and parsing</a></li>
 								<!--<li id="menu_struts2ext_tag_reference"><a href="struts2ext/tag_reference.htm">Tag reference</a></li>-->
-								<li id="menu_struts2ext_input_controls">
-								<a href="../struts2ext/input_controls.htm">Input controls</a></li>
+								<li id="menu_struts2ext_input_controls"><a href="../struts2ext/input_controls.htm">Input controls</a></li>
 							</ul>
 						</li>
-						<li id="menu_downloads">
-						<a href="../downloads/latest.htm">Downloads</a>
+						<li id="menu_downloads"><a href="../downloads/latest.htm">Downloads</a>
 								<ul class="subMenu">
-									<li id="menu_downloads_previous">
-									<a href="../downloads/previous.htm">Previous releases</a></li>
-									<li id="menu_downloads_license">
-									<a href="../downloads/license.htm">License</a></li>
+									<li id="menu_downloads_previous"><a href="../downloads/previous.htm">Previous releases</a></li>
+									<li id="menu_downloads_license"><a href="../downloads/license.htm">License</a></li>
 								</ul>
 						</li>
-						<li id="menu_documentation">
-						<a href="../documentation/documentation.htm">Documentation</a>					
+						<li id="menu_documentation"><a href="../documentation/documentation.htm">Documentation</a>					
 							<ul class="subMenu">
-								<li id="menu_documentation_class_overview">
-								<a href="../documentation/class_overview.htm">Empire-db class<br />overview</a></li>
-								<li id="menu_documentation_tutorials">
-								<a href="../documentation/tutorial.htm">Tutorial</a></li>
-								<li id="menu_documentation_getting_started">
-								<a href="../documentation/getting_started.htm">Getting started</a></li>
-								<li id="menu_documentation_api">
-								<a href="../documentation/api.htm">API</a></li>
+								<li id="menu_documentation_class_overview"><a href="../documentation/class_overview.htm">Empire-db class<br />overview</a></li>
+								<li id="menu_documentation_tutorials"><a href="../documentation/tutorial.htm">Tutorial</a></li>
+								<li id="menu_documentation_getting_started"><a href="../documentation/getting_started.htm">Getting started</a></li>
+								<li id="menu_documentation_api"><a href="../documentation/api.htm">API</a></li>
 							</ul>
 						</li>
-						<li id="menu_community">
-						<a href="../community/community.htm">Community</a>					
+						<li id="menu_community"><a href="../community/community.htm">Community</a>					
 							<ul class="subMenu">
-								<li id="menu_community_mailing_lists">
-								<a href="../community/mailing_lists.htm">Mailing lists</a></li>
-								<li id="menu_community_source_code">
-								<a href="../community/source_code.htm">Source code</a></li>
-								<li id="menu_community_jira">
-								<a href="../community/jira.htm">Ticketing &amp; Wiki</a></li>
+								<li id="menu_community_mailing_lists"><a href="../community/mailing_lists.htm">Mailing lists</a></li>
+								<li id="menu_community_source_code"><a href="../community/source_code.htm">Source code</a></li>
+								<li id="menu_community_jira"><a href="../community/jira.htm">Ticketing &amp; Wiki</a></li>
 								<!--<li id="menu_community_road_map"><a href="community/road_map.htm">Road map</a></li>-->
-								<li id="menu_community_contributors">
-								<a href="../community/contributors.htm">Contributors</a></li>
+								<li id="menu_community_contributors"><a href="../community/contributors.htm">Contributors</a></li>
 							</ul>
 						</li>
-						<li id="menu_disclaimer"><a href="../disclaimer.htm">Disclaimer</a></li>
+						<li id="menu_apache"><a href="../apache.htm">About Apache</a>
+							<ul class="subMenu">
+								<li id="menu_apache_home"><a href="http://www.apache.org">Apache home<span class="asflink">&nbsp;</span></a></li>
+								<li id="menu_apache_donate"><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship<span class="asflink">&nbsp;</span></a></li>
+								<li id="menu_apache_thanks"><a href="http://www.apache.org/foundation/thanks.html">Foundation thanks<span class="asflink">&nbsp;</span></a></li>
+								<li id="menu_apache_security"><a href="http://www.apache.org/security/">Security<span class="asflink">&nbsp;</span></a></li>
+							</ul>
+						</li>
+						<li id="menu_disclaimer"><a href="http://www.apache.org/licenses/">License<span class="asflink">&nbsp;</span></a></li>
 					</ul>
 				</div>
 				
@@ -205,8 +191,7 @@
 				</div>
 				<div id="nav_next">
 					&nbsp;
-					<a id="next" href="">Next Page 
-					<img src="../images/next.gif" alt="" /></a>
+					<a id="next" href="">Next Page <img src="../images/next.gif" alt="" /></a>
 				</div>
 				<div style="clear: both;"></div>
 			</div>
@@ -245,12 +230,9 @@
 	
 	<!-- Footer -->		
 	<div id="footer">
-		<small>Copyright &copy; 2008-2009, The Apache Software Foundation</small>&nbsp;<!--<p style="padding-right: 25px; text-align: right;">
-	    <a href="http://validator.w3.org/check?uri=referer">
-		<img
-	        src="images/valid-xhtml10.png"
-	        alt="Valid XHTML 1.0 Transitional" height="31" width="88" /></a>
-	 	</p>--></div>
+		<div class="cr"><small>Copyright &copy; 2008-2012, The Apache Software Foundation</small></div>
+		<div class="tm"><small>Apache Empire-db, Empire-db, Apache, the Apache feather logo, and the Apache Empire-db project logo are trademarks of The Apache Software Foundation</small></div>
+	</div>
 
 </div>
 

Modified: empire-db/site/empiredb/faq.htm
URL: http://svn.apache.org/viewvc/empire-db/site/empiredb/faq.htm?rev=1245208&r1=1245207&r2=1245208&view=diff
==============================================================================
--- empire-db/site/empiredb/faq.htm (original)
+++ empire-db/site/empiredb/faq.htm Thu Feb 16 22:14:20 2012
@@ -21,6 +21,23 @@
 	<link rel="stylesheet" href="../css/layout.css" type="text/css" />
 	<!-- #BeginEditable "stylesheets" -->
 <style type="text/css">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 #content h2 {
 	font-style: italic;
 	border-bottom: 1px solid;
@@ -46,8 +63,8 @@
 			<img src="../images/logos/empire-db-logo.gif" alt="Empire-db: The relational data persistence component." />
 		</div>
 		<div id="asf">
-			<a target="_blank" href="http://incubator.apache.org/">
-			<img src="../images/logos/apache-incubator-logo.png" alt="Apache Incubator" /></a>
+			<a id="asfhome" target="_blank" href="http://www.apache.org"><img src="../images/logos/feather-small.gif" alt="The Apache Software Foundation" /></a>
+			<label for="asfhome" >The Apache Software Foundation</label>
 		</div>
 		<div style="clear:both"></div>
 	</div>
@@ -66,67 +83,53 @@
 						<li id="menu_news"><a href="../news.htm">News</a></li>
 						<li id="menu_empiredb"><a href="empiredb.htm">Empire-db</a>
 								<ul class="subMenu">
-									<li id="menu_empiredb_extending_pattern">
-									<a href="pattern.htm">The Empire DAO-<br />pattern</a></li>
-									<li id="menu_empiredb_handling_metadata">
-									<a href="metadata.htm">Handling data and metadata</a></li>
-									<li id="menu_empiredb_wrong">
-									<a href="hibernate.htm">What's wrong with Hibernate and JPA</a></li>
-									<li id="menu_empiredb_stringfree">
-									<a href="stringfree.htm">The principle of<br/>string-free coding</a></li>
-									<li id="menu_empiredb_faq">
-									<a href="faq.htm">FAQ</a></li>
+									<li id="menu_empiredb_extending_pattern"><a href="pattern.htm">The Empire DAO-<br />pattern</a></li>
+									<li id="menu_empiredb_handling_metadata"><a href="metadata.htm">Handling data and metadata</a></li>
+									<li id="menu_empiredb_wrong"><a href="hibernate.htm">What's wrong with Hibernate and JPA</a></li>
+									<li id="menu_empiredb_stringfree"><a href="stringfree.htm">The principle of<br/>string-free coding</a></li>
+									<li id="menu_empiredb_faq"><a href="faq.htm">FAQ</a></li>
 								</ul>
 						</li>
-						<li id="menu_struts2ext">
-						<a href="../struts2ext/struts2ext.htm">Empire-db and Struts2</a>
+						<li id="menu_struts2ext"><a href="../struts2ext/struts2ext.htm">Empire-db and Struts2</a>
 							<ul class="subMenu">
-								<li id="menu_struts2ext_forms_controls">
-								<a href="../struts2ext/forms_controls.htm">Forms and controls</a></li>
-								<li id="menu_struts2ext_rendering_parsing">
-								<a href="../struts2ext/rendering_parsing.htm">Rendering and parsing</a></li>
+								<li id="menu_struts2ext_forms_controls"><a href="../struts2ext/forms_controls.htm">Forms and controls</a></li>
+								<li id="menu_struts2ext_rendering_parsing"><a href="../struts2ext/rendering_parsing.htm">Rendering and parsing</a></li>
 								<!--<li id="menu_struts2ext_tag_reference"><a href="struts2ext/tag_reference.htm">Tag reference</a></li>-->
-								<li id="menu_struts2ext_input_controls">
-								<a href="../struts2ext/input_controls.htm">Input controls</a></li>
+								<li id="menu_struts2ext_input_controls"><a href="../struts2ext/input_controls.htm">Input controls</a></li>
 							</ul>
 						</li>
-						<li id="menu_downloads">
-						<a href="../downloads/latest.htm">Downloads</a>
+						<li id="menu_downloads"><a href="../downloads/latest.htm">Downloads</a>
 								<ul class="subMenu">
-									<li id="menu_downloads_previous">
-									<a href="../downloads/previous.htm">Previous releases</a></li>
-									<li id="menu_downloads_license">
-									<a href="../downloads/license.htm">License</a></li>
+									<li id="menu_downloads_previous"><a href="../downloads/previous.htm">Previous releases</a></li>
+									<li id="menu_downloads_license"><a href="../downloads/license.htm">License</a></li>
 								</ul>
 						</li>
-						<li id="menu_documentation">
-						<a href="../documentation/documentation.htm">Documentation</a>					
+						<li id="menu_documentation"><a href="../documentation/documentation.htm">Documentation</a>					
 							<ul class="subMenu">
-								<li id="menu_documentation_class_overview">
-								<a href="../documentation/class_overview.htm">Empire-db class<br />overview</a></li>
-								<li id="menu_documentation_tutorials">
-								<a href="../documentation/tutorial.htm">Tutorial</a></li>
-								<li id="menu_documentation_getting_started">
-								<a href="../documentation/getting_started.htm">Getting started</a></li>
-								<li id="menu_documentation_api">
-								<a href="../documentation/api.htm">API</a></li>
+								<li id="menu_documentation_class_overview"><a href="../documentation/class_overview.htm">Empire-db class<br />overview</a></li>
+								<li id="menu_documentation_tutorials"><a href="../documentation/tutorial.htm">Tutorial</a></li>
+								<li id="menu_documentation_getting_started"><a href="../documentation/getting_started.htm">Getting started</a></li>
+								<li id="menu_documentation_api"><a href="../documentation/api.htm">API</a></li>
 							</ul>
 						</li>
-						<li id="menu_community">
-						<a href="../community/community.htm">Community</a>					
+						<li id="menu_community"><a href="../community/community.htm">Community</a>					
 							<ul class="subMenu">
-								<li id="menu_community_mailing_lists">
-								<a href="../community/mailing_lists.htm">Mailing lists</a></li>
-								<li id="menu_community_source_code">
-								<a href="../community/source_code.htm">Source code</a></li>
-								<li id="menu_community_jira">
-								<a href="../community/jira.htm">Ticketing &amp; Wiki</a></li>
+								<li id="menu_community_mailing_lists"><a href="../community/mailing_lists.htm">Mailing lists</a></li>
+								<li id="menu_community_source_code"><a href="../community/source_code.htm">Source code</a></li>
+								<li id="menu_community_jira"><a href="../community/jira.htm">Ticketing &amp; Wiki</a></li>
 								<!--<li id="menu_community_road_map"><a href="community/road_map.htm">Road map</a></li>-->
-								<li id="menu_community_contributors">
-								<a href="../community/contributors.htm">Contributors</a></li>
+								<li id="menu_community_contributors"><a href="../community/contributors.htm">Contributors</a></li>
 							</ul>
 						</li>
-						<li id="menu_disclaimer"><a href="../disclaimer.htm">Disclaimer</a></li>
+						<li id="menu_apache"><a href="../apache.htm">About Apache</a>
+							<ul class="subMenu">
+								<li id="menu_apache_home"><a href="http://www.apache.org">Apache home<span class="asflink">&nbsp;</span></a></li>
+								<li id="menu_apache_donate"><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship<span class="asflink">&nbsp;</span></a></li>
+								<li id="menu_apache_thanks"><a href="http://www.apache.org/foundation/thanks.html">Foundation thanks<span class="asflink">&nbsp;</span></a></li>
+								<li id="menu_apache_security"><a href="http://www.apache.org/security/">Security<span class="asflink">&nbsp;</span></a></li>
+							</ul>
+						</li>
+						<li id="menu_disclaimer"><a href="http://www.apache.org/licenses/">License<span class="asflink">&nbsp;</span></a></li>
 					</ul>
 				</div>
 				
@@ -241,8 +244,7 @@
 				</div>
 				<div id="nav_next">
 					&nbsp;
-					<a id="next" href="">Next Page 
-					<img src="../images/next.gif" alt="" /></a>
+					<a id="next" href="">Next Page <img src="../images/next.gif" alt="" /></a>
 				</div>
 				<div style="clear: both;"></div>
 			</div>
@@ -281,12 +283,9 @@
 	
 	<!-- Footer -->		
 	<div id="footer">
-		<small>Copyright &copy; 2008-2009, The Apache Software Foundation</small>&nbsp;<!--<p style="padding-right: 25px; text-align: right;">
-	    <a href="http://validator.w3.org/check?uri=referer">
-		<img
-	        src="images/valid-xhtml10.png"
-	        alt="Valid XHTML 1.0 Transitional" height="31" width="88" /></a>
-	 	</p>--></div>
+		<div class="cr"><small>Copyright &copy; 2008-2012, The Apache Software Foundation</small></div>
+		<div class="tm"><small>Apache Empire-db, Empire-db, Apache, the Apache feather logo, and the Apache Empire-db project logo are trademarks of The Apache Software Foundation</small></div>
+	</div>
 
 </div>
 



Mime
View raw message