myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r896331 - in /websites/staging/myfaces/trunk/content: ./ wiki/core/ wiki/core/committer-and-pmc-guide/ wiki/core/committer-and-pmc-guide/myfaces-project-management/ wiki/core/user-guide/ wiki/core/user-guide/configuration-of-special-feature...
Date Tue, 04 Feb 2014 03:41:49 GMT
Author: buildbot
Date: Tue Feb  4 03:41:48 2014
New Revision: 896331

Log:
Staging update by buildbot for myfaces

Modified:
    websites/staging/myfaces/trunk/content/   (props changed)
    websites/staging/myfaces/trunk/content/wiki/core/committer-and-pmc-guide.html
    websites/staging/myfaces/trunk/content/wiki/core/committer-and-pmc-guide/myfaces-developer-notes.html
    websites/staging/myfaces/trunk/content/wiki/core/committer-and-pmc-guide/myfaces-project-management.html
    websites/staging/myfaces/trunk/content/wiki/core/committer-and-pmc-guide/myfaces-project-management/deploying-project-website.html
    websites/staging/myfaces/trunk/content/wiki/core/committer-and-pmc-guide/myfaces-project-management/promote-sandbox-components.html
    websites/staging/myfaces/trunk/content/wiki/core/committer-and-pmc-guide/myfaces-project-management/release-a-myfaces-project.html
    websites/staging/myfaces/trunk/content/wiki/core/committer-and-pmc-guide/myfaces-project-management/voting-on-a-myfaces-project-release.html
    websites/staging/myfaces/trunk/content/wiki/core/committer-and-pmc-guide/new-committers.html
    websites/staging/myfaces/trunk/content/wiki/core/faq.html
    websites/staging/myfaces/trunk/content/wiki/core/user-guide.html
    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/configuration-of-special-features.html
    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/elresolver-ordering.html
    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/getting-started.html
    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/myfaces-archetypes-for-maven.html
    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/jsf-and-myfaces-core-concepts.html
    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-jsf-state-management-works.html
    websites/staging/myfaces/trunk/content/wiki/core/user-guide/jsf-and-myfaces-core-concepts/how-the-immediate-attribute-works.html
    websites/staging/myfaces/trunk/content/wiki/core/user-guide/jsf-and-myfaces-core-concepts/jsf-and-mvc.html
    websites/staging/myfaces/trunk/content/wiki/core/user-guide/jsf-and-myfaces-core-concepts/studying-how-myfaces-core-works.html
    websites/staging/myfaces/trunk/content/wiki/core/user-guide/jsf-and-myfaces-howtos/backend.html
    websites/staging/myfaces/trunk/content/wiki/core/user-guide/jsf-and-myfaces-howtos/backend/access-facescontext-from-servlet.html
    websites/staging/myfaces/trunk/content/wiki/core/user-guide/jsf-and-myfaces-howtos/backend/accessing-one-managed-bean-from-another.html
    websites/staging/myfaces/trunk/content/wiki/core/user-guide/jsf-and-myfaces-howtos/backend/clear-input-components.html
    websites/staging/myfaces/trunk/content/wiki/core/user-guide/jsf-and-myfaces-howtos/backend/resulting-nested-facescontext.html
    websites/staging/myfaces/trunk/content/wiki/core/user-guide/jsf-and-myfaces-howtos/composite-components.html
    websites/staging/myfaces/trunk/content/wiki/core/user-guide/jsf-and-myfaces-howtos/composite-components/create-a-non-namingcontainer-composite-component.html
    websites/staging/myfaces/trunk/content/wiki/core/user-guide/jsf-and-myfaces-howtos/managing-errors---infos---warnings.html
    websites/staging/myfaces/trunk/content/wiki/core/user-guide/jsf-and-myfaces-howtos/managing-errors---infos---warnings/displaying-errors---infos---warnings-in-jsf-pages.html
    websites/staging/myfaces/trunk/content/wiki/core/user-guide/jsf-and-myfaces-howtos/managing-errors---infos---warnings/handling-server-errors.html
    websites/staging/myfaces/trunk/content/wiki/core/user-guide/jsf-and-myfaces-howtos/working-with-tables.html
    websites/staging/myfaces/trunk/content/wiki/core/user-guide/jsf-and-myfaces-howtos/working-with-tables/executing-methods-from-link-or-button-inside-a-table.html
    websites/staging/myfaces/trunk/content/wiki/core/user-guide/jsf-and-myfaces-howtos/working-with-tables/get-row-data-from-an-actionlistener.html
    websites/staging/myfaces/trunk/content/wiki/core/user-guide/migration-guide.html
    websites/staging/myfaces/trunk/content/wiki/core/user-guide/migration-guide/from-1.2-to-2.0---2.1.html
    websites/staging/myfaces/trunk/content/wiki/core/user-guide/working-with-myfaces-core-integration-tests.html

Propchange: websites/staging/myfaces/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue Feb  4 03:41:48 2014
@@ -1 +1 @@
-1564167
+1564179

Modified: websites/staging/myfaces/trunk/content/wiki/core/committer-and-pmc-guide.html
==============================================================================
--- websites/staging/myfaces/trunk/content/wiki/core/committer-and-pmc-guide.html (original)
+++ websites/staging/myfaces/trunk/content/wiki/core/committer-and-pmc-guide.html Tue Feb  4 03:41:48 2014
@@ -86,13 +86,10 @@
       <div>
       <p><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/wiki/">Wiki</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/">Core</a></p>
       <h2>MyFaces Committer and PMC Guide</h2>
-      <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>Here you can find information about how to work with MyFaces Core code,
-and other administrative information of MyFaces project.</p></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 id="content" class="grid_16"><div class="section-content"><p>Here you can find information about how to work with MyFaces Core code,
+and other administrative information of MyFaces project.</p>
+
+<p><ac:macro ac:name="children" /></p></div></div>
       </div>
     </div>
     <div class="clear"></div>

Modified: websites/staging/myfaces/trunk/content/wiki/core/committer-and-pmc-guide/myfaces-developer-notes.html
==============================================================================
--- websites/staging/myfaces/trunk/content/wiki/core/committer-and-pmc-guide/myfaces-developer-notes.html (original)
+++ websites/staging/myfaces/trunk/content/wiki/core/committer-and-pmc-guide/myfaces-developer-notes.html Tue Feb  4 03:41:48 2014
@@ -86,10 +86,9 @@
       <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/committer-and-pmc-guide.html">MyFaces Committer and PMC Guide</a></p>
       <h2>MyFaces Developer Notes</h2>
-      <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>This document deals with issues that are important for MyFaces
-developers and custom component developers.</p></p>
+      <div id="content" class="grid_16"><div class="section-content"><p>This document deals with issues that are important for MyFaces
+developers and custom component developers.</p>
+
 <h3>Component developer guidelines</h3>
 
 <p>(same as &quot;SVN guidelines&quot;, see below)</p>
@@ -235,10 +234,7 @@ page</a>.</p>
 <h5>Closing issues</h5>
 
 <p>Issues should be marked as closed at the same time that an issue is
-marked as resolved.</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>
+marked as resolved.</p></div></div>
       </div>
     </div>
     <div class="clear"></div>

