You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by bu...@apache.org on 2016/11/08 12:22:29 UTC

svn commit: r1000746 [5/20] - in /websites/production/tapestry/content: ./ cache/

Modified: websites/production/tapestry/content/configuration.html
==============================================================================
--- websites/production/tapestry/content/configuration.html (original)
+++ websites/production/tapestry/content/configuration.html Tue Nov  8 12:22:26 2016
@@ -46,7 +46,7 @@
 
   <div class="wrapper bs">
 
-        <div id="navigation"><div class="nav"><ul class="alternate"><li><a  href="index.html">Home</a></li><li><a  href="getting-started.html">Getting Started</a></li><li><a  href="documentation.html">Documentation</a></li><li><a  href="download.html">Download</a></li><li><a  href="about.html">About</a></li><li><a  href="community.html">Community</a></li><li><a  class="external-link" href="http://www.apache.org/">Apache</a></li><li><a  class="external-link" href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li><li><a  class="external-link" href="http://www.apache.org/foundation/thanks.html">Thanks</a></li></ul></div></div>
+        <div id="navigation"><div class="nav"><ul class="alternate"><li><a  href="index.html">Home</a></li><li><a  href="getting-started.html">Getting Started</a></li><li><a  href="documentation.html">Documentation</a></li><li><a  href="download.html">Download</a></li><li><a  href="about.html">About</a></li><li><a  class="external-link" href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li><li><a  href="community.html">Community</a></li><li><a  class="external-link" href="http://www.apache.org/security/">Security</a></li><li><a  class="external-link" href="http://www.apache.org/">Apache</a></li><li><a  class="external-link" href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li><li><a  class="external-link" href="http://www.apache.org/foundation/thanks.html">Thanks</a></li></ul></div></div>
 
           <div id="top">
             <div id="smallbanner"><div class="searchbox" style="float:right;margin: .3em 1em .1em 1em"><span style="color: #999; font-size: 90%">Tapestry docs, issues, wikis &amp; blogs:</span><form enctype="application/x-www-form-urlencoded" method="get" action="http://tapestry.apache.org/search.html"> 
@@ -101,11 +101,11 @@
   <div class="details"> 
    <a  href="configuration.html">Configuration</a> 
   </div> </li></ul></div><h1 id="Configuration-ConfiguringTapestry">Configuring Tapestry</h1><p>This page discusses all the ways in which Tapestry can be configured. Tapestry applications are configured almost entirely using Java, with very little XML at all.</p><p><strong>Contents</strong></p><p><style type="text/css">/*<![CDATA[*/
-div.rbtoc1477588769916 {padding: 0px;}
-div.rbtoc1477588769916 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1477588769916 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1478607673000 {padding: 0px;}
+div.rbtoc1478607673000 ul {list-style: disc;margin-left: 0px;}
+div.rbtoc1478607673000 li {margin-left: 0px;padding-left: 0px;}
 
-/*]]>*/</style></p><div class="toc-macro rbtoc1477588769916">
+/*]]>*/</style></p><div class="toc-macro rbtoc1478607673000">
 <ul class="toc-indentation"><li><a  href="#Configuration-XMLconfiguration(web.xml)">XML configuration (web.xml)</a></li><li><a  href="#Configuration-YourApplication'sModuleClass">Your Application's Module Class</a></li><li><a  href="#Configuration-ConfigurationSymbolNames">Configuration Symbol Names</a></li><li><a  href="#Configuration-SettingComponentParameterDefaults">Setting Component Parameter Defaults</a></li><li><a  href="#Configuration-ConfiguringIgnoredPaths">Configuring Ignored Paths</a></li><li><a  href="#Configuration-ConfiguringContentTypeMapping">Configuring Content Type Mapping</a></li><li><a  href="#Configuration-SettingExecutionModes">Setting Execution Modes</a></li></ul>
 </div><h2 id="Configuration-XMLconfiguration(web.xml)">XML configuration (web.xml)</h2><p>Tapestry runs on top of the standard Java Servlet API. To the servlet container, such as Tomcat, Tapestry appears as a <em>servlet filter</em>. This gives Tapestry great flexibility in matching URLs without requiring lots of XML configuration.</p><p>Although most configuration is done with Java, a small but necessary amount of configuration occurs inside the servlet deployment descriptor, WEB-INF/web.xml. Most of the configuration is boilerplate, nearly the same for all applications.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>web.xml (partial)</b></div><div class="codeContent panelContent pdl">
 <pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;!DOCTYPE web-app

Modified: websites/production/tapestry/content/confluence-site-setup.html
==============================================================================
--- websites/production/tapestry/content/confluence-site-setup.html (original)
+++ websites/production/tapestry/content/confluence-site-setup.html Tue Nov  8 12:22:26 2016
@@ -36,18 +36,13 @@
 
   <div class="wrapper bs">
 
-        <div id="navigation"><div class="nav">
-<ul class="alternate"><li><a  href="index.html">Home</a></li><li><a  href="getting-started.html">Getting Started</a></li><li><a  href="documentation.html">Documentation</a></li><li><a  href="download.html">Download</a></li><li><a  href="about.html">About</a></li><li><a  href="community.html">Community</a></li><li><a  class="external-link" href="http://www.apache.org/">Apache</a></li><li><a  class="external-link" href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li><li><a  class="external-link" href="http://www.apache.org/foundation/thanks.html">Thanks</a></li></ul>
-</div></div>
+        <div id="navigation"><div class="nav"><ul class="alternate"><li><a  href="index.html">Home</a></li><li><a  href="getting-started.html">Getting Started</a></li><li><a  href="documentation.html">Documentation</a></li><li><a  href="download.html">Download</a></li><li><a  href="about.html">About</a></li><li><a  class="external-link" href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li><li><a  href="community.html">Community</a></li><li><a  class="external-link" href="http://www.apache.org/security/">Security</a></li><li><a  class="external-link" href="http://www.apache.org/">Apache</a></li><li><a  class="external-link" href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li><li><a  class="external-link" href="http://www.apache.org/foundation/thanks.html">Thanks</a></li></ul></div></div>
 
           <div id="top">
-            <div id="smallbanner"><div class="searchbox" style="float:right;margin: .3em 1em .1em 1em"><span style="color: #999; font-size: 90%">Tapestry docs, issues, wikis &amp; blogs:</span>
-<form enctype="application/x-www-form-urlencoded" method="get" action="http://tapestry.apache.org/search.html">
-  <input type="text" name="q">
-  <input type="submit" value="Search">
-</form>
-
-</div><div class="emblem" style="float:left"><p><a  href="index.html"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="http://tapestry.apache.org/images/tapestry_small.png" data-image-src="http://tapestry.apache.org/images/tapestry_small.png"></span></a></p></div><div class="title" style="float:left; margin: 0 0 0 3em"><h1 id="SmallBanner-PageTitle">Confluence Site Setup</h1></div></div>
+            <div id="smallbanner"><div class="searchbox" style="float:right;margin: .3em 1em .1em 1em"><span style="color: #999; font-size: 90%">Tapestry docs, issues, wikis &amp; blogs:</span><form enctype="application/x-www-form-urlencoded" method="get" action="http://tapestry.apache.org/search.html"> 
+ <input type="text" name="q"> 
+ <input type="submit" value="Search"> 
+</form></div><div class="emblem" style="float:left"><p><a  href="index.html"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="http://tapestry.apache.org/images/tapestry_small.png" data-image-src="http://tapestry.apache.org/images/tapestry_small.png"></span></a></p></div><div class="title" style="float:left; margin: 0 0 0 3em"><h1 id="SmallBanner-PageTitle">Confluence Site Setup</h1></div></div>
       <div class="clearer"></div>
       </div>
 
@@ -59,73 +54,43 @@
       </div>
 
       <div id="content">
