Author: apetrelli
Date: Fri Mar 11 13:32:37 2011
New Revision: 1080566
URL: http://svn.apache.org/viewvc?rev=1080566&view=rev
Log:
TILES-520
Merge from trunk to sandbox.
Fixed link.
Modified:
tiles/sandbox/trunk/tiles3/ (props changed)
tiles/sandbox/trunk/tiles3/src/site/apt/getting_started.apt
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 Fri Mar 11 13:32:37 2011
@@ -1 +1 @@
-/tiles/framework/trunk:829356,836356,880940,880948,887758,900938-902966,904552,921998,931637,949559,950449,982366-982367,989864-990230,996297,1042419,1061995
+/tiles/framework/trunk:829356,836356,880940,880948,887758,900938-902966,904552,921998,931637,949559,950449,982366-982367,989864-990230,996297,1042419,1061995,1080544
Modified: tiles/sandbox/trunk/tiles3/src/site/apt/getting_started.apt
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/src/site/apt/getting_started.apt?rev=1080566&r1=1080565&r2=1080566&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/src/site/apt/getting_started.apt (original)
+++ tiles/sandbox/trunk/tiles3/src/site/apt/getting_started.apt Fri Mar 11
13:32:37 2011
@@ -86,7 +86,7 @@ Examples
To see Tiles in action, there are two examples:
* The Tiles test web application, included in <<<examples>>> directory of the
- binary distribution ({{{download.html}download it}}).
+ binary distribution ({{{../download.html}download it}}).
* The Tiles showcase, that shows Tiles features and integration with other
technologies and frameworks (currently only Struts 1).
Propchange: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 11 13:32:37 2011
@@ -1,3 +1,3 @@
-/tiles/framework/trunk/tiles-test-pom/tiles-test:829356,836356,880940,880948,887758,900938-902966,904552,921998,931637,949559,950449,982366-982367,989864-990230,996297,1042419,1061995
+/tiles/framework/trunk/tiles-test-pom/tiles-test:829356,836356,880940,880948,887758,900938-902966,904552,921998,931637,949559,950449,982366-982367,989864-990230,996297,1042419,1061995,1080544
/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 Fri Mar 11 13:32:37 2011
@@ -1 +1 @@
-/tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/tools.xml:829356,836356,880940,880948,887758,900938-902966,904552,921998,931637,949559,950449,982366-982367,989864-990230,996297,1042419,1061995
+/tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/tools.xml:829356,836356,880940,880948,887758,900938-902966,904552,921998,931637,949559,950449,982366-982367,989864-990230,996297,1042419,1061995,1080544
