Mailing-List: contact commits-help@velocity.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@velocity.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1760353 -
 /velocity/site/cms/trunk/content/engine/devel/configuration.mdtext
Date: Mon, 12 Sep 2016 12:42:52 -0000
To: commits@velocity.apache.org
From: cbrisson@apache.org
Message-Id: <20160912124252.9E9CD3A0EDB@svn01-us-west.apache.org>
archived-at: Mon, 12 Sep 2016 12:42:58 -0000

Author: cbrisson
Date: Mon Sep 12 12:42:51 2016
New Revision: 1760353

URL: http://svn.apache.org/viewvc?rev=1760353&view=rev
Log:
document the new option (by the way, it fixes VELOCITY-802)

Modified:
    velocity/site/cms/trunk/content/engine/devel/configuration.mdtext

Modified: velocity/site/cms/trunk/content/engine/devel/configuration.mdtext
URL: http://svn.apache.org/viewvc/velocity/site/cms/trunk/content/engine/devel/configuration.mdtext?rev=1760353&r1=1760352&r2=1760353&view=diff
==============================================================================
--- velocity/site/cms/trunk/content/engine/devel/configuration.mdtext (original)
+++ velocity/site/cms/trunk/content/engine/devel/configuration.mdtext Mon Sep 12 12:42:51 2016
@@ -93,6 +93,9 @@ Below are listed the configuration keys
 
 ## Resource Management
 
+**`resource.manager.instance = null`
+> Living Java instance, that must implement the interface org.apache.velocity.runtime.resource.ResourceManager. This property can only be set programmatically, and takes precedence over the next property. It is otherwise used by Velocity to store its actual resource manager once instanciated.
+
 **`resource.manager.class = org.apache.velocity.runtime.resource.ResourceManagerImpl`**
 
 > Replace the Velocity default Resource Manager class. A resource manager implementation must implement the (`org.apache.velocity.runtime.resource.ResourceManager`)[apidocs/org/apache/velocity/runtime/resource/ResourceManager.html] interface. A description of the requirements of a resource manager is out of scope for this document. Implementors are encouraged to review the default implementation.