You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bu...@apache.org on 2014/01/28 19:38:39 UTC

svn commit: r895650 [3/6] - in /websites/staging/myfaces/trunk/content: ./ wiki/ wiki/asf-board-reports/ wiki/commons/ wiki/commons/user-guide/ wiki/core/ wiki/core/committer-and-pmc-guide/ wiki/core/committer-and-pmc-guide/myfaces-project-management/ ...

Modified: websites/staging/myfaces/trunk/content/wiki/core/user-guide.html
==============================================================================
--- websites/staging/myfaces/trunk/content/wiki/core/user-guide.html (original)
+++ websites/staging/myfaces/trunk/content/wiki/core/user-guide.html Tue Jan 28 18:38:38 2014
@@ -1,45 +1,61 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html lang="en">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
   <head>
     <title>MyFaces Core User Guide</title>
-
     <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-    <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
-
-    <link rel="stylesheet" type="text/css" media="screen" href="http://www.apache.org/css/style.css">
-    <link rel="stylesheet" type="text/css" media="screen" href="http://www.apache.org/css/code.css">
-
+    
+    <link rel="stylesheet" type="text/css" media="all" href="/wiki/css/maven-base.css"/>
+    <link rel="stylesheet" type="text/css" media="all" href="/wiki/css/maven-theme.css"/>
+    <link rel="stylesheet" type="text/css" media="print" href="/wiki/css/print.css"/>
+    
     
 
     
     
   </head>
-
   <body>
-    <div id="page" class="container_16">
-      <div id="header" class="grid_8">
-        <img src="http://www.apache.org/images/feather-small.gif" alt="The Apache Software Foundation">
-        <h1>The Apache Software Foundation</h1>
-        <h2>MyFaces Core User Guide</h2>
-      </div>
-      <div id="nav" class="grid_8">
-        <ul>
-          <!-- <li><a href="/" title="Welcome!">Home</a></li> -->
-          <li><a href="http://www.apache.org/foundation/" title="The Foundation">Foundation</a></li>
-          <li><a href="http://projects.apache.org" title="The Projects">Projects</a></li>
-          <li><a href="http://people.apache.org" title="The People">People</a></li>
-          <li><a href="http://www.apache.org/foundation/getinvolved.html" title="Get Involved">Get Involved</a></li>
-          <li><a href="http://www.apache.org/dyn/closer.cgi" title="Download">Download</a></li>
-          <li><a href="http://www.apache.org/foundation/sponsorship.html" title="Support Apache">Support Apache</a></li>
-        </ul>
-        <p><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/wiki/">Wiki</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/">Core</a></p>
-        <form name="search" id="search" action="http://www.google.com/search" method="get">
-          <input value="*.apache.org" name="sitesearch" type="hidden"/>
-          <input type="text" name="q" id="query">
-          <input type="submit" id="submit" value="Search">
-        </form>
+  <div id="header">
+    <div id="top_menu">
+      <div id="top_menu_container">
+          MyFaces Core User Guide
+          <!-- #simplePublishDate($decoration.publishDate)
+          #links( $decoration.body.links ) -->
+        <div class="clear"></div>
+      </div> <!-- close top_menu_container -->
+    </div> <!-- close top_menu -->
+    <div id="header_bottom">
+    <div id="logo_banner_container">
+      <!--#banner( $decoration.bannerLeft "logo" )-->
+      <div id="logo">
+        <a href="index.html">
+          <img src="/wiki/img/banners/MyFaces_logo.jpg" alt="" />
+        </a>
       </div>
+      <!--#banner( $decoration.bannerRight "banner" )-->
+      <div id="banner">
+        <a href="http://www.apache.org/">
+          <img src="/wiki/img/banners/apache_banner.png" alt="" />
+        </a>
+      </div>    
       <div class="clear"></div>
+    </div> <!-- close logo_banner_container -->
+    </div> <!-- close header_bottom -->
+  </div> <!-- close header -->
+    <div id="main_container">
+    <div id="left_column">
+    <!--
+       #mainMenu( $decoration.body.menus )
+       #poweredByLogo( $decoration.poweredBy )
+       -->
+        <div id="powered_by">
+          <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
+            <img alt="Built by Maven" src="/wiki/img/banners/maven-feather.png"></img>
+          </a>
+        </div>
+    </div>
+    <div id="body_column">
+      <div>
+      <p><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/wiki/">Wiki</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/">Core</a></p>
       <div id="content" class="grid_16"><div class="section-content"><p><ac:macro ac:name="unmigrated-inline-wiki-markup"><ac:plain-text-body>&lt;![CDATA<a href="cdata[{scrollbar}.html">{scrollbar}</a>
 ]&gt;</ac:plain-text-body></ac:macro>
 <p>JavaServer&trade; Faces (JSF) is a web application framework
@@ -85,11 +101,15 @@ with MyFaces Core JSF implementation.</p
 <p><ac:macro ac:name="children" /></p>
 <p><ac:macro ac:name="unmigrated-inline-wiki-markup"><ac:plain-text-body>&lt;![CDATA<a href="cdata[{scrollbar}.html">{scrollbar}</a>
 ]&gt;</ac:plain-text-body></ac:macro></p></div></div>
-      <div class="clear"></div>
-    </div>
-
-    <div id="copyright" class="container_16">
-      <p>Copyright &#169; 2011 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
+      </div>
     </div>
+    <div class="clear"></div>
+    </div> <!-- close main container -->
+    <div id="footer">
+      <div class="copyright">
+      Copyright &#169; Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>
+       Apache MyFaces, Apache Tobago, Apache, the Apache feather logo, and the Apache MyFaces project logos are trademarks of The Apache Software Foundation.
+      </div><!-- close copyright -->
+    </div><!-- close footer -->
   </body>
 </html>

Modified: websites/staging/myfaces/trunk/content/wiki/core/user-guide/build-myfaces-core-from-source-code-using-maven.html
==============================================================================
--- websites/staging/myfaces/trunk/content/wiki/core/user-guide/build-myfaces-core-from-source-code-using-maven.html (original)
+++ websites/staging/myfaces/trunk/content/wiki/core/user-guide/build-myfaces-core-from-source-code-using-maven.html Tue Jan 28 18:38:38 2014
@@ -1,45 +1,61 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html lang="en">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
   <head>
     <title>Build MyFaces Core from source code using Maven</title>
-
     <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-    <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
-
-    <link rel="stylesheet" type="text/css" media="screen" href="http://www.apache.org/css/style.css">
-    <link rel="stylesheet" type="text/css" media="screen" href="http://www.apache.org/css/code.css">
-
+    
+    <link rel="stylesheet" type="text/css" media="all" href="/wiki/css/maven-base.css"/>
+    <link rel="stylesheet" type="text/css" media="all" href="/wiki/css/maven-theme.css"/>
+    <link rel="stylesheet" type="text/css" media="print" href="/wiki/css/print.css"/>
+    
     
 
     
     
   </head>
-
   <body>
-    <div id="page" class="container_16">
-      <div id="header" class="grid_8">
-        <img src="http://www.apache.org/images/feather-small.gif" alt="The Apache Software Foundation">
-        <h1>The Apache Software Foundation</h1>
-        <h2>Build MyFaces Core from source code using Maven</h2>
-      </div>
-      <div id="nav" class="grid_8">
-        <ul>
-          <!-- <li><a href="/" title="Welcome!">Home</a></li> -->
-          <li><a href="http://www.apache.org/foundation/" title="The Foundation">Foundation</a></li>
-          <li><a href="http://projects.apache.org" title="The Projects">Projects</a></li>
-          <li><a href="http://people.apache.org" title="The People">People</a></li>
-          <li><a href="http://www.apache.org/foundation/getinvolved.html" title="Get Involved">Get Involved</a></li>
-          <li><a href="http://www.apache.org/dyn/closer.cgi" title="Download">Download</a></li>
-          <li><a href="http://www.apache.org/foundation/sponsorship.html" title="Support Apache">Support Apache</a></li>
-        </ul>
-        <p><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/wiki/">Wiki</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/">Core</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/user-guide/">User-guide</a></p>
-        <form name="search" id="search" action="http://www.google.com/search" method="get">
-          <input value="*.apache.org" name="sitesearch" type="hidden"/>
-          <input type="text" name="q" id="query">
-          <input type="submit" id="submit" value="Search">
-        </form>
+  <div id="header">
+    <div id="top_menu">
+      <div id="top_menu_container">
+          Build MyFaces Core from source code using Maven
+          <!-- #simplePublishDate($decoration.publishDate)
+          #links( $decoration.body.links ) -->
+        <div class="clear"></div>
+      </div> <!-- close top_menu_container -->
+    </div> <!-- close top_menu -->
+    <div id="header_bottom">
+    <div id="logo_banner_container">
+      <!--#banner( $decoration.bannerLeft "logo" )-->
+      <div id="logo">
+        <a href="index.html">
+          <img src="/wiki/img/banners/MyFaces_logo.jpg" alt="" />
+        </a>
       </div>
+      <!--#banner( $decoration.bannerRight "banner" )-->
+      <div id="banner">
+        <a href="http://www.apache.org/">
+          <img src="/wiki/img/banners/apache_banner.png" alt="" />
+        </a>
+      </div>    
       <div class="clear"></div>
