http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/1d301529/builds/fm2.3.28/api/freemarker/core/TemplateConfiguration.html
----------------------------------------------------------------------
diff --git a/builds/fm2.3.28/api/freemarker/core/TemplateConfiguration.html
b/builds/fm2.3.28/api/freemarker/core/TemplateConfiguration.html
index 2a29ba9..fbf08c0 100644
--- a/builds/fm2.3.28/api/freemarker/core/TemplateConfiguration.html
+++ b/builds/fm2.3.28/api/freemarker/core/TemplateConfiguration.html
@@ -19,7 +19,7 @@
catch(err) {
}
//-->
-var methods =
{"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10,"i22":10,"i23":10,"i24":10,"i25":10,"i26":10,"i27":10,"i28":10,"i29":10,"i30":10,"i31":10,"i32":10};
+var methods =
{"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10,"i22":10,"i23":10,"i24":10,"i25":10,"i26":10,"i27":10,"i28":10,"i29":10,"i30":10,"i31":10,"i32":10,"i33":10,"i34":10,"i35":10};
var tabs = {65535:["t0","All Methods"],2:["t2","Instance
Methods"],8:["t4","Concrete Methods"]};
var altColor = "altColor";
var rowColor = "rowColor";
@@ -257,172 +257,190 @@ implements <a
href="../../freemarker/core/ParserConfiguration.html" title="inter
</tr>
<tr id="i4" class="altColor">
<td class="colFirst"><code>int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a
href="../../freemarker/core/TemplateConfiguration.html#getInterpolationSyntax--">getInterpolationSyntax</a></span>()</code>
+<div class="block">The getter pair of <a
href="../../freemarker/core/TemplateConfiguration.html#setInterpolationSyntax-int-"><code>setInterpolationSyntax(int)</code></a>.</div>
+</td>
+</tr>
+<tr id="i5" class="rowColor">
+<td class="colFirst"><code>int</code></td>
<td class="colLast"><code><span class="memberNameLink"><a
href="../../freemarker/core/TemplateConfiguration.html#getNamingConvention--">getNamingConvention</a></span>()</code>
<div class="block">The getter pair of <a
href="../../freemarker/core/TemplateConfiguration.html#setNamingConvention-int-"><code>setNamingConvention(int)</code></a>.</div>
</td>
</tr>
-<tr id="i5" class="rowColor">
+<tr id="i6" class="altColor">
<td class="colFirst"><code><a href="../../freemarker/core/OutputFormat.html"
title="class in freemarker.core">OutputFormat</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a
href="../../freemarker/core/TemplateConfiguration.html#getOutputFormat--">getOutputFormat</a></span>()</code>
<div class="block">The getter pair of <a
href="../../freemarker/core/TemplateConfiguration.html#setOutputFormat-freemarker.core.OutputFormat-"><code>setOutputFormat(OutputFormat)</code></a>.</div>
</td>
</tr>
-<tr id="i6" class="altColor">
+<tr id="i7" class="rowColor">
<td class="colFirst"><code><a
href="../../freemarker/template/Configuration.html" title="class in
freemarker.template">Configuration</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a
href="../../freemarker/core/TemplateConfiguration.html#getParentConfiguration--">getParentConfiguration</a></span>()</code>
<div class="block">Returns the parent <a
href="../../freemarker/template/Configuration.html" title="class in
freemarker.template"><code>Configuration</code></a>, or <code>null</code> if
none was associated yet.</div>
</td>
</tr>
-<tr id="i7" class="rowColor">
+<tr id="i8" class="altColor">
<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><code><span class="memberNameLink"><a
href="../../freemarker/core/TemplateConfiguration.html#getRecognizeStandardFileExtensions--">getRecognizeStandardFileExtensions</a></span>()</code>
<div class="block">Getter pair of <a
href="../../freemarker/core/TemplateConfiguration.html#setRecognizeStandardFileExtensions-boolean-"><code>setRecognizeStandardFileExtensions(boolean)</code></a>.</div>
</td>
</tr>
-<tr id="i8" class="altColor">
+<tr id="i9" class="rowColor">
<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><code><span class="memberNameLink"><a
href="../../freemarker/core/TemplateConfiguration.html#getStrictSyntaxMode--">getStrictSyntaxMode</a></span>()</code>
<div class="block">The getter pair of <a
href="../../freemarker/core/TemplateConfiguration.html#setStrictSyntaxMode-boolean-"><code>setStrictSyntaxMode(boolean)</code></a>.</div>
</td>
</tr>
-<tr id="i9" class="rowColor">
+<tr id="i10" class="altColor">
<td class="colFirst"><code>int</code></td>
<td class="colLast"><code><span class="memberNameLink"><a
href="../../freemarker/core/TemplateConfiguration.html#getTabSize--">getTabSize</a></span>()</code>
<div class="block">Getter pair of <a
href="../../freemarker/core/TemplateConfiguration.html#setTabSize-int-"><code>setTabSize(int)</code></a>.</div>
</td>
</tr>
-<tr id="i10" class="altColor">
+<tr id="i11" class="rowColor">
<td class="colFirst"><code>int</code></td>
<td class="colLast"><code><span class="memberNameLink"><a
href="../../freemarker/core/TemplateConfiguration.html#getTagSyntax--">getTagSyntax</a></span>()</code>
<div class="block">The getter pair of <a
href="../../freemarker/core/TemplateConfiguration.html#setTagSyntax-int-"><code>setTagSyntax(int)</code></a>.</div>
</td>
</tr>
-<tr id="i11" class="rowColor">
+<tr id="i12" class="altColor">
<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><code><span class="memberNameLink"><a
href="../../freemarker/core/TemplateConfiguration.html#getWhitespaceStripping--">getWhitespaceStripping</a></span>()</code>
<div class="block">The getter pair of <a
href="../../freemarker/core/TemplateConfiguration.html#getWhitespaceStripping--"><code>getWhitespaceStripping()</code></a>.</div>
</td>
</tr>
-<tr id="i12" class="altColor">
+<tr id="i13" class="rowColor">
<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><code><span class="memberNameLink"><a
href="../../freemarker/core/TemplateConfiguration.html#isAutoEscapingPolicySet--">isAutoEscapingPolicySet</a></span>()</code>
<div class="block">Tells if this setting is set directly in this object or its
value is coming from the <a
href="../../freemarker/core/Configurable.html#getParent--"><code>parent</code></a>.</div>
</td>
</tr>
-<tr id="i13" class="rowColor">
+<tr id="i14" class="altColor">
<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><code><span class="memberNameLink"><a
href="../../freemarker/core/TemplateConfiguration.html#isEncodingSet--">isEncodingSet</a></span>()</code> </td>
</tr>
-<tr id="i14" class="altColor">
+<tr id="i15" class="rowColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a
href="../../freemarker/core/TemplateConfiguration.html#isInterpolationSyntaxSet--">isInterpolationSyntaxSet</a></span>()</code>
+<div class="block">Tells if this setting is set directly in this object or its
value is coming from the <a
href="../../freemarker/core/Configurable.html#getParent--"><code>parent</code></a>.</div>
+</td>
+</tr>
+<tr id="i16" class="altColor">
<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><code><span class="memberNameLink"><a
href="../../freemarker/core/TemplateConfiguration.html#isNamingConventionSet--">isNamingConventionSet</a></span>()</code>
<div class="block">Tells if this setting is set directly in this object or its
value is coming from the <a
href="../../freemarker/core/Configurable.html#getParent--"><code>parent</code></a>.</div>
</td>
</tr>
-<tr id="i15" class="rowColor">
+<tr id="i17" class="rowColor">
<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><code><span class="memberNameLink"><a
href="../../freemarker/core/TemplateConfiguration.html#isOutputFormatSet--">isOutputFormatSet</a></span>()</code>
<div class="block">Tells if this setting is set directly in this object or its
value is coming from the <a
href="../../freemarker/core/Configurable.html#getParent--"><code>parent</code></a>.</div>
</td>
</tr>
-<tr id="i16" class="altColor">
+<tr id="i18" class="altColor">
<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><code><span class="memberNameLink"><a
href="../../freemarker/core/TemplateConfiguration.html#isRecognizeStandardFileExtensionsSet--">isRecognizeStandardFileExtensionsSet</a></span>()</code>
<div class="block">Tells if this setting is set directly in this object or its
value is coming from the <a
href="../../freemarker/core/Configurable.html#getParent--"><code>parent</code></a>.</div>
</td>
</tr>
-<tr id="i17" class="rowColor">
+<tr id="i19" class="rowColor">
<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><code><span class="memberNameLink"><a
href="../../freemarker/core/TemplateConfiguration.html#isStrictSyntaxModeSet--">isStrictSyntaxModeSet</a></span>()</code>
<div class="block">Tells if this setting is set directly in this object or its
value is coming from the <a
href="../../freemarker/core/Configurable.html#getParent--"><code>parent</code></a>.</div>
</td>
</tr>
-<tr id="i18" class="altColor">
+<tr id="i20" class="altColor">
<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><code><span class="memberNameLink"><a
href="../../freemarker/core/TemplateConfiguration.html#isTabSizeSet--">isTabSizeSet</a></span>()</code>
<div class="block">Tells if this setting is set directly in this object or its
value is coming from the <a
href="../../freemarker/core/Configurable.html#getParent--"><code>parent</code></a>.</div>
</td>
</tr>
-<tr id="i19" class="rowColor">
+<tr id="i21" class="rowColor">
<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><code><span class="memberNameLink"><a
href="../../freemarker/core/TemplateConfiguration.html#isTagSyntaxSet--">isTagSyntaxSet</a></span>()</code>
<div class="block">Tells if this setting is set directly in this object or its
value is coming from the <a
href="../../freemarker/core/Configurable.html#getParent--"><code>parent</code></a>.</div>
</td>
</tr>
-<tr id="i20" class="altColor">
+<tr id="i22" class="altColor">
<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><code><span class="memberNameLink"><a
href="../../freemarker/core/TemplateConfiguration.html#isWhitespaceStrippingSet--">isWhitespaceStrippingSet</a></span>()</code>
<div class="block">Tells if this setting is set directly in this object or its
value is coming from the <a
href="../../freemarker/core/Configurable.html#getParent--"><code>parent</code></a>.</div>
</td>
</tr>
-<tr id="i21" class="rowColor">
+<tr id="i23" class="rowColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a
href="../../freemarker/core/TemplateConfiguration.html#merge-freemarker.core.TemplateConfiguration-">merge</a></span>(<a
href="../../freemarker/core/TemplateConfiguration.html" title="class in
freemarker.core">TemplateConfiguration</a> tc)</code>
<div class="block">Set all settings in this <a
href="../../freemarker/core/TemplateConfiguration.html" title="class in
freemarker.core"><code>TemplateConfiguration</code></a> that were set in the
parameter
<a href="../../freemarker/core/TemplateConfiguration.html" title="class in
freemarker.core"><code>TemplateConfiguration</code></a>, possibly overwriting
the earlier value in this object.</div>
</td>
</tr>
-<tr id="i22" class="altColor">
+<tr id="i24" class="altColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a
href="../../freemarker/core/TemplateConfiguration.html#setAutoEscapingPolicy-int-">setAutoEscapingPolicy</a></span>(int autoEscapingPolicy)</code>
<div class="block">Sets the output format of the template; see <a
href="../../freemarker/template/Configuration.html#setAutoEscapingPolicy-int-"><code>Configuration.setAutoEscapingPolicy(int)</code></a>
for more.</div>
</td>
</tr>
-<tr id="i23" class="rowColor">
+<tr id="i25" class="rowColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a
href="../../freemarker/core/TemplateConfiguration.html#setEncoding-java.lang.String-">setEncoding</a></span>(java.lang.String encoding)</code>
<div class="block">When the standard template loading/caching mechanism is
used, this forces the charset used for reading the
template "file", overriding everything but the encoding coming from the
<code>#ftl</code> header.</div>
</td>
</tr>
-<tr id="i24" class="altColor">
+<tr id="i26" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a
href="../../freemarker/core/TemplateConfiguration.html#setInterpolationSyntax-int-">setInterpolationSyntax</a></span>(int interpolationSyntax)</code>
+<div class="block">See <a
href="../../freemarker/template/Configuration.html#setInterpolationSyntax-int-"><code>Configuration.setInterpolationSyntax(int)</code></a>.</div>
+</td>
+</tr>
+<tr id="i27" class="rowColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a
href="../../freemarker/core/TemplateConfiguration.html#setNamingConvention-int-">setNamingConvention</a></span>(int namingConvention)</code>
<div class="block">See <a
href="../../freemarker/template/Configuration.html#setNamingConvention-int-"><code>Configuration.setNamingConvention(int)</code></a>.</div>
</td>
</tr>
-<tr id="i25" class="rowColor">
+<tr id="i28" class="altColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a
href="../../freemarker/core/TemplateConfiguration.html#setOutputFormat-freemarker.core.OutputFormat-">setOutputFormat</a></span>(<a
href="../../freemarker/core/OutputFormat.html" title="class in
freemarker.core">OutputFormat</a> outputFormat)</code>
<div class="block">Sets the output format of the template; see <a
href="../../freemarker/template/Configuration.html#setOutputFormat-freemarker.core.OutputFormat-"><code>Configuration.setOutputFormat(OutputFormat)</code></a>
for more.</div>
</td>
</tr>
-<tr id="i26" class="altColor">
+<tr id="i29" class="rowColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a
href="../../freemarker/core/TemplateConfiguration.html#setParentConfiguration-freemarker.template.Configuration-">setParentConfiguration</a></span>(<a
href="../../freemarker/template/Configuration.html" title="class in
freemarker.template">Configuration</a> cfg)</code>
<div class="block">Associates this instance with a <a
href="../../freemarker/template/Configuration.html" title="class in
freemarker.template"><code>Configuration</code></a>; usually you don't call
this, as it's called internally
when this instance is added to a <a
href="../../freemarker/template/Configuration.html" title="class in
freemarker.template"><code>Configuration</code></a>.</div>
</td>
</tr>
-<tr id="i27" class="rowColor">
+<tr id="i30" class="altColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a
href="../../freemarker/core/TemplateConfiguration.html#setRecognizeStandardFileExtensions-boolean-">setRecognizeStandardFileExtensions</a></span>(boolean recognizeStandardFileExtensions)</code>
<div class="block">See <a
href="../../freemarker/template/Configuration.html#setRecognizeStandardFileExtensions-boolean-"><code>Configuration.setRecognizeStandardFileExtensions(boolean)</code></a>.</div>
</td>
</tr>
-<tr id="i28" class="altColor">
+<tr id="i31" class="rowColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a
href="../../freemarker/core/TemplateConfiguration.html#setStrictBeanModels-boolean-">setStrictBeanModels</a></span>(boolean strict)</code> </td>
</tr>
-<tr id="i29" class="rowColor">
+<tr id="i32" class="altColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a
href="../../freemarker/core/TemplateConfiguration.html#setStrictSyntaxMode-boolean-">setStrictSyntaxMode</a></span>(boolean strictSyntaxMode)</code>
<div class="block">See <a
href="../../freemarker/template/Configuration.html#setStrictSyntaxMode-boolean-"><code>Configuration.setStrictSyntaxMode(boolean)</code></a>.</div>
</td>
</tr>
-<tr id="i30" class="altColor">
+<tr id="i33" class="rowColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a
href="../../freemarker/core/TemplateConfiguration.html#setTabSize-int-">setTabSize</a></span>(int tabSize)</code>
<div class="block">See <a
href="../../freemarker/template/Configuration.html#setTabSize-int-"><code>Configuration.setTabSize(int)</code></a>.</div>
</td>
</tr>
-<tr id="i31" class="rowColor">
+<tr id="i34" class="altColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a
href="../../freemarker/core/TemplateConfiguration.html#setTagSyntax-int-">setTagSyntax</a></span>(int tagSyntax)</code>
<div class="block">See <a
href="../../freemarker/template/Configuration.html#setTagSyntax-int-"><code>Configuration.setTagSyntax(int)</code></a>.</div>
</td>
</tr>
-<tr id="i32" class="altColor">
+<tr id="i35" class="rowColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a
href="../../freemarker/core/TemplateConfiguration.html#setWhitespaceStripping-boolean-">setWhitespaceStripping</a></span>(boolean whitespaceStripping)</code>
<div class="block">See <a
href="../../freemarker/template/Configuration.html#setWhitespaceStripping-boolean-"><code>Configuration.setWhitespaceStripping(boolean)</code></a>.</div>
@@ -584,6 +602,40 @@ implements <a
href="../../freemarker/core/ParserConfiguration.html" title="inter
<div class="block">Tells if this setting is set directly in this object or its
value is coming from the <a
href="../../freemarker/core/Configurable.html#getParent--"><code>parent</code></a>.</div>
</li>
</ul>
+<a name="setInterpolationSyntax-int-">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setInterpolationSyntax</h4>
+<pre>public void setInterpolationSyntax(int interpolationSyntax)</pre>
+<div class="block">See <a
href="../../freemarker/template/Configuration.html#setInterpolationSyntax-int-"><code>Configuration.setInterpolationSyntax(int)</code></a>.</div>
+</li>
+</ul>
+<a name="getInterpolationSyntax--">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getInterpolationSyntax</h4>
+<pre>public int getInterpolationSyntax()</pre>
+<div class="block">The getter pair of <a
href="../../freemarker/core/TemplateConfiguration.html#setInterpolationSyntax-int-"><code>setInterpolationSyntax(int)</code></a>.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a
href="../../freemarker/core/ParserConfiguration.html#getInterpolationSyntax--">getInterpolationSyntax</a></code> in
interface <code><a href="../../freemarker/core/ParserConfiguration.html"
title="interface in freemarker.core">ParserConfiguration</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="isInterpolationSyntaxSet--">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isInterpolationSyntaxSet</h4>
+<pre>public boolean isInterpolationSyntaxSet()</pre>
+<div class="block">Tells if this setting is set directly in this object or its
value is coming from the <a
href="../../freemarker/core/Configurable.html#getParent--"><code>parent</code></a>.</div>
+</li>
+</ul>
<a name="setNamingConvention-int-">
<!-- -->
</a>