Author: apetrelli
Date: Sun Dec 6 20:22:52 2009
New Revision: 887763
URL: http://svn.apache.org/viewvc?rev=887763&view=rev
Log:
TILES-488
Merged from trunk to sandbox.
Corrected link to TLDDoc and DTDDoc.
Modified:
tiles/sandbox/trunk/tiles3/ (props changed)
tiles/sandbox/trunk/tiles3/src/site/xdoc/index.xml
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/ (props changed)
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/tools.xml
(props changed)
Propchange: tiles/sandbox/trunk/tiles3/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Dec 6 20:22:52 2009
@@ -1 +1 @@
-/tiles/framework/trunk:829356,836356,880940,880948
+/tiles/framework/trunk:829356,836356,880940,880948,887758
Modified: tiles/sandbox/trunk/tiles3/src/site/xdoc/index.xml
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/src/site/xdoc/index.xml?rev=887763&r1=887762&r2=887763&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/src/site/xdoc/index.xml (original)
+++ tiles/sandbox/trunk/tiles3/src/site/xdoc/index.xml Sun Dec 6 20:22:52 2009
@@ -54,8 +54,8 @@
<li><a href="how-to/index.html">HOW-TOs</a></li>
<li><a href="config-reference.html">Configuration
Reference</a></li>
<li><a href="apidocs/index.html">Javadocs</a></li>
- <li><a href="tlddoc/index.html">Tag library documentation</a></li>
- <li><a href="dtddoc/index.html">Tiles definition file
documentation</a></li>
+ <li><a href="tiles-jsp/tlddoc/index.html">Tag library
documentation</a></li>
+ <li><a href="tiles-core/dtddoc/index.html">Tiles definition file
documentation</a></li>
<li><a href="http://cwiki.apache.org/TILES/";>Wiki</a></li>
</ul>
</subsection>
Propchange: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Dec 6 20:22:52 2009
@@ -1,3 +1,3 @@
-/tiles/framework/trunk/tiles-test-pom/tiles-test:829356,836356,880940,880948
+/tiles/framework/trunk/tiles-test-pom/tiles-test:829356,836356,880940,880948,887758
/tiles/sandbox/trunk/tiles-test:740289
/tiles/sandbox/trunk/tiles-test-sandbox:740290-745038,747727-751891
Propchange:
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/tools.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Dec 6 20:22:52 2009
@@ -1 +1 @@
-/tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/tools.xml:829356,836356,880940,880948
+/tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/tools.xml:829356,836356,880940,880948,887758