+    </div> <!-- close logo_banner_container -->
+    </div> <!-- close header_bottom -->
+  </div> <!-- close header -->
+    <div id="main_container">
+    <div id="left_column">
+    <!--
+       #mainMenu( $decoration.body.menus )
+       #poweredByLogo( $decoration.poweredBy )
+       -->
+        <div id="powered_by">
+          <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
+            <img alt="Built by Maven" src="/wiki/img/banners/maven-feather.png"></img>
+          </a>
+        </div>
+    </div>
+    <div id="body_column">
+      <div>
+      <p><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/wiki/">Wiki</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/">Core</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/user-guide/">User-guide</a></p>
       <div id="content" class="grid_16"><div class="section-content"><p><ac:macro ac:name="unmigrated-inline-wiki-markup"><ac:plain-text-body>&lt;![CDATA<a href="cdata[{scrollbar}.html">{scrollbar}</a>
 ]&gt;</ac:plain-text-body></ac:macro>
 <h2>Build MyFaces Core from source code using Maven</h2></p>
@@ -157,11 +173,15 @@ href="http://wiki.apache.org/myfaces/Bui
 
 <p><ac:macro ac:name="unmigrated-inline-wiki-markup"><ac:plain-text-body>&lt;![CDATA<a href="cdata[{scrollbar}.html">{scrollbar}</a>
 ]&gt;</ac:plain-text-body></ac:macro></p></div></div>
-      <div class="clear"></div>
-    </div>
-
-    <div id="copyright" class="container_16">
-      <p>Copyright &#169; 2011 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
+      </div>
     </div>
+    <div class="clear"></div>
+    </div> <!-- close main container -->
+    <div id="footer">
+      <div class="copyright">
+      Copyright &#169; Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>
+       Apache MyFaces, Apache Tobago, Apache, the Apache feather logo, and the Apache MyFaces project logos are trademarks of The Apache Software Foundation.
+      </div><!-- close copyright -->
+    </div><!-- close footer -->
   </body>
 </html>

Modified: websites/staging/myfaces/trunk/content/wiki/core/user-guide/configuration-of-special-features.html
==============================================================================
--- websites/staging/myfaces/trunk/content/wiki/core/user-guide/configuration-of-special-features.html (original)
+++ websites/staging/myfaces/trunk/content/wiki/core/user-guide/configuration-of-special-features.html Tue Jan 28 18:38:38 2014
@@ -1,45 +1,61 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html lang="en">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
   <head>
     <title>Configuration of special features</title>
-
     <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-    <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
-
-    <link rel="stylesheet" type="text/css" media="screen" href="http://www.apache.org/css/style.css">
-    <link rel="stylesheet" type="text/css" media="screen" href="http://www.apache.org/css/code.css">
-
+    
+    <link rel="stylesheet" type="text/css" media="all" href="/wiki/css/maven-base.css"/>
+    <link rel="stylesheet" type="text/css" media="all" href="/wiki/css/maven-theme.css"/>
+    <link rel="stylesheet" type="text/css" media="print" href="/wiki/css/print.css"/>
+    
     
 
     
     
   </head>
-
   <body>
-    <div id="page" class="container_16">
-      <div id="header" class="grid_8">
-        <img src="http://www.apache.org/images/feather-small.gif" alt="The Apache Software Foundation">
-        <h1>The Apache Software Foundation</h1>
-        <h2>Configuration of special features</h2>
-      </div>
-      <div id="nav" class="grid_8">
-        <ul>
-          <!-- <li><a href="/" title="Welcome!">Home</a></li> -->
-          <li><a href="http://www.apache.org/foundation/" title="The Foundation">Foundation</a></li>
-          <li><a href="http://projects.apache.org" title="The Projects">Projects</a></li>
-          <li><a href="http://people.apache.org" title="The People">People</a></li>
-          <li><a href="http://www.apache.org/foundation/getinvolved.html" title="Get Involved">Get Involved</a></li>
-          <li><a href="http://www.apache.org/dyn/closer.cgi" title="Download">Download</a></li>
-          <li><a href="http://www.apache.org/foundation/sponsorship.html" title="Support Apache">Support Apache</a></li>
-        </ul>
-        <p><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/wiki/">Wiki</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/">Core</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/user-guide/">User-guide</a></p>
-        <form name="search" id="search" action="http://www.google.com/search" method="get">
-          <input value="*.apache.org" name="sitesearch" type="hidden"/>
-          <input type="text" name="q" id="query">
-          <input type="submit" id="submit" value="Search">
-        </form>
+  <div id="header">
+    <div id="top_menu">
+      <div id="top_menu_container">
+          Configuration of special features
+          <!-- #simplePublishDate($decoration.publishDate)
+          #links( $decoration.body.links ) -->
+        <div class="clear"></div>
+      </div> <!-- close top_menu_container -->
+    </div> <!-- close top_menu -->
+    <div id="header_bottom">
+    <div id="logo_banner_container">
+      <!--#banner( $decoration.bannerLeft "logo" )-->
+      <div id="logo">
+        <a href="index.html">
+          <img src="/wiki/img/banners/MyFaces_logo.jpg" alt="" />
+        </a>
       </div>
+      <!--#banner( $decoration.bannerRight "banner" )-->
+      <div id="banner">
+        <a href="http://www.apache.org/">
+          <img src="/wiki/img/banners/apache_banner.png" alt="" />
+        </a>
+      </div>    
       <div class="clear"></div>
+    </div> <!-- close logo_banner_container -->
+    </div> <!-- close header_bottom -->
+  </div> <!-- close header -->
+    <div id="main_container">
+    <div id="left_column">
+    <!--
+       #mainMenu( $decoration.body.menus )
+       #poweredByLogo( $decoration.poweredBy )
+       -->
+        <div id="powered_by">
+          <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
+            <img alt="Built by Maven" src="/wiki/img/banners/maven-feather.png"></img>
+          </a>
+        </div>
+    </div>
+    <div id="body_column">
+      <div>
+      <p><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/wiki/">Wiki</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/">Core</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/user-guide/">User-guide</a></p>
       <div id="content" class="grid_16"><div class="section-content"><p><ac:macro ac:name="unmigrated-inline-wiki-markup"><ac:plain-text-body>&lt;![CDATA<a href="cdata[{scrollbar}.html">{scrollbar}</a>
 ]&gt;</ac:plain-text-body></ac:macro></p>
 <p>Here you can find additional information about how to configure special
@@ -61,11 +77,15 @@ href="http://myfaces.apache.org/core20/m
 
 <p><ac:macro ac:name="unmigrated-inline-wiki-markup"><ac:plain-text-body>&lt;![CDATA<a href="cdata[{scrollbar}.html">{scrollbar}</a>
 ]&gt;</ac:plain-text-body></ac:macro></p></div></div>
-      <div class="clear"></div>
-    </div>
-
-    <div id="copyright" class="container_16">
-      <p>Copyright &#169; 2011 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
+      </div>
     </div>
+    <div class="clear"></div>
+    </div> <!-- close main container -->
+    <div id="footer">
+      <div class="copyright">
+      Copyright &#169; Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>
+       Apache MyFaces, Apache Tobago, Apache, the Apache feather logo, and the Apache MyFaces project logos are trademarks of The Apache Software Foundation.
+      </div><!-- close copyright -->
+    </div><!-- close footer -->
   </body>
 </html>

Modified: websites/staging/myfaces/trunk/content/wiki/core/user-guide/configuration-of-special-features/cache-el-expressions.html
==============================================================================
--- websites/staging/myfaces/trunk/content/wiki/core/user-guide/configuration-of-special-features/cache-el-expressions.html (original)
+++ websites/staging/myfaces/trunk/content/wiki/core/user-guide/configuration-of-special-features/cache-el-expressions.html Tue Jan 28 18:38:38 2014
@@ -1,45 +1,61 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html lang="en">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
   <head>
     <title>Cache EL Expressions</title>
-
     <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-    <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
-
-    <link rel="stylesheet" type="text/css" media="screen" href="http://www.apache.org/css/style.css">
-    <link rel="stylesheet" type="text/css" media="screen" href="http://www.apache.org/css/code.css">
-
+    
+    <link rel="stylesheet" type="text/css" media="all" href="/wiki/css/maven-base.css"/>
+    <link rel="stylesheet" type="text/css" media="all" href="/wiki/css/maven-theme.css"/>
+    <link rel="stylesheet" type="text/css" media="print" href="/wiki/css/print.css"/>
+    
     
 
     
     
   </head>
-
   <body>
-    <div id="page" class="container_16">
-      <div id="header" class="grid_8">
-        <img src="http://www.apache.org/images/feather-small.gif" alt="The Apache Software Foundation">
-        <h1>The Apache Software Foundation</h1>
-        <h2>Cache EL Expressions</h2>
-      </div>
-      <div id="nav" class="grid_8">
-        <ul>
-          <!-- <li><a href="/" title="Welcome!">Home</a></li> -->
-          <li><a href="http://www.apache.org/foundation/" title="The Foundation">Foundation</a></li>
-          <li><a href="http://projects.apache.org" title="The Projects">Projects</a></li>
-          <li><a href="http://people.apache.org" title="The People">People</a></li>
-          <li><a href="http://www.apache.org/foundation/getinvolved.html" title="Get Involved">Get Involved</a></li>
-          <li><a href="http://www.apache.org/dyn/closer.cgi" title="Download">Download</a></li>
-          <li><a href="http://www.apache.org/foundation/sponsorship.html" title="Support Apache">Support Apache</a></li>
-        </ul>
-        <p><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/wiki/">Wiki</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/">Core</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/user-guide/">User-guide</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/user-guide/configuration-of-special-features/">Configuration-of-special-features</a></p>
-        <form name="search" id="search" action="http://www.google.com/search" method="get">
-          <input value="*.apache.org" name="sitesearch" type="hidden"/>
-          <input type="text" name="q" id="query">
-          <input type="submit" id="submit" value="Search">
-        </form>
+  <div id="header">
+    <div id="top_menu">
+      <div id="top_menu_container">
+          Cache EL Expressions
+          <!-- #simplePublishDate($decoration.publishDate)
+          #links( $decoration.body.links ) -->
+        <div class="clear"></div>
+      </div> <!-- close top_menu_container -->
+    </div> <!-- close top_menu -->
+    <div id="header_bottom">
+    <div id="logo_banner_container">
+      <!--#banner( $decoration.bannerLeft "logo" )-->
+      <div id="logo">
+        <a href="index.html">
+          <img src="/wiki/img/banners/MyFaces_logo.jpg" alt="" />
+        </a>
       </div>