-                <div id="ConfluenceContent"><p>This document describes our web site setup: what is where and how it works.</p><div class="aui-label" style="float:right" title="Related Articles">
-
-
-
-
-
-
-
-
-<h3>Related Articles</h3>
-
-<ul class="content-by-label"><li>
-        <div>
-                <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>        </div>
-
-        <div class="details">
-                        <a  href="building-tapestry-from-source.html">Building Tapestry from Source</a>
-                
-                        
-                    </div>
-    </li><li>
-        <div>
-                <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>        </div>
-
-        <div class="details">
-                        <a  href="version-numbers.html">Version Numbers</a>
-                
-                        
-                    </div>
-    </li><li>
-        <div>
-                <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>        </div>
-
-        <div class="details">
-                        <a  href="developer-bible.html">Developer Bible</a>
-                
-                        
-                    </div>
-    </li><li>
-        <div>
-                <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>        </div>
-
-        <div class="details">
-                        <a  href="release-process.html">Release Process</a>
-                
-                        
-                    </div>
-    </li><li>
-        <div>
-                <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>        </div>
-
-        <div class="details">
-                        <a  href="developer-information.html">Developer Information</a>
-                
-                        
-                    </div>
-    </li><li>
-        <div>
-                <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>        </div>
-
-        <div class="details">
-                        <a  href="confluence-site-setup.html">Confluence Site Setup</a>
-                
-                        
-                    </div>
-    </li></ul>
-</div><h1 id="ConfluenceSiteSetup-Overview">Overview</h1><p>Most of the web site and documentation (with the notable exception of the Javadoc API pages) are kept in Confluence.</p><p>Since the Confluence instance at <a  class="external-link" href="https://cwiki.apache.org/confluence/">https://cwiki.apache.org/confluence/</a> isn't capable of handling a lot of incoming requests, all wiki spaces are statically exported. The SiteExporter program is responsible for that. Once a page in Confluence changes, that page gets re-exported automatically.</p><h2 id="ConfluenceSiteSetup-HowSiteExporterworks">How SiteExporter works</h2><p><em>For more details see the <a  class="external-link" href="https://svn.apache.org/repos/asf/tapestry/tapestry-site/trunk/README">SiteExporter README</a>.</em></p><p>SiteExporter is a command-line Java program that is run hourly (currently at 19 minutes after the hour) from Apache's BuildBot. It makes a web service call to Confluence (to its RSS feed, actually) 
 to get a list of pages that have changed since the last run, and the HTML-formatted export of those pages. For each, it post-processes the file (described below). Finally, SiteExporter commits all changed HTML files into Tapestry's part of the Apache Subversion repository, which (nearly instantly) makes it available to the public at <a  class="external-link" href="http://tapestry.apache.org">http://tapestry.apache.org</a>, and commit emails are sent to Tapestry's "commits" mailing list.</p><p>Attachments (to Confluence pages) are exported in roughly the same way.</p><p>The time between saving a change in Confluence and seeing the result on the public site is at most 1 hour, depending on when you do it. If you save a change at 18 minutes after the hour you'll see the change in about a minute. If you publish it at 20 minutes after the hour then you'll have to wait almost an hour.</p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><td colspan="1" rowspan="1" class="co
 nfluenceTd"><p>HTML files in SVN</p></td><td colspan="1" rowspan="1" class="confluenceTd"><a  class="external-link" href="https://svn.apache.org/repos/infra/websites/production/tapestry">https://svn.apache.org/repos/infra/websites/production/tapestry</a></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Cache File</p></td><td colspan="1" rowspan="1" class="confluenceTd"><a  class="external-link" href="https://svn.apache.org/repos/infra/websites/production/tapestry/content/cache/main.pageCache">https://svn.apache.org/repos/infra/websites/production/tapestry/content/cache/main.pageCache</a></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>SiteExporter source</p></td><td colspan="1" rowspan="1" class="confluenceTd"><a  class="external-link" href="https://svn.apache.org/repos/asf/tapestry/tapestry-site/trunk">https://svn.apache.org/repos/asf/tapestry/tapestry-site/trunk</a></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Velocity template<
 /p></td><td colspan="1" rowspan="1" class="confluenceTd"><a  class="external-link" href="https://svn.apache.org/repos/asf/tapestry/tapestry-site/trunk/template/template.vm">https://svn.apache.org/repos/asf/tapestry/tapestry-site/trunk/template/template.vm</a></td></tr></tbody></table></div><h3 id="ConfluenceSiteSetup-Post-processingHTMLPages">Post-processing HTML Pages</h3><p>HTML pages exported from Confluence are post-processed in several ways before being committed to SVN. Here are just a few of the things going on:</p><ul><li>Tagsoup is used to clean up the HTML.</li><li>The breadcrumb links are updated.</li><li>Empty paragraph (&lt;p&gt;) tags are removed from the top of the page.</li><li>{code} macro output (code examples) are detected, and SyntaxHighlighter JavaScript links are added to the page when needed.</li><li>{include} tags (when one Confluence page includes another) are detected, causing the <em>including</em> page to be regenerated autoamtically.</li><li>{children} t
 ags are also detected and handled</li></ul><h2 id="ConfluenceSiteSetup-ManualIntervention">Manual Intervention</h2><p>You can cause the <em>whole site</em> to be republished by deleting the main.pageCache file (above) in the subversion repo. This is usually only needed after changing the template.</p><h2 id="ConfluenceSiteSetup-ChangingSiteExporteritself">Changing SiteExporter itself</h2><p>Currently the SiteExporter source code is an unmodified copy of a program of the same name written by Dan Kulp for the Apache CXF project and also used by Camel, Geronimo, and Struts (and possibly others). It can be customized, but proceed with caution, because any customizations will make it harder to pull in future changes from the original CXF SiteExporter code. The CXF SiteExporter is likely to change as Confluence versions change.</p><p>To pick up changes to the original CXF SiteExporter code, just compare <a  class="external-link" href="https://svn.apache.org/repos/asf/tapestry/tapestry-sit
 e/trunk/src/main/java/org/apache/cxf/cwiki">the Tapestry source code</a> with <a  class="external-link" href="http://svn.apache.org/repos/asf/cxf/web/src/main/java/org/apache/cxf/cwiki/">the CXF source code</a>.</p><hr><h1 id="ConfluenceSiteSetup-WikiFormattingGuidelines">Wiki Formatting Guidelines</h1><ul><li>Precede annotation names with '@'. If the annotation name is hyperlinked, put the '@' character <em>outside</em> of the link: @[AnnotationType|http://...AnnotationType.html]</li><li>The first reference to a type on a page should be a link to <a  class="external-link" href="http://tapestry.apache.org/current/apidocs/">http://tapestry.apache.org/current/apidocs/</a>... (or the component reference)</li><li>Treat the page title as if it were an h0. element, and put top level sections within the page as h1.</li><li>Page names as headings should have All Words Captialized.</li><li>For other headings, only the first word of multi-word headings should be capitalized, e.g. "h2. Naming 
 conventions" (following Wikipedia)</li><li>Use <code>code</code> font for method and property names: <code>myProperty</code>, <code>someMethod()</code>.</li><li>Use the default font for Class names (qualified or not).</li><li>Use the default font for path names.</li><li>Use {code} for listings, not {noformat}.</li><li>Use {noformat} for console output.</li><li>Images and diagrams should be small-sized thumbnails, centered, with no border.</li><li>Use the <a  href="since-and-deprecated-user-macros.html">Since and Deprecated</a> macros to mark new or deprecated features.</li><li><em>Proposed: Each page should include explicit links to its child pages. Don't rely on the "Child Pages" links at the bottom, which don't carry over to the exported site.</em></li><li><em>Proposed: In pages other than the User Guide pages, subsections that briefly discuss topics that are more fully covered in the User Guide should lead with a "Main Article: [Foo]" line, where Foo is the name of the page in th
 e User Guide. Example: the "Template Localization" section of <a  href="component-templates.html">Component Templates</a></em></li><li><em>Proposed: User Guide pages should generally start with a right-floated "Related Articles" box that provides links to related content in the FAQ, Cookbook, Cheat Sheets, etc. <a  href="component-classes.html">Example</a></em></li><li><em>Proposed: The lead paragraph should generally lead with the title word or phrase in bold (following Wikipedia)</em></li></ul><h1 id="ConfluenceSiteSetup-Websitestructure">Website structure</h1><p>The <a  href="index.html">Index</a> page includes the <a  href="banner.html">Banner</a> and <a  href="key-features.html">Key Features</a> pages as well as the blog posts. Most other pages are just plain pages and may or may not include other parts. In addition the <a  href="navigation.html">Navigation</a>, <a  href="small-banner.html">Small Banner</a> and <a  href="footer.html">Footer</a> pages exist.</p><p>Our SiteExport
 er template (described above) glues everything together. It adds the contents of the <a  href="navigation.html">Navigation</a> and <a  href="footer.html">Footer</a> pages in the appropriate places and on all pages except the <a  href="index.html">Index</a> page. It also adds the contents of the <a  href="small-banner.html">Small Banner</a> page as well as the breadcrumbs navigation.</p><div class="confluence-information-macro confluence-information-macro-warning"><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>HLS: I've noticed that pages with footnotes that are combined with the {include} macro do not render correctly ... the footnote numbers and anchors reset back to 1 for each included page. Perhaps there's a way to fix that with the template?</p></div></div><h1 id="ConfluenceSiteSetup-Updatingthetemplate">Updating the template</h1><p>You must be a Tapestry committer or otherwise h
 ave write access to the subversion repository (see link above).</p><p>To edit the template:</p><ol><li>check out the SiteExporter source project (see link above)</li><li>find and edit the template.vm file</li><li>commit your changes</li></ol></div>
