http://git-wip-us.apache.org/repos/asf/freemarker/blob/e9ca9d4c/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/AutoEscapingExample-stringLiteral.ftlh
----------------------------------------------------------------------
diff --git 
a/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/AutoEscapingExample-stringLiteral.ftlh
 
b/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/AutoEscapingExample-stringLiteral.ftlh
deleted file mode 100644
index 4904f60..0000000
--- 
a/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/AutoEscapingExample-stringLiteral.ftlh
+++ /dev/null
@@ -1,21 +0,0 @@
-<#--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<#assign s = "Foo & bar">
-${s}
-${"${s} & baz"}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/freemarker/blob/e9ca9d4c/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/AutoEscapingExample-stringLiteral.ftlh.out
----------------------------------------------------------------------
diff --git 
a/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/AutoEscapingExample-stringLiteral.ftlh.out
 
b/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/AutoEscapingExample-stringLiteral.ftlh.out
deleted file mode 100644
index c6bd10d..0000000
--- 
a/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/AutoEscapingExample-stringLiteral.ftlh.out
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-Foo &amp; bar
-Foo &amp; bar &amp; baz
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/freemarker/blob/e9ca9d4c/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/AutoEscapingExample-stringLiteral2.f3ah
----------------------------------------------------------------------
diff --git 
a/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/AutoEscapingExample-stringLiteral2.f3ah
 
b/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/AutoEscapingExample-stringLiteral2.f3ah
new file mode 100644
index 0000000..c0a8758
--- /dev/null
+++ 
b/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/AutoEscapingExample-stringLiteral2.f3ah
@@ -0,0 +1,25 @@
+<#--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<#-- Markup output value created by escaping plain text: -->
+<#assign mo1 = "Foo & bar"?esc>
+<#-- Markup output value created outherwise: -->
+<#assign mo2 = "<p>Foo"?noEsc>
+
+${"${mo1} baz"}
+${"${mo2} baz"}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/freemarker/blob/e9ca9d4c/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/AutoEscapingExample-stringLiteral2.f3ah.out
----------------------------------------------------------------------
diff --git 
a/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/AutoEscapingExample-stringLiteral2.f3ah.out
 
b/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/AutoEscapingExample-stringLiteral2.f3ah.out
new file mode 100644
index 0000000..f47e521
--- /dev/null
+++ 
b/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/AutoEscapingExample-stringLiteral2.f3ah.out
@@ -0,0 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+Foo &amp; bar baz
+<p>Foo baz
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/freemarker/blob/e9ca9d4c/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/AutoEscapingExample-stringLiteral2.ftlh
----------------------------------------------------------------------
diff --git 
a/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/AutoEscapingExample-stringLiteral2.ftlh
 
b/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/AutoEscapingExample-stringLiteral2.ftlh
deleted file mode 100644
index c0a8758..0000000
--- 
a/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/AutoEscapingExample-stringLiteral2.ftlh
+++ /dev/null
@@ -1,25 +0,0 @@
-<#--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<#-- Markup output value created by escaping plain text: -->
-<#assign mo1 = "Foo & bar"?esc>
-<#-- Markup output value created outherwise: -->
-<#assign mo2 = "<p>Foo"?noEsc>
-
-${"${mo1} baz"}
-${"${mo2} baz"}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/freemarker/blob/e9ca9d4c/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/AutoEscapingExample-stringLiteral2.ftlh.out
----------------------------------------------------------------------
diff --git 
a/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/AutoEscapingExample-stringLiteral2.ftlh.out
 
b/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/AutoEscapingExample-stringLiteral2.ftlh.out
deleted file mode 100644
index f47e521..0000000
--- 
a/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/AutoEscapingExample-stringLiteral2.ftlh.out
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-Foo &amp; bar baz
-<p>Foo baz
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/freemarker/blob/e9ca9d4c/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/CustomFormatsExample-alias1.f3ah
----------------------------------------------------------------------
diff --git 
a/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/CustomFormatsExample-alias1.f3ah
 
b/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/CustomFormatsExample-alias1.f3ah
new file mode 100644
index 0000000..c851df7
--- /dev/null
+++ 
b/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/CustomFormatsExample-alias1.f3ah
@@ -0,0 +1,22 @@
+<#--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+${p?string.@price}
+${w?string.@weight}
+${fd?string.@fileDate}
+${let?dateTime?string.@logEventTime}

http://git-wip-us.apache.org/repos/asf/freemarker/blob/e9ca9d4c/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/CustomFormatsExample-alias1.f3ah.out
----------------------------------------------------------------------
diff --git 
a/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/CustomFormatsExample-alias1.f3ah.out
 
b/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/CustomFormatsExample-alias1.f3ah.out
new file mode 100644
index 0000000..717431f
--- /dev/null
+++ 
b/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/CustomFormatsExample-alias1.f3ah.out
@@ -0,0 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+10,000.00
+10.31
+23/Dec/15 10:09 PM
+2015-12-23T21:09:04.213Z

http://git-wip-us.apache.org/repos/asf/freemarker/blob/e9ca9d4c/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/CustomFormatsExample-alias1.ftlh
----------------------------------------------------------------------
diff --git 
a/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/CustomFormatsExample-alias1.ftlh
 
b/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/CustomFormatsExample-alias1.ftlh
deleted file mode 100644
index c851df7..0000000
--- 
a/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/CustomFormatsExample-alias1.ftlh
+++ /dev/null
@@ -1,22 +0,0 @@
-<#--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-${p?string.@price}
-${w?string.@weight}
-${fd?string.@fileDate}
-${let?dateTime?string.@logEventTime}

http://git-wip-us.apache.org/repos/asf/freemarker/blob/e9ca9d4c/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/CustomFormatsExample-alias1.ftlh.out
----------------------------------------------------------------------
diff --git 
a/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/CustomFormatsExample-alias1.ftlh.out
 
b/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/CustomFormatsExample-alias1.ftlh.out
deleted file mode 100644
index 717431f..0000000
--- 
a/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/CustomFormatsExample-alias1.ftlh.out
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-10,000.00
-10.31
-23/Dec/15 10:09 PM
-2015-12-23T21:09:04.213Z

http://git-wip-us.apache.org/repos/asf/freemarker/blob/e9ca9d4c/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/CustomFormatsExample-alias2.f3ah
----------------------------------------------------------------------
diff --git 
a/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/CustomFormatsExample-alias2.f3ah
 