+      <!--#banner( $decoration.bannerRight "banner" )-->
+      <div id="banner">
+        <a href="http://www.apache.org/">
+          <img src="/wiki/img/banners/apache_banner.png" alt="" />
+        </a>
+      </div>    
       <div class="clear"></div>
+    </div> <!-- close logo_banner_container -->
+    </div> <!-- close header_bottom -->
+  </div> <!-- close header -->
+    <div id="main_container">
+    <div id="left_column">
+    <!--
+       #mainMenu( $decoration.body.menus )
+       #poweredByLogo( $decoration.poweredBy )
+       -->
+        <div id="powered_by">
+          <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
+            <img alt="Built by Maven" src="/wiki/img/banners/maven-feather.png"></img>
+          </a>
+        </div>
+    </div>
+    <div id="body_column">
+      <div>
+      <p><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/wiki/">Wiki</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/">Core</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/user-guide/">User-guide</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/user-guide/configuration-of-special-features/">Configuration-of-special-features</a></p>
       <div id="content" class="grid_16"><div class="section-content"><p><ac:macro ac:name="unmigrated-inline-wiki-markup"><ac:plain-text-body>&lt;![CDATA<a href="cdata[{scrollbar}.html">{scrollbar}</a>
 ]&gt;</ac:plain-text-body></ac:macro>
 <p>Since MyFaces Core 2.0.8 / 2.1.2, a new optimization was added to
@@ -144,11 +160,15 @@ href="https://issues.apache.org/jira/bro
 
 <p><ac:macro ac:name="unmigrated-inline-wiki-markup"><ac:plain-text-body>&lt;![CDATA<a href="cdata[{scrollbar}.html">{scrollbar}</a>
 ]&gt;</ac:plain-text-body></ac:macro></p></div></div>
-      <div class="clear"></div>
-    </div>
-
-    <div id="copyright" class="container_16">
-      <p>Copyright &#169; 2011 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
+      </div>
     </div>
+    <div class="clear"></div>
+    </div> <!-- close main container -->
+    <div id="footer">
+      <div class="copyright">
+      Copyright &#169; Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>
+       Apache MyFaces, Apache Tobago, Apache, the Apache feather logo, and the Apache MyFaces project logos are trademarks of The Apache Software Foundation.
+      </div><!-- close copyright -->
+    </div><!-- close footer -->
   </body>
 </html>

Modified: websites/staging/myfaces/trunk/content/wiki/core/user-guide/configuration-of-special-features/elresolver-ordering.html
==============================================================================
--- websites/staging/myfaces/trunk/content/wiki/core/user-guide/configuration-of-special-features/elresolver-ordering.html (original)
+++ websites/staging/myfaces/trunk/content/wiki/core/user-guide/configuration-of-special-features/elresolver-ordering.html Tue Jan 28 18:38:38 2014
@@ -1,45 +1,61 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html lang="en">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
   <head>
     <title>ELResolver ordering</title>
-
     <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-    <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
-
-    <link rel="stylesheet" type="text/css" media="screen" href="http://www.apache.org/css/style.css">
-    <link rel="stylesheet" type="text/css" media="screen" href="http://www.apache.org/css/code.css">
-
+    
+    <link rel="stylesheet" type="text/css" media="all" href="/wiki/css/maven-base.css"/>
+    <link rel="stylesheet" type="text/css" media="all" href="/wiki/css/maven-theme.css"/>
+    <link rel="stylesheet" type="text/css" media="print" href="/wiki/css/print.css"/>
+    
     
 
     
     
   </head>
-
   <body>
-    <div id="page" class="container_16">
-      <div id="header" class="grid_8">
-        <img src="http://www.apache.org/images/feather-small.gif" alt="The Apache Software Foundation">
-        <h1>The Apache Software Foundation</h1>
-        <h2>ELResolver ordering</h2>
-      </div>
-      <div id="nav" class="grid_8">
-        <ul>
-          <!-- <li><a href="/" title="Welcome!">Home</a></li> -->
-          <li><a href="http://www.apache.org/foundation/" title="The Foundation">Foundation</a></li>
-          <li><a href="http://projects.apache.org" title="The Projects">Projects</a></li>
-          <li><a href="http://people.apache.org" title="The People">People</a></li>
-          <li><a href="http://www.apache.org/foundation/getinvolved.html" title="Get Involved">Get Involved</a></li>
-          <li><a href="http://www.apache.org/dyn/closer.cgi" title="Download">Download</a></li>
-          <li><a href="http://www.apache.org/foundation/sponsorship.html" title="Support Apache">Support Apache</a></li>
-        </ul>
-        <p><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/wiki/">Wiki</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/">Core</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/user-guide/">User-guide</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/user-guide/configuration-of-special-features/">Configuration-of-special-features</a></p>
-        <form name="search" id="search" action="http://www.google.com/search" method="get">
-          <input value="*.apache.org" name="sitesearch" type="hidden"/>
-          <input type="text" name="q" id="query">
-          <input type="submit" id="submit" value="Search">
-        </form>
+  <div id="header">
+    <div id="top_menu">
+      <div id="top_menu_container">
+          ELResolver ordering
+          <!-- #simplePublishDate($decoration.publishDate)
+          #links( $decoration.body.links ) -->
+        <div class="clear"></div>
+      </div> <!-- close top_menu_container -->
+    </div> <!-- close top_menu -->
+    <div id="header_bottom">
+    <div id="logo_banner_container">
+      <!--#banner( $decoration.bannerLeft "logo" )-->
+      <div id="logo">
+        <a href="index.html">
+          <img src="/wiki/img/banners/MyFaces_logo.jpg" alt="" />
+        </a>
       </div>
+      <!--#banner( $decoration.bannerRight "banner" )-->
+      <div id="banner">
+        <a href="http://www.apache.org/">
+          <img src="/wiki/img/banners/apache_banner.png" alt="" />
+        </a>
+      </div>    
       <div class="clear"></div>
+    </div> <!-- close logo_banner_container -->
+    </div> <!-- close header_bottom -->
+  </div> <!-- close header -->
+    <div id="main_container">
+    <div id="left_column">
+    <!--
+       #mainMenu( $decoration.body.menus )
+       #poweredByLogo( $decoration.poweredBy )
+       -->
+        <div id="powered_by">
+          <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
+            <img alt="Built by Maven" src="/wiki/img/banners/maven-feather.png"></img>
+          </a>
+        </div>
+    </div>
+    <div id="body_column">
+      <div>
+      <p><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/wiki/">Wiki</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/">Core</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/user-guide/">User-guide</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/user-guide/configuration-of-special-features/">Configuration-of-special-features</a></p>
       <div id="content" class="grid_16"><div class="section-content"><p><ac:macro ac:name="unmigrated-inline-wiki-markup"><ac:plain-text-body>&lt;![CDATA<a href="cdata[{scrollbar}.html">{scrollbar}</a>
 ]&gt;</ac:plain-text-body></ac:macro>
 <p>As with MyFaces core 2.0.2 (or 1.2.10) it is possible to change the
@@ -125,11 +141,15 @@ href="https://issues.apache.org/jira/bro
 
 <p><ac:macro ac:name="unmigrated-inline-wiki-markup"><ac:plain-text-body>&lt;![CDATA<a href="cdata[{scrollbar}.html">{scrollbar}</a>
 ]&gt;</ac:plain-text-body></ac:macro></p></div></div>
-      <div class="clear"></div>
-    </div>
-
-    <div id="copyright" class="container_16">
-      <p>Copyright &#169; 2011 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
+      </div>
     </div>
+    <div class="clear"></div>
+    </div> <!-- close main container -->
+    <div id="footer">
+      <div class="copyright">
+      Copyright &#169; Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>
+       Apache MyFaces, Apache Tobago, Apache, the Apache feather logo, and the Apache MyFaces project logos are trademarks of The Apache Software Foundation.
+      </div><!-- close copyright -->
+    </div><!-- close footer -->
   </body>
 </html>

Modified: websites/staging/myfaces/trunk/content/wiki/core/user-guide/configuration-of-special-features/integration-with-application-and-web-servers.html
==============================================================================
--- websites/staging/myfaces/trunk/content/wiki/core/user-guide/configuration-of-special-features/integration-with-application-and-web-servers.html (original)
+++ websites/staging/myfaces/trunk/content/wiki/core/user-guide/configuration-of-special-features/integration-with-application-and-web-servers.html Tue Jan 28 18:38:38 2014
@@ -1,45 +1,61 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html lang="en">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
   <head>
     <title>Integration with application and web servers</title>
-
     <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-    <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
-
-    <link rel="stylesheet" type="text/css" media="screen" href="http://www.apache.org/css/style.css">
-    <link rel="stylesheet" type="text/css" media="screen" href="http://www.apache.org/css/code.css">
-
+    
+    <link rel="stylesheet" type="text/css" media="all" href="/wiki/css/maven-base.css"/>
+    <link rel="stylesheet" type="text/css" media="all" href="/wiki/css/maven-theme.css"/>
+    <link rel="stylesheet" type="text/css" media="print" href="/wiki/css/print.css"/>
+    
     
 
     
     
   </head>
-
   <body>