+                <div id="ConfluenceContent"><p>This document describes our web site setup: what is where and how it works.</p><div class="aui-label" style="float:right" title="Related Articles"><h3>Related Articles</h3><ul class="content-by-label"><li> 
+  <div> 
+   <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span> 
+  </div> 
+  <div class="details"> 
+   <a  href="building-tapestry-from-source.html">Building Tapestry from Source</a> 
+  </div> </li><li> 
+  <div> 
+   <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span> 
+  </div> 
+  <div class="details"> 
+   <a  href="version-numbers.html">Version Numbers</a> 
+  </div> </li><li> 
+  <div> 
+   <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span> 
+  </div> 
+  <div class="details"> 
+   <a  href="developer-bible.html">Developer Bible</a> 
+  </div> </li><li> 
+  <div> 
+   <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span> 
+  </div> 
+  <div class="details"> 
+   <a  href="release-process.html">Release Process</a> 
+  </div> </li><li> 
+  <div> 
+   <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span> 
+  </div> 
+  <div class="details"> 
+   <a  href="developer-information.html">Developer Information</a> 
+  </div> </li><li> 
+  <div> 
+   <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span> 
+  </div> 
+  <div class="details"> 
+   <a  href="confluence-site-setup.html">Confluence Site Setup</a> 
+  </div> </li></ul></div><h1 id="ConfluenceSiteSetup-Overview">Overview</h1><p>Most of the web site and documentation (with the notable exception of the Javadoc API pages) are kept in Confluence.</p><p>Since the Confluence instance at <a  class="external-link" href="https://cwiki.apache.org/confluence/">https://cwiki.apache.org/confluence/</a> isn't capable of handling a lot of incoming requests, all wiki spaces are statically exported. The SiteExporter program is responsible for that. Once a page in Confluence changes, that page gets re-exported automatically.</p><h2 id="ConfluenceSiteSetup-HowSiteExporterworks">How SiteExporter works</h2><p><em>For more details see the <a  class="external-link" href="https://svn.apache.org/repos/asf/tapestry/tapestry-site/trunk/README">SiteExporter README</a>.</em></p><p>SiteExporter is a command-line Java program that is run hourly (currently at 19 minutes after the hour) from Apache's BuildBot. It makes a web service call to Confluence (to its R
 SS feed, actually) to get a list of pages that have changed since the last run, and the HTML-formatted export of those pages. For each, it post-processes the file (described below). Finally, SiteExporter commits all changed HTML files into Tapestry's part of the Apache Subversion repository, which (nearly instantly) makes it available to the public at <a  class="external-link" href="http://tapestry.apache.org">http://tapestry.apache.org</a>, and commit emails are sent to Tapestry's "commits" mailing list.</p><p>Attachments (to Confluence pages) are exported in roughly the same way.</p><p>The time between saving a change in Confluence and seeing the result on the public site is at most 1 hour, depending on when you do it. If you save a change at 18 minutes after the hour you'll see the change in about a minute. If you publish it at 20 minutes after the hour then you'll have to wait almost an hour.</p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><td colspan="1" ro
 wspan="1" class="confluenceTd"><p>HTML files in SVN</p></td><td colspan="1" rowspan="1" class="confluenceTd"><a  class="external-link" href="https://svn.apache.org/repos/infra/websites/production/tapestry">https://svn.apache.org/repos/infra/websites/production/tapestry</a></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Cache File</p></td><td colspan="1" rowspan="1" class="confluenceTd"><a  class="external-link" href="https://svn.apache.org/repos/infra/websites/production/tapestry/content/cache/main.pageCache">https://svn.apache.org/repos/infra/websites/production/tapestry/content/cache/main.pageCache</a></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>SiteExporter source</p></td><td colspan="1" rowspan="1" class="confluenceTd"><a  class="external-link" href="https://svn.apache.org/repos/asf/tapestry/tapestry-site/trunk">https://svn.apache.org/repos/asf/tapestry/tapestry-site/trunk</a></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p
 >Velocity template</p></td><td colspan="1" rowspan="1" class="confluenceTd"><a  class="external-link" href="https://svn.apache.org/repos/asf/tapestry/tapestry-site/trunk/template/template.vm">https://svn.apache.org/repos/asf/tapestry/tapestry-site/trunk/template/template.vm</a></td></tr></tbody></table></div><h3 id="ConfluenceSiteSetup-Post-processingHTMLPages">Post-processing HTML Pages</h3><p>HTML pages exported from Confluence are post-processed in several ways before being committed to SVN. Here are just a few of the things going on:</p><ul><li>Tagsoup is used to clean up the HTML.</li><li>The breadcrumb links are updated.</li><li>Empty paragraph (&lt;p&gt;) tags are removed from the top of the page.</li><li>{code} macro output (code examples) are detected, and SyntaxHighlighter JavaScript links are added to the page when needed.</li><li>{include} tags (when one Confluence page includes another) are detected, causing the <em>including</em> page to be regenerated autoamtically.</
 li><li>{children} tags are also detected and handled</li></ul><h2 id="ConfluenceSiteSetup-ManualIntervention">Manual Intervention</h2><p>You can cause the <em>whole site</em> to be republished by deleting the main.pageCache file (above) in the subversion repo. This is usually only needed after changing the template.</p><h2 id="ConfluenceSiteSetup-ChangingSiteExporteritself">Changing SiteExporter itself</h2><p>Currently the SiteExporter source code is an unmodified copy of a program of the same name written by Dan Kulp for the Apache CXF project and also used by Camel, Geronimo, and Struts (and possibly others). It can be customized, but proceed with caution, because any customizations will make it harder to pull in future changes from the original CXF SiteExporter code. The CXF SiteExporter is likely to change as Confluence versions change.</p><p>To pick up changes to the original CXF SiteExporter code, just compare <a  class="external-link" href="https://svn.apache.org/repos/asf/ta
 pestry/tapestry-site/trunk/src/main/java/org/apache/cxf/cwiki">the Tapestry source code</a> with <a  class="external-link" href="http://svn.apache.org/repos/asf/cxf/web/src/main/java/org/apache/cxf/cwiki/">the CXF source code</a>.</p><hr><h1 id="ConfluenceSiteSetup-WikiFormattingGuidelines">Wiki Formatting Guidelines</h1><ul><li>Precede annotation names with '@'. If the annotation name is hyperlinked, put the '@' character <em>outside</em> of the link: @[AnnotationType|http://...AnnotationType.html]</li><li>The first reference to a type on a page should be a link to <a  class="external-link" href="http://tapestry.apache.org/current/apidocs/">http://tapestry.apache.org/current/apidocs/</a>... (or the component reference)</li><li>Treat the page title as if it were an h0. element, and put top level sections within the page as h1.</li><li>Page names as headings should have All Words Captialized.</li><li>For other headings, only the first word of multi-word headings should be capitalized
 , e.g. "h2. Naming conventions" (following Wikipedia)</li><li>Use <code>code</code> font for method and property names: <code>myProperty</code>, <code>someMethod()</code>.</li><li>Use the default font for Class names (qualified or not).</li><li>Use the default font for path names.</li><li>Use {code} for listings, not {noformat}.</li><li>Use {noformat} for console output.</li><li>Images and diagrams should be small-sized thumbnails, centered, with no border.</li><li>Use the <a  href="since-and-deprecated-user-macros.html">Since and Deprecated</a> macros to mark new or deprecated features.</li><li><em>Proposed: Each page should include explicit links to its child pages. Don't rely on the "Child Pages" links at the bottom, which don't carry over to the exported site.</em></li><li><em>Proposed: In pages other than the User Guide pages, subsections that briefly discuss topics that are more fully covered in the User Guide should lead with a "Main Article: [Foo]" line, where Foo is the nam
 e of the page in the User Guide. Example: the "Template Localization" section of <a  href="component-templates.html">Component Templates</a></em></li><li><em>Proposed: User Guide pages should generally start with a right-floated "Related Articles" box that provides links to related content in the FAQ, Cookbook, Cheat Sheets, etc. <a  href="component-classes.html">Example</a></em></li><li><em>Proposed: The lead paragraph should generally lead with the title word or phrase in bold (following Wikipedia)</em></li></ul><h1 id="ConfluenceSiteSetup-Websitestructure">Website structure</h1><p>The <a  href="index.html">Index</a> page includes the <a  href="banner.html">Banner</a> and <a  href="key-features.html">Key Features</a> pages as well as the blog posts. Most other pages are just plain pages and may or may not include other parts. In addition the <a  href="navigation.html">Navigation</a>, <a  href="small-banner.html">Small Banner</a> and <a  href="footer.html">Footer</a> pages exist.</
 p><p>Our SiteExporter template (described above) glues everything together. It adds the contents of the <a  href="navigation.html">Navigation</a> and <a  href="footer.html">Footer</a> pages in the appropriate places and on all pages except the <a  href="index.html">Index</a> page. It also adds the contents of the <a  href="small-banner.html">Small Banner</a> page as well as the breadcrumbs navigation.</p><div class="confluence-information-macro confluence-information-macro-warning"><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>HLS: I've noticed that pages with footnotes that are combined with the {include} macro do not render correctly ... the footnote numbers and anchors reset back to 1 for each included page. Perhaps there's a way to fix that with the template?</p></div></div><h1 id="ConfluenceSiteSetup-Updatingthetemplate">Updating the template</h1><p>You must be a Tapestry commi
 tter or otherwise have write access to the subversion repository (see link above).</p><p>To edit the template:</p><ol><li>check out the SiteExporter source project (see link above)</li><li>find and edit the template.vm file</li><li>commit your changes</li></ol></div>
       </div>
 
       <div class="clearer"></div>