Modified: websites/staging/myfaces/trunk/content/wiki/core/committer-and-pmc-guide/myfaces-project-management.html
==============================================================================
--- websites/staging/myfaces/trunk/content/wiki/core/committer-and-pmc-guide/myfaces-project-management.html (original)
+++ websites/staging/myfaces/trunk/content/wiki/core/committer-and-pmc-guide/myfaces-project-management.html Tue Feb  4 03:41:48 2014
@@ -86,13 +86,10 @@
       <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/committer-and-pmc-guide.html">MyFaces Committer and PMC Guide</a></p>
       <h2>MyFaces Project Management</h2>
-      <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>Here you will find all information related management of MyFaces project
-and community tasks.</p></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 id="content" class="grid_16"><div class="section-content"><p>Here you will find all information related management of MyFaces project
+and community tasks.</p>
+
+<p><ac:macro ac:name="children" /></p></div></div>
       </div>
     </div>
     <div class="clear"></div>

Modified: websites/staging/myfaces/trunk/content/wiki/core/committer-and-pmc-guide/myfaces-project-management/deploying-project-website.html
==============================================================================
--- websites/staging/myfaces/trunk/content/wiki/core/committer-and-pmc-guide/myfaces-project-management/deploying-project-website.html (original)
+++ websites/staging/myfaces/trunk/content/wiki/core/committer-and-pmc-guide/myfaces-project-management/deploying-project-website.html Tue Feb  4 03:41:48 2014
@@ -86,10 +86,9 @@
       <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/committer-and-pmc-guide.html">MyFaces Committer and PMC Guide</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/committer-and-pmc-guide/myfaces-project-management.html">MyFaces Project Management</a></p>
       <h2>Deploying project website</h2>
-      <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 uses maven to deploy its website. To build and deploy a site for
-a project just run.</p></p>
+      <div id="content" class="grid_16"><div class="section-content"><p>MyFaces uses maven to deploy its website. To build and deploy a site for
+a project just run.</p>
+
 <p><ac:macro ac:name="code"><ac:plain-text-body>&lt;![CDATA[
 mvn site
 mvn site:deploy
@@ -126,9 +125,7 @@ result, none of the inter-module links w
 ]
 ]&gt;</ac:plain-text-body></ac:macro>
 <p>which will assemble a complete site from the partial pieces present in
-the different modules.</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>
+the different modules.</p></p></div></div>
       </div>
     </div>
     <div class="clear"></div>

Modified: websites/staging/myfaces/trunk/content/wiki/core/committer-and-pmc-guide/myfaces-project-management/promote-sandbox-components.html
==============================================================================
--- websites/staging/myfaces/trunk/content/wiki/core/committer-and-pmc-guide/myfaces-project-management/promote-sandbox-components.html (original)
+++ websites/staging/myfaces/trunk/content/wiki/core/committer-and-pmc-guide/myfaces-project-management/promote-sandbox-components.html Tue Feb  4 03:41:48 2014
@@ -86,9 +86,8 @@
       <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/committer-and-pmc-guide.html">MyFaces Committer and PMC Guide</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/committer-and-pmc-guide/myfaces-project-management.html">MyFaces Project Management</a></p>
       <h2>Promote Sandbox Components</h2>
-      <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>Requirements for a sandbox promotion</h2></p>
+      <div id="content" class="grid_16"><div class="section-content"><h2>Requirements for a sandbox promotion</h2>
+
 <ul>
     <li>Component is documented by JavaDoc (general class description
 plus javadoc for each method)</li>
@@ -112,10 +111,7 @@ in myfaces land.</li>
 src\main\resources\licenses and sandbox
 src\main\resources\licenses\NOTICE.txt file to tomahawk, myfaces commons or
 other project in myfaces land.</li>
-</ul>
-
-<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>
+</ul></div></div>
       </div>
     </div>
     <div class="clear"></div>

Modified: websites/staging/myfaces/trunk/content/wiki/core/committer-and-pmc-guide/myfaces-project-management/release-a-myfaces-project.html
==============================================================================
--- websites/staging/myfaces/trunk/content/wiki/core/committer-and-pmc-guide/myfaces-project-management/release-a-myfaces-project.html (original)
+++ websites/staging/myfaces/trunk/content/wiki/core/committer-and-pmc-guide/myfaces-project-management/release-a-myfaces-project.html Tue Feb  4 03:41:48 2014
@@ -86,9 +86,8 @@
       <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/committer-and-pmc-guide.html">MyFaces Committer and PMC Guide</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/committer-and-pmc-guide/myfaces-project-management.html">MyFaces Project Management</a></p>
       <h2>Release a MyFaces Project</h2>
-      <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>Release a MyFaces Project</h2></p>
+      <div id="content" class="grid_16"><div class="section-content"><h2>Release a MyFaces Project</h2>
+
 <p>All MyFaces projects are now released using Nexus. Just follow the guide
 on:</p>
 
@@ -121,10 +120,7 @@ href="http://wiki.apache.org/myfaces/Bui
 href="http://wiki.apache.org/myfaces/ReleaseHowTo">http://wiki.apache.org/myfaces/ReleaseHowTo</a></li>
     <li><a
 href="http://wiki.apache.org/myfaces/Release_Procedure">http://wiki.apache.org/myfaces/Release_Procedure</a></li>
-</ul>
-
-<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>
+</ul></div></div>
       </div>
     </div>
     <div class="clear"></div>

Modified: websites/staging/myfaces/trunk/content/wiki/core/committer-and-pmc-guide/myfaces-project-management/voting-on-a-myfaces-project-release.html
==============================================================================
--- websites/staging/myfaces/trunk/content/wiki/core/committer-and-pmc-guide/myfaces-project-management/voting-on-a-myfaces-project-release.html (original)
+++ websites/staging/myfaces/trunk/content/wiki/core/committer-and-pmc-guide/myfaces-project-management/voting-on-a-myfaces-project-release.html Tue Feb  4 03:41:48 2014
@@ -86,9 +86,8 @@
       <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/committer-and-pmc-guide.html">MyFaces Committer and PMC Guide</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/committer-and-pmc-guide/myfaces-project-management.html">MyFaces Project Management</a></p>
       <h2>Voting on a MyFaces Project Release</h2>
-      <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>Voting on a MyFaces Project Release</h2></p>
+      <div id="content" class="grid_16"><div class="section-content"><h2>Voting on a MyFaces Project Release</h2>
+
 <p>An Apache release is a set of valid and signed artifacts, voted on by
 the appropriate PMC and distributed on the ASF's official release
 infrastructure.  All voters for a release must verify these items:</p>

Modified: websites/staging/myfaces/trunk/content/wiki/core/committer-and-pmc-guide/new-committers.html
==============================================================================
--- websites/staging/myfaces/trunk/content/wiki/core/committer-and-pmc-guide/new-committers.html (original)
+++ websites/staging/myfaces/trunk/content/wiki/core/committer-and-pmc-guide/new-committers.html Tue Feb  4 03:41:48 2014
@@ -86,9 +86,8 @@
       <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/committer-and-pmc-guide.html">MyFaces Committer and PMC Guide</a></p>
       <h2>New Committers</h2>