-    <div id="page" class="container_16">
-      <div id="header" class="grid_8">
-        <img src="http://www.apache.org/images/feather-small.gif" alt="The Apache Software Foundation">
-        <h1>The Apache Software Foundation</h1>
-        <h2>Integration with application and web servers</h2>
-      </div>
-      <div id="nav" class="grid_8">
-        <ul>
-          <!-- <li><a href="/" title="Welcome!">Home</a></li> -->
-          <li><a href="http://www.apache.org/foundation/" title="The Foundation">Foundation</a></li>
-          <li><a href="http://projects.apache.org" title="The Projects">Projects</a></li>
-          <li><a href="http://people.apache.org" title="The People">People</a></li>
-          <li><a href="http://www.apache.org/foundation/getinvolved.html" title="Get Involved">Get Involved</a></li>
-          <li><a href="http://www.apache.org/dyn/closer.cgi" title="Download">Download</a></li>
-          <li><a href="http://www.apache.org/foundation/sponsorship.html" title="Support Apache">Support Apache</a></li>
-        </ul>
-        <p><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/wiki/">Wiki</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/">Core</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/user-guide/">User-guide</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/user-guide/configuration-of-special-features/">Configuration-of-special-features</a></p>
-        <form name="search" id="search" action="http://www.google.com/search" method="get">
-          <input value="*.apache.org" name="sitesearch" type="hidden"/>
-          <input type="text" name="q" id="query">
-          <input type="submit" id="submit" value="Search">
-        </form>
+  <div id="header">
+    <div id="top_menu">
+      <div id="top_menu_container">
+          Integration with application and web servers
+          <!-- #simplePublishDate($decoration.publishDate)
+          #links( $decoration.body.links ) -->
+        <div class="clear"></div>
+      </div> <!-- close top_menu_container -->
+    </div> <!-- close top_menu -->
+    <div id="header_bottom">
+    <div id="logo_banner_container">
+      <!--#banner( $decoration.bannerLeft "logo" )-->
+      <div id="logo">
+        <a href="index.html">
+          <img src="/wiki/img/banners/MyFaces_logo.jpg" alt="" />
+        </a>
       </div>
+      <!--#banner( $decoration.bannerRight "banner" )-->
+      <div id="banner">
+        <a href="http://www.apache.org/">
+          <img src="/wiki/img/banners/apache_banner.png" alt="" />
+        </a>
+      </div>    
       <div class="clear"></div>
+    </div> <!-- close logo_banner_container -->
+    </div> <!-- close header_bottom -->
+  </div> <!-- close header -->
+    <div id="main_container">
+    <div id="left_column">
+    <!--
+       #mainMenu( $decoration.body.menus )
+       #poweredByLogo( $decoration.poweredBy )
+       -->
+        <div id="powered_by">
+          <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
+            <img alt="Built by Maven" src="/wiki/img/banners/maven-feather.png"></img>
+          </a>
+        </div>
+    </div>
+    <div id="body_column">
+      <div>
+      <p><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/wiki/">Wiki</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/">Core</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/user-guide/">User-guide</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/user-guide/configuration-of-special-features/">Configuration-of-special-features</a></p>
       <div id="content" class="grid_16"><div class="section-content"><p><ac:macro ac:name="unmigrated-inline-wiki-markup"><ac:plain-text-body>&lt;![CDATA<a href="cdata[{scrollbar}.html">{scrollbar}</a>
 ]&gt;</ac:plain-text-body></ac:macro>
 <p>MyFaces core provides some &quot;points of integration&quot; that can be
@@ -224,11 +240,15 @@ on myfaces site.</p>
 
 <p><ac:macro ac:name="unmigrated-inline-wiki-markup"><ac:plain-text-body>&lt;![CDATA<a href="cdata[{scrollbar}.html">{scrollbar}</a>
 ]&gt;</ac:plain-text-body></ac:macro></p></div></div>
-      <div class="clear"></div>
-    </div>
-
-    <div id="copyright" class="container_16">
-      <p>Copyright &#169; 2011 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
+      </div>
     </div>
+    <div class="clear"></div>
+    </div> <!-- close main container -->
+    <div id="footer">
+      <div class="copyright">
+      Copyright &#169; Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>
+       Apache MyFaces, Apache Tobago, Apache, the Apache feather logo, and the Apache MyFaces project logos are trademarks of The Apache Software Foundation.
+      </div><!-- close copyright -->
+    </div><!-- close footer -->
   </body>
 </html>

Modified: websites/staging/myfaces/trunk/content/wiki/core/user-guide/configuration-of-special-features/update-all-form-javax.faces.viewstate-hidden-fields-between-ajax-requests.html
==============================================================================
--- websites/staging/myfaces/trunk/content/wiki/core/user-guide/configuration-of-special-features/update-all-form-javax.faces.viewstate-hidden-fields-between-ajax-requests.html (original)
+++ websites/staging/myfaces/trunk/content/wiki/core/user-guide/configuration-of-special-features/update-all-form-javax.faces.viewstate-hidden-fields-between-ajax-requests.html Tue Jan 28 18:38:38 2014
@@ -1,45 +1,61 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html lang="en">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
   <head>
     <title>Update all form javax.faces.ViewState hidden fields between ajax requests</title>
-
     <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-    <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
-
-    <link rel="stylesheet" type="text/css" media="screen" href="http://www.apache.org/css/style.css">
-    <link rel="stylesheet" type="text/css" media="screen" href="http://www.apache.org/css/code.css">
-
+    
+    <link rel="stylesheet" type="text/css" media="all" href="/wiki/css/maven-base.css"/>
+    <link rel="stylesheet" type="text/css" media="all" href="/wiki/css/maven-theme.css"/>
+    <link rel="stylesheet" type="text/css" media="print" href="/wiki/css/print.css"/>
+    
     
 
     
     
   </head>
-
   <body>
-    <div id="page" class="container_16">
-      <div id="header" class="grid_8">
-        <img src="http://www.apache.org/images/feather-small.gif" alt="The Apache Software Foundation">
-        <h1>The Apache Software Foundation</h1>
-        <h2>Update all form javax.faces.ViewState hidden fields between ajax requests</h2>
-      </div>
-      <div id="nav" class="grid_8">
-        <ul>
-          <!-- <li><a href="/" title="Welcome!">Home</a></li> -->
-          <li><a href="http://www.apache.org/foundation/" title="The Foundation">Foundation</a></li>
-          <li><a href="http://projects.apache.org" title="The Projects">Projects</a></li>
-          <li><a href="http://people.apache.org" title="The People">People</a></li>
-          <li><a href="http://www.apache.org/foundation/getinvolved.html" title="Get Involved">Get Involved</a></li>
-          <li><a href="http://www.apache.org/dyn/closer.cgi" title="Download">Download</a></li>
-          <li><a href="http://www.apache.org/foundation/sponsorship.html" title="Support Apache">Support Apache</a></li>
-        </ul>
-        <p><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/wiki/">Wiki</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/">Core</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/user-guide/">User-guide</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/user-guide/configuration-of-special-features/">Configuration-of-special-features</a></p>
-        <form name="search" id="search" action="http://www.google.com/search" method="get">
-          <input value="*.apache.org" name="sitesearch" type="hidden"/>
-          <input type="text" name="q" id="query">
-          <input type="submit" id="submit" value="Search">
-        </form>
+  <div id="header">
+    <div id="top_menu">
+      <div id="top_menu_container">
+          Update all form javax.faces.ViewState hidden fields between ajax requests
+          <!-- #simplePublishDate($decoration.publishDate)
+          #links( $decoration.body.links ) -->
+        <div class="clear"></div>
+      </div> <!-- close top_menu_container -->
+    </div> <!-- close top_menu -->
+    <div id="header_bottom">
+    <div id="logo_banner_container">
+      <!--#banner( $decoration.bannerLeft "logo" )-->
+      <div id="logo">
+        <a href="index.html">
+          <img src="/wiki/img/banners/MyFaces_logo.jpg" alt="" />
+        </a>
       </div>
+      <!--#banner( $decoration.bannerRight "banner" )-->
+      <div id="banner">
+        <a href="http://www.apache.org/">
+          <img src="/wiki/img/banners/apache_banner.png" alt="" />
+        </a>
+      </div>    
       <div class="clear"></div>
+    </div> <!-- close logo_banner_container -->
+    </div> <!-- close header_bottom -->
+  </div> <!-- close header -->
+    <div id="main_container">
+    <div id="left_column">
+    <!--
+       #mainMenu( $decoration.body.menus )
+       #poweredByLogo( $decoration.poweredBy )
+       -->
+        <div id="powered_by">
+          <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
+            <img alt="Built by Maven" src="/wiki/img/banners/maven-feather.png"></img>
+          </a>
+        </div>
+    </div>
+    <div id="body_column">
+      <div>
+      <p><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/wiki/">Wiki</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/">Core</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/user-guide/">User-guide</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/user-guide/configuration-of-special-features/">Configuration-of-special-features</a></p>
       <div id="content" class="grid_16"><div class="section-content"><p>Suppose the following example:</p>
 
 <p><ac:macro
@@ -97,11 +113,15 @@ multiple forms per page
 ]&gt;</ac:plain-text-body></ac:macro></p>
 <p>This enable and special mode that find and update javax.faces.ViewState
 per ajax request, solving the problem.</p></div></div>
-      <div class="clear"></div>
-    </div>
-
-    <div id="copyright" class="container_16">
-      <p>Copyright &#169; 2011 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
+      </div>
     </div>
+    <div class="clear"></div>
+    </div> <!-- close main container -->
+    <div id="footer">
+      <div class="copyright">
+      Copyright &#169; Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>
+       Apache MyFaces, Apache Tobago, Apache, the Apache feather logo, and the Apache MyFaces project logos are trademarks of The Apache Software Foundation.
+      </div><!-- close copyright -->
+    </div><!-- close footer -->
   </body>
 </html>