Modified: websites/production/tapestry/content/content-type-and-markup.html
==============================================================================
--- websites/production/tapestry/content/content-type-and-markup.html (original)
+++ websites/production/tapestry/content/content-type-and-markup.html Tue Nov  8 12:22:26 2016
@@ -36,18 +36,13 @@
 
   <div class="wrapper bs">
 
-        <div id="navigation"><div class="nav">
-<ul class="alternate"><li><a  href="index.html">Home</a></li><li><a  href="getting-started.html">Getting Started</a></li><li><a  href="documentation.html">Documentation</a></li><li><a  href="download.html">Download</a></li><li><a  href="about.html">About</a></li><li><a  href="community.html">Community</a></li><li><a  class="external-link" href="http://www.apache.org/">Apache</a></li><li><a  class="external-link" href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li><li><a  class="external-link" href="http://www.apache.org/foundation/thanks.html">Thanks</a></li></ul>
-</div></div>
+        <div id="navigation"><div class="nav"><ul class="alternate"><li><a  href="index.html">Home</a></li><li><a  href="getting-started.html">Getting Started</a></li><li><a  href="documentation.html">Documentation</a></li><li><a  href="download.html">Download</a></li><li><a  href="about.html">About</a></li><li><a  class="external-link" href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li><li><a  href="community.html">Community</a></li><li><a  class="external-link" href="http://www.apache.org/security/">Security</a></li><li><a  class="external-link" href="http://www.apache.org/">Apache</a></li><li><a  class="external-link" href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li><li><a  class="external-link" href="http://www.apache.org/foundation/thanks.html">Thanks</a></li></ul></div></div>
 
           <div id="top">
-            <div id="smallbanner"><div class="searchbox" style="float:right;margin: .3em 1em .1em 1em"><span style="color: #999; font-size: 90%">Tapestry docs, issues, wikis &amp; blogs:</span>
-<form enctype="application/x-www-form-urlencoded" method="get" action="http://tapestry.apache.org/search.html">
-  <input type="text" name="q">
-  <input type="submit" value="Search">
-</form>
-
-</div><div class="emblem" style="float:left"><p><a  href="index.html"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="http://tapestry.apache.org/images/tapestry_small.png" data-image-src="http://tapestry.apache.org/images/tapestry_small.png"></span></a></p></div><div class="title" style="float:left; margin: 0 0 0 3em"><h1 id="SmallBanner-PageTitle">Content Type and Markup</h1></div></div>
+            <div id="smallbanner"><div class="searchbox" style="float:right;margin: .3em 1em .1em 1em"><span style="color: #999; font-size: 90%">Tapestry docs, issues, wikis &amp; blogs:</span><form enctype="application/x-www-form-urlencoded" method="get" action="http://tapestry.apache.org/search.html"> 
+ <input type="text" name="q"> 
+ <input type="submit" value="Search"> 
+</form></div><div class="emblem" style="float:left"><p><a  href="index.html"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="http://tapestry.apache.org/images/tapestry_small.png" data-image-src="http://tapestry.apache.org/images/tapestry_small.png"></span></a></p></div><div class="title" style="float:left; margin: 0 0 0 3em"><h1 id="SmallBanner-PageTitle">Content Type and Markup</h1></div></div>
       <div class="clearer"></div>
       </div>
 

Modified: websites/production/tapestry/content/contributors.html
==============================================================================
--- websites/production/tapestry/content/contributors.html (original)
+++ websites/production/tapestry/content/contributors.html Tue Nov  8 12:22:26 2016
@@ -36,18 +36,13 @@
 
   <div class="wrapper bs">
 
-        <div id="navigation"><div class="nav">
-<ul class="alternate"><li><a  href="index.html">Home</a></li><li><a  href="getting-started.html">Getting Started</a></li><li><a  href="documentation.html">Documentation</a></li><li><a  href="download.html">Download</a></li><li><a  href="about.html">About</a></li><li><a  href="community.html">Community</a></li><li><a  class="external-link" href="http://www.apache.org/">Apache</a></li><li><a  class="external-link" href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li><li><a  class="external-link" href="http://www.apache.org/foundation/thanks.html">Thanks</a></li></ul>
-</div></div>
+        <div id="navigation"><div class="nav"><ul class="alternate"><li><a  href="index.html">Home</a></li><li><a  href="getting-started.html">Getting Started</a></li><li><a  href="documentation.html">Documentation</a></li><li><a  href="download.html">Download</a></li><li><a  href="about.html">About</a></li><li><a  class="external-link" href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li><li><a  href="community.html">Community</a></li><li><a  class="external-link" href="http://www.apache.org/security/">Security</a></li><li><a  class="external-link" href="http://www.apache.org/">Apache</a></li><li><a  class="external-link" href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li><li><a  class="external-link" href="http://www.apache.org/foundation/thanks.html">Thanks</a></li></ul></div></div>
 
           <div id="top">
-            <div id="smallbanner"><div class="searchbox" style="float:right;margin: .3em 1em .1em 1em"><span style="color: #999; font-size: 90%">Tapestry docs, issues, wikis &amp; blogs:</span>
-<form enctype="application/x-www-form-urlencoded" method="get" action="http://tapestry.apache.org/search.html">
-  <input type="text" name="q">
-  <input type="submit" value="Search">
-</form>
-
-</div><div class="emblem" style="float:left"><p><a  href="index.html"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="http://tapestry.apache.org/images/tapestry_small.png" data-image-src="http://tapestry.apache.org/images/tapestry_small.png"></span></a></p></div><div class="title" style="float:left; margin: 0 0 0 3em"><h1 id="SmallBanner-PageTitle">Contributors</h1></div></div>
+            <div id="smallbanner"><div class="searchbox" style="float:right;margin: .3em 1em .1em 1em"><span style="color: #999; font-size: 90%">Tapestry docs, issues, wikis &amp; blogs:</span><form enctype="application/x-www-form-urlencoded" method="get" action="http://tapestry.apache.org/search.html"> 
+ <input type="text" name="q"> 
+ <input type="submit" value="Search"> 
+</form></div><div class="emblem" style="float:left"><p><a  href="index.html"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="http://tapestry.apache.org/images/tapestry_small.png" data-image-src="http://tapestry.apache.org/images/tapestry_small.png"></span></a></p></div><div class="title" style="float:left; margin: 0 0 0 3em"><h1 id="SmallBanner-PageTitle">Contributors</h1></div></div>
       <div class="clearer"></div>
       </div>
 