-      <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>New Committers</h2></p>
+      <div id="content" class="grid_16"><div class="section-content"><h2>New Committers</h2>
+
 <p>Congratulations!  You have reached committer status. This page will help
 you to get up and started.</p>
 
@@ -160,10 +159,7 @@ href="http://www.apache.org/dev/version-
 the svn access</li>
     <li><a href="http://subversion.apache.org">Subversion</a> main
 page</li>
-</ul>
-
-<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>
+</ul></div></div>
       </div>
     </div>
     <div class="clear"></div>

Modified: websites/staging/myfaces/trunk/content/wiki/core/faq.html
==============================================================================
--- websites/staging/myfaces/trunk/content/wiki/core/faq.html (original)
+++ websites/staging/myfaces/trunk/content/wiki/core/faq.html Tue Feb  4 03:41:48 2014
@@ -86,9 +86,8 @@
       <div>
       <p><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/wiki/">Wiki</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/">Core</a></p>
       <h2>FAQ</h2>
-      <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>
-<h1>Frequently Asked Questions</h1></p>
+      <div id="content" class="grid_16"><div class="section-content"><h1>Frequently Asked Questions</h1>
+
 <p>Note that in addition to this FAQ, there are a number of
 &quot;how-to&quot; guides on the <a
 href="https://cwiki.apache.org/confluence/display/MYFACES/Index">MyFaces
@@ -967,10 +966,7 @@ Object value)
 }
 ]
 ]&gt;</ac:plain-text-body></ac:macro></p>
-<p>Then just register this new component in the standard JSF way.</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>
+<p>Then just register this new component in the standard JSF way.</p></div></div>
       </div>
     </div>
     <div class="clear"></div>

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 Feb  4 03:41:48 2014
@@ -86,11 +86,10 @@
       <div>
       <p><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/wiki/">Wiki</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/">Core</a></p>
       <h2>MyFaces Core User Guide</h2>
-      <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
+      <div id="content" class="grid_16"><div class="section-content"><p>JavaServer&trade; Faces (JSF) is a web application framework
 specification (JSR314, JSR252, JSR127) based around the
