Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 487C9200B7D for ; Sat, 10 Sep 2016 17:16:04 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 47029160ABE; Sat, 10 Sep 2016 15:16:04 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 9109A160AA5 for ; Sat, 10 Sep 2016 17:16:03 +0200 (CEST) Received: (qmail 60947 invoked by uid 500); 10 Sep 2016 15:16:02 -0000 Mailing-List: contact commits-help@velocity.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@velocity.apache.org Delivered-To: mailing list commits@velocity.apache.org Received: (qmail 60938 invoked by uid 99); 10 Sep 2016 15:16:02 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 10 Sep 2016 15:16:02 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 2F1E6C14A4 for ; Sat, 10 Sep 2016 15:16:02 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -0.124 X-Spam-Level: X-Spam-Status: No, score=-0.124 tagged_above=-999 required=6.31 tests=[KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-1.124] autolearn=disabled Received: from mx2-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id dIzC_-IZBk6x for ; Sat, 10 Sep 2016 15:16:01 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx2-lw-eu.apache.org (ASF Mail Server at mx2-lw-eu.apache.org) with ESMTP id 05DF45F230 for ; Sat, 10 Sep 2016 15:16:01 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id 037DCE0099 for ; Sat, 10 Sep 2016 15:15:59 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id BE9343A02BD for ; Sat, 10 Sep 2016 15:15:59 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1760183 - /velocity/site/cms/trunk/content/engine/devel/user-guide.mdtext Date: Sat, 10 Sep 2016 15:15:59 -0000 To: commits@velocity.apache.org From: cbrisson@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20160910151559.BE9343A02BD@svn01-us-west.apache.org> archived-at: Sat, 10 Sep 2016 15:16:04 -0000 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 off 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.