@@ -61,7 +56,57 @@
       <div id="content">
                 <div id="ConfluenceContent"><h2 id="Contributors-Committers">Committers</h2>
 
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Name</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>ID</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>role</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>email address</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>website</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Andreas Andreou</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>andyhot</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>PMC member</p></td><td colspan="1" rowspan="1" class="confluenceTd"><div align="right" class="">andyhot@apache.org</div></td><td colspan="1" rowspan="1" class="confluenceTd"><a  class="external-link" href="http://andyhot.gr" rel="nofollow">http://andyhot.gr</a></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Ben Dotte</p></td><td colspan="1" rowspan="1" class="confluenceT
 d"><p>bdotte</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>committer</p></td><td colspan="1" rowspan="1" class="confluenceTd"><div align="right" class="">bdotte@apache.org</div></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Bob Harner</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>bobharner</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>committer</p></td><td colspan="1" rowspan="1" class="confluenceTd"><div align="right" class="">bobharner@apache.org</div></td><td colspan="1" rowspan="1" class="confluenceTd"><a  class="external-link" href="https://github.com/bobharner" rel="nofollow">https://github.com/bobharner</a></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Christophe Cordenier</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>ccordenier</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>committer</p></td><td colspan=
 "1" rowspan="1" class="confluenceTd"><div align="right" class="">ccordenier@apache.org</div></td><td colspan="1" rowspan="1" class="confluenceTd"><a  class="external-link" href="http://spreadthesource.com" rel="nofollow">http://spreadthesource.com</a></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Dan Adams</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>dadams</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>committer</p></td><td colspan="1" rowspan="1" class="confluenceTd"><div align="right" class="">dadams@apache.org</div></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Daniel Gredler</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>gredler</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>committer</p></td><td colspan="1" rowspan="1" class="confluenceTd"><div align="right" class="">gredler@apache.org</div></td><td colspan="1" rowspan="
 1" class="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Daniel Jue</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>djue</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>committer</p></td><td colspan="1" rowspan="1" class="confluenceTd"><div align="right" class="">djue@apache.org</div></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>David Solis</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>dsolis</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>committer</p></td><td colspan="1" rowspan="1" class="confluenceTd"><div align="right" class="">dsolis@apache.org</div></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Fran&#231;ois Facon</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>ffacon</p></td><td colspan="1" rowspan=
 "1" class="confluenceTd"><p>committer</p></td><td colspan="1" rowspan="1" class="confluenceTd"><div align="right" class="">ffacon@apache.org</div></td><td colspan="1" rowspan="1" class="confluenceTd"><a  class="external-link" href="http://people.apache.org/~ffacon/">http://people.apache.org/~ffacon/</a></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Howard M. Lewis Ship</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>hlship</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>PMC member and former chair</p></td><td colspan="1" rowspan="1" class="confluenceTd"><div align="right" class="">hlship@apache.org</div></td><td colspan="1" rowspan="1" class="confluenceTd"><a  class="external-link" href="http://howardlewisship.com" rel="nofollow">http://howardlewisship.com</a></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Igor Drobiazko</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>drobiazko</p></td><td colspan="1" rowspan="
 1" class="confluenceTd"><p>PMC member</p></td><td colspan="1" rowspan="1" class="confluenceTd"><div align="right" class="">drobiazko@apache.org</div></td><td colspan="1" rowspan="1" class="confluenceTd"><a  class="external-link" href="http://tapestry5.de" rel="nofollow">http://tapestry5.de</a></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Jesse Kuhnert</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>jkuhnert</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>PMC member</p></td><td colspan="1" rowspan="1" class="confluenceTd"><div align="right" class="">jkuhnert@apache.org</div></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">Jochen Kemnade</td><td colspan="1" rowspan="1" class="confluenceTd">jkemnade</td><td colspan="1" rowspan="1" class="confluenceTd">PMC member</td><td colspan="1" rowspan="1" class="confluenceTd"><div align="right" class=""><a  class="external-l
 ink" href="mailto:jkemnade@apache.org" rel="nofollow">jkemnade@apache.org</a></div></td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Josh Canfield</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>joshcanfield</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>committer</p></td><td colspan="1" rowspan="1" class="confluenceTd"><div align="right" class="">joshcanfield@apache.org</div></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Kalle Korhonen</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>kaosko</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>committer</p></td><td colspan="1" rowspan="1" class="confluenceTd"><div align="right" class="">kaosko@apache.org</div></td><td colspan="1" rowspan="1" class="confluenceTd"><a  class="external-link" href="http://tynamo.org" rel="nofollow">http
 ://tynamo.org</a></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Kevin Menard</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>kmenard</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>committer</p></td><td colspan="1" rowspan="1" class="confluenceTd"><div align="right" class="">kmenard@apache.org</div></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Marcus Schulte</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>mschulte</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>PMC member</p></td><td colspan="1" rowspan="1" class="confluenceTd"><div align="right" class="">mschulte@apache.org</div></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Massimo Lusetti</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>mlusetti</p></td><td colspan="1" rowspan="1" cl
 ass="confluenceTd"><p>PMC member</p></td><td colspan="1" rowspan="1" class="confluenceTd"><div align="right" class="">mlusetti@apache.org</div></td><td colspan="1" rowspan="1" class="confluenceTd"><a  class="external-link" href="http://meridio.blogspot.com" rel="nofollow">http://meridio.blogspot.com</a></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Richard Lewis-Shell</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>rlewisshell</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>PMC member</p></td><td colspan="1" rowspan="1" class="confluenceTd"><div align="right" class="">rlewisshell@apache.org</div></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Robert D. Zeigler</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>robertdzeigler</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>committer</p></td><td colspan="1" rowspan="1" class="confluenceTd
 "><div align="right" class="">robertdzeigler@apache.org</div></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Robin Komiwes</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>robinkomiwes</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>committer</p></td><td colspan="1" rowspan="1" class="confluenceTd"><div align="right" class="">robinkomiwes@apache.org</div></td><td colspan="1" rowspan="1" class="confluenceTd"><a  class="external-link" href="http://spreadthesource.com" rel="nofollow">http://spreadthesource.com</a></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Taha Hafeez</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>tawus</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>committer</p></td><td colspan="1" rowspan="1" class="confluenceTd"><div align="right" class="">tawus@apache.org</div></td><td colspan="1" rowspan="1" class="confluenceTd
 "><a  class="external-link" href="http://tawus.wordpress.com" rel="nofollow">http://tawus.wordpress.com</a></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Ted Steen</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>tedst</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>committer</p></td><td colspan="1" rowspan="1" class="confluenceTd"><div align="right" class="">tedst@apache.org</div></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Thiago H. de Paula Figueiredo</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>thiagohp</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>PMC chair</p></td><td colspan="1" rowspan="1" class="confluenceTd"><div align="right" class="">thiagohp@apache.org</div></td><td colspan="1" rowspan="1" class="confluenceTd"><a  class="external-link" href="http://machina.com.br" rel="nofollow">http://machina.com.br</a></td></tr>
 <tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Ulrich St&#228;rk</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>uli</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>PMC member</p></td><td colspan="1" rowspan="1" class="confluenceTd"><div align="right" class="">uli@apache.org</div></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr></tbody></table></div>
