svn commit: r1760183 - /velocity/site/cms/trunk/content/engine/devel/user-guide.mdtext

[cb...@apache.org]

Author: cbrisson
Date: Sat Sep 10 15:15:59 2016
New Revision: 1760183

URL: http://svn.apache.org/viewvc?rev=1760183&view=rev
Log:
[site] docfix for VELOCITY-652

Modified:
    velocity/site/cms/trunk/content/engine/devel/user-guide.mdtext

Modified: velocity/site/cms/trunk/content/engine/devel/user-guide.mdtext
URL: http://svn.apache.org/viewvc/velocity/site/cms/trunk/content/engine/devel/user-guide.mdtext?rev=1760183&r1=1760182&r2=1760183&view=diff
==============================================================================
--- velocity/site/cms/trunk/content/engine/devel/user-guide.mdtext (original)
+++ velocity/site/cms/trunk/content/engine/devel/user-guide.mdtext Sat Sep 10 15:15:59 2016
@@ -820,6 +820,8 @@ Several lines in the `velocity.propertie
 
 `velocimacro.library.autoreload` - This property controls Velocimacro library autoloading. The default value is `false`.  When set to `true` the source Velocimacro library for an invoked Velocimacro will be checked for changes, and reloaded if necessary.  This allows you to change and test Velocimacro libraries without having to restart your application or servlet container, just like you can with regular templates. This mode only works when caching is <i>off</i> in the resource loaders (e.g. `file.resource.loader.cache = false` ). This feature is intended for development, not for production.
 
+Please note than when two templates each define a macro with the same name, you either need `velocimacro.permissions.allow.inline.local.scope` or `velocimacro.permissions.allow.inline.to.replace.global` to be set to true for each template to use its own macro version.
+
 ## Getting Literal
 
 VTL uses special characters, such as *$* and *#*, to do its work, so some added care should be taken where using these characters in your templates. This section deals with escaping these characters.