Modified: websites/staging/myfaces/trunk/content/wiki/core/user-guide/getting-started.html
==============================================================================
--- websites/staging/myfaces/trunk/content/wiki/core/user-guide/getting-started.html (original)
+++ websites/staging/myfaces/trunk/content/wiki/core/user-guide/getting-started.html Tue Jan 28 18:38:38 2014
@@ -1,45 +1,61 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html lang="en">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
   <head>
     <title>Getting Started</title>
-
     <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-    <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
-
-    <link rel="stylesheet" type="text/css" media="screen" href="http://www.apache.org/css/style.css">
-    <link rel="stylesheet" type="text/css" media="screen" href="http://www.apache.org/css/code.css">
-
+    
+    <link rel="stylesheet" type="text/css" media="all" href="/wiki/css/maven-base.css"/>
+    <link rel="stylesheet" type="text/css" media="all" href="/wiki/css/maven-theme.css"/>
+    <link rel="stylesheet" type="text/css" media="print" href="/wiki/css/print.css"/>
+    
     
 
     
     
   </head>
-
   <body>
-    <div id="page" class="container_16">
-      <div id="header" class="grid_8">
-        <img src="http://www.apache.org/images/feather-small.gif" alt="The Apache Software Foundation">
-        <h1>The Apache Software Foundation</h1>
-        <h2>Getting Started</h2>
-      </div>
-      <div id="nav" class="grid_8">
-        <ul>
-          <!-- <li><a href="/" title="Welcome!">Home</a></li> -->
-          <li><a href="http://www.apache.org/foundation/" title="The Foundation">Foundation</a></li>
-          <li><a href="http://projects.apache.org" title="The Projects">Projects</a></li>
-          <li><a href="http://people.apache.org" title="The People">People</a></li>
-          <li><a href="http://www.apache.org/foundation/getinvolved.html" title="Get Involved">Get Involved</a></li>
-          <li><a href="http://www.apache.org/dyn/closer.cgi" title="Download">Download</a></li>
-          <li><a href="http://www.apache.org/foundation/sponsorship.html" title="Support Apache">Support Apache</a></li>
-        </ul>
-        <p><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/wiki/">Wiki</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/">Core</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/user-guide/">User-guide</a></p>
-        <form name="search" id="search" action="http://www.google.com/search" method="get">
-          <input value="*.apache.org" name="sitesearch" type="hidden"/>
-          <input type="text" name="q" id="query">
-          <input type="submit" id="submit" value="Search">
-        </form>
+  <div id="header">
+    <div id="top_menu">
+      <div id="top_menu_container">
+          Getting Started
+          <!-- #simplePublishDate($decoration.publishDate)
+          #links( $decoration.body.links ) -->
+        <div class="clear"></div>
+      </div> <!-- close top_menu_container -->
+    </div> <!-- close top_menu -->
+    <div id="header_bottom">
+    <div id="logo_banner_container">
+      <!--#banner( $decoration.bannerLeft "logo" )-->
+      <div id="logo">
+        <a href="index.html">
+          <img src="/wiki/img/banners/MyFaces_logo.jpg" alt="" />
+        </a>
       </div>
+      <!--#banner( $decoration.bannerRight "banner" )-->
+      <div id="banner">
+        <a href="http://www.apache.org/">
+          <img src="/wiki/img/banners/apache_banner.png" alt="" />
+        </a>
+      </div>    
       <div class="clear"></div>
+    </div> <!-- close logo_banner_container -->
+    </div> <!-- close header_bottom -->
+  </div> <!-- close header -->
+    <div id="main_container">
+    <div id="left_column">
+    <!--
+       #mainMenu( $decoration.body.menus )
+       #poweredByLogo( $decoration.poweredBy )
+       -->
+        <div id="powered_by">
+          <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
+            <img alt="Built by Maven" src="/wiki/img/banners/maven-feather.png"></img>
+          </a>
+        </div>
+    </div>
+    <div id="body_column">
+      <div>
+      <p><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/wiki/">Wiki</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/">Core</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/user-guide/">User-guide</a></p>
       <div id="content" class="grid_16"><div class="section-content"><p><ac:macro ac:name="unmigrated-inline-wiki-markup"><ac:plain-text-body>&lt;![CDATA<a href="cdata[{scrollbar}.html">{scrollbar}</a>
 ]&gt;</ac:plain-text-body></ac:macro></p>
 <p>All MyFaces projects use <a href="http://maven.apache.org">Maven</a>,
@@ -70,11 +86,15 @@ Started in 30 Minutes</a></li>
 <p><ac:macro ac:name="children" /></p>
 <p><ac:macro ac:name="unmigrated-inline-wiki-markup"><ac:plain-text-body>&lt;![CDATA<a href="cdata[{scrollbar}.html">{scrollbar}</a>
 ]&gt;</ac:plain-text-body></ac:macro></p></div></div>
-      <div class="clear"></div>
-    </div>
-
-    <div id="copyright" class="container_16">
-      <p>Copyright &#169; 2011 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
+      </div>
     </div>
+    <div class="clear"></div>
+    </div> <!-- close main container -->
+    <div id="footer">
+      <div class="copyright">
+      Copyright &#169; Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>
+       Apache MyFaces, Apache Tobago, Apache, the Apache feather logo, and the Apache MyFaces project logos are trademarks of The Apache Software Foundation.
+      </div><!-- close copyright -->
+    </div><!-- close footer -->
   </body>
 </html>

Modified: websites/staging/myfaces/trunk/content/wiki/core/user-guide/getting-started/configuring-myfaces.html
==============================================================================
--- websites/staging/myfaces/trunk/content/wiki/core/user-guide/getting-started/configuring-myfaces.html (original)
+++ websites/staging/myfaces/trunk/content/wiki/core/user-guide/getting-started/configuring-myfaces.html Tue Jan 28 18:38:38 2014
@@ -1,45 +1,61 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html lang="en">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
   <head>
     <title>Configuring MyFaces</title>
-
     <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-    <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
-
-    <link rel="stylesheet" type="text/css" media="screen" href="http://www.apache.org/css/style.css">
-    <link rel="stylesheet" type="text/css" media="screen" href="http://www.apache.org/css/code.css">
-
+    
+    <link rel="stylesheet" type="text/css" media="all" href="/wiki/css/maven-base.css"/>
+    <link rel="stylesheet" type="text/css" media="all" href="/wiki/css/maven-theme.css"/>
+    <link rel="stylesheet" type="text/css" media="print" href="/wiki/css/print.css"/>
+    
     
 
     
     
   </head>
-
   <body>
-    <div id="page" class="container_16">
-      <div id="header" class="grid_8">
-        <img src="http://www.apache.org/images/feather-small.gif" alt="The Apache Software Foundation">
-        <h1>The Apache Software Foundation</h1>
-        <h2>Configuring MyFaces</h2>
-      </div>
-      <div id="nav" class="grid_8">
-        <ul>
-          <!-- <li><a href="/" title="Welcome!">Home</a></li> -->
-          <li><a href="http://www.apache.org/foundation/" title="The Foundation">Foundation</a></li>
-          <li><a href="http://projects.apache.org" title="The Projects">Projects</a></li>
-          <li><a href="http://people.apache.org" title="The People">People</a></li>
-          <li><a href="http://www.apache.org/foundation/getinvolved.html" title="Get Involved">Get Involved</a></li>
-          <li><a href="http://www.apache.org/dyn/closer.cgi" title="Download">Download</a></li>
-          <li><a href="http://www.apache.org/foundation/sponsorship.html" title="Support Apache">Support Apache</a></li>
-        </ul>
-        <p><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/wiki/">Wiki</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/">Core</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/user-guide/">User-guide</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/user-guide/getting-started/">Getting-started</a></p>
-        <form name="search" id="search" action="http://www.google.com/search" method="get">
-          <input value="*.apache.org" name="sitesearch" type="hidden"/>
-          <input type="text" name="q" id="query">
-          <input type="submit" id="submit" value="Search">
-        </form>
+  <div id="header">
+    <div id="top_menu">
+      <div id="top_menu_container">
+          Configuring MyFaces
+          <!-- #simplePublishDate($decoration.publishDate)
+          #links( $decoration.body.links ) -->
+        <div class="clear"></div>
+      </div> <!-- close top_menu_container -->
+    </div> <!-- close top_menu -->
+    <div id="header_bottom">
+    <div id="logo_banner_container">
+      <!--#banner( $decoration.bannerLeft "logo" )-->
+      <div id="logo">
+        <a href="index.html">
+          <img src="/wiki/img/banners/MyFaces_logo.jpg" alt="" />
+        </a>
       </div>
+      <!--#banner( $decoration.bannerRight "banner" )-->
+      <div id="banner">
+        <a href="http://www.apache.org/">
+          <img src="/wiki/img/banners/apache_banner.png" alt="" />
+        </a>
+      </div>    
       <div class="clear"></div>
+    </div> <!-- close logo_banner_container -->
+    </div> <!-- close header_bottom -->
+  </div> <!-- close header -->
+    <div id="main_container">
+    <div id="left_column">
+    <!--
+       #mainMenu( $decoration.body.menus )
+       #poweredByLogo( $decoration.poweredBy )
+       -->
+        <div id="powered_by">
+          <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
+            <img alt="Built by Maven" src="/wiki/img/banners/maven-feather.png"></img>
+          </a>
+        </div>
+    </div>
+    <div id="body_column">
+      <div>
+      <p><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/wiki/">Wiki</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/">Core</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/user-guide/">User-guide</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/user-guide/getting-started/">Getting-started</a></p>
       <div id="content" class="grid_16"><div class="section-content"><p><ac:macro ac:name="unmigrated-inline-wiki-markup"><ac:plain-text-body>&lt;![CDATA<a href="cdata[{scrollbar}.html">{scrollbar}</a>
 ]&gt;</ac:plain-text-body></ac:macro>
 <h6><em>Thanks to Bart Kummel for providing this text from his book <a
