Author: apetrelli
Date: Fri Dec 19 04:36:56 2008
New Revision: 728011
URL: http://svn.apache.org/viewvc?rev=728011&view=rev
Log:
TILES-342
Merged from trunk to TILES_2_0_X branch.
Fixed link to "Rendering Utilities".
Modified:
tiles/framework/branches/TILES_2_0_X/ (props changed)
tiles/framework/branches/TILES_2_0_X/src/site/apt/config-reference.apt
(props changed)
tiles/framework/branches/TILES_2_0_X/src/site/apt/dev/ (props changed)
tiles/framework/branches/TILES_2_0_X/src/site/apt/getting_started.apt
(props changed)
tiles/framework/branches/TILES_2_0_X/src/site/apt/migration/ (props
changed)
tiles/framework/branches/TILES_2_0_X/src/site/apt/selenium.apt (props
changed)
tiles/framework/branches/TILES_2_0_X/src/site/apt/tutorial/ (props
changed)
tiles/framework/branches/TILES_2_0_X/src/site/apt/tutorial/index.apt
tiles/framework/branches/TILES_2_0_X/src/site/resources/images/page_to_page.png
(props changed)
tiles/framework/branches/TILES_2_0_X/src/site/resources/images/tiled_page.png
(props changed)
tiles/framework/branches/TILES_2_0_X/src/site/xdoc/dev/building.xml
(props changed)
tiles/framework/branches/TILES_2_0_X/src/site/xdoc/dev/snapshots.xml
(props changed)
tiles/framework/branches/TILES_2_0_X/src/site/xdoc/images/page_to_page.svg
(props changed)
tiles/framework/branches/TILES_2_0_X/src/site/xdoc/images/tiled_page.svg
(props changed)
tiles/framework/branches/TILES_2_0_X/tiles-api/src/main/java/org/apache/tiles/reflect/
(props changed)
Propchange: tiles/framework/branches/TILES_2_0_X/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 19 04:36:56 2008
@@ -1 +1 @@
-/tiles/framework/trunk:676655,680114-680116,693549-693560,694754,700541,701807,701815,705699,708901,727707-727708
+/tiles/framework/trunk:676655,680114-680116,693549-693560,694754,700541,701807,701815,705699,708901,727707-727708,728010
Propchange:
tiles/framework/branches/TILES_2_0_X/src/site/apt/config-reference.apt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 19 04:36:56 2008
@@ -1 +1 @@
-/tiles/framework/trunk/src/site/apt/config-reference.apt:694754,700541,701807,701815,705699,708901,727707-727708
+/tiles/framework/trunk/src/site/apt/config-reference.apt:694754,700541,701807,701815,705699,708901,727707-727708,728010
Propchange: tiles/framework/branches/TILES_2_0_X/src/site/apt/dev/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 19 04:36:56 2008
@@ -1 +1 @@
-/tiles/framework/trunk/src/site/apt/dev:694754,700541,701807,701815,705699,708901,727707-727708
+/tiles/framework/trunk/src/site/apt/dev:694754,700541,701807,701815,705699,708901,727707-727708,728010
Propchange:
tiles/framework/branches/TILES_2_0_X/src/site/apt/getting_started.apt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 19 04:36:56 2008
@@ -1 +1 @@
-/tiles/framework/trunk/src/site/apt/getting_started.apt:694754,700541,701807,701815,705699,708901,727707-727708
+/tiles/framework/trunk/src/site/apt/getting_started.apt:694754,700541,701807,701815,705699,708901,727707-727708,728010
Propchange: tiles/framework/branches/TILES_2_0_X/src/site/apt/migration/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 19 04:36:56 2008
@@ -1 +1 @@
-/tiles/framework/trunk/src/site/apt/migration:694754,700541,701807,701815,705699,708901,727707-727708
+/tiles/framework/trunk/src/site/apt/migration:694754,700541,701807,701815,705699,708901,727707-727708,728010
Propchange: tiles/framework/branches/TILES_2_0_X/src/site/apt/selenium.apt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 19 04:36:56 2008
@@ -1 +1 @@
-/tiles/framework/trunk/src/site/apt/selenium.apt:694754,700541,701807,701815,705699,708901,727707-727708
+/tiles/framework/trunk/src/site/apt/selenium.apt:694754,700541,701807,701815,705699,708901,727707-727708,728010
Propchange: tiles/framework/branches/TILES_2_0_X/src/site/apt/tutorial/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 19 04:36:56 2008
@@ -1 +1 @@
-/tiles/framework/trunk/src/site/apt/tutorial:694754,700541,701807,701815,705699,708901,727707-727708
+/tiles/framework/trunk/src/site/apt/tutorial:694754,700541,701807,701815,705699,708901,727707-727708,728010
Modified: tiles/framework/branches/TILES_2_0_X/src/site/apt/tutorial/index.apt
URL:
http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_0_X/src/site/apt/tutorial/index.apt?rev=728011&r1=728010&r2=728011&view=diff
==============================================================================
--- tiles/framework/branches/TILES_2_0_X/src/site/apt/tutorial/index.apt
(original)
+++ tiles/framework/branches/TILES_2_0_X/src/site/apt/tutorial/index.apt Fri
Dec 19 04:36:56 2008
@@ -47,7 +47,7 @@
[[4]] {{{advanced/preparer.html}View Preparers}}
- [[5]] {{{utils.html}Rendering Utilities}}
+ [[5]] {{{advanced/utils.html}Rendering Utilities}}
[[6]] {{{advanced/l10n.html}Tiles Localization}}
Propchange:
tiles/framework/branches/TILES_2_0_X/src/site/resources/images/page_to_page.png
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 19 04:36:56 2008
@@ -1 +1 @@
-/tiles/framework/trunk/src/site/resources/images/page_to_page.png:694754,700541,701807,701815,705699,708901,727707-727708
+/tiles/framework/trunk/src/site/resources/images/page_to_page.png:694754,700541,701807,701815,705699,708901,727707-727708,728010
Propchange:
tiles/framework/branches/TILES_2_0_X/src/site/resources/images/tiled_page.png
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 19 04:36:56 2008
@@ -1 +1 @@
-/tiles/framework/trunk/src/site/resources/images/tiled_page.png:694754,700541,701807,701815,705699,708901,727707-727708
+/tiles/framework/trunk/src/site/resources/images/tiled_page.png:694754,700541,701807,701815,705699,708901,727707-727708,728010
Propchange: tiles/framework/branches/TILES_2_0_X/src/site/xdoc/dev/building.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 19 04:36:56 2008
@@ -1 +1 @@
-/tiles/framework/trunk/src/site/xdoc/dev/building.xml:694754,700541,701807,701815,705699,708901,727707-727708
+/tiles/framework/trunk/src/site/xdoc/dev/building.xml:694754,700541,701807,701815,705699,708901,727707-727708,728010
Propchange: tiles/framework/branches/TILES_2_0_X/src/site/xdoc/dev/snapshots.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 19 04:36:56 2008
@@ -1 +1 @@
-/tiles/framework/trunk/src/site/xdoc/dev/snapshots.xml:694754,700541,701807,701815,705699,708901,727707-727708
+/tiles/framework/trunk/src/site/xdoc/dev/snapshots.xml:694754,700541,701807,701815,705699,708901,727707-727708,728010
Propchange:
tiles/framework/branches/TILES_2_0_X/src/site/xdoc/images/page_to_page.svg
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 19 04:36:56 2008
@@ -1 +1 @@
-/tiles/framework/trunk/src/site/xdoc/images/page_to_page.svg:694754,700541,701807,701815,705699,708901,727707-727708
+/tiles/framework/trunk/src/site/xdoc/images/page_to_page.svg:694754,700541,701807,701815,705699,708901,727707-727708,728010
Propchange:
tiles/framework/branches/TILES_2_0_X/src/site/xdoc/images/tiled_page.svg
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 19 04:36:56 2008
@@ -1 +1 @@
-/tiles/framework/trunk/src/site/xdoc/images/tiled_page.svg:694754,700541,701807,701815,705699,708901,727707-727708
+/tiles/framework/trunk/src/site/xdoc/images/tiled_page.svg:694754,700541,701807,701815,705699,708901,727707-727708,728010
Propchange:
tiles/framework/branches/TILES_2_0_X/tiles-api/src/main/java/org/apache/tiles/reflect/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 19 04:36:56 2008
@@ -1 +1 @@
-/tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/reflect:693549-693560,694754,700541,701807,701815,705699,708901,727707-727708
+/tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/reflect:693549-693560,694754,700541,701807,701815,705699,708901,727707-727708,728010
