Author: mck Date: Thu Oct 1 20:09:11 2015 New Revision: 1706315 URL: http://svn.apache.org/viewvc?rev=1706315&view=rev Log: forward port commit 1706314 to trunk using svn merge -c1706314 ^/tiles/framework/branches/TILES_3_0_X .
Documentation spelling errors fixed – https://github.com/apache/tiles/pull/6 contributed by Tim Gifford ( https://github.com/timgifford ) Modified: tiles/framework/trunk/ (props changed) tiles/framework/trunk/src/site/apt/tutorial/advanced/nesting-extending.apt Propchange: tiles/framework/trunk/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Oct 1 20:09:11 2015 @@ -1,2 +1,2 @@ -/tiles/framework/branches/TILES_3_0_X:1486577,1538333,1539385,1539481-1541580,1543135,1571643,1594481-1626663 +/tiles/framework/branches/TILES_3_0_X:1486577,1538333,1539385,1539481-1541580,1543135,1571643,1594481-1626663,1706314 /tiles/framework/trunk:829356,836356,880940,880948,887758,900938-902966,904552,921998,931637,949559,950449,982366-982367,989864-990230,996297,1042419,1061995,1080544,1080580-1081105 Modified: tiles/framework/trunk/src/site/apt/tutorial/advanced/nesting-extending.apt URL: http://svn.apache.org/viewvc/tiles/framework/trunk/src/site/apt/tutorial/advanced/nesting-extending.apt?rev=1706315&r1=1706314&r2=1706315&view=diff ============================================================================== --- tiles/framework/trunk/src/site/apt/tutorial/advanced/nesting-extending.apt (original) +++ tiles/framework/trunk/src/site/apt/tutorial/advanced/nesting-extending.apt Thu Oct 1 20:09:11 2015 @@ -24,14 +24,14 @@ Nesting Definitions Sometimes it is useful to have a structured page with, say, a structured body. - Tipically, there is a main layout (for example, the "classic" layout) and the + Typically, there is a main layout (for example, the "classic" layout) and the body is made of certain number of sections. In this case, nesting a definition (the one for the body) inside another definition (the main layout) can be useful. * {Named subdefinitions} - Tiles supports nesting definitions natively. One way of usng nested definitions + Tiles supports nesting definitions natively. One way of using nested definitions is creating a named "subdefinition" and using it as an attribute. For example: ------------------------------------
