Author: apetrelli
Date: Fri May 2 11:12:55 2008
New Revision: 652855
URL: http://svn.apache.org/viewvc?rev=652855&view=rev
Log:
TILES-266
Merge from trunk to TILES_2_0_X branch.
Clarified docs for <add-attribute> and <add-list-attribute> elements.
Modified:
tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/resources/org/apache/tiles/resources/tiles-config_2_0.dtd
Modified:
tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/resources/org/apache/tiles/resources/tiles-config_2_0.dtd
URL:
http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/resources/org/apache/tiles/resources/tiles-config_2_0.dtd?rev=652855&r1=652854&r2=652855&view=diff
==============================================================================
---
tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/resources/org/apache/tiles/resources/tiles-config_2_0.dtd
(original)
+++
tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/resources/org/apache/tiles/resources/tiles-config_2_0.dtd
Fri May 2 11:12:55 2008
@@ -195,8 +195,9 @@
<!ATTLIST add-attribute value CDATA #IMPLIED>
<!--
@attr role Security role name that is allowed access to this
attribute
- object. The attribute is inserted only if the role name is
- allowed.
+ object. The attribute will be added to the parent list
+ anyway. It is delegated to the user of this attribute to
+ use it or not depending on the role of the user.
-->
<!ATTLIST add-attribute role CDATA
#IMPLIED>
@@ -210,8 +211,9 @@
<!ATTLIST add-list-attribute id ID #IMPLIED>
<!--
@attr role Security role name that is allowed access to this
attribute
- object. The attribute is inserted only if the role name is
- allowed.
+ object. The attribute will be added to the parent list
+ anyway. It is delegated to the user of this attribute to
+ use it or not depending on the role of the user.
-->
<!ATTLIST add-list-attribute role CDATA #IMPLIED>