+<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Name</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>ID</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>role</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>email address</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>website</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Andreas Andreou</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>andyhot</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>PMC member</p></td><td colspan="1" rowspan="1" class="confluenceTd">    
+<div class="cfm-align-right" style="text-align: right;">andyhot@apache.org</div>
+</td><td colspan="1" rowspan="1" class="confluenceTd"><a  class="external-link" href="http://andyhot.gr" rel="nofollow">http://andyhot.gr</a></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Ben Dotte</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>bdotte</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>committer</p></td><td colspan="1" rowspan="1" class="confluenceTd">    
+<div class="cfm-align-right" style="text-align: right;">bdotte@apache.org</div>
+</td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Bob Harner</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>bobharner</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>committer</p></td><td colspan="1" rowspan="1" class="confluenceTd">    
+<div class="cfm-align-right" style="text-align: right;">bobharner@apache.org</div>
+</td><td colspan="1" rowspan="1" class="confluenceTd"><a  class="external-link" href="https://github.com/bobharner" rel="nofollow">https://github.com/bobharner</a></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Christophe Cordenier</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>ccordenier</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>committer</p></td><td colspan="1" rowspan="1" class="confluenceTd">    
+<div class="cfm-align-right" style="text-align: right;">ccordenier@apache.org</div>
+</td><td colspan="1" rowspan="1" class="confluenceTd"><a  class="external-link" href="http://spreadthesource.com" rel="nofollow">http://spreadthesource.com</a></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Dan Adams</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>dadams</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>committer</p></td><td colspan="1" rowspan="1" class="confluenceTd">    
+<div class="cfm-align-right" style="text-align: right;">dadams@apache.org</div>
+</td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Daniel Gredler</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>gredler</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>committer</p></td><td colspan="1" rowspan="1" class="confluenceTd">    
+<div class="cfm-align-right" style="text-align: right;">gredler@apache.org</div>
+</td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Daniel Jue</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>djue</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>committer</p></td><td colspan="1" rowspan="1" class="confluenceTd">    
+<div class="cfm-align-right" style="text-align: right;">djue@apache.org</div>
+</td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>David Solis</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>dsolis</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>committer</p></td><td colspan="1" rowspan="1" class="confluenceTd">    
+<div class="cfm-align-right" style="text-align: right;">dsolis@apache.org</div>
+</td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Fran&#231;ois Facon</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>ffacon</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>committer</p></td><td colspan="1" rowspan="1" class="confluenceTd">    
+<div class="cfm-align-right" style="text-align: right;">ffacon@apache.org</div>
+</td><td colspan="1" rowspan="1" class="confluenceTd"><a  class="external-link" href="http://people.apache.org/~ffacon/">http://people.apache.org/~ffacon/</a></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Howard M. Lewis Ship</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>hlship</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>PMC member and former chair</p></td><td colspan="1" rowspan="1" class="confluenceTd">    
+<div class="cfm-align-right" style="text-align: right;">hlship@apache.org</div>
+</td><td colspan="1" rowspan="1" class="confluenceTd"><a  class="external-link" href="http://howardlewisship.com" rel="nofollow">http://howardlewisship.com</a></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Igor Drobiazko</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>drobiazko</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>PMC member</p></td><td colspan="1" rowspan="1" class="confluenceTd">    
+<div class="cfm-align-right" style="text-align: right;">drobiazko@apache.org</div>
+</td><td colspan="1" rowspan="1" class="confluenceTd"><a  class="external-link" href="http://tapestry5.de" rel="nofollow">http://tapestry5.de</a></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Jesse Kuhnert</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>jkuhnert</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>PMC member</p></td><td colspan="1" rowspan="1" class="confluenceTd">    
+<div class="cfm-align-right" style="text-align: right;">jkuhnert@apache.org</div>
+</td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">Jochen Kemnade</td><td colspan="1" rowspan="1" class="confluenceTd">jkemnade</td><td colspan="1" rowspan="1" class="confluenceTd">PMC member</td><td colspan="1" rowspan="1" class="confluenceTd">    
+<div class="cfm-align-right" style="text-align: right;"><a  class="external-link" href="mailto:jkemnade@apache.org" rel="nofollow">jkemnade@apache.org</a></div>
+</td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Josh Canfield</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>joshcanfield</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>committer</p></td><td colspan="1" rowspan="1" class="confluenceTd">    
+<div class="cfm-align-right" style="text-align: right;">joshcanfield@apache.org</div>
+</td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Kalle Korhonen</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>kaosko</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>committer</p></td><td colspan="1" rowspan="1" class="confluenceTd">    
+<div class="cfm-align-right" style="text-align: right;">kaosko@apache.org</div>
+</td><td colspan="1" rowspan="1" class="confluenceTd"><a  class="external-link" href="http://tynamo.org" rel="nofollow">http://tynamo.org</a></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Kevin Menard</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>kmenard</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>committer</p></td><td colspan="1" rowspan="1" class="confluenceTd">    
+<div class="cfm-align-right" style="text-align: right;">kmenard@apache.org</div>
+</td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Marcus Schulte</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>mschulte</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>PMC member</p></td><td colspan="1" rowspan="1" class="confluenceTd">    
+<div class="cfm-align-right" style="text-align: right;">mschulte@apache.org</div>
+</td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Massimo Lusetti</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>mlusetti</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>PMC member</p></td><td colspan="1" rowspan="1" class="confluenceTd">    
+<div class="cfm-align-right" style="text-align: right;">mlusetti@apache.org</div>
+</td><td colspan="1" rowspan="1" class="confluenceTd"><a  class="external-link" href="http://meridio.blogspot.com" rel="nofollow">http://meridio.blogspot.com</a></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Richard Lewis-Shell</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>rlewisshell</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>PMC member</p></td><td colspan="1" rowspan="1" class="confluenceTd">    
+<div class="cfm-align-right" style="text-align: right;">rlewisshell@apache.org</div>
+</td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Robert D. Zeigler</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>robertdzeigler</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>committer</p></td><td colspan="1" rowspan="1" class="confluenceTd">    
+<div class="cfm-align-right" style="text-align: right;">robertdzeigler@apache.org</div>
+</td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Robin Komiwes</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>robinkomiwes</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>committer</p></td><td colspan="1" rowspan="1" class="confluenceTd">    
+<div class="cfm-align-right" style="text-align: right;">robinkomiwes@apache.org</div>
+</td><td colspan="1" rowspan="1" class="confluenceTd"><a  class="external-link" href="http://spreadthesource.com" rel="nofollow">http://spreadthesource.com</a></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Taha Hafeez</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>tawus</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>committer</p></td><td colspan="1" rowspan="1" class="confluenceTd">    
+<div class="cfm-align-right" style="text-align: right;">tawus@apache.org</div>
+</td><td colspan="1" rowspan="1" class="confluenceTd"><a  class="external-link" href="http://tawus.wordpress.com" rel="nofollow">http://tawus.wordpress.com</a></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Ted Steen</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>tedst</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>committer</p></td><td colspan="1" rowspan="1" class="confluenceTd">    
+<div class="cfm-align-right" style="text-align: right;">tedst@apache.org</div>
+</td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Thiago H. de Paula Figueiredo</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>thiagohp</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>PMC chair</p></td><td colspan="1" rowspan="1" class="confluenceTd">    
+<div class="cfm-align-right" style="text-align: right;">thiagohp@apache.org</div>
+</td><td colspan="1" rowspan="1" class="confluenceTd"><a  class="external-link" href="http://machina.com.br" rel="nofollow">http://machina.com.br</a></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Ulrich St&#228;rk</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>uli</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>PMC member</p></td><td colspan="1" rowspan="1" class="confluenceTd">    
+<div class="cfm-align-right" style="text-align: right;">uli@apache.org</div>
+</td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr></tbody></table></div>
 
 <h2 id="Contributors-OtherContributors">Other Contributors</h2>
 

Modified: websites/production/tapestry/content/cookbook.html
==============================================================================
--- websites/production/tapestry/content/cookbook.html (original)
+++ websites/production/tapestry/content/cookbook.html Tue Nov  8 12:22:26 2016
@@ -36,18 +36,13 @@
 
   <div class="wrapper bs">
 
-        <div id="navigation"><div class="nav">
-<ul class="alternate"><li><a  href="index.html">Home</a></li><li><a  href="getting-started.html">Getting Started</a></li><li><a  href="documentation.html">Documentation</a></li><li><a  href="download.html">Download</a></li><li><a  href="about.html">About</a></li><li><a  href="community.html">Community</a></li><li><a  class="external-link" href="http://www.apache.org/">Apache</a></li><li><a  class="external-link" href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li><li><a  class="external-link" href="http://www.apache.org/foundation/thanks.html">Thanks</a></li></ul>
-</div></div>
+        <div id="navigation"><div class="nav"><ul class="alternate"><li><a  href="index.html">Home</a></li><li><a  href="getting-started.html">Getting Started</a></li><li><a  href="documentation.html">Documentation</a></li><li><a  href="download.html">Download</a></li><li><a  href="about.html">About</a></li><li><a  class="external-link" href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li><li><a  href="community.html">Community</a></li><li><a  class="external-link" href="http://www.apache.org/security/">Security</a></li><li><a  class="external-link" href="http://www.apache.org/">Apache</a></li><li><a  class="external-link" href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li><li><a  class="external-link" href="http://www.apache.org/foundation/thanks.html">Thanks</a></li></ul></div></div>
 
           <div id="top">
-            <div id="smallbanner"><div class="searchbox" style="float:right;margin: .3em 1em .1em 1em"><span style="color: #999; font-size: 90%">Tapestry docs, issues, wikis &amp; blogs:</span>
-<form enctype="application/x-www-form-urlencoded" method="get" action="http://tapestry.apache.org/search.html">
-  <input type="text" name="q">
-  <input type="submit" value="Search">
-</form>
-
-</div><div class="emblem" style="float:left"><p><a  href="index.html"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="http://tapestry.apache.org/images/tapestry_small.png" data-image-src="http://tapestry.apache.org/images/tapestry_small.png"></span></a></p></div><div class="title" style="float:left; margin: 0 0 0 3em"><h1 id="SmallBanner-PageTitle">Cookbook</h1></div></div>
+            <div id="smallbanner"><div class="searchbox" style="float:right;margin: .3em 1em .1em 1em"><span style="color: #999; font-size: 90%">Tapestry docs, issues, wikis &amp; blogs:</span><form enctype="application/x-www-form-urlencoded" method="get" action="http://tapestry.apache.org/search.html"> 
+ <input type="text" name="q"> 
+ <input type="submit" value="Search"> 
+</form></div><div class="emblem" style="float:left"><p><a  href="index.html"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="http://tapestry.apache.org/images/tapestry_small.png" data-image-src="http://tapestry.apache.org/images/tapestry_small.png"></span></a></p></div><div class="title" style="float:left; margin: 0 0 0 3em"><h1 id="SmallBanner-PageTitle">Cookbook</h1></div></div>
       <div class="clearer"></div>
       </div>
 