-model-view-controller pattern. </p></p>
+model-view-controller pattern. </p>
+
 <p>The Apache MyFaces project provides both an implementation of the JSF
 specification (&quot;MyFaces Core&quot;), and a set of add-on libraries
 that work on any implementation of the specification (including, of course,
@@ -128,9 +127,7 @@ the well-known Struts framework, but has
 <p>Here you can find additional information about how to setup and work
 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>
+<p><ac:macro ac:name="children" /></p></div></div>
       </div>
     </div>
     <div class="clear"></div>

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 Feb  4 03:41:48 2014
@@ -86,9 +86,8 @@
       <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.html">MyFaces Core User Guide</a></p>
       <h2>Build MyFaces Core from source code using Maven</h2>
-      <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>
+      <div id="content" class="grid_16"><div class="section-content"><h2>Build MyFaces Core from source code using Maven</h2>
+
 <p>Myfaces is built using the Maven software project management tool. 
 Follow these instructions to build Myfaces from source on your machine.  If
 you just want a binary distribution, one can be downloaded from <a
@@ -199,10 +198,7 @@ ac:name="code"><ac:default-parameter>xml
 <h3>IDE support </h3>
 
 <p>See <a
-href="http://wiki.apache.org/myfaces/Building_MyFaces_in_your_IDE">Building_MyFaces_in_your_IDE</a>.</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>
+href="http://wiki.apache.org/myfaces/Building_MyFaces_in_your_IDE">Building_MyFaces_in_your_IDE</a>.</p></div></div>
       </div>
     </div>
     <div class="clear"></div>

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 Feb  4 03:41:48 2014
@@ -86,9 +86,7 @@
       <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.html">MyFaces Core User Guide</a></p>
       <h2>Configuration of special features</h2>
-      <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
+      <div id="content" class="grid_16"><div class="section-content"><p>Here you can find additional information about how to configure special
 features available on MyFaces core project.</p>
 
 <p><ac:macro ac:name="children"><ac:parameter
@@ -103,10 +101,7 @@ href="http://myfaces.apache.org/core21/m
     <li><a
 href="http://myfaces.apache.org/core20/myfaces-impl/webconfig.html">Core
 2.0 Web Context Parameters</a></li>
-</ul>
-
-<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>
+</ul></div></div>
       </div>
     </div>
     <div class="clear"></div>

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 Feb  4 03:41:48 2014
@@ -86,13 +86,12 @@
       <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.html">MyFaces Core User Guide</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/user-guide/configuration-of-special-features.html">Configuration of special features</a></p>
       <h2>Cache EL Expressions</h2>
-      <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
+      <div id="content" class="grid_16"><div class="section-content"><p>Since MyFaces Core 2.0.8 / 2.1.2, a new optimization was added to
 prevent create EL Expressions unnecessary. Each time a page is build,
 facelets compiler create all EL expressions, and then evaluate them, so
 with this special configuration, you can reduce the time and memory
-resources required to build a view. Just add this to your web.xml file:</p></p>
+resources required to build a view. Just add this to your web.xml file:</p>
+
 <p><ac:macro
 ac:name="code"><ac:default-parameter>xml</ac:default-parameter><ac:plain-text-body>&lt;![CDATA[
       <context-param>
@@ -186,10 +185,7 @@ ui:param) will prevent cache inner EL ex
 the view is build.</p>
 
 <p>Related issue <a
-href="https://issues.apache.org/jira/browse/MYFACES-3160">MYFACES-3160</a></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>
+href="https://issues.apache.org/jira/browse/MYFACES-3160">MYFACES-3160</a></p></div></div>
       </div>
     </div>
     <div class="clear"></div>

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 Feb  4 03:41:48 2014
@@ -86,10 +86,9 @@
       <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.html">MyFaces Core User Guide</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/user-guide/configuration-of-special-features.html">Configuration of special features</a></p>
       <h2>ELResolver ordering</h2>
-      <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
-predefined order or ELResolvers.</p></p>
+      <div id="content" class="grid_16"><div class="section-content"><p>As with MyFaces core 2.0.2 (or 1.2.10) it is possible to change the
+predefined order or ELResolvers.</p>
+
 <h3>Standard order defined in the JSF 2.0 spec</h3>
 
 <ol>
@@ -167,10 +166,7 @@ evaluations.</p>
 <h5>Links</h5>
 
 <p>Related issue in the JIRA: <a
-href="https://issues.apache.org/jira/browse/MYFACES-2873">MYFACES-2873</a></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>
+href="https://issues.apache.org/jira/browse/MYFACES-2873">MYFACES-2873</a></p></div></div>
       </div>
     </div>
     <div class="clear"></div>

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 Feb  4 03:41:48 2014
@@ -86,15 +86,14 @@
       <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.html">MyFaces Core User Guide</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/user-guide/configuration-of-special-features.html">Configuration of special features</a></p>
       <h2>Integration with application and web servers</h2>
-      <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
+      <div id="content" class="grid_16"><div class="section-content"><p>MyFaces core provides some &quot;points of integration&quot; that can be
 used by application and web servers to override or add some specific code.
 For example, JBoss AS provides a custom <a
 href="http://docs.jboss.org/jbossmc/docs/2.0.x/userGuide/ch20.html">virtual
 file system (VFS)</a>, and MyFaces core needs to scan for faces-config.xml
 files, so it is necessary to provide some code that uses JBoss VFS to
-locate faces-config.xml files to be parsed later.</p></p>
+locate faces-config.xml files to be parsed later.</p>
+
 <p>Note usually common users of MyFaces Core does not need to deal with
 these specific stuff, because the application/web server could already
 provide the necessary hooks or integration modules &quot;out of the
@@ -266,10 +265,7 @@ class="atl-forced-newline" /> </p></td>
 </tbody></table>
 
 <p>For more detailed information, take a look at the javadoc of each class
-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>
+on myfaces site.</p></div></div>
       </div>
     </div>
     <div class="clear"></div>

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 Feb  4 03:41:48 2014
@@ -86,9 +86,7 @@
       <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.html">MyFaces Core User Guide</a></p>
       <h2>Getting Started</h2>
-      <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>,
+      <div id="content" class="grid_16"><div class="section-content"><p>All MyFaces projects use <a href="http://maven.apache.org">Maven</a>,
 that is software project management and comprehension tool. In few words,
 it helps you to build your project, handle related project libraries and
 generate reports about the project itself.</p>
@@ -113,9 +111,7 @@ Started in 30 Minutes</a></li>
 
 <h3>Contents</h3>
 
-<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>
+<p><ac:macro ac:name="children" /></p></div></div>
       </div>
     </div>
     <div class="clear"></div>

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 Feb  4 03:41:48 2014
@@ -86,11 +86,10 @@
       <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.html">MyFaces Core User Guide</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/user-guide/getting-started.html">Getting Started</a></p>
       <h2>Configuring MyFaces</h2>
-      <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
+      <div id="content" class="grid_16"><div class="section-content"><h6><em>Thanks to Bart Kummel for providing this text from his book <a
 href="http://www.packtpub.com/apache-myfaces-1-2-web-application-development/book/mid/25011044nqxl?utm_source=bartkummel.net&amp;utm_medium=affiliate&amp;utm_content=blog&amp;utm_campaign=mdb_002220">Apache
-MyFaces 1.2 Web Application Development</a></em></h6></p>
+MyFaces 1.2 Web Application Development</a></em></h6>
+
 <p>There are two important configuration files for a JSF application&mdash;
 <code>web.xml</code> and <code>faces-config.xml</code>. We will discuss the
 basics of both of them.</p>
@@ -231,10 +230,7 @@ Server 8.1 Servlet 2.4//EN"</p>
 <p>This disables the default implementation and forces GlassFish to use
 MyFaces Core instead. Of course, we have to make sure that the MyFaces Core
 libraries are added properly to our application and configured correctly,
-as described in the previous sections.</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>
+as described in the previous sections.</p></div></div>
       </div>
     </div>
     <div class="clear"></div>

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 Feb  4 03:41:48 2014
@@ -86,9 +86,7 @@
       <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.html">MyFaces Core User Guide</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/user-guide/getting-started.html">Getting Started</a></p>
       <h2>MyFaces Archetypes for Maven</h2>
-      <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>
+      <div id="content" class="grid_16"><div class="section-content"><h2>MyFaces Maven archetypes </h2>
 
 <p>The MyFaces Maven archetypes project provides a number of <a
 href="http://maven.apache.org/guides/introduction/introduction-to-archetypes.html">Maven
@@ -397,10 +395,7 @@ developers.</p>
 <p>For more information on this archetype and how you can use it you can
 refer to <a
 href="http://brunoaranda.googlepages.com/jsfcomponentsarchetype2">this
-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>
+tutorial</a>.</p></div></div>
       </div>
     </div>
     <div class="clear"></div>

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 Feb  4 03:41:48 2014
@@ -86,9 +86,8 @@
       <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.html">MyFaces Core User Guide</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/user-guide/getting-started.html">Getting Started</a></p>
       <h2>Using MyFaces in a project built with Maven</h2>
-      <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>
+      <div id="content" class="grid_16"><div class="section-content"><h2>Using MyFaces in a project built with Maven</h2>
+
 <p>MyFaces can easily be added to a project built with Maven.  The
 instruction below should work with version MyFaces 1.1.2+ and Maven 2.0.4+
 <a
@@ -158,10 +157,7 @@ WEB-INF/lib and copy resources into WEB-
 
 <p>For more information on Maven see <a class="external-link"
 href="http://maven.apache.org"
-rel="nofollow">http://maven.apache.org</a></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>
+rel="nofollow">http://maven.apache.org</a></p></div></div>
       </div>
     </div>
     <div class="clear"></div>

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 Feb  4 03:41:48 2014
@@ -86,13 +86,10 @@
       <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.html">MyFaces Core User Guide</a></p>
       <h2>JSF and MyFaces Core Concepts</h2>
-      <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
-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 id="content" class="grid_16"><div class="section-content"><p>Below you can find some useful concepts in JSF and MyFaces that are
+important to understand.</p>
+
+<p><ac:macro ac:name="children" /></p></div></div>
       </div>
     </div>
     <div class="clear"></div>

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 Feb  4 03:41:48 2014
@@ -86,9 +86,8 @@
       <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.html">MyFaces Core User Guide</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/user-guide/jsf-and-myfaces-core-concepts.html">JSF and MyFaces Core Concepts</a></p>
       <h2>How Component Child Rendering Works</h2>
-      <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>
+      <div id="content" class="grid_16"><div class="section-content"><h2>How Component Child Rendering Works</h2>
+
 <p>Any &quot;container&quot; or &quot;layout&quot; component is going to
 need to manage the way in which its children are rendered as well as decide
 whether they will be rendered.  As a simple example, consider the standard
@@ -107,10 +106,7 @@ out its decorations, then notify the chi
  The child components, in turn, will decide whether to manage their own
 children, in a recursive process going down the tree.</p>
 
-<p><em>(Paraphrased from a message by Craig McClanahan)</em></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>
+<p><em>(Paraphrased from a message by Craig McClanahan)</em></p></div></div>
       </div>
     </div>
     <div class="clear"></div>

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 Feb  4 03:41:48 2014
@@ -86,9 +86,8 @@
       <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.html">MyFaces Core User Guide</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/user-guide/jsf-and-myfaces-core-concepts.html">JSF and MyFaces Core Concepts</a></p>
       <h2>How JSF State Management works</h2>
-      <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>
+      <div id="content" class="grid_16"><div class="section-content"><h2>How JSF State Management Works</h2>
+
 <h3>Overview</h3>
 
 <p><strong>StateManager</strong> manages state, but you, as an end-user,
@@ -123,10 +122,7 @@ you could implement a strategy that allo
 <p>Another alternative to handling backtracking is to use client-side state
 saving and avoid the use of session-scoped data.   This also requires
 resyncing any other persisting backing stores (i.e. databases) when the
-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>
+page is reloaded.</p></div></div>
       </div>
     </div>
     <div class="clear"></div>

Modified: websites/staging/myfaces/trunk/content/wiki/core/user-guide/jsf-and-myfaces-core-concepts/how-the-immediate-attribute-works.html
==============================================================================
--- websites/staging/myfaces/trunk/content/wiki/core/user-guide/jsf-and-myfaces-core-concepts/how-the-immediate-attribute-works.html (original)
+++ websites/staging/myfaces/trunk/content/wiki/core/user-guide/jsf-and-myfaces-core-concepts/how-the-immediate-attribute-works.html Tue Feb  4 03:41:48 2014
@@ -86,9 +86,8 @@
       <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.html">MyFaces Core User Guide</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/user-guide/jsf-and-myfaces-core-concepts.html">JSF and MyFaces Core Concepts</a></p>
       <h2>How the immediate attribute works</h2>
-      <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>
-<h3>Purpose</h3></p>
+      <div id="content" class="grid_16"><div class="section-content"><h3>Purpose</h3>
+
 <p>The immediate attribute can be used to achieve the following
 effects:</p>
 
@@ -327,10 +326,7 @@ submitted value, not the backing bean or
 
 <p>Since only one group of components can be marked as immediate, you
 cannot have multiple kinds of immediate actions that depend on different
-component sets.</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>
+component sets.</p></div></div>
       </div>
     </div>
     <div class="clear"></div>

Modified: websites/staging/myfaces/trunk/content/wiki/core/user-guide/jsf-and-myfaces-core-concepts/jsf-and-mvc.html
==============================================================================
--- websites/staging/myfaces/trunk/content/wiki/core/user-guide/jsf-and-myfaces-core-concepts/jsf-and-mvc.html (original)
+++ websites/staging/myfaces/trunk/content/wiki/core/user-guide/jsf-and-myfaces-core-concepts/jsf-and-mvc.html Tue Feb  4 03:41:48 2014
@@ -86,12 +86,11 @@
       <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.html">MyFaces Core User Guide</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/user-guide/jsf-and-myfaces-core-concepts.html">JSF and MyFaces Core Concepts</a></p>
       <h2>JSF and MVC</h2>
-      <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>Over the last decade or so, the development of applications with
+      <div id="content" class="grid_16"><div class="section-content"><p>Over the last decade or so, the development of applications with
 graphical user interfaces has pretty much standardised. Whether you are
 developing with Gnome, KDE, MFC, VisualBasic, Delphi, or any similar
-library the process is the same:</p></p>
+library the process is the same:</p>
+
 <ul>
     <li>a tree of widgets is built, either by code or by loading a
 configuration file</li>
@@ -178,10 +177,7 @@ still a reasonably young technology and 
 partly it is due to the fact that JSF is optimized for very interactive
 applications; it can do things that are extremely complex to do with other
 approaches, but does not always perform quite as elegantly in the simpler
-cases.</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>
+cases.</p></div></div>
       </div>
     </div>
     <div class="clear"></div>

Modified: websites/staging/myfaces/trunk/content/wiki/core/user-guide/jsf-and-myfaces-core-concepts/studying-how-myfaces-core-works.html
==============================================================================
--- websites/staging/myfaces/trunk/content/wiki/core/user-guide/jsf-and-myfaces-core-concepts/studying-how-myfaces-core-works.html (original)
+++ websites/staging/myfaces/trunk/content/wiki/core/user-guide/jsf-and-myfaces-core-concepts/studying-how-myfaces-core-works.html Tue Feb  4 03:41:48 2014
@@ -86,10 +86,9 @@
       <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.html">MyFaces Core User Guide</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/user-guide/jsf-and-myfaces-core-concepts.html">JSF and MyFaces Core Concepts</a></p>
       <h2>Studying how MyFaces Core works</h2>
-      <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>When learning JSF, there's nothing quite like looking at a real
-implementation.</p></p>
+      <div id="content" class="grid_16"><div class="section-content"><p>When learning JSF, there's nothing quite like looking at a real
+implementation.</p>
+
 <p>Here's a suggested list of classes/methods to look at when trying to get
 to grips with how JSF and MyFaces actually works, together with a brief
 description of the typical behaviour of interesting methods.</p>
@@ -236,9 +235,7 @@ data starts in a form, is loaded into a 
 component, is converted to a local value field on the component, and is
 copied into the backing bean.   Many conditions affect the outcome of this
 process, such as rendered state, required state, immediate state,
-conversion errors, and validation errors.
-<ac:macro ac:name="unmigrated-inline-wiki-markup"><ac:plain-text-body><![CDATA[{scrollbar}](cdata[{scrollbar}.html)
-]></ac:plain-text-body></ac:macro></li>
+conversion errors, and validation errors.</li>
 </ul></div></div>
       </div>
     </div>

Modified: websites/staging/myfaces/trunk/content/wiki/core/user-guide/jsf-and-myfaces-howtos/backend.html
==============================================================================
--- websites/staging/myfaces/trunk/content/wiki/core/user-guide/jsf-and-myfaces-howtos/backend.html (original)
+++ websites/staging/myfaces/trunk/content/wiki/core/user-guide/jsf-and-myfaces-howtos/backend.html Tue Feb  4 03:41:48 2014
@@ -86,12 +86,8 @@
       <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.html">MyFaces Core User Guide</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/user-guide/jsf-and-myfaces-howtos/">Jsf-and-myfaces-howtos</a></p>
       <h2>Backend</h2>
-      <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><ac:macro ac:name="children"><ac:parameter
-ac:name="all">true</ac:parameter></ac:macro></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 id="content" class="grid_16"><div class="section-content"><p><ac:macro ac:name="children"><ac:parameter
+ac:name="all">true</ac:parameter></ac:macro></p></div></div>
       </div>
     </div>
     <div class="clear"></div>

Modified: websites/staging/myfaces/trunk/content/wiki/core/user-guide/jsf-and-myfaces-howtos/backend/access-facescontext-from-servlet.html
==============================================================================
--- websites/staging/myfaces/trunk/content/wiki/core/user-guide/jsf-and-myfaces-howtos/backend/access-facescontext-from-servlet.html (original)
+++ websites/staging/myfaces/trunk/content/wiki/core/user-guide/jsf-and-myfaces-howtos/backend/access-facescontext-from-servlet.html Tue Feb  4 03:41:48 2014
@@ -86,9 +86,7 @@
       <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.html">MyFaces Core User Guide</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/user-guide/jsf-and-myfaces-howtos/">Jsf-and-myfaces-howtos</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/user-guide/jsf-and-myfaces-howtos/backend.html">Backend</a></p>
       <h2>Access FacesContext From Servlet</h2>
-      <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>
-<ac:macro ac:name="info"><ac:rich-text-body>
+      <div id="content" class="grid_16"><div class="section-content"><p><ac:macro ac:name="info"><ac:rich-text-body>
 <p>In JSF 2.0 or later it is better to create a custom ResourceHandler
 wrapper and use FacesServlet instead. In that way, JSF will create
 FacesContext instance.</p></ac:rich-text-body></ac:macro></p>
@@ -230,10 +228,7 @@ should call that after calling .release(
 more importantly, there are probably good reasons for <span
 style="text-decoration: underline;">not doing this at all</span> and
 changing to Phase Listeners and staying within the JSF framework which I
-think is an important topic for continued discussion.</em></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>
+think is an important topic for continued discussion.</em></p></div></div>
       </div>
     </div>
     <div class="clear"></div>

Modified: websites/staging/myfaces/trunk/content/wiki/core/user-guide/jsf-and-myfaces-howtos/backend/accessing-one-managed-bean-from-another.html
==============================================================================
--- websites/staging/myfaces/trunk/content/wiki/core/user-guide/jsf-and-myfaces-howtos/backend/accessing-one-managed-bean-from-another.html (original)
+++ websites/staging/myfaces/trunk/content/wiki/core/user-guide/jsf-and-myfaces-howtos/backend/accessing-one-managed-bean-from-another.html Tue Feb  4 03:41:48 2014
@@ -86,9 +86,8 @@
       <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.html">MyFaces Core User Guide</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/user-guide/jsf-and-myfaces-howtos/">Jsf-and-myfaces-howtos</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/user-guide/jsf-and-myfaces-howtos/backend.html">Backend</a></p>
       <h2>Accessing one managed bean from another</h2>
-      <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 can I access one Managed Bean from another?</h2></p>
+      <div id="content" class="grid_16"><div class="section-content"><h2>How can I access one Managed Bean from another?</h2>
+
 <p>There are two ways for one managed bean to access another managed bean
 in the same webapp:</p>
 
@@ -190,8 +189,6 @@ NeededBean neededBean
     = (NeededBean)facesContext.getApplication()
       .createValueBinding("#{neededBean}").getValue(facesContext);
 ]
-]&gt;</ac:plain-text-body></ac:macro>
-<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>
     </div>

Modified: websites/staging/myfaces/trunk/content/wiki/core/user-guide/jsf-and-myfaces-howtos/backend/clear-input-components.html
==============================================================================
--- websites/staging/myfaces/trunk/content/wiki/core/user-guide/jsf-and-myfaces-howtos/backend/clear-input-components.html (original)
+++ websites/staging/myfaces/trunk/content/wiki/core/user-guide/jsf-and-myfaces-howtos/backend/clear-input-components.html Tue Feb  4 03:41:48 2014
@@ -86,9 +86,8 @@
       <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.html">MyFaces Core User Guide</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/user-guide/jsf-and-myfaces-howtos/">Jsf-and-myfaces-howtos</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/user-guide/jsf-and-myfaces-howtos/backend.html">Backend</a></p>
       <h2>Clear Input Components</h2>
-      <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>Problem Description</h2></p>
+      <div id="content" class="grid_16"><div class="section-content"><h2>Problem Description</h2>
+
 <p>Sometimes you want to provide a command component (eg a link or button)
 that performs some server action, and renders the same page but with
 completely &quot;fresh&quot; values for all components.</p>
@@ -242,10 +241,7 @@ and rendered, rather than re-rendering t
 <p>It's not currently clear whether this behaviour is required by the spec,
 or is implementation-specific (ie, only works in MyFaces). If you find
 something in the spec about this, please also update this page with that
-information.</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>
+information.</p></div></div>
       </div>
     </div>
     <div class="clear"></div>

Modified: websites/staging/myfaces/trunk/content/wiki/core/user-guide/jsf-and-myfaces-howtos/backend/resulting-nested-facescontext.html
==============================================================================
--- websites/staging/myfaces/trunk/content/wiki/core/user-guide/jsf-and-myfaces-howtos/backend/resulting-nested-facescontext.html (original)
+++ websites/staging/myfaces/trunk/content/wiki/core/user-guide/jsf-and-myfaces-howtos/backend/resulting-nested-facescontext.html Tue Feb  4 03:41:48 2014
@@ -86,9 +86,7 @@
       <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.html">MyFaces Core User Guide</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/user-guide/jsf-and-myfaces-howtos/">Jsf-and-myfaces-howtos</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/user-guide/jsf-and-myfaces-howtos/backend.html">Backend</a></p>
       <h2>Resulting Nested FacesContext</h2>
-      <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>
-<ac:macro ac:name="info"><ac:rich-text-body>
+      <div id="content" class="grid_16"><div class="section-content"><p><ac:macro ac:name="info"><ac:rich-text-body>
 <p>In JSF 2.0 or later it is better to create a custom ResourceHandler
 wrapper and use FacesServlet instead. In that way, JSF will create
 FacesContext instance.</p></ac:rich-text-body></ac:macro></p>
@@ -237,10 +235,7 @@ previousContext.getMessages(clientId);
 on newContext.release(). One can enhance it. For me it was sufficient that
 way as after the JSF request there is nothing further I will do with the
 FacesContext ... and the problem might be, that then one might copy some
-state back ... too complicated.</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>
+state back ... too complicated.</p></div></div>
       </div>
     </div>
     <div class="clear"></div>

Modified: websites/staging/myfaces/trunk/content/wiki/core/user-guide/jsf-and-myfaces-howtos/composite-components.html
==============================================================================
--- websites/staging/myfaces/trunk/content/wiki/core/user-guide/jsf-and-myfaces-howtos/composite-components.html (original)
+++ websites/staging/myfaces/trunk/content/wiki/core/user-guide/jsf-and-myfaces-howtos/composite-components.html Tue Feb  4 03:41:48 2014
@@ -86,12 +86,8 @@
       <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.html">MyFaces Core User Guide</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/user-guide/jsf-and-myfaces-howtos/">Jsf-and-myfaces-howtos</a></p>
       <h2>Composite Components</h2>
-      <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><ac:macro ac:name="children"><ac:parameter
-ac:name="all">true</ac:parameter></ac:macro></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 id="content" class="grid_16"><div class="section-content"><p><ac:macro ac:name="children"><ac:parameter
+ac:name="all">true</ac:parameter></ac:macro></p></div></div>
       </div>
     </div>
     <div class="clear"></div>

Modified: websites/staging/myfaces/trunk/content/wiki/core/user-guide/jsf-and-myfaces-howtos/composite-components/create-a-non-namingcontainer-composite-component.html
==============================================================================
--- websites/staging/myfaces/trunk/content/wiki/core/user-guide/jsf-and-myfaces-howtos/composite-components/create-a-non-namingcontainer-composite-component.html (original)
+++ websites/staging/myfaces/trunk/content/wiki/core/user-guide/jsf-and-myfaces-howtos/composite-components/create-a-non-namingcontainer-composite-component.html Tue Feb  4 03:41:48 2014
@@ -86,9 +86,7 @@
       <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.html">MyFaces Core User Guide</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/user-guide/jsf-and-myfaces-howtos/">Jsf-and-myfaces-howtos</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/user-guide/jsf-and-myfaces-howtos/composite-components.html">Composite Components</a></p>
       <h2>Create a non NamingContainer Composite Component</h2>
-      <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>In theory, a &quot;non explicit&quot; requeriment for a composite
+      <div id="content" class="grid_16"><div class="section-content"><p>In theory, a &quot;non explicit&quot; requeriment for a composite
 component class is it should implement NamingContainer interface. Note I
 said &quot;non explicit&quot;, because in practice there is nothing on JSF
 2.0 spec that enforces that.</p>
@@ -239,9 +237,7 @@ root component not to be a NamingContain
 <p><a
 href="http://java.net/projects/javaserverfaces-spec-public/lists/jsr344-experts/archive/2011-07/message/2">should
 really a composite component requires NamingContainer interface?</a> for
-more information.</p></ac:rich-text-body></ac:macro>
-    <ac:macro ac:name="unmigrated-inline-wiki-markup"><ac:plain-text-body>&lt;![CDATA[{scrollbar}]
-]&gt;</ac:plain-text-body></ac:macro></p></div></div>
+more information.</p></ac:rich-text-body></ac:macro></p></div></div>
       </div>
     </div>
     <div class="clear"></div>

Modified: websites/staging/myfaces/trunk/content/wiki/core/user-guide/jsf-and-myfaces-howtos/managing-errors---infos---warnings.html
==============================================================================
--- websites/staging/myfaces/trunk/content/wiki/core/user-guide/jsf-and-myfaces-howtos/managing-errors---infos---warnings.html (original)
+++ websites/staging/myfaces/trunk/content/wiki/core/user-guide/jsf-and-myfaces-howtos/managing-errors---infos---warnings.html Tue Feb  4 03:41:48 2014
@@ -86,12 +86,8 @@
       <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.html">MyFaces Core User Guide</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/user-guide/jsf-and-myfaces-howtos/">Jsf-and-myfaces-howtos</a></p>
       <h2>Managing Errors - Infos - Warnings</h2>
-      <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><ac:macro ac:name="children"><ac:parameter
-ac:name="all">true</ac:parameter></ac:macro></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 id="content" class="grid_16"><div class="section-content"><p><ac:macro ac:name="children"><ac:parameter
+ac:name="all">true</ac:parameter></ac:macro></p></div></div>
       </div>
     </div>
     <div class="clear"></div>

Modified: websites/staging/myfaces/trunk/content/wiki/core/user-guide/jsf-and-myfaces-howtos/managing-errors---infos---warnings/displaying-errors---infos---warnings-in-jsf-pages.html
==============================================================================
--- websites/staging/myfaces/trunk/content/wiki/core/user-guide/jsf-and-myfaces-howtos/managing-errors---infos---warnings/displaying-errors---infos---warnings-in-jsf-pages.html (original)
+++ websites/staging/myfaces/trunk/content/wiki/core/user-guide/jsf-and-myfaces-howtos/managing-errors---infos---warnings/displaying-errors---infos---warnings-in-jsf-pages.html Tue Feb  4 03:41:48 2014
@@ -86,12 +86,11 @@
       <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.html">MyFaces Core User Guide</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/user-guide/jsf-and-myfaces-howtos/">Jsf-and-myfaces-howtos</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/user-guide/jsf-and-myfaces-howtos/managing-errors---infos---warnings.html">Managing Errors - Infos - Warnings</a></p>
       <h2>Displaying Errors - Infos - Warnings in JSF pages</h2>
-      <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>One common question about JSF is how to manage messages of various
+      <div id="content" class="grid_16"><div class="section-content"><p>One common question about JSF is how to manage messages of various
 types, which are generated by JSF components and backing beans. This
 discussion is designed as an introduction to the topic and focused on entry
-to mid-level JSF users.</p></p>
+to mid-level JSF users.</p>
+
 <p>The pattern described here is just one approach that we developed which
 meets our needs for:</p>
 
@@ -359,8 +358,6 @@ ac:name="code"><ac:default-parameter>xml
     <jsp:directive.include file="PageMessages.jspf" />
 </f:subview>
 ]
-]&gt;</ac:plain-text-body></ac:macro>
-<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>
     </div>