@@ -189,11 +205,15 @@ as described in the previous sections.</
 
 <p><ac:macro ac:name="unmigrated-inline-wiki-markup"><ac:plain-text-body>&lt;![CDATA<a href="cdata[{scrollbar}.html">{scrollbar}</a>
 ]&gt;</ac:plain-text-body></ac:macro></p></div></div>
-      <div class="clear"></div>
-    </div>
-
-    <div id="copyright" class="container_16">
-      <p>Copyright &#169; 2011 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
+      </div>
     </div>
+    <div class="clear"></div>
+    </div> <!-- close main container -->
+    <div id="footer">
+      <div class="copyright">
+      Copyright &#169; Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>
+       Apache MyFaces, Apache Tobago, Apache, the Apache feather logo, and the Apache MyFaces project logos are trademarks of The Apache Software Foundation.
+      </div><!-- close copyright -->
+    </div><!-- close footer -->
   </body>
 </html>

Modified: websites/staging/myfaces/trunk/content/wiki/core/user-guide/getting-started/myfaces-archetypes-for-maven.html
==============================================================================
--- websites/staging/myfaces/trunk/content/wiki/core/user-guide/getting-started/myfaces-archetypes-for-maven.html (original)
+++ websites/staging/myfaces/trunk/content/wiki/core/user-guide/getting-started/myfaces-archetypes-for-maven.html Tue Jan 28 18:38:38 2014
@@ -1,45 +1,61 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html lang="en">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
   <head>
     <title>MyFaces Archetypes for Maven</title>
-
     <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-    <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
-
-    <link rel="stylesheet" type="text/css" media="screen" href="http://www.apache.org/css/style.css">
-    <link rel="stylesheet" type="text/css" media="screen" href="http://www.apache.org/css/code.css">
-
+    
+    <link rel="stylesheet" type="text/css" media="all" href="/wiki/css/maven-base.css"/>
+    <link rel="stylesheet" type="text/css" media="all" href="/wiki/css/maven-theme.css"/>
+    <link rel="stylesheet" type="text/css" media="print" href="/wiki/css/print.css"/>
+    
     
 
     
     
   </head>
-
   <body>
-    <div id="page" class="container_16">
-      <div id="header" class="grid_8">
-        <img src="http://www.apache.org/images/feather-small.gif" alt="The Apache Software Foundation">
-        <h1>The Apache Software Foundation</h1>
-        <h2>MyFaces Archetypes for Maven</h2>
-      </div>
-      <div id="nav" class="grid_8">
-        <ul>
-          <!-- <li><a href="/" title="Welcome!">Home</a></li> -->
-          <li><a href="http://www.apache.org/foundation/" title="The Foundation">Foundation</a></li>
-          <li><a href="http://projects.apache.org" title="The Projects">Projects</a></li>
-          <li><a href="http://people.apache.org" title="The People">People</a></li>
-          <li><a href="http://www.apache.org/foundation/getinvolved.html" title="Get Involved">Get Involved</a></li>
-          <li><a href="http://www.apache.org/dyn/closer.cgi" title="Download">Download</a></li>
-          <li><a href="http://www.apache.org/foundation/sponsorship.html" title="Support Apache">Support Apache</a></li>
-        </ul>
-        <p><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/wiki/">Wiki</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/">Core</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/user-guide/">User-guide</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/user-guide/getting-started/">Getting-started</a></p>
-        <form name="search" id="search" action="http://www.google.com/search" method="get">
-          <input value="*.apache.org" name="sitesearch" type="hidden"/>
-          <input type="text" name="q" id="query">
-          <input type="submit" id="submit" value="Search">
-        </form>
+  <div id="header">
+    <div id="top_menu">
+      <div id="top_menu_container">
+          MyFaces Archetypes for Maven
+          <!-- #simplePublishDate($decoration.publishDate)
+          #links( $decoration.body.links ) -->
+        <div class="clear"></div>
+      </div> <!-- close top_menu_container -->
+    </div> <!-- close top_menu -->
+    <div id="header_bottom">
+    <div id="logo_banner_container">
+      <!--#banner( $decoration.bannerLeft "logo" )-->
+      <div id="logo">
+        <a href="index.html">
+          <img src="/wiki/img/banners/MyFaces_logo.jpg" alt="" />
+        </a>
       </div>
+      <!--#banner( $decoration.bannerRight "banner" )-->
+      <div id="banner">
+        <a href="http://www.apache.org/">
+          <img src="/wiki/img/banners/apache_banner.png" alt="" />
+        </a>
+      </div>    
       <div class="clear"></div>
+    </div> <!-- close logo_banner_container -->
+    </div> <!-- close header_bottom -->
+  </div> <!-- close header -->
+    <div id="main_container">
+    <div id="left_column">
+    <!--
+       #mainMenu( $decoration.body.menus )
+       #poweredByLogo( $decoration.poweredBy )
+       -->
+        <div id="powered_by">
+          <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
+            <img alt="Built by Maven" src="/wiki/img/banners/maven-feather.png"></img>
+          </a>
+        </div>
+    </div>
+    <div id="body_column">
+      <div>
+      <p><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/wiki/">Wiki</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/">Core</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/user-guide/">User-guide</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/user-guide/getting-started/">Getting-started</a></p>
       <div id="content" class="grid_16"><div class="section-content"><p><ac:macro ac:name="unmigrated-inline-wiki-markup"><ac:plain-text-body>&lt;![CDATA<a href="cdata[{scrollbar}.html">{scrollbar}</a>
 ]&gt;</ac:plain-text-body></ac:macro></p>
 <h2>MyFaces Maven archetypes </h2>