@@ -59,7 +54,7 @@
       </div>
 
       <div id="content">
-                <div id="ConfluenceContent"><p>This is the <strong>Tapestry Cookbook</strong>, a collection of mini-tutorials for commonly occurring patterns in Tapestry.</p><h1 id="Cookbook-Contents">Contents</h1><p></p><ul class="childpages-macro"><li><a  href="default-parameter.html">Default Parameter</a> &#8212; <span class="smalltext">Avoiding repetition when using component parameters by adding autoconnect=true</span></li><li><a  href="overriding-exception-reporting.html">Overriding Exception Reporting</a> &#8212; <span class="smalltext">Customizing Tapestry's default exception reporting page</span></li><li><a  href="error-page-recipe.html">Error Page Recipe</a> &#8212; <span class="smalltext">Serving up a Tapestry page as your site's custom 404 response page</span></li><li><a  href="supporting-informal-parameters.html">Supporting Informal Parameters</a> &#8212; <span class="smalltext">How to make your custom component accept and pass on all unknown parameters to the underlyin
 g HTML element</span></li><li><a  href="component-libraries.html">Component Libraries</a> &#8212; <span class="smalltext">How to create a library of your custom components</span></li><li><a  href="switching-cases.html">Switching Cases</a> &#8212; <span class="smalltext">Performing the equivalent of a "switch" statement in your component template using blocks and a delegate</span></li><li><a  href="enum-parameter-recipe.html">Enum Parameter Recipe</a> &#8212; <span class="smalltext">Using an Enum as a component parameter using coercion</span></li><li><a  href="extending-the-if-component.html">Extending the If Component</a> &#8212; <span class="smalltext">Adding a type coercion to enable the If component to test for anything</span></li><li><a  href="meta-programming-page-content.html">Meta-Programming Page Content</a> &#8212; <span class="smalltext">Adding an Annotation and a Filter to customize Tapestry's page rendering</span></li><li><a  href="using-select-with-a-list.html">Using Se
 lect With a List</a> &#8212; <span class="smalltext">Using SelectModel, SelectModelFactory and ValueEncoder for Select menus populated from a database</span></li><li><a  href="ioc-cookbook.html">IoC cookbook</a> &#8212; <span class="smalltext">A tutorial for using Tapestry's Inversion of Control container</span><ul class="childpages-macro"><li><a  href="ioc-cookbook-basic-services-and-injection.html">IoC Cookbook - Basic Services and Injection</a></li><li><a  href="ioc-cookbook-overriding-ioc-services.html">IoC Cookbook - Overriding IoC Services</a></li><li><a  href="ioc-cookbook-patterns.html">IoC Cookbook - Patterns</a></li><li><a  href="ioc-cookbook-service-configurations.html">IoC cookbook - Service Configurations</a></li></ul></li><li><a  href="performance-and-clustering.html">Performance and Clustering</a></li><li><a  href="google-app-engine.html">Google App Engine</a></li></ul><p>&#160;</p><p>&#160;</p><p>&#160;</p><p>&#160;</p><p>&#160;</p><p>&#160;</p><p>&#160;</p><p>&#160;
 </p></div>
+                <div id="ConfluenceContent"><p>This is the <strong>Tapestry Cookbook</strong>, a collection of mini-tutorials for commonly occurring patterns in Tapestry.</p><h1 id="Cookbook-Contents">Contents</h1><p></p><ul class="childpages-macro"><li><a  href="default-parameter.html">Default Parameter</a> &#8212; <span class="smalltext">Avoiding repetition when using component parameters by adding autoconnect=true</span></li><li><a  href="overriding-exception-reporting.html">Overriding Exception Reporting</a> &#8212; <span class="smalltext">Customizing Tapestry's default exception reporting page</span></li><li><a  href="error-page-recipe.html">Error Page Recipe</a> &#8212; <span class="smalltext">Serving up a Tapestry page as your site's custom 404 response page</span></li><li><a  href="supporting-informal-parameters.html">Supporting Informal Parameters</a> &#8212; <span class="smalltext">How to make your custom component accept and pass on all unknown parameters to the underlyin
 g HTML element</span></li><li><a  href="component-libraries.html">Component Libraries</a> &#8212; <span class="smalltext">How to create a library of your custom components</span></li><li><a  href="switching-cases.html">Switching Cases</a> &#8212; <span class="smalltext">Performing the equivalent of a "switch" statement in your component template using blocks and a delegate</span></li><li><a  href="enum-parameter-recipe.html">Enum Parameter Recipe</a> &#8212; <span class="smalltext">Using an Enum as a component parameter using coercion</span></li><li><a  href="extending-the-if-component.html">Extending the If Component</a> &#8212; <span class="smalltext">Adding a type coercion to enable the If component to test for anything</span></li><li><a  href="meta-programming-page-content.html">Meta-Programming Page Content</a> &#8212; <span class="smalltext">Adding an Annotation and a Filter to customize Tapestry's page rendering</span></li><li><a  href="using-select-with-a-list.html">Using Se
 lect With a List</a> &#8212; <span class="smalltext">Using SelectModel, SelectModelFactory and ValueEncoder for Select menus populated from a database</span></li><li><a  href="ioc-cookbook.html">IoC cookbook</a> &#8212; <span class="smalltext">A tutorial for using Tapestry's Inversion of Control container</span><ul class="childpages-macro"><li><a  href="ioc-cookbook-basic-services-and-injection.html">IoC Cookbook - Basic Services and Injection</a></li><li><a  href="ioc-cookbook-overriding-ioc-services.html">IoC Cookbook - Overriding IoC Services</a></li><li><a  href="ioc-cookbook-patterns.html">IoC Cookbook - Patterns</a></li><li><a  href="ioc-cookbook-service-configurations.html">IoC cookbook - Service Configurations</a></li></ul></li><li><a  href="performance-and-clustering.html">Performance and Clustering</a></li><li><a  href="google-app-engine.html">Google App Engine</a> &#8212; <span class="smalltext">Running a Tapestry app within a GAE server environment</span></li></ul><p>&#1
 60;</p><p>&#160;</p><p>&#160;</p><p>&#160;</p><p>&#160;</p><p>&#160;</p><p>&#160;</p><p>&#160;</p></div>
       </div>
 
       <div class="clearer"></div>

Modified: websites/production/tapestry/content/creating-the-skeleton-application.html
==============================================================================
--- websites/production/tapestry/content/creating-the-skeleton-application.html (original)
+++ websites/production/tapestry/content/creating-the-skeleton-application.html Tue Nov  8 12:22:26 2016
@@ -44,18 +44,13 @@
 
   <div class="wrapper bs">
 
-        <div id="navigation"><div class="nav">
-<ul class="alternate"><li><a  href="index.html">Home</a></li><li><a  href="getting-started.html">Getting Started</a></li><li><a  href="documentation.html">Documentation</a></li><li><a  href="download.html">Download</a></li><li><a  href="about.html">About</a></li><li><a  href="community.html">Community</a></li><li><a  class="external-link" href="http://www.apache.org/">Apache</a></li><li><a  class="external-link" href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li><li><a  class="external-link" href="http://www.apache.org/foundation/thanks.html">Thanks</a></li></ul>
-</div></div>
+        <div id="navigation"><div class="nav"><ul class="alternate"><li><a  href="index.html">Home</a></li><li><a  href="getting-started.html">Getting Started</a></li><li><a  href="documentation.html">Documentation</a></li><li><a  href="download.html">Download</a></li><li><a  href="about.html">About</a></li><li><a  class="external-link" href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li><li><a  href="community.html">Community</a></li><li><a  class="external-link" href="http://www.apache.org/security/">Security</a></li><li><a  class="external-link" href="http://www.apache.org/">Apache</a></li><li><a  class="external-link" href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li><li><a  class="external-link" href="http://www.apache.org/foundation/thanks.html">Thanks</a></li></ul></div></div>
 
           <div id="top">