Modified: websites/staging/myfaces/trunk/content/wiki/core/user-guide/jsf-and-myfaces-howtos/managing-errors---infos---warnings/handling-server-errors.html
==============================================================================
--- websites/staging/myfaces/trunk/content/wiki/core/user-guide/jsf-and-myfaces-howtos/managing-errors---infos---warnings/handling-server-errors.html (original)
+++ websites/staging/myfaces/trunk/content/wiki/core/user-guide/jsf-and-myfaces-howtos/managing-errors---infos---warnings/handling-server-errors.html Tue Feb  4 03:41:48 2014
@@ -86,9 +86,8 @@
       <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.html">MyFaces Core User Guide</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/user-guide/jsf-and-myfaces-howtos/">Jsf-and-myfaces-howtos</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/user-guide/jsf-and-myfaces-howtos/managing-errors---infos---warnings.html">Managing Errors - Infos - Warnings</a></p>
       <h2>Handling Server Errors</h2>
-      <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>Error handling for MyFaces Core 2.0 and later versions</h2></p>
+      <div id="content" class="grid_16"><div class="section-content"><h2>Error handling for MyFaces Core 2.0 and later versions</h2>
+
 <p>Since JSF 2.0, it is possible to provide a custom
 javax.faces.context.ExceptionHandler or
 javax.faces.context.ExceptionHandlerWrapper implementation to deal with