@@ -355,11 +371,15 @@ tutorial</a>.</p>
 
 <ac:macro ac:name="unmigrated-inline-wiki-markup"><ac:plain-text-body><![CDATA[{scrollbar}](cdata[{scrollbar}.html)
 ]></ac:plain-text-body></ac:macro></div></div>
-      <div class="clear"></div>
-    </div>
-
-    <div id="copyright" class="container_16">
-      <p>Copyright &#169; 2011 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
+      </div>
     </div>
+    <div class="clear"></div>
+    </div> <!-- close main container -->
+    <div id="footer">
+      <div class="copyright">
+      Copyright &#169; Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>
+       Apache MyFaces, Apache Tobago, Apache, the Apache feather logo, and the Apache MyFaces project logos are trademarks of The Apache Software Foundation.
+      </div><!-- close copyright -->
+    </div><!-- close footer -->
   </body>
 </html>

Modified: websites/staging/myfaces/trunk/content/wiki/core/user-guide/getting-started/using-myfaces-in-a-project-built-with-maven.html
==============================================================================
--- websites/staging/myfaces/trunk/content/wiki/core/user-guide/getting-started/using-myfaces-in-a-project-built-with-maven.html (original)
+++ websites/staging/myfaces/trunk/content/wiki/core/user-guide/getting-started/using-myfaces-in-a-project-built-with-maven.html Tue Jan 28 18:38:38 2014
@@ -1,45 +1,61 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html lang="en">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
   <head>
     <title>Using MyFaces in a project built with Maven</title>
-
     <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-    <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
-
-    <link rel="stylesheet" type="text/css" media="screen" href="http://www.apache.org/css/style.css">
-    <link rel="stylesheet" type="text/css" media="screen" href="http://www.apache.org/css/code.css">
-
+    
+    <link rel="stylesheet" type="text/css" media="all" href="/wiki/css/maven-base.css"/>
+    <link rel="stylesheet" type="text/css" media="all" href="/wiki/css/maven-theme.css"/>
+    <link rel="stylesheet" type="text/css" media="print" href="/wiki/css/print.css"/>
+    
     
 
     
     
   </head>
-
   <body>
-    <div id="page" class="container_16">
-      <div id="header" class="grid_8">
-        <img src="http://www.apache.org/images/feather-small.gif" alt="The Apache Software Foundation">
-        <h1>The Apache Software Foundation</h1>
-        <h2>Using MyFaces in a project built with Maven</h2>
-      </div>
-      <div id="nav" class="grid_8">
-        <ul>
-          <!-- <li><a href="/" title="Welcome!">Home</a></li> -->
-          <li><a href="http://www.apache.org/foundation/" title="The Foundation">Foundation</a></li>
-          <li><a href="http://projects.apache.org" title="The Projects">Projects</a></li>
-          <li><a href="http://people.apache.org" title="The People">People</a></li>
-          <li><a href="http://www.apache.org/foundation/getinvolved.html" title="Get Involved">Get Involved</a></li>
-          <li><a href="http://www.apache.org/dyn/closer.cgi" title="Download">Download</a></li>
-          <li><a href="http://www.apache.org/foundation/sponsorship.html" title="Support Apache">Support Apache</a></li>
-        </ul>
-        <p><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/wiki/">Wiki</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/">Core</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/user-guide/">User-guide</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/user-guide/getting-started/">Getting-started</a></p>
-        <form name="search" id="search" action="http://www.google.com/search" method="get">
-          <input value="*.apache.org" name="sitesearch" type="hidden"/>
-          <input type="text" name="q" id="query">
-          <input type="submit" id="submit" value="Search">
-        </form>
+  <div id="header">
+    <div id="top_menu">
+      <div id="top_menu_container">
+          Using MyFaces in a project built with Maven
+          <!-- #simplePublishDate($decoration.publishDate)
+          #links( $decoration.body.links ) -->
+        <div class="clear"></div>
+      </div> <!-- close top_menu_container -->
+    </div> <!-- close top_menu -->
+    <div id="header_bottom">
+    <div id="logo_banner_container">
+      <!--#banner( $decoration.bannerLeft "logo" )-->
+      <div id="logo">
+        <a href="index.html">
+          <img src="/wiki/img/banners/MyFaces_logo.jpg" alt="" />
+        </a>
       </div>
+      <!--#banner( $decoration.bannerRight "banner" )-->
+      <div id="banner">
+        <a href="http://www.apache.org/">
+          <img src="/wiki/img/banners/apache_banner.png" alt="" />
+        </a>
+      </div>    
       <div class="clear"></div>
+    </div> <!-- close logo_banner_container -->
+    </div> <!-- close header_bottom -->
+  </div> <!-- close header -->
+    <div id="main_container">
+    <div id="left_column">
+    <!--
+       #mainMenu( $decoration.body.menus )
+       #poweredByLogo( $decoration.poweredBy )
+       -->
+        <div id="powered_by">
+          <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
+            <img alt="Built by Maven" src="/wiki/img/banners/maven-feather.png"></img>
+          </a>
+        </div>
+    </div>
+    <div id="body_column">
+      <div>
+      <p><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/wiki/">Wiki</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/">Core</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/user-guide/">User-guide</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/user-guide/getting-started/">Getting-started</a></p>
       <div id="content" class="grid_16"><div class="section-content"><p><ac:macro ac:name="unmigrated-inline-wiki-markup"><ac:plain-text-body>&lt;![CDATA<a href="cdata[{scrollbar}.html">{scrollbar}</a>
 ]&gt;</ac:plain-text-body></ac:macro>
 <h2>Using MyFaces in a project built with Maven</h2></p>
@@ -116,11 +132,15 @@ rel="nofollow">http://maven.apache.org</
 
 <p><ac:macro ac:name="unmigrated-inline-wiki-markup"><ac:plain-text-body>&lt;![CDATA<a href="cdata[{scrollbar}.html">{scrollbar}</a>
 ]&gt;</ac:plain-text-body></ac:macro></p></div></div>
-      <div class="clear"></div>
-    </div>
-
-    <div id="copyright" class="container_16">
-      <p>Copyright &#169; 2011 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
+      </div>
     </div>
+    <div class="clear"></div>
+    </div> <!-- close main container -->
+    <div id="footer">
+      <div class="copyright">
+      Copyright &#169; Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>
+       Apache MyFaces, Apache Tobago, Apache, the Apache feather logo, and the Apache MyFaces project logos are trademarks of The Apache Software Foundation.
+      </div><!-- close copyright -->
+    </div><!-- close footer -->
   </body>
 </html>

Modified: websites/staging/myfaces/trunk/content/wiki/core/user-guide/jsf-and-myfaces-core-concepts.html
==============================================================================
--- websites/staging/myfaces/trunk/content/wiki/core/user-guide/jsf-and-myfaces-core-concepts.html (original)
+++ websites/staging/myfaces/trunk/content/wiki/core/user-guide/jsf-and-myfaces-core-concepts.html Tue Jan 28 18:38:38 2014
@@ -1,45 +1,61 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html lang="en">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
   <head>
     <title>JSF and MyFaces Core Concepts</title>
-
     <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-    <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
-
-    <link rel="stylesheet" type="text/css" media="screen" href="http://www.apache.org/css/style.css">
-    <link rel="stylesheet" type="text/css" media="screen" href="http://www.apache.org/css/code.css">
-
+    
+    <link rel="stylesheet" type="text/css" media="all" href="/wiki/css/maven-base.css"/>
+    <link rel="stylesheet" type="text/css" media="all" href="/wiki/css/maven-theme.css"/>
+    <link rel="stylesheet" type="text/css" media="print" href="/wiki/css/print.css"/>
+    
     
 
     
     
   </head>
-
   <body>
-    <div id="page" class="container_16">
-      <div id="header" class="grid_8">
-        <img src="http://www.apache.org/images/feather-small.gif" alt="The Apache Software Foundation">
-        <h1>The Apache Software Foundation</h1>
-        <h2>JSF and MyFaces Core Concepts</h2>
-      </div>
-      <div id="nav" class="grid_8">
-        <ul>
-          <!-- <li><a href="/" title="Welcome!">Home</a></li> -->
-          <li><a href="http://www.apache.org/foundation/" title="The Foundation">Foundation</a></li>
-          <li><a href="http://projects.apache.org" title="The Projects">Projects</a></li>
-          <li><a href="http://people.apache.org" title="The People">People</a></li>
-          <li><a href="http://www.apache.org/foundation/getinvolved.html" title="Get Involved">Get Involved</a></li>
-          <li><a href="http://www.apache.org/dyn/closer.cgi" title="Download">Download</a></li>
-          <li><a href="http://www.apache.org/foundation/sponsorship.html" title="Support Apache">Support Apache</a></li>
-        </ul>
-        <p><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/wiki/">Wiki</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/">Core</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/user-guide/">User-guide</a></p>
-        <form name="search" id="search" action="http://www.google.com/search" method="get">
-          <input value="*.apache.org" name="sitesearch" type="hidden"/>
-          <input type="text" name="q" id="query">
-          <input type="submit" id="submit" value="Search">
-        </form>
+  <div id="header">
+    <div id="top_menu">
+      <div id="top_menu_container">
+          JSF and MyFaces Core Concepts
+          <!-- #simplePublishDate($decoration.publishDate)
+          #links( $decoration.body.links ) -->
+        <div class="clear"></div>
+      </div> <!-- close top_menu_container -->
+    </div> <!-- close top_menu -->
+    <div id="header_bottom">
+    <div id="logo_banner_container">
+      <!--#banner( $decoration.bannerLeft "logo" )-->
+      <div id="logo">
+        <a href="index.html">
+          <img src="/wiki/img/banners/MyFaces_logo.jpg" alt="" />
+        </a>
       </div>
+      <!--#banner( $decoration.bannerRight "banner" )-->
+      <div id="banner">
+        <a href="http://www.apache.org/">
+          <img src="/wiki/img/banners/apache_banner.png" alt="" />
+        </a>
+      </div>    
       <div class="clear"></div>
+    </div> <!-- close logo_banner_container -->
+    </div> <!-- close header_bottom -->
+  </div> <!-- close header -->
+    <div id="main_container">
+    <div id="left_column">
+    <!--
+       #mainMenu( $decoration.body.menus )
+       #poweredByLogo( $decoration.poweredBy )
+       -->
+        <div id="powered_by">
+          <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
+            <img alt="Built by Maven" src="/wiki/img/banners/maven-feather.png"></img>
+          </a>
+        </div>
+    </div>
+    <div id="body_column">
+      <div>
+      <p><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/wiki/">Wiki</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/">Core</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/user-guide/">User-guide</a></p>
       <div id="content" class="grid_16"><div class="section-content"><p><ac:macro ac:name="unmigrated-inline-wiki-markup"><ac:plain-text-body>&lt;![CDATA<a href="cdata[{scrollbar}.html">{scrollbar}</a>
 ]&gt;</ac:plain-text-body></ac:macro>
 <p>Below you can find some useful concepts in JSF and MyFaces that are
@@ -47,11 +63,15 @@ important to understand.</p></p>
 <p><ac:macro ac:name="children" />
 <ac:macro ac:name="unmigrated-inline-wiki-markup"><ac:plain-text-body>&lt;![CDATA<a href="cdata[{scrollbar}.html">{scrollbar}</a>
 ]&gt;</ac:plain-text-body></ac:macro></p></div></div>
-      <div class="clear"></div>
-    </div>
-
-    <div id="copyright" class="container_16">
-      <p>Copyright &#169; 2011 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
+      </div>
     </div>
+    <div class="clear"></div>
+    </div> <!-- close main container -->
+    <div id="footer">
+      <div class="copyright">
+      Copyright &#169; Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>
+       Apache MyFaces, Apache Tobago, Apache, the Apache feather logo, and the Apache MyFaces project logos are trademarks of The Apache Software Foundation.
+      </div><!-- close copyright -->
+    </div><!-- close footer -->
   </body>
 </html>

Modified: websites/staging/myfaces/trunk/content/wiki/core/user-guide/jsf-and-myfaces-core-concepts/how-component-child-rendering-works.html
==============================================================================
--- websites/staging/myfaces/trunk/content/wiki/core/user-guide/jsf-and-myfaces-core-concepts/how-component-child-rendering-works.html (original)
+++ websites/staging/myfaces/trunk/content/wiki/core/user-guide/jsf-and-myfaces-core-concepts/how-component-child-rendering-works.html Tue Jan 28 18:38:38 2014
@@ -1,45 +1,61 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html lang="en">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
   <head>
     <title>How Component Child Rendering Works</title>
-
     <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-    <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
-
-    <link rel="stylesheet" type="text/css" media="screen" href="http://www.apache.org/css/style.css">
-    <link rel="stylesheet" type="text/css" media="screen" href="http://www.apache.org/css/code.css">
-
+    
+    <link rel="stylesheet" type="text/css" media="all" href="/wiki/css/maven-base.css"/>
+    <link rel="stylesheet" type="text/css" media="all" href="/wiki/css/maven-theme.css"/>
+    <link rel="stylesheet" type="text/css" media="print" href="/wiki/css/print.css"/>
+    
     
 
     
     
   </head>
-
   <body>
-    <div id="page" class="container_16">
-      <div id="header" class="grid_8">
-        <img src="http://www.apache.org/images/feather-small.gif" alt="The Apache Software Foundation">
-        <h1>The Apache Software Foundation</h1>
-        <h2>How Component Child Rendering Works</h2>
-      </div>
-      <div id="nav" class="grid_8">
-        <ul>
-          <!-- <li><a href="/" title="Welcome!">Home</a></li> -->
-          <li><a href="http://www.apache.org/foundation/" title="The Foundation">Foundation</a></li>
-          <li><a href="http://projects.apache.org" title="The Projects">Projects</a></li>
-          <li><a href="http://people.apache.org" title="The People">People</a></li>
-          <li><a href="http://www.apache.org/foundation/getinvolved.html" title="Get Involved">Get Involved</a></li>
-          <li><a href="http://www.apache.org/dyn/closer.cgi" title="Download">Download</a></li>
-          <li><a href="http://www.apache.org/foundation/sponsorship.html" title="Support Apache">Support Apache</a></li>
-        </ul>
-        <p><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/wiki/">Wiki</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/">Core</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/user-guide/">User-guide</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/user-guide/jsf-and-myfaces-core-concepts/">Jsf-and-myfaces-core-concepts</a></p>
-        <form name="search" id="search" action="http://www.google.com/search" method="get">
-          <input value="*.apache.org" name="sitesearch" type="hidden"/>
-          <input type="text" name="q" id="query">
-          <input type="submit" id="submit" value="Search">
-        </form>
+  <div id="header">
+    <div id="top_menu">
+      <div id="top_menu_container">
+          How Component Child Rendering Works
+          <!-- #simplePublishDate($decoration.publishDate)
+          #links( $decoration.body.links ) -->
+        <div class="clear"></div>
+      </div> <!-- close top_menu_container -->
+    </div> <!-- close top_menu -->
+    <div id="header_bottom">
+    <div id="logo_banner_container">
+      <!--#banner( $decoration.bannerLeft "logo" )-->
+      <div id="logo">
+        <a href="index.html">
+          <img src="/wiki/img/banners/MyFaces_logo.jpg" alt="" />
+        </a>
       </div>
+      <!--#banner( $decoration.bannerRight "banner" )-->
+      <div id="banner">
+        <a href="http://www.apache.org/">
+          <img src="/wiki/img/banners/apache_banner.png" alt="" />
+        </a>
+      </div>    
       <div class="clear"></div>
+    </div> <!-- close logo_banner_container -->
+    </div> <!-- close header_bottom -->
+  </div> <!-- close header -->
+    <div id="main_container">
+    <div id="left_column">
+    <!--
+       #mainMenu( $decoration.body.menus )
+       #poweredByLogo( $decoration.poweredBy )
+       -->
+        <div id="powered_by">
+          <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
+            <img alt="Built by Maven" src="/wiki/img/banners/maven-feather.png"></img>
+          </a>
+        </div>
+    </div>
+    <div id="body_column">
+      <div>
+      <p><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/wiki/">Wiki</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/">Core</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/user-guide/">User-guide</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/user-guide/jsf-and-myfaces-core-concepts/">Jsf-and-myfaces-core-concepts</a></p>
       <div id="content" class="grid_16"><div class="section-content"><p><ac:macro ac:name="unmigrated-inline-wiki-markup"><ac:plain-text-body>&lt;![CDATA<a href="cdata[{scrollbar}.html">{scrollbar}</a>
 ]&gt;</ac:plain-text-body></ac:macro>
 <h2>How Component Child Rendering Works</h2></p>
@@ -65,11 +81,15 @@ children, in a recursive process going d
 
 <p><ac:macro ac:name="unmigrated-inline-wiki-markup"><ac:plain-text-body>&lt;![CDATA<a href="cdata[{scrollbar}.html">{scrollbar}</a>
 ]&gt;</ac:plain-text-body></ac:macro></p></div></div>
-      <div class="clear"></div>
-    </div>
-
-    <div id="copyright" class="container_16">
-      <p>Copyright &#169; 2011 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
+      </div>
     </div>
+    <div class="clear"></div>
+    </div> <!-- close main container -->
+    <div id="footer">
+      <div class="copyright">
+      Copyright &#169; Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>
+       Apache MyFaces, Apache Tobago, Apache, the Apache feather logo, and the Apache MyFaces project logos are trademarks of The Apache Software Foundation.
+      </div><!-- close copyright -->
+    </div><!-- close footer -->
   </body>
 </html>

Modified: websites/staging/myfaces/trunk/content/wiki/core/user-guide/jsf-and-myfaces-core-concepts/how-jsf-state-management-works.html
==============================================================================
--- websites/staging/myfaces/trunk/content/wiki/core/user-guide/jsf-and-myfaces-core-concepts/how-jsf-state-management-works.html (original)
+++ websites/staging/myfaces/trunk/content/wiki/core/user-guide/jsf-and-myfaces-core-concepts/how-jsf-state-management-works.html Tue Jan 28 18:38:38 2014
@@ -1,45 +1,61 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html lang="en">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
   <head>
     <title>How JSF State Management works</title>
-
     <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-    <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
-
-    <link rel="stylesheet" type="text/css" media="screen" href="http://www.apache.org/css/style.css">
-    <link rel="stylesheet" type="text/css" media="screen" href="http://www.apache.org/css/code.css">
-
+    
+    <link rel="stylesheet" type="text/css" media="all" href="/wiki/css/maven-base.css"/>
+    <link rel="stylesheet" type="text/css" media="all" href="/wiki/css/maven-theme.css"/>
+    <link rel="stylesheet" type="text/css" media="print" href="/wiki/css/print.css"/>
+    
     
 
     
     
   </head>
-
   <body>
-    <div id="page" class="container_16">
-      <div id="header" class="grid_8">
-        <img src="http://www.apache.org/images/feather-small.gif" alt="The Apache Software Foundation">
-        <h1>The Apache Software Foundation</h1>
-        <h2>How JSF State Management works</h2>
-      </div>
-      <div id="nav" class="grid_8">
-        <ul>
-          <!-- <li><a href="/" title="Welcome!">Home</a></li> -->
-          <li><a href="http://www.apache.org/foundation/" title="The Foundation">Foundation</a></li>
-          <li><a href="http://projects.apache.org" title="The Projects">Projects</a></li>
-          <li><a href="http://people.apache.org" title="The People">People</a></li>
-          <li><a href="http://www.apache.org/foundation/getinvolved.html" title="Get Involved">Get Involved</a></li>
-          <li><a href="http://www.apache.org/dyn/closer.cgi" title="Download">Download</a></li>
-          <li><a href="http://www.apache.org/foundation/sponsorship.html" title="Support Apache">Support Apache</a></li>
-        </ul>
-        <p><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/wiki/">Wiki</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/">Core</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/user-guide/">User-guide</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/user-guide/jsf-and-myfaces-core-concepts/">Jsf-and-myfaces-core-concepts</a></p>
-        <form name="search" id="search" action="http://www.google.com/search" method="get">
-          <input value="*.apache.org" name="sitesearch" type="hidden"/>
-          <input type="text" name="q" id="query">
-          <input type="submit" id="submit" value="Search">
-        </form>
+  <div id="header">
+    <div id="top_menu">
+      <div id="top_menu_container">
+          How JSF State Management works
+          <!-- #simplePublishDate($decoration.publishDate)
+          #links( $decoration.body.links ) -->
+        <div class="clear"></div>
+      </div> <!-- close top_menu_container -->
+    </div> <!-- close top_menu -->
+    <div id="header_bottom">
+    <div id="logo_banner_container">
+      <!--#banner( $decoration.bannerLeft "logo" )-->
+      <div id="logo">
+        <a href="index.html">
+          <img src="/wiki/img/banners/MyFaces_logo.jpg" alt="" />
+        </a>
       </div>
+      <!--#banner( $decoration.bannerRight "banner" )-->
+      <div id="banner">
+        <a href="http://www.apache.org/">
+          <img src="/wiki/img/banners/apache_banner.png" alt="" />
+        </a>
+      </div>    
       <div class="clear"></div>
+    </div> <!-- close logo_banner_container -->
+    </div> <!-- close header_bottom -->
+  </div> <!-- close header -->
+    <div id="main_container">
+    <div id="left_column">
+    <!--
+       #mainMenu( $decoration.body.menus )
+       #poweredByLogo( $decoration.poweredBy )
+       -->
+        <div id="powered_by">
+          <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
+            <img alt="Built by Maven" src="/wiki/img/banners/maven-feather.png"></img>
+          </a>
+        </div>
+    </div>
+    <div id="body_column">
+      <div>
+      <p><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/wiki/">Wiki</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/">Core</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/user-guide/">User-guide</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/user-guide/jsf-and-myfaces-core-concepts/">Jsf-and-myfaces-core-concepts</a></p>
       <div id="content" class="grid_16"><div class="section-content"><p><ac:macro ac:name="unmigrated-inline-wiki-markup"><ac:plain-text-body>&lt;![CDATA<a href="cdata[{scrollbar}.html">{scrollbar}</a>
 ]&gt;</ac:plain-text-body></ac:macro>
 <h2>How JSF State Management Works</h2></p>
@@ -81,11 +97,15 @@ page is reloaded.</p>
 
 <p><ac:macro ac:name="unmigrated-inline-wiki-markup"><ac:plain-text-body>&lt;![CDATA<a href="cdata[{scrollbar}.html">{scrollbar}</a>
 ]&gt;</ac:plain-text-body></ac:macro></p></div></div>
-      <div class="clear"></div>
-    </div>
-
-    <div id="copyright" class="container_16">
-      <p>Copyright &#169; 2011 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
+      </div>
     </div>
+    <div class="clear"></div>
+    </div> <!-- close main container -->
+    <div id="footer">
+      <div class="copyright">
+      Copyright &#169; Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>
+       Apache MyFaces, Apache Tobago, Apache, the Apache feather logo, and the Apache MyFaces project logos are trademarks of The Apache Software Foundation.
+      </div><!-- close copyright -->
+    </div><!-- close footer -->
   </body>
 </html>