b/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/CustomFormatsExample-alias2.f3ah
new file mode 100644
index 0000000..624950f
--- /dev/null
+++ 
b/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/CustomFormatsExample-alias2.f3ah
@@ -0,0 +1,19 @@
+<#--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+${10?string.@oct}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/freemarker/blob/e9ca9d4c/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/CustomFormatsExample-alias2.f3ah.out
----------------------------------------------------------------------
diff --git 
a/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/CustomFormatsExample-alias2.f3ah.out
 
b/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/CustomFormatsExample-alias2.f3ah.out
new file mode 100644
index 0000000..08d0fea
--- /dev/null
+++ 
b/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/CustomFormatsExample-alias2.f3ah.out
@@ -0,0 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+12
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/freemarker/blob/e9ca9d4c/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/CustomFormatsExample-alias2.ftlh
----------------------------------------------------------------------
diff --git 
a/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/CustomFormatsExample-alias2.ftlh
 
b/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/CustomFormatsExample-alias2.ftlh
deleted file mode 100644
index 624950f..0000000
--- 
a/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/CustomFormatsExample-alias2.ftlh
+++ /dev/null
@@ -1,19 +0,0 @@
-<#--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-${10?string.@oct}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/freemarker/blob/e9ca9d4c/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/CustomFormatsExample-alias2.ftlh.out
----------------------------------------------------------------------
diff --git 
a/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/CustomFormatsExample-alias2.ftlh.out
 
b/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/CustomFormatsExample-alias2.ftlh.out
deleted file mode 100644
index 08d0fea..0000000
--- 
a/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/CustomFormatsExample-alias2.ftlh.out
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-12
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/freemarker/blob/e9ca9d4c/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/CustomFormatsExample-modelAware.f3ah
----------------------------------------------------------------------
diff --git 
a/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/CustomFormatsExample-modelAware.f3ah
 
b/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/CustomFormatsExample-modelAware.f3ah
new file mode 100644
index 0000000..9a34ac0
--- /dev/null
+++ 
b/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/CustomFormatsExample-modelAware.f3ah
@@ -0,0 +1,20 @@
+<#--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+${10.12356}
+${weight}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/freemarker/blob/e9ca9d4c/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/CustomFormatsExample-modelAware.f3ah.out
----------------------------------------------------------------------
diff --git 
a/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/CustomFormatsExample-modelAware.f3ah.out
 
b/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/CustomFormatsExample-modelAware.f3ah.out
new file mode 100644
index 0000000..25d6155
--- /dev/null
+++ 
b/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/CustomFormatsExample-modelAware.f3ah.out
@@ -0,0 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+10.1236
+1.5 kg
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/freemarker/blob/e9ca9d4c/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/CustomFormatsExample-modelAware.ftlh
----------------------------------------------------------------------
diff --git 
a/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/CustomFormatsExample-modelAware.ftlh
 
b/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/CustomFormatsExample-modelAware.ftlh
deleted file mode 100644
index 9a34ac0..0000000
--- 
a/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/CustomFormatsExample-modelAware.ftlh
+++ /dev/null
@@ -1,20 +0,0 @@
-<#--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-${10.12356}
-${weight}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/freemarker/blob/e9ca9d4c/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/CustomFormatsExample-modelAware.ftlh.out
----------------------------------------------------------------------
diff --git 
a/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/CustomFormatsExample-modelAware.ftlh.out
 
b/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/CustomFormatsExample-modelAware.ftlh.out
deleted file mode 100644
index 25d6155..0000000
--- 
a/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/CustomFormatsExample-modelAware.ftlh.out
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-10.1236
-1.5 kg
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/freemarker/blob/e9ca9d4c/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/dir/AbsoluteTemplateNameBIExample-foo.f3ah
----------------------------------------------------------------------
diff --git 
a/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/dir/AbsoluteTemplateNameBIExample-foo.f3ah
 
b/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/dir/AbsoluteTemplateNameBIExample-foo.f3ah
new file mode 100644
index 0000000..e68993c
--- /dev/null
+++ 
b/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/dir/AbsoluteTemplateNameBIExample-foo.f3ah
@@ -0,0 +1,19 @@
+<#--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+/dir/foo

http://git-wip-us.apache.org/repos/asf/freemarker/blob/e9ca9d4c/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/dir/AbsoluteTemplateNameBIExample-foo.ftl
----------------------------------------------------------------------
diff --git 
a/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/dir/AbsoluteTemplateNameBIExample-foo.ftl
 
b/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/dir/AbsoluteTemplateNameBIExample-foo.ftl
deleted file mode 100644
index e68993c..0000000
--- 
a/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/dir/AbsoluteTemplateNameBIExample-foo.ftl
+++ /dev/null
@@ -1,19 +0,0 @@
-<#--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-/dir/foo

http://git-wip-us.apache.org/repos/asf/freemarker/blob/e9ca9d4c/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/dir/AbsoluteTemplateNameBIExample-main.f3ah
----------------------------------------------------------------------
diff --git 
a/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/dir/AbsoluteTemplateNameBIExample-main.f3ah
 
b/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/dir/AbsoluteTemplateNameBIExample-main.f3ah
new file mode 100644
index 0000000..ae73e1c
--- /dev/null
+++ 
b/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/dir/AbsoluteTemplateNameBIExample-main.f3ah
@@ -0,0 +1,24 @@
+<#--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<#import '/AbsoluteTemplateNameBIExample-lib.f3ah' as lib>
+
+<@lib.smileyInclude 'AbsoluteTemplateNameBIExample-foo.f3ah' />
+<@lib.smileyInclude '../AbsoluteTemplateNameBIExample-foo.f3ah' />
+<@lib.smileyInclude '/AbsoluteTemplateNameBIExample-foo.f3ah' />
+<@lib.smileyInclude 'AbsoluteTemplateNameBIExample-missing.f3ah' />
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/freemarker/blob/e9ca9d4c/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/dir/AbsoluteTemplateNameBIExample-main.f3ah.out
----------------------------------------------------------------------
diff --git 
a/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/dir/AbsoluteTemplateNameBIExample-main.f3ah.out
 