@@ -682,10 +681,7 @@ ac:name="code"><ac:default-parameter>xml
 ]
 ]&gt;</ac:plain-text-body></ac:macro></p>
 <p>This solution was tested under Apache Geronimo 2.1.3., but will probably
-be similar in other versions.</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>
+be similar in other versions.</p></div></div>
       </div>
     </div>
     <div class="clear"></div>

Modified: websites/staging/myfaces/trunk/content/wiki/core/user-guide/jsf-and-myfaces-howtos/working-with-tables.html
==============================================================================
--- websites/staging/myfaces/trunk/content/wiki/core/user-guide/jsf-and-myfaces-howtos/working-with-tables.html (original)
+++ websites/staging/myfaces/trunk/content/wiki/core/user-guide/jsf-and-myfaces-howtos/working-with-tables.html Tue Feb  4 03:41:48 2014
@@ -86,12 +86,8 @@
       <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.html">MyFaces Core User Guide</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/user-guide/jsf-and-myfaces-howtos/">Jsf-and-myfaces-howtos</a></p>
       <h2>Working with tables</h2>
-      <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><ac:macro ac:name="children"><ac:parameter
-ac:name="all">true</ac:parameter></ac:macro></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 id="content" class="grid_16"><div class="section-content"><p><ac:macro ac:name="children"><ac:parameter
+ac:name="all">true</ac:parameter></ac:macro></p></div></div>
       </div>
     </div>
     <div class="clear"></div>

