svn commit: r657047 - in /tiles/framework/branches/TILES_2_0_X/tiles-jsp: pom.xml src/main/resources/META-INF/tld/tiles-jsp.tld

[apetrelli]

Author: apetrelli
Date: Fri May 16 05:56:50 2008
New Revision: 657047

URL: http://svn.apache.org/viewvc?rev=657047&view=rev
Log:
TILES-274
Merged from trunk to TILES_2_0_X branch.
Applied patch submitted by Matthieu Chase Heimer in a modified form.

Modified:
    tiles/framework/branches/TILES_2_0_X/tiles-jsp/pom.xml
    
tiles/framework/branches/TILES_2_0_X/tiles-jsp/src/main/resources/META-INF/tld/tiles-jsp.tld

Modified: tiles/framework/branches/TILES_2_0_X/tiles-jsp/pom.xml
URL: 
http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_0_X/tiles-jsp/pom.xml?rev=657047&r1=657046&r2=657047&view=diff
==============================================================================
--- tiles/framework/branches/TILES_2_0_X/tiles-jsp/pom.xml (original)
+++ tiles/framework/branches/TILES_2_0_X/tiles-jsp/pom.xml Fri May 16 05:56:50 
2008
@@ -111,6 +111,9 @@
       <plugin>
         <groupId>net.sourceforge.maven-taglib</groupId>
         <artifactId>maven-taglib-plugin</artifactId>
+        <configuration>
+          <parseHtml>true</parseHtml>
+        </configuration>
       </plugin>
     </plugins>
   </reporting>

Modified: 
tiles/framework/branches/TILES_2_0_X/tiles-jsp/src/main/resources/META-INF/tld/tiles-jsp.tld
URL: 
http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_0_X/tiles-jsp/src/main/resources/META-INF/tld/tiles-jsp.tld?rev=657047&r1=657046&r2=657047&view=diff
==============================================================================
--- 
tiles/framework/branches/TILES_2_0_X/tiles-jsp/src/main/resources/META-INF/tld/tiles-jsp.tld
 (original)
+++ 
tiles/framework/branches/TILES_2_0_X/tiles-jsp/src/main/resources/META-INF/tld/tiles-jsp.tld
 Fri May 16 05:56:50 2008
@@ -50,7 +50,7 @@
       <code>&lt;tiles:putAttribute&gt;</code> or
       <code>&lt;tiles:putListAttribute&gt;</code>.
       </p>
-      <p>You must specify <li><code>template</code> attribute, for inserting a 
template</p>
+      <p>You must specify <code>template</code> attribute, for inserting a 
template</p>
      
       <p><strong>Example : </strong></p>
       <pre>