b/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/dir/AbsoluteTemplateNameBIExample-main.f3ah.out
new file mode 100644
index 0000000..9e9f175
--- /dev/null
+++ 
b/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/dir/AbsoluteTemplateNameBIExample-main.f3ah.out
@@ -0,0 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+    (:
+/dir/foo
+    (:
+/foo
+    (:
+/foo
+    ):

http://git-wip-us.apache.org/repos/asf/freemarker/blob/e9ca9d4c/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/dir/AbsoluteTemplateNameBIExample-main.ftl
----------------------------------------------------------------------
diff --git 
a/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/dir/AbsoluteTemplateNameBIExample-main.ftl
 
b/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/dir/AbsoluteTemplateNameBIExample-main.ftl
deleted file mode 100644
index 311bb9a..0000000
--- 
a/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/dir/AbsoluteTemplateNameBIExample-main.ftl
+++ /dev/null
@@ -1,24 +0,0 @@
-<#--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<#import '/AbsoluteTemplateNameBIExample-lib.ftl' as lib>
-
-<@lib.smileyInclude 'AbsoluteTemplateNameBIExample-foo.ftl' />
-<@lib.smileyInclude '../AbsoluteTemplateNameBIExample-foo.ftl' />
-<@lib.smileyInclude '/AbsoluteTemplateNameBIExample-foo.ftl' />
-<@lib.smileyInclude 'AbsoluteTemplateNameBIExample-missing.ftl' />
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/freemarker/blob/e9ca9d4c/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/dir/AbsoluteTemplateNameBIExample-main.ftl.out
----------------------------------------------------------------------
diff --git 
a/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/dir/AbsoluteTemplateNameBIExample-main.ftl.out
 
b/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/dir/AbsoluteTemplateNameBIExample-main.ftl.out
deleted file mode 100644
index 9e9f175..0000000
--- 
a/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/dir/AbsoluteTemplateNameBIExample-main.ftl.out
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-    (:
-/dir/foo
-    (:
-/foo
-    (:
-/foo
-    ):

http://git-wip-us.apache.org/repos/asf/freemarker/blob/e9ca9d4c/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/test.f3ah
----------------------------------------------------------------------
diff --git 
a/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/test.f3ah
 
b/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/test.f3ah
new file mode 100644
index 0000000..852b82b
--- /dev/null
+++ 
b/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/test.f3ah
@@ -0,0 +1,28 @@
+<#--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<html>
+<head>
+  <title>Welcome!</title>
+</head>
+<body>
+  <h1>Welcome ${user}!</h1>
+  <p>Our latest product:
+  <a href="${latestProduct.url}">${latestProduct.name}</a>!
+</body>
+</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/freemarker/blob/e9ca9d4c/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/test.ftlh
----------------------------------------------------------------------
diff --git 
a/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/test.ftlh
 
b/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/test.ftlh
deleted file mode 100644
index 852b82b..0000000
--- 
a/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/test.ftlh
+++ /dev/null
@@ -1,28 +0,0 @@
-<#--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<html>
-<head>
-  <title>Welcome!</title>
-</head>
-<body>
-  <h1>Welcome ${user}!</h1>
-  <p>Our latest product:
-  <a href="${latestProduct.url}">${latestProduct.name}</a>!
-</body>
-</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/freemarker/blob/e9ca9d4c/freemarker-spring/src/test/java/org/apache/freemarker/spring/ConfigurationFactoryBeanTest.java
----------------------------------------------------------------------
diff --git 
a/freemarker-spring/src/test/java/org/apache/freemarker/spring/ConfigurationFactoryBeanTest.java
 
b/freemarker-spring/src/test/java/org/apache/freemarker/spring/ConfigurationFactoryBeanTest.java
index 6e40762..a737b36 100644
--- 
a/freemarker-spring/src/test/java/org/apache/freemarker/spring/ConfigurationFactoryBeanTest.java
+++ 
b/freemarker-spring/src/test/java/org/apache/freemarker/spring/ConfigurationFactoryBeanTest.java
@@ -30,7 +30,6 @@ import org.apache.freemarker.core.Configuration;
 import org.apache.freemarker.core.Configuration.ExtendableBuilder;
 import org.apache.freemarker.core.DefaultTemplateLanguage;
 import org.apache.freemarker.core.MutableParsingAndProcessingConfiguration;
-import org.apache.freemarker.core.TagSyntax;
 import org.apache.freemarker.core.Template;
 import org.apache.freemarker.core.Version;
 import org.apache.freemarker.core.model.impl.RestrictedObjectWrapper;
@@ -72,8 +71,7 @@ public class ConfigurationFactoryBeanTest {
         
settings.setProperty(MutableParsingAndProcessingConfiguration.WHITESPACE_STRIPPING_KEY,
 "true");
         
settings.setProperty(MutableParsingAndProcessingConfiguration.AUTO_ESCAPING_POLICY_KEY,
 "enableIfSupported");
         
settings.setProperty(MutableParsingAndProcessingConfiguration.RECOGNIZE_STANDARD_FILE_EXTENSIONS_KEY,
 "true");
-        
settings.setProperty(MutableParsingAndProcessingConfiguration.TEMPLATE_LANGUAGE_KEY,
 "FTL");
-        
settings.setProperty(MutableParsingAndProcessingConfiguration.TAG_SYNTAX_KEY, 
"squareBracket");
+        
settings.setProperty(MutableParsingAndProcessingConfiguration.TEMPLATE_LANGUAGE_KEY,
 "F3SC");
         
settings.setProperty(MutableParsingAndProcessingConfiguration.TAB_SIZE_KEY, 
"4");
 
         settings.setProperty(ExtendableBuilder.OBJECT_WRAPPER_KEY, 
"restricted");
@@ -148,8 +146,7 @@ public class ConfigurationFactoryBeanTest {
         assertTrue(config.isWhitespaceStrippingSet());
         assertEquals(AutoEscapingPolicy.ENABLE_IF_SUPPORTED, 
config.getAutoEscapingPolicy());
         assertTrue(config.isRecognizeStandardFileExtensionsSet());
-        assertEquals(DefaultTemplateLanguage.F3CC, 
config.getTemplateLanguage());
-        assertEquals(TagSyntax.SQUARE_BRACKET, config.getTagSyntax());
+        assertEquals(DefaultTemplateLanguage.F3SC, 
config.getTemplateLanguage());
         assertEquals(4, config.getTabSize());
 
         assertTrue(config.getObjectWrapper() instanceof 
RestrictedObjectWrapper);

http://git-wip-us.apache.org/repos/asf/freemarker/blob/e9ca9d4c/freemarker-spring/src/test/resources/META-INF/web-resources/views/example/users/useredit.f3ah
----------------------------------------------------------------------
diff --git 
a/freemarker-spring/src/test/resources/META-INF/web-resources/views/example/users/useredit.f3ah
 
b/freemarker-spring/src/test/resources/META-INF/web-resources/views/example/users/useredit.f3ah
new file mode 100644
index 0000000..cf2900f
--- /dev/null
+++ 
b/freemarker-spring/src/test/resources/META-INF/web-resources/views/example/users/useredit.f3ah
@@ -0,0 +1,87 @@
+<#--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<html>
+<head>
+<title>Spring MVC Form Example - User Edit Form</title>
+</head>
+<body>
+
+<h1>Editing User: ${spring.eval("user.firstName + ' ' + user.lastName")}</h1>
+
+<p>${spring.message("user.form.message", user.firstName, user.lastName, 
user.email)}</p>
+
+<form method="POST" action="${spring.url('/usereditaction.do', 
context='/othercontext', param1='value1', param2='value2')}">
+  <table border="2">
+    <tbody>
+      <tr>
+        <th>${spring.message("user.id")!}</th>
+        <td>${user.id}</td>
+      </tr>
+      <tr>
+        <th>${spring.message("user.password")!}</th>
+        <td>
+          <@spring.bind "user.password"; status>
+            <input type="password" name="password" value="${status.value!}" />
+          </@spring.bind>
+        </td>
+      </tr>
+      <tr>
+        <th>${spring.message("user.email")!}</th>
+        <td>
+          <@spring.bind "user.email"; status>
+            <input type="text" name="email" value="${status.value!}" />
+          </@spring.bind>
+        </td>
+      </tr>
+      <tr>
+        <th>${spring.message("user.firstName")!}</th>
+        <td>
+          <@spring.bind "user.firstName"; status>
+            <input type="text" name="firstName" value="${status.value!}" />
+          </@spring.bind>
+        </td>
+      </tr>
+      <tr>
+        <th>${spring.message("user.lastName")!}</th>
+        <td>
+          <@spring.bind "user.lastName"; status>
+            <input type="text" name="lastName" value="${status.value!}" />
+          </@spring.bind>
+        </td>
+      </tr>
+      <tr>
+        <th>${spring.message("user.birthDate")!}</th>
+        <td>
+          <@spring.bind "user.birthDate"; status>
+            ${spring.transform(status.editor, status.actualValue)!}
+          </@spring.bind>
+        </td>
+      </tr>
+      <tr>
+        <td colspan="2">
+          <input type="submit" 
value="${spring.message('user.form.submit')!'Save'}" />
+          <input type="reset" 
value="${spring.message('user.form.submit')!'Reset'}" />
+        </td>
+      </tr>
+    </tbody>
+  </table>
+</form>
+
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/freemarker/blob/e9ca9d4c/freemarker-spring/src/test/resources/META-INF/web-resources/views/example/users/useredit.ftlh
----------------------------------------------------------------------
diff --git 
a/freemarker-spring/src/test/resources/META-INF/web-resources/views/example/users/useredit.ftlh
 
b/freemarker-spring/src/test/resources/META-INF/web-resources/views/example/users/useredit.ftlh
deleted file mode 100644
index cf2900f..0000000
--- 
a/freemarker-spring/src/test/resources/META-INF/web-resources/views/example/users/useredit.ftlh
+++ /dev/null
@@ -1,87 +0,0 @@
-<#--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<html>
-<head>
-<title>Spring MVC Form Example - User Edit Form</title>
-</head>
-<body>
-
-<h1>Editing User: ${spring.eval("user.firstName + ' ' + user.lastName")}</h1>
-
-<p>${spring.message("user.form.message", user.firstName, user.lastName, 
user.email)}</p>
-
-<form method="POST" action="${spring.url('/usereditaction.do', 
context='/othercontext', param1='value1', param2='value2')}">
-  <table border="2">
-    <tbody>
-      <tr>
-        <th>${spring.message("user.id")!}</th>
-        <td>${user.id}</td>
-      </tr>
-      <tr>
-        <th>${spring.message("user.password")!}</th>
-        <td>
-          <@spring.bind "user.password"; status>
-            <input type="password" name="password" value="${status.value!}" />
-          </@spring.bind>
-        </td>
-      </tr>
-      <tr>
-        <th>${spring.message("user.email")!}</th>
-        <td>
-          <@spring.bind "user.email"; status>
-            <input type="text" name="email" value="${status.value!}" />
-          </@spring.bind>
-        </td>
-      </tr>
-      <tr>
-        <th>${spring.message("user.firstName")!}</th>
-        <td>
-          <@spring.bind "user.firstName"; status>
-            <input type="text" name="firstName" value="${status.value!}" />
-          </@spring.bind>
-        </td>
-      </tr>
-      <tr>
-        <th>${spring.message("user.lastName")!}</th>
-        <td>
-          <@spring.bind "user.lastName"; status>
-            <input type="text" name="lastName" value="${status.value!}" />
-          </@spring.bind>
-        </td>
-      </tr>
-      <tr>
-        <th>${spring.message("user.birthDate")!}</th>
-        <td>
-          <@spring.bind "user.birthDate"; status>
-            ${spring.transform(status.editor, status.actualValue)!}
-          </@spring.bind>
-        </td>
-      </tr>
-      <tr>
-        <td colspan="2">
-          <input type="submit" 
value="${spring.message('user.form.submit')!'Save'}" />
-          <input type="reset" 
value="${spring.message('user.form.submit')!'Reset'}" />
-        </td>
-      </tr>
-    </tbody>
-  </table>
-</form>
-
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/freemarker/blob/e9ca9d4c/freemarker-spring/src/test/resources/META-INF/web-resources/views/example/users/userlist.f3ah
----------------------------------------------------------------------
diff --git 
a/freemarker-spring/src/test/resources/META-INF/web-resources/views/example/users/userlist.f3ah
 
b/freemarker-spring/src/test/resources/META-INF/web-resources/views/example/users/userlist.f3ah
new file mode 100644
index 0000000..7224eb7
--- /dev/null
+++ 
b/freemarker-spring/src/test/resources/META-INF/web-resources/views/example/users/userlist.f3ah
@@ -0,0 +1,45 @@
+<#--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<html>
+<head>
+<title>Spring MVC Form Example - Users</title>
+</head>
+<body>
+
+<h1>Users</h1>
+
+<table border="2">
+  <thead>
+    <tr>
+      <th>Name</th>
+      <th>E-Mail</th>
+    </tr>
+  </thead>
+  <tbody>
+    <#list users as user>
+    <tr>
+      <td><a href="users/${user.id}">${user.firstName} 
${user.lastName}</a></td>
+      <td><a href="mailto:${user.email}";>${user.email}</a></td>
+    </tr>
+    </#list>
+  </tbody>
+</table>
+
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/freemarker/blob/e9ca9d4c/freemarker-spring/src/test/resources/META-INF/web-resources/views/example/users/userlist.ftlh
----------------------------------------------------------------------
diff --git 
a/freemarker-spring/src/test/resources/META-INF/web-resources/views/example/users/userlist.ftlh
 
b/freemarker-spring/src/test/resources/META-INF/web-resources/views/example/users/userlist.ftlh
deleted file mode 100644
index 7224eb7..0000000
--- 
a/freemarker-spring/src/test/resources/META-INF/web-resources/views/example/users/userlist.ftlh
+++ /dev/null
@@ -1,45 +0,0 @@
-<#--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<html>
-<head>
-<title>Spring MVC Form Example - Users</title>
-</head>
-<body>
-
-<h1>Users</h1>
-
-<table border="2">
-  <thead>
-    <tr>
-      <th>Name</th>
-      <th>E-Mail</th>
-    </tr>
-  </thead>
-  <tbody>
-    <#list users as user>
-    <tr>
-      <td><a href="users/${user.id}">${user.firstName} 
${user.lastName}</a></td>
-      <td><a href="mailto:${user.email}";>${user.email}</a></td>
-    </tr>
-    </#list>
-  </tbody>
-</table>
-
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/freemarker/blob/e9ca9d4c/freemarker-spring/src/test/resources/META-INF/web-resources/views/test/model/bind-directive-basic-usages.f3ah
----------------------------------------------------------------------
diff --git 
a/freemarker-spring/src/test/resources/META-INF/web-resources/views/test/model/bind-directive-basic-usages.f3ah
 
b/freemarker-spring/src/test/resources/META-INF/web-resources/views/test/model/bind-directive-basic-usages.f3ah
new file mode 100644
index 0000000..8cd8b14
--- /dev/null
+++ 
b/freemarker-spring/src/test/resources/META-INF/web-resources/views/test/model/bind-directive-basic-usages.f3ah
@@ -0,0 +1,54 @@
+<#--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<html>
+<body>
+
+<table class="table">
+  <tbody>
+    <tr>
+      <th>E-Mail</th>
+      <td>
+        <@spring.bind "user.email"; status>
+          <input type="text" name="email" value="${status.value!}" />
+        </@spring.bind>
+      </td>
+    </tr>
+    <tr>
+      <th>First Name</th>
+      <td>
+        <@spring.bind "user.firstName"; status>
+          <input type="text" name="firstName" value="${status.value!}" />
+        </@spring.bind>
+      </td>
+    </tr>
+    <tr>
+      <th>Last Name</th>
+      <td>
+        <@spring.bind "user.lastName"; status>
+          <input type="text" name="lastName" value="${status.value!}" />
+        </@spring.bind>
+      </td>
+    </tr>
+  </tbody>
+</table>
+
+<div id="statusValueNotReachable"><#if status??>${status.value!}</#if></div>
+
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/freemarker/blob/e9ca9d4c/freemarker-spring/src/test/resources/META-INF/web-resources/views/test/model/bind-directive-basic-usages.ftlh
----------------------------------------------------------------------
diff --git 
a/freemarker-spring/src/test/resources/META-INF/web-resources/views/test/model/bind-directive-basic-usages.ftlh
 
b/freemarker-spring/src/test/resources/META-INF/web-resources/views/test/model/bind-directive-basic-usages.ftlh
deleted file mode 100644
index 8cd8b14..0000000
--- 
a/freemarker-spring/src/test/resources/META-INF/web-resources/views/test/model/bind-directive-basic-usages.ftlh
+++ /dev/null
@@ -1,54 +0,0 @@
-<#--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<html>
-<body>
-
-<table class="table">
-  <tbody>
-    <tr>
-      <th>E-Mail</th>
-      <td>
-        <@spring.bind "user.email"; status>
-          <input type="text" name="email" value="${status.value!}" />
-        </@spring.bind>
-      </td>
-    </tr>
-    <tr>
-      <th>First Name</th>
-      <td>
-        <@spring.bind "user.firstName"; status>
-          <input type="text" name="firstName" value="${status.value!}" />
-        </@spring.bind>
-      </td>
-    </tr>
-    <tr>
-      <th>Last Name</th>
-      <td>
-        <@spring.bind "user.lastName"; status>
-          <input type="text" name="lastName" value="${status.value!}" />
-        </@spring.bind>
-      </td>
-    </tr>
-  </tbody>
-</table>
-
-<div id="statusValueNotReachable"><#if status??>${status.value!}</#if></div>
-
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/freemarker/blob/e9ca9d4c/freemarker-spring/src/test/resources/META-INF/web-resources/views/test/model/binderrors-directive-basic-usages.f3ah
----------------------------------------------------------------------
diff --git 
a/freemarker-spring/src/test/resources/META-INF/web-resources/views/test/model/binderrors-directive-basic-usages.f3ah
 
b/freemarker-spring/src/test/resources/META-INF/web-resources/views/test/model/binderrors-directive-basic-usages.f3ah
new file mode 100644
index 0000000..e394928
--- /dev/null
+++ 
b/freemarker-spring/src/test/resources/META-INF/web-resources/views/test/model/binderrors-directive-basic-usages.f3ah
@@ -0,0 +1,69 @@
+<#--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<html>
+<body>
+
+<@spring.hasBindErrors "user"; errors>
+  <div class="errors">
+    <#list errors.allErrors as error>
+      <div class="error">
+        ${spring.message(message=error)!}
+      </div>
+    </#list>
+  </div>
+</@spring.hasBindErrors>
+
+<form method="POST" action="${spring.url('/users')}">
+  <table class="table">
+    <tbody>
+      <tr>
+        <th>E-Mail</th>
+        <td>
+          <@spring.bind "user.email"; status>
+            <input type="text" name="email" value="${status.value!}" />
+          </@spring.bind>
+        </td>
+      </tr>
+      <tr>
+        <th>First Name</th>
+        <td>
+          <@spring.bind "user.firstName"; status>
+            <input type="text" name="firstName" value="${status.value!}" />
+          </@spring.bind>
+        </td>
+      </tr>
+      <tr>
+        <th>Last Name</th>
+        <td>
+          <@spring.bind "user.lastName"; status>
+            <input type="text" name="lastName" value="${status.value!}" />
+          </@spring.bind>
+        </td>
+      </tr>
+      <tr>
+        <td colspan="2">
+          <input type="submit" name="save" value="Save" />
+        </td>
+      </tr>
+    </tbody>
+  </table>
+</form>
+
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/freemarker/blob/e9ca9d4c/freemarker-spring/src/test/resources/META-INF/web-resources/views/test/model/binderrors-directive-basic-usages.ftlh
----------------------------------------------------------------------
diff --git 
a/freemarker-spring/src/test/resources/META-INF/web-resources/views/test/model/binderrors-directive-basic-usages.ftlh
 
b/freemarker-spring/src/test/resources/META-INF/web-resources/views/test/model/binderrors-directive-basic-usages.ftlh
deleted file mode 100644
index e394928..0000000
--- 
a/freemarker-spring/src/test/resources/META-INF/web-resources/views/test/model/binderrors-directive-basic-usages.ftlh
+++ /dev/null
@@ -1,69 +0,0 @@
-<#--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<html>
-<body>
-
-<@spring.hasBindErrors "user"; errors>
-  <div class="errors">
-    <#list errors.allErrors as error>
-      <div class="error">
-        ${spring.message(message=error)!}
-      </div>
-    </#list>
-  </div>
-</@spring.hasBindErrors>
-
-<form method="POST" action="${spring.url('/users')}">
-  <table class="table">
-    <tbody>
-      <tr>
-        <th>E-Mail</th>
-        <td>
-          <@spring.bind "user.email"; status>
-            <input type="text" name="email" value="${status.value!}" />
-          </@spring.bind>
-        </td>
-      </tr>
-      <tr>
-        <th>First Name</th>
-        <td>
-          <@spring.bind "user.firstName"; status>
-            <input type="text" name="firstName" value="${status.value!}" />
-          </@spring.bind>
-        </td>
-      </tr>
-      <tr>
-        <th>Last Name</th>
-        <td>
-          <@spring.bind "user.lastName"; status>
-            <input type="text" name="lastName" value="${status.value!}" />
-          </@spring.bind>
-        </td>
-      </tr>
-      <tr>
-        <td colspan="2">
-          <input type="submit" name="save" value="Save" />
-        </td>
-      </tr>
-    </tbody>
-  </table>
-</form>
-
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/freemarker/blob/e9ca9d4c/freemarker-spring/src/test/resources/META-INF/web-resources/views/test/model/eval-function-basic-usages.f3ah
----------------------------------------------------------------------
diff --git 
a/freemarker-spring/src/test/resources/META-INF/web-resources/views/test/model/eval-function-basic-usages.f3ah
 
b/freemarker-spring/src/test/resources/META-INF/web-resources/views/test/model/eval-function-basic-usages.f3ah
new file mode 100644
index 0000000..1060b28
--- /dev/null
+++ 
b/freemarker-spring/src/test/resources/META-INF/web-resources/views/test/model/eval-function-basic-usages.f3ah
@@ -0,0 +1,40 @@
+<#--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<html>
+<body>
+
+<div id="maxNumber">${spring.eval("T(java.lang.Math).max(12.34, 56.78)")}</div>
+
+<ul>
+  <#list users as user>
+    <li>
+      <div id="user-${spring.eval('user.id')!}">
+        ${spring.eval("user.firstName + ' ' + user.lastName")!}
+      </div>
+    </li>
+  </#list>
+</ul>
+
+<div id="firstUserId">${spring.eval("users[0].id")!}</div>
+
+<#assign numbers=spring.eval("{0,1,1,2,3,5,8,13}") />
+<div id="fibonacci"><#list numbers as number>${number}<#sep>, </#list></div>
+
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/freemarker/blob/e9ca9d4c/freemarker-spring/src/test/resources/META-INF/web-resources/views/test/model/eval-function-basic-usages.ftlh
----------------------------------------------------------------------
diff --git 
a/freemarker-spring/src/test/resources/META-INF/web-resources/views/test/model/eval-function-basic-usages.ftlh
 
b/freemarker-spring/src/test/resources/META-INF/web-resources/views/test/model/eval-function-basic-usages.ftlh
deleted file mode 100644
index 1060b28..0000000
--- 
a/freemarker-spring/src/test/resources/META-INF/web-resources/views/test/model/eval-function-basic-usages.ftlh
+++ /dev/null
@@ -1,40 +0,0 @@
-<#--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<html>
-<body>
-
-<div id="maxNumber">${spring.eval("T(java.lang.Math).max(12.34, 56.78)")}</div>
-
-<ul>
-  <#list users as user>
-    <li>
-      <div id="user-${spring.eval('user.id')!}">
-        ${spring.eval("user.firstName + ' ' + user.lastName")!}
-      </div>
-    </li>
-  </#list>
-</ul>
-
-<div id="firstUserId">${spring.eval("users[0].id")!}</div>
-
-<#assign numbers=spring.eval("{0,1,1,2,3,5,8,13}") />
-<div id="fibonacci"><#list numbers as number>${number}<#sep>, </#list></div>
-
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/freemarker/blob/e9ca9d4c/freemarker-spring/src/test/resources/META-INF/web-resources/views/test/model/form/button-directive-usages.f3ah
----------------------------------------------------------------------
diff --git 
a/freemarker-spring/src/test/resources/META-INF/web-resources/views/test/model/form/button-directive-usages.f3ah
 
b/freemarker-spring/src/test/resources/META-INF/web-resources/views/test/model/form/button-directive-usages.f3ah
new file mode 100644
index 0000000..860af4e
--- /dev/null
+++ 
b/freemarker-spring/src/test/resources/META-INF/web-resources/views/test/model/form/button-directive-usages.f3ah
@@ -0,0 +1,39 @@
+<#--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<html>
+<body>
+
+  <h1>Form 1</h1>
+  <hr/>
+  <form id="form1">
+    <table>
+      <tr>
+        <td>
+          <@form.button name="button1">
+            Something inside...
+          </@form.button>
+          <@form.button name="button2" value="Button 2" />
+          <@form.button name="button3" value="Button 3" disabled=true />
+        </td>
+      </tr>
+    </table>
+  </form>
+
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/freemarker/blob/e9ca9d4c/freemarker-spring/src/test/resources/META-INF/web-resources/views/test/model/form/button-directive-usages.ftlh
----------------------------------------------------------------------
diff --git 
a/freemarker-spring/src/test/resources/META-INF/web-resources/views/test/model/form/button-directive-usages.ftlh
 
b/freemarker-spring/src/test/resources/META-INF/web-resources/views/test/model/form/button-directive-usages.ftlh
deleted file mode 100644
index 860af4e..0000000
--- 
a/freemarker-spring/src/test/resources/META-INF/web-resources/views/test/model/form/button-directive-usages.ftlh
+++ /dev/null
@@ -1,39 +0,0 @@
-<#--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<html>
-<body>
-
-  <h1>Form 1</h1>
-  <hr/>
-  <form id="form1">
-    <table>
-      <tr>
-        <td>
-          <@form.button name="button1">
-            Something inside...
-          </@form.button>
-          <@form.button name="button2" value="Button 2" />
-          <@form.button name="button3" value="Button 3" disabled=true />
-        </td>
-      </tr>
-    </table>
-  </form>
-
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/freemarker/blob/e9ca9d4c/freemarker-spring/src/test/resources/META-INF/web-resources/views/test/model/form/errors-directive-usages.f3ah
----------------------------------------------------------------------
diff --git 
a/freemarker-spring/src/test/resources/META-INF/web-resources/views/test/model/form/errors-directive-usages.f3ah
 
b/freemarker-spring/src/test/resources/META-INF/web-resources/views/test/model/form/errors-directive-usages.f3ah
new file mode 100644
index 0000000..62b5141
--- /dev/null
+++ 
b/freemarker-spring/src/test/resources/META-INF/web-resources/views/test/model/form/errors-directive-usages.f3ah
@@ -0,0 +1,72 @@
+<#--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<html>
+<body>
+
+  <h1>Form 1</h1>
+  <hr/>
+
+  <@form.form 'user' id="form1">
+    <div id="formErrors1">
+      <@form.errors '*'; messages>
+        <ul>
+          <#list messages as message>
+            <li>${message}</li>
+          </#list>
+        </ul>
+      </@form.errors>
+    </div>
+    <div id="formErrors2">
+      <@form.errors '*'>
+        <p>There are some errors.</p>
+      </@form.errors>
+    </div>
+    <table>
+      <tr>
+        <th>
+          <@form.label 'firstName'>First name:</@form.label>
+        </th>
+        <td>
+          <@form.input 'firstName' />
+          <@form.errors 'firstName' cssClass="errorFirstName" />
+        </td>
+      </tr>
+      <tr>
+        <th>
+          <@form.label 'lastName'>Last name:</@form.label>
+        </th>
+        <td>
+          <@form.input 'lastName' />
+          <@form.errors 'lastName' cssClass="errorLastName" />
+        </td>
+      </tr>
+      <tr>
+        <th>
+          <@form.label 'email'>E-Mail:</@form.label>
+        </th>
+        <td>
+          <@form.input 'email' />
+          <@form.errors 'email' element="div" cssClass="errorEmail" />
+        </td>
+      </tr>
+    </table>
+  </@form.form>
+
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/freemarker/blob/e9ca9d4c/freemarker-spring/src/test/resources/META-INF/web-resources/views/test/model/form/errors-directive-usages.ftlh
----------------------------------------------------------------------
diff --git 
a/freemarker-spring/src/test/resources/META-INF/web-resources/views/test/model/form/errors-directive-usages.ftlh
 
b/freemarker-spring/src/test/resources/META-INF/web-resources/views/test/model/form/errors-directive-usages.ftlh
deleted file mode 100644
index 62b5141..0000000
--- 
a/freemarker-spring/src/test/resources/META-INF/web-resources/views/test/model/form/errors-directive-usages.ftlh
+++ /dev/null
@@ -1,72 +0,0 @@
-<#--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<html>
-<body>
-
-  <h1>Form 1</h1>
-  <hr/>
-
-  <@form.form 'user' id="form1">
-    <div id="formErrors1">
-      <@form.errors '*'; messages>
-        <ul>
-          <#list messages as message>
-            <li>${message}</li>
-          </#list>
-        </ul>
-      </@form.errors>
-    </div>
-    <div id="formErrors2">
-      <@form.errors '*'>
-        <p>There are some errors.</p>
-      </@form.errors>
-    </div>
-    <table>
-      <tr>
-        <th>
-          <@form.label 'firstName'>First name:</@form.label>
-        </th>
-        <td>
-          <@form.input 'firstName' />
-          <@form.errors 'firstName' cssClass="errorFirstName" />
-        </td>
-      </tr>
-      <tr>
-        <th>
-          <@form.label 'lastName'>Last name:</@form.label>
-        </th>
-        <td>
-          <@form.input 'lastName' />
-          <@form.errors 'lastName' cssClass="errorLastName" />
-        </td>
-      </tr>
-      <tr>
-        <th>
-          <@form.label 'email'>E-Mail:</@form.label>
-        </th>
-        <td>
-          <@form.input 'email' />
-          <@form.errors 'email' element="div" cssClass="errorEmail" />
-        </td>
-      </tr>
-    </table>
-  </@form.form>
-
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/freemarker/blob/e9ca9d4c/freemarker-spring/src/test/resources/META-INF/web-resources/views/test/model/form/form-directive-usages.f3ah
----------------------------------------------------------------------
diff --git 
a/freemarker-spring/src/test/resources/META-INF/web-resources/views/test/model/form/form-directive-usages.f3ah
 
b/freemarker-spring/src/test/resources/META-INF/web-resources/views/test/model/form/form-directive-usages.f3ah
new file mode 100644
index 0000000..bfd65cd
--- /dev/null
+++ 
b/freemarker-spring/src/test/resources/META-INF/web-resources/views/test/model/form/form-directive-usages.f3ah
@@ -0,0 +1,78 @@
+<#--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<html>
+<body>
+
+  <h1>Form 1</h1>
+  <hr/>
+  <@form.form "user" id="form1">
+    <table>
+      <tr>
+        <th>First name:</th>
+        <td>
+          <@form.input 'firstName' />
+        </td>
+      </tr>
+      <tr>
+        <th>Last name:</th>
+        <td>
+          <@form.input 'lastName' />
+        </td>
+      </tr>
+    </table>
+  </@form.form>
+
+  <hr/>
+
+  <h2>Testing default attributes</h2>
+  <@form.form "user" id="form2"
+                     cssClass="my_cssClass"
+                     cssStyle="my_cssStyle"
+                     lang="my_lang"
+                     title="my_title"
+                     dir="my_dir"
+                     tabindex="my_tabindex"
+                     onclick="my_onclick()"
+                     ondblclick="my_ondblclick()"
+                     onmousedown="my_onmousedown()"
+                     onmouseup="my_onmouseup()"
+                     onmouseover="my_onmouseover()"
+                     onmousemove="my_onmousemove()"
+                     onmouseout="my_onmouseout()"
+                     onkeypress="my_onkeypress()"
+                     onkeyup="my_onkeyup()"
+                     onkeydown="my_onkeydown()"
+                     cssErrorClass="my_cssErrorClass"
+                     action="my_action"
+                     method="post"
+                     target="my_target"
+                     enctype="my_enctype"
+                     acceptCharset="my_acceptCharset"
+                     onsubmit="my_onsubmit()"
+                     onreset="my_onreset()"
+                     autocomplete="my_autocomplete"
+                     name="my_name"
+                     value="my_value"
+                     type="my_type"
+                     servletRelativeAction="my_servletRelativeAction"
+                     methodParam="my_methodParam">
+  </@form.form>
+
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/freemarker/blob/e9ca9d4c/freemarker-spring/src/test/resources/META-INF/web-resources/views/test/model/form/form-directive-usages.ftlh
----------------------------------------------------------------------
diff --git 
a/freemarker-spring/src/test/resources/META-INF/web-resources/views/test/model/form/form-directive-usages.ftlh
 
b/freemarker-spring/src/test/resources/META-INF/web-resources/views/test/model/form/form-directive-usages.ftlh
deleted file mode 100644
index bfd65cd..0000000
--- 
a/freemarker-spring/src/test/resources/META-INF/web-resources/views/test/model/form/form-directive-usages.ftlh
+++ /dev/null
@@ -1,78 +0,0 @@
-<#--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<html>
-<body>
-
-  <h1>Form 1</h1>
-  <hr/>
-  <@form.form "user" id="form1">
-    <table>
-      <tr>
-        <th>First name:</th>
-        <td>
-          <@form.input 'firstName' />
-        </td>
-      </tr>
-      <tr>
-        <th>Last name:</th>
-        <td>
-          <@form.input 'lastName' />
-        </td>
-      </tr>
-    </table>
-  </@form.form>
-
-  <hr/>
-
-  <h2>Testing default attributes</h2>
-  <@form.form "user" id="form2"
-                     cssClass="my_cssClass"
-                     cssStyle="my_cssStyle"
-                     lang="my_lang"
-                     title="my_title"
-                     dir="my_dir"
-                     tabindex="my_tabindex"
-                     onclick="my_onclick()"
-                     ondblclick="my_ondblclick()"
-                     onmousedown="my_onmousedown()"
-                     onmouseup="my_onmouseup()"
-                     onmouseover="my_onmouseover()"
-                     onmousemove="my_onmousemove()"
-                     onmouseout="my_onmouseout()"
-                     onkeypress="my_onkeypress()"
-                     onkeyup="my_onkeyup()"
-                     onkeydown="my_onkeydown()"
-                     cssErrorClass="my_cssErrorClass"
-                     action="my_action"
-                     method="post"
-                     target="my_target"
-                     enctype="my_enctype"
-                     acceptCharset="my_acceptCharset"
-                     onsubmit="my_onsubmit()"
-                     onreset="my_onreset()"
-                     autocomplete="my_autocomplete"
-                     name="my_name"
-                     value="my_value"
-                     type="my_type"
-                     servletRelativeAction="my_servletRelativeAction"
-                     methodParam="my_methodParam">
-  </@form.form>
-
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/freemarker/blob/e9ca9d4c/freemarker-spring/src/test/resources/META-INF/web-resources/views/test/model/form/hidden-input-directive-usages.f3ah
----------------------------------------------------------------------
diff --git 
a/freemarker-spring/src/test/resources/META-INF/web-resources/views/test/model/form/hidden-input-directive-usages.f3ah
 
b/freemarker-spring/src/test/resources/META-INF/web-resources/views/test/model/form/hidden-input-directive-usages.f3ah
new file mode 100644
index 0000000..090ebb4
--- /dev/null
+++ 
b/freemarker-spring/src/test/resources/META-INF/web-resources/views/test/model/form/hidden-input-directive-usages.f3ah
@@ -0,0 +1,63 @@
+<#--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<html>
+<body>
+
+  <h1>Form 1</h1>
+  <hr/>
+  <form id="form1">
+    <table>
+      <tr>
+        <th>Hidden 1:</th>
+        <td>
+          <@form.hidden 'user.email' />
+        </td>
+      </tr>
+    </table>
+  </form>
+
+  <hr/>
+
+  <form id="form2">
+    <table>
+      <tr>
+        <th>Hidden 2:</th>
+        <td>
+          <@form.hidden 'user.email' disabled=true />
+        </td>
+      </tr>
+    </table>
+  </form>
+
+  <hr/>
+
+  <h2>Testing with setting showPassword to false explicitly</h2>
+  <form id="form3">
+    <table>
+      <tr>
+        <th>Password:</th>
+        <td>
+          <@form.password 'user.password' showPassword=false />
+        </td>
+      </tr>
+    </table>
+  </form>
+
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/freemarker/blob/e9ca9d4c/freemarker-spring/src/test/resources/META-INF/web-resources/views/test/model/form/hidden-input-directive-usages.ftlh
----------------------------------------------------------------------
diff --git 
a/freemarker-spring/src/test/resources/META-INF/web-resources/views/test/model/form/hidden-input-directive-usages.ftlh
 
b/freemarker-spring/src/test/resources/META-INF/web-resources/views/test/model/form/hidden-input-directive-usages.ftlh
deleted file mode 100644
index 090ebb4..0000000
--- 
a/freemarker-spring/src/test/resources/META-INF/web-resources/views/test/model/form/hidden-input-directive-usages.ftlh
+++ /dev/null
@@ -1,63 +0,0 @@
-<#--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<html>
-<body>
-
-  <h1>Form 1</h1>
-  <hr/>
-  <form id="form1">
-    <table>
-      <tr>
-        <th>Hidden 1:</th>
-        <td>
-          <@form.hidden 'user.email' />
-        </td>
-      </tr>
-    </table>
-  </form>
-
-  <hr/>
-
-  <form id="form2">
-    <table>
-      <tr>
-        <th>Hidden 2:</th>
-        <td>
-          <@form.hidden 'user.email' disabled=true />
-        </td>
-      </tr>
-    </table>
-  </form>
-
-  <hr/>
-
-  <h2>Testing with setting showPassword to false explicitly</h2>
-  <form id="form3">
-    <table>
-      <tr>
-        <th>Password:</th>
-        <td>
-          <@form.password 'user.password' showPassword=false />
-        </td>
-      </tr>
-    </table>
-  </form>
-
-</body>
-</html>

Reply via email to