Modified: websites/staging/myfaces/trunk/content/wiki/core/user-guide/jsf-and-myfaces-howtos/working-with-tables/executing-methods-from-link-or-button-inside-a-table.html
==============================================================================
--- websites/staging/myfaces/trunk/content/wiki/core/user-guide/jsf-and-myfaces-howtos/working-with-tables/executing-methods-from-link-or-button-inside-a-table.html (original)
+++ websites/staging/myfaces/trunk/content/wiki/core/user-guide/jsf-and-myfaces-howtos/working-with-tables/executing-methods-from-link-or-button-inside-a-table.html Tue Feb  4 03:41:48 2014
@@ -86,9 +86,8 @@
       <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.html">MyFaces Core User Guide</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/user-guide/jsf-and-myfaces-howtos/">Jsf-and-myfaces-howtos</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/user-guide/jsf-and-myfaces-howtos/working-with-tables.html">Working with tables</a></p>
       <h2>Executing methods from link or button inside a table</h2>
-      <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>
-<h3>Handling Command components within table columns</h3></p>
+      <div id="content" class="grid_16"><div class="section-content"><h3>Handling Command components within table columns</h3>
+
 <p>In a typical master/detail scenario, a table displays a Collection of
 objects. There is a command component (a link or button) in each table row
 that performs some operation on the object for that row (for example,
@@ -246,10 +245,7 @@ String employeeID = (String) map.get("id
 map to the appropriate object id yourself. Plus, you have extra lines of
 code just to get a handle to the map holding the parameters. Sure you can
 push that off to a utility class, but the above solutions are cleaner ways
-to handle this.</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>
+to handle this.</p></div></div>
       </div>
     </div>
     <div class="clear"></div>

Modified: websites/staging/myfaces/trunk/content/wiki/core/user-guide/jsf-and-myfaces-howtos/working-with-tables/get-row-data-from-an-actionlistener.html
==============================================================================
--- websites/staging/myfaces/trunk/content/wiki/core/user-guide/jsf-and-myfaces-howtos/working-with-tables/get-row-data-from-an-actionlistener.html (original)
+++ websites/staging/myfaces/trunk/content/wiki/core/user-guide/jsf-and-myfaces-howtos/working-with-tables/get-row-data-from-an-actionlistener.html Tue Feb  4 03:41:48 2014
@@ -86,9 +86,8 @@
       <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.html">MyFaces Core User Guide</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/user-guide/jsf-and-myfaces-howtos/">Jsf-and-myfaces-howtos</a>&nbsp;&raquo&nbsp;<a href="/wiki/core/user-guide/jsf-and-myfaces-howtos/working-with-tables.html">Working with tables</a></p>
       <h2>Get row data from an ActionListener</h2>
-      <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>Handling buttons or links in table rows</h2></p>
+      <div id="content" class="grid_16"><div class="section-content"><h2>Handling buttons or links in table rows</h2>
+
 <p>If you you have a command link or button in a row of a dataTable, there
 is an easy way to get to row bean from an <a
 href="http://java.sun.com/javaee/javaserverfaces/1.1_01/docs/api/javax/faces/event/ActionListener.html">javax.faces.event.ActionListener</a>.</p>
@@ -141,8 +140,6 @@ AbortProcessingException {</p>
 <p>}
 }
 ]
