geirm 01/06/18 06:10:24
Modified: xdocs user-guide.xml
docs user-guide.html
Log:
Small fix to correct a veloimacro property that was incorrect, and
causing havoc over on the Turbine list. Submitted by
Keng Wong <[EMAIL PROTECTED]> to the turbine list, via Jon.
Revision Changes Path
1.44 +5 -4 jakarta-velocity/xdocs/user-guide.xml
Index: user-guide.xml
===================================================================
RCS file: /home/cvs/jakarta-velocity/xdocs/user-guide.xml,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- user-guide.xml 2001/06/11 21:47:50 1.43
+++ user-guide.xml 2001/06/18 13:10:16 1.44
@@ -1307,14 +1307,15 @@
<p>
Several lines in the <code>velocity.properties</code> file allow for
- flexible implementation of Velocimacros:
+ flexible implementation of Velocimacros. Node that these are also
+ documented in the <a href="developer-guide.html">Developer Guide</a>.
</p>
<p>
<code>velocimacro.library</code> - A comma-separated list of all
Velocimacro template libraries. By default, Velocity looks for
- a single library: <em>VM_global_lib.vm</em>. All template libraries
- in the list must be found in the template path.
+ a single library: <em>VM_global_lib.vm</em>. The configured template path
+ is used to find the Velocimacro libraries.
</p>
<p>
@@ -1326,7 +1327,7 @@
</p>
<p>
- <code>velocimacro.permissions.allow.inline.to.override</code> -
+ <code>velocimacro.permissions.allow.inline.to.replace.global</code> -
With possible values of true or false,
this property allows the user to specify if a Velocimacro defined
inline in a template can replace a globally defined template, one
1.41 +5 -4 jakarta-velocity/docs/user-guide.html
Index: user-guide.html
===================================================================
RCS file: /home/cvs/jakarta-velocity/docs/user-guide.html,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- user-guide.html 2001/06/11 21:47:45 1.40
+++ user-guide.html 2001/06/18 13:10:20 1.41
@@ -2346,13 +2346,14 @@
<strong>Velocimacro
Properties</strong>
<p>
Several lines in the <code>velocity.properties</code> file allow for
- flexible implementation of Velocimacros:
+ flexible implementation of Velocimacros. Node that these are also
+ documented in the <a href="developer-guide.html">Developer Guide</a>.
</p>
<p>
<code>velocimacro.library</code> - A comma-separated list of all
Velocimacro template libraries. By default, Velocity looks for
- a single library: <em>VM_global_lib.vm</em>. All template libraries
- in the list must be found in the template path.
+ a single library: <em>VM_global_lib.vm</em>. The configured template path
+ is used to find the Velocimacro libraries.
</p>
<p>
<code>velocimacro.permissions.allow.inline</code> - This property,
@@ -2362,7 +2363,7 @@
templates themselves.
</p>
<p>
- <code>velocimacro.permissions.allow.inline.to.override</code> -
+ <code>velocimacro.permissions.allow.inline.to.replace.global</code> -
With possible values of true or false,
this property allows the user to specify if a Velocimacro defined
inline in a template can replace a globally defined template, one