-            <div id="smallbanner"><div class="searchbox" style="float:right;margin: .3em 1em .1em 1em"><span style="color: #999; font-size: 90%">Tapestry docs, issues, wikis &amp; blogs:</span>
-<form enctype="application/x-www-form-urlencoded" method="get" action="http://tapestry.apache.org/search.html">
-  <input type="text" name="q">
-  <input type="submit" value="Search">
-</form>
-
-</div><div class="emblem" style="float:left"><p><a  href="index.html"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="http://tapestry.apache.org/images/tapestry_small.png" data-image-src="http://tapestry.apache.org/images/tapestry_small.png"></span></a></p></div><div class="title" style="float:left; margin: 0 0 0 3em"><h1 id="SmallBanner-PageTitle">Creating The Skeleton Application</h1></div></div>
+            <div id="smallbanner"><div class="searchbox" style="float:right;margin: .3em 1em .1em 1em"><span style="color: #999; font-size: 90%">Tapestry docs, issues, wikis &amp; blogs:</span><form enctype="application/x-www-form-urlencoded" method="get" action="http://tapestry.apache.org/search.html"> 
+ <input type="text" name="q"> 
+ <input type="submit" value="Search"> 
+</form></div><div class="emblem" style="float:left"><p><a  href="index.html"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="http://tapestry.apache.org/images/tapestry_small.png" data-image-src="http://tapestry.apache.org/images/tapestry_small.png"></span></a></p></div><div class="title" style="float:left; margin: 0 0 0 3em"><h1 id="SmallBanner-PageTitle">Creating The Skeleton Application</h1></div></div>
       <div class="clearer"></div>
       </div>
 

Modified: websites/production/tapestry/content/css.html
==============================================================================
--- websites/production/tapestry/content/css.html (original)
+++ websites/production/tapestry/content/css.html Tue Nov  8 12:22:26 2016
@@ -45,18 +45,13 @@
 
   <div class="wrapper bs">
 
-        <div id="navigation"><div class="nav">
-<ul class="alternate"><li><a  href="index.html">Home</a></li><li><a  href="getting-started.html">Getting Started</a></li><li><a  href="documentation.html">Documentation</a></li><li><a  href="download.html">Download</a></li><li><a  href="about.html">About</a></li><li><a  href="community.html">Community</a></li><li><a  class="external-link" href="http://www.apache.org/">Apache</a></li><li><a  class="external-link" href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li><li><a  class="external-link" href="http://www.apache.org/foundation/thanks.html">Thanks</a></li></ul>
-</div></div>
+        <div id="navigation"><div class="nav"><ul class="alternate"><li><a  href="index.html">Home</a></li><li><a  href="getting-started.html">Getting Started</a></li><li><a  href="documentation.html">Documentation</a></li><li><a  href="download.html">Download</a></li><li><a  href="about.html">About</a></li><li><a  class="external-link" href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li><li><a  href="community.html">Community</a></li><li><a  class="external-link" href="http://www.apache.org/security/">Security</a></li><li><a  class="external-link" href="http://www.apache.org/">Apache</a></li><li><a  class="external-link" href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li><li><a  class="external-link" href="http://www.apache.org/foundation/thanks.html">Thanks</a></li></ul></div></div>
 
           <div id="top">
-            <div id="smallbanner"><div class="searchbox" style="float:right;margin: .3em 1em .1em 1em"><span style="color: #999; font-size: 90%">Tapestry docs, issues, wikis &amp; blogs:</span>
-<form enctype="application/x-www-form-urlencoded" method="get" action="http://tapestry.apache.org/search.html">
-  <input type="text" name="q">
-  <input type="submit" value="Search">
-</form>
-
-</div><div class="emblem" style="float:left"><p><a  href="index.html"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="http://tapestry.apache.org/images/tapestry_small.png" data-image-src="http://tapestry.apache.org/images/tapestry_small.png"></span></a></p></div><div class="title" style="float:left; margin: 0 0 0 3em"><h1 id="SmallBanner-PageTitle">CSS</h1></div></div>
+            <div id="smallbanner"><div class="searchbox" style="float:right;margin: .3em 1em .1em 1em"><span style="color: #999; font-size: 90%">Tapestry docs, issues, wikis &amp; blogs:</span><form enctype="application/x-www-form-urlencoded" method="get" action="http://tapestry.apache.org/search.html"> 
+ <input type="text" name="q"> 
+ <input type="submit" value="Search"> 
+</form></div><div class="emblem" style="float:left"><p><a  href="index.html"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="http://tapestry.apache.org/images/tapestry_small.png" data-image-src="http://tapestry.apache.org/images/tapestry_small.png"></span></a></p></div><div class="title" style="float:left; margin: 0 0 0 3em"><h1 id="SmallBanner-PageTitle">CSS</h1></div></div>
       <div class="clearer"></div>
       </div>
 
@@ -68,55 +63,31 @@
       </div>
 
       <div id="content">
-                <div id="ConfluenceContent"><p>Most web applications delegate to <strong>Cascading Style Sheets</strong> (CSS) the stylistic details of the page &#8211; fonts, colors, margins, borders and alignment. This helps the remaining HTML to remain simple and semantic, which usually makes it easier to read and maintain.</p><div class="aui-label" style="float:right" title="Related Articles">
-
-
-
-
-
-
-
-
-<h3>Related Articles</h3>
-
-<ul class="content-by-label"><li>
-        <div>
-                <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>        </div>
-
-        <div class="details">
-                        <a  href="layout-component.html">Layout Component</a>
-                
-                        
-                    </div>
-    </li><li>
-        <div>
-                <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>        </div>
-
-        <div class="details">
-                        <a  href="css.html">CSS</a>
-                
-                        
-                    </div>
-    </li><li>
-        <div>
-                <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>        </div>
-
-        <div class="details">
-                        <a  href="legacy-javascript.html">Legacy JavaScript</a>
-                
-                        
-                    </div>
-    </li><li>
-        <div>
-                <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>        </div>
-
-        <div class="details">
-                        <a  href="assets.html">Assets</a>
-                
-                        
-                    </div>
-    </li></ul>
-</div><p>Tapestry includes sophisticated support for CSS in the form of annotation-based linking, far-future expire headers, automatic duplicate removal, and other features provided for <a  href="assets.html">assets</a>.</p><h2 id="CSS-Defaultstylesheet">Default style sheet</h2><p>Tapestry includes a built-in style sheet, tapestry.css, in all HTML documents (documents that have an outer &lt;html&gt; element and a nested &lt;head&gt; element), as part of the "core" JavaScript stack. For Tapestry 5.4 and later, the core JavaScript stack also includes the CSS for <a  class="external-link" href="http://getbootstrap.com/" rel="nofollow">Bootstrap 3.1.1</a>.</p><h2 id="CSS-AddingyourownCSS">Adding your own CSS</h2><p>A page or component (for example, a <a  href="layout-component.html">layout component</a>) that is rendering the &lt;head&gt; tag can add a style sheet directly in the markup.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+                <div id="ConfluenceContent"><p>Most web applications delegate to <strong>Cascading Style Sheets</strong> (CSS) the stylistic details of the page &#8211; fonts, colors, margins, borders and alignment. This helps the remaining HTML to remain simple and semantic, which usually makes it easier to read and maintain.</p><div class="aui-label" style="float:right" title="Related Articles"><h3>Related Articles</h3><ul class="content-by-label"><li> 
+  <div> 
+   <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span> 
+  </div> 
+  <div class="details"> 
+   <a  href="layout-component.html">Layout Component</a> 
+  </div> </li><li> 
+  <div> 
+   <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span> 
+  </div> 
+  <div class="details"> 
+   <a  href="css.html">CSS</a> 
+  </div> </li><li> 
+  <div> 
+   <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span> 
+  </div> 
+  <div class="details"> 
+   <a  href="legacy-javascript.html">Legacy JavaScript</a> 
+  </div> </li><li> 
+  <div> 
+   <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span> 
+  </div> 
+  <div class="details"> 
+   <a  href="assets.html">Assets</a> 
+  </div> </li></ul></div><p>Tapestry includes sophisticated support for CSS in the form of annotation-based linking, far-future expire headers, automatic duplicate removal, and other features provided for <a  href="assets.html">assets</a>.</p><h2 id="CSS-Defaultstylesheet">Default style sheet</h2><p>Tapestry includes a built-in style sheet, tapestry.css, in all HTML documents (documents that have an outer &lt;html&gt; element and a nested &lt;head&gt; element), as part of the "core" JavaScript stack. For Tapestry 5.4 and later, the core JavaScript stack also includes the CSS for <a  class="external-link" href="http://getbootstrap.com/" rel="nofollow">Bootstrap 3.1.1</a>.</p><h2 id="CSS-AddingyourownCSS">Adding your own CSS</h2><p>A page or component (for example, a <a  href="layout-component.html">layout component</a>) that is rendering the &lt;head&gt; tag can add a style sheet directly in the markup.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent
  panelContent pdl">
 <pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">&lt;head&gt;
   &lt;link href="/css/site.css" rel="stylesheet" type="text/css"/&gt;
   . . .