Author: byron
Date: Sun Jan 11 03:31:25 2009
New Revision: 733457
URL: http://svn.apache.org/viewvc?rev=733457&view=rev
Log:
Remove legacy warning in docs about the order of macro defintions, merge from
trunk
Modified:
velocity/engine/branches/1.6.x/ (props changed)
velocity/engine/branches/1.6.x/build/ (props changed)
velocity/engine/branches/1.6.x/xdocs/docs/user-guide.xml
Propchange: velocity/engine/branches/1.6.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jan 11 03:31:25 2009
@@ -1 +1 @@
-/velocity/engine/trunk:728869-729711,730359-730365
+/velocity/engine/trunk:728869-729711,730359-730365,732913
Propchange: velocity/engine/branches/1.6.x/build/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Jan 11 03:31:25 2009
@@ -0,0 +1,2 @@
+/velocity/engine/trunk:732913
+/velocity/engine/trunk/build:728869-729711,730359-730365,732913
Modified: velocity/engine/branches/1.6.x/xdocs/docs/user-guide.xml
URL:
http://svn.apache.org/viewvc/velocity/engine/branches/1.6.x/xdocs/docs/user-guide.xml?rev=733457&r1=733456&r2=733457&view=diff
==============================================================================
--- velocity/engine/branches/1.6.x/xdocs/docs/user-guide.xml (original)
+++ velocity/engine/branches/1.6.x/xdocs/docs/user-guide.xml Sun Jan 11
03:31:25 2009
@@ -1820,24 +1820,6 @@
This feature is intended for development, not for production.
</p>
- <strong>Velocimacro Trivia</strong>
-
- <p>
- Currently, Velocimacros must be defined before they are first
- used in a template. This means that your #macro() declarations
- should come before using the Velocimacros.
- </p>
-
- <p>
- This is important to remember if you try to #parse()
- a template containing inline #macro() directives. Because
- the #parse() happens at runtime, and the parser decides if
- a VM-looking element in the template is a VM at parsetime,
- #parse()-ing a set of VM declarations won't work as expected.
- To get around this, simply use the <code>velocimacro.library</code>
- facility to have Velocity load your VMs at startup.
- </p>
-
</section>
<section name="Getting literal" href="getting_literal">