-]&gt;</ac:plain-text-body></ac:macro>
-<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>
     </div>

Modified: websites/staging/myfaces/trunk/content/wiki/core/user-guide/migration-guide.html
==============================================================================
--- websites/staging/myfaces/trunk/content/wiki/core/user-guide/migration-guide.html (original)
+++ websites/staging/myfaces/trunk/content/wiki/core/user-guide/migration-guide.html Tue Feb  4 03:41:48 2014
@@ -86,11 +86,7 @@
       <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.html">MyFaces Core User Guide</a></p>
       <h2>Migration Guide</h2>
-      <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><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 id="content" class="grid_16"><div class="section-content"><p><ac:macro ac:name="children" /></p></div></div>
       </div>
     </div>
     <div class="clear"></div>

Modified: websites/staging/myfaces/trunk/content/wiki/core/user-guide/migration-guide/from-1.2-to-2.0---2.1.html
==============================================================================
--- websites/staging/myfaces/trunk/content/wiki/core/user-guide/migration-guide/from-1.2-to-2.0---2.1.html (original)
+++ websites/staging/myfaces/trunk/content/wiki/core/user-guide/migration-guide/from-1.2-to-2.0---2.1.html Tue Feb  4 03:41:48 2014
@@ -135,22 +135,19 @@ information see JSF 2.1 spec Appendix A 
 element).</li>
 </ul>
 
-<p><ac:macro
-ac:name="code"><ac:default-parameter>xml</ac:default-parameter><ac:plain-text-body>&lt;![CDATA[
-<faces-config xmlns="http://java.sun.com/xml/ns/javaee" 
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
-          http://java.sun.com/xml/ns/javaee/web-facesconfig_2_1.xsd"
-          version="2.1">
-  <faces-config-extension>
-    <facelets-processing>
-      <file-extension>.jspx</file-extension>
-      <process-as>jspx</process-as>
-    </facelets-processing>
-  </faces-config-extension>
-</faces-config>
-]
-]&gt;</ac:plain-text-body></ac:macro></p></div></div>
+<div class="codehilite"><pre><span class="nt">&lt;faces-config</span> <span class="na">xmlns=</span><span class="s">&quot;http://java.sun.com/xml/ns/javaee&quot;</span> 
+          <span class="na">xmlns:xsi=</span><span class="s">&quot;http://www.w3.org/2001/XMLSchema-instance&quot;</span>
+          <span class="na">xsi:schemaLocation=</span><span class="s">&quot;http://java.sun.com/xml/ns/javaee</span>
+<span class="s">          http://java.sun.com/xml/ns/javaee/web-facesconfig_2_1.xsd&quot;</span>
+          <span class="na">version=</span><span class="s">&quot;2.1&quot;</span><span class="nt">&gt;</span>
+  <span class="nt">&lt;faces-config-extension&gt;</span>
+    <span class="nt">&lt;facelets-processing&gt;</span>
+      <span class="nt">&lt;file-extension&gt;</span>.jspx<span class="nt">&lt;/file-extension&gt;</span>
+      <span class="nt">&lt;process-as&gt;</span>jspx<span class="nt">&lt;/process-as&gt;</span>
+    <span class="nt">&lt;/facelets-processing&gt;</span>
+  <span class="nt">&lt;/faces-config-extension&gt;</span>
+<span class="nt">&lt;/faces-config&gt;</span>
+</pre></div></div></div>
       </div>
     </div>
     <div class="clear"></div>

Modified: websites/staging/myfaces/trunk/content/wiki/core/user-guide/working-with-myfaces-core-integration-tests.html
==============================================================================
--- websites/staging/myfaces/trunk/content/wiki/core/user-guide/working-with-myfaces-core-integration-tests.html (original)
+++ websites/staging/myfaces/trunk/content/wiki/core/user-guide/working-with-myfaces-core-integration-tests.html Tue Feb  4 03:41:48 2014
@@ -86,13 +86,12 @@
       <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.html">MyFaces Core User Guide</a></p>
       <h2>Working with MyFaces Core integration tests</h2>
-      <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 a submodule for running integration tests in
+      <div id="content" class="grid_16"><div class="section-content"><p>MyFaces core provides a submodule for running integration tests in
 various environments and configurations. The module can be found at
 core/integration-tests. The different submodules of the integration-test
 module include different configurations and environments (e.g. servlet 2.5
-and el 1.0 or servlet 3.0 and el 2.2).</p></p>
+and el 1.0 or servlet 3.0 and el 2.2).</p>
+
 <p>The MyFaces core integration tests use the cargo maven plugin to start
 and stop different containers and use HtmlUnit to write the test cases
 against the running container.</p>
@@ -130,10 +129,7 @@ mvn clean package cargo:run
 <h3>Creating a new integration-test submodule with a specific
 configuration</h3>
 
-<p>TODO</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>
+<p>TODO</p></div></div>
       </div>
     </div>
     <div class="clear"></div>



Mime
View raw message