Repository: incubator-freemarker
Updated Branches:
  refs/heads/2.3 ec24a4247 -> 5377aadec


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/lastcharacter.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/lastcharacter.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/lastcharacter.txt
index 54d2f71..5b20799 100644
--- 
a/src/test/resources/freemarker/test/templatesuite/expected/lastcharacter.txt
+++ 
b/src/test/resources/freemarker/test/templatesuite/expected/lastcharacter.txt
@@ -1,3 +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.
+-->
 <html>
 <head>
 <title>FreeMarker: Last Character Test</title>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/list-bis.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/list-bis.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/list-bis.txt
index 1d6cdba..2978827 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/list-bis.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/list-bis.txt
@@ -1,3 +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.
+-->
     0: a [0:A, 1:B, 2:C]
     1: b [0:A, 1:B, 2:C]
     2: c [0:A, 1:B, 2:C]

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/list.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/list.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/list.txt
index 7cdac1e..514cff5 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/list.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/list.txt
@@ -1,3 +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.
+-->
 Size: 4
 Items: @0 aardvark, @1 bear, @2 cat, @3 dog.
 

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/list2.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/list2.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/list2.txt
index 0fe498d..361f786 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/list2.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/list2.txt
@@ -1,3 +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.
+-->
 === [aardvark, bear, cat, dog] ===
 
 -- List+sep:

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/list3.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/list3.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/list3.txt
index 50d3da8..4a4f632 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/list3.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/list3.txt
@@ -1,3 +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.
+-->
 [
     [(11@0, 11@0), (11@0, 22@1), (11@0, 33@2)],
     [(22@1, 11@0), (22@1, 22@1), (22@1, 33@2)],

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/listliteral.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/listliteral.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/listliteral.txt
index 8b13180..a7f832c 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/listliteral.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/listliteral.txt
@@ -1,3 +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.
+-->
 <html>
 <head>
 <title>FreeMarker: List Literal Test</title>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/localization.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/localization.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/localization.txt
index d918be0..349662d 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/localization.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/localization.txt
@@ -1,3 +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.
+-->
 <html>
 <head>
 <title>FreeMarker: Localization Test</title>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/logging.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/logging.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/logging.txt
index e6a1c9e..35c56bd 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/logging.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/logging.txt
@@ -1,3 +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.
+-->
 <html>
 <head>
 <title>FreeMarker: Logging Test</title>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/loopvariable.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/loopvariable.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/loopvariable.txt
index fd1c38a..a96ae2b 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/loopvariable.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/loopvariable.txt
@@ -1,3 +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.
+-->
 ---
   2
   -     L1 1

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/macros-return.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/macros-return.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/macros-return.txt
index c7f0329..2ec0812 100644
--- 
a/src/test/resources/freemarker/test/templatesuite/expected/macros-return.txt
+++ 
b/src/test/resources/freemarker/test/templatesuite/expected/macros-return.txt
@@ -1,3 +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.
+-->
 m{
 m{
 m{

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/macros.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/macros.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/macros.txt
index f5008d4..18ef53a 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/macros.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/macros.txt
@@ -1,3 +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.
+-->
 <html>
 <head>
 <title>FreeMarker: Function Test</title>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/macros2.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/macros2.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/macros2.txt
index 8db709d..5fb707f 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/macros2.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/macros2.txt
@@ -1,3 +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.
+-->
 1 1
 2 2
 4

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/multimodels.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/multimodels.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/multimodels.txt
index 39fd626..44fe7de 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/multimodels.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/multimodels.txt
@@ -1,3 +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.
+-->
 <html>
 <head>
 <title>FreeMarker: Test of Multiple Model implementations</title>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/nested.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/nested.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/nested.txt
index 4e3845b..1f6b896 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/nested.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/nested.txt
@@ -1,3 +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.
+-->
     test 3/1: undefined undefined undefined 
     test 3/2: undefined undefined undefined 
     test 3/3: undefined undefined undefined 

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/new-allowsnothing.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/new-allowsnothing.txt
 
b/src/test/resources/freemarker/test/templatesuite/expected/new-allowsnothing.txt
index 8d50c0d..e6e3206 100644
--- 
a/src/test/resources/freemarker/test/templatesuite/expected/new-allowsnothing.txt
+++ 
b/src/test/resources/freemarker/test/templatesuite/expected/new-allowsnothing.txt
@@ -1 +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.
+-->
 fails
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/new-defaultresolver.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/new-defaultresolver.txt
 
b/src/test/resources/freemarker/test/templatesuite/expected/new-defaultresolver.txt
index 719734a..b139a43 100644
--- 
a/src/test/resources/freemarker/test/templatesuite/expected/new-defaultresolver.txt
+++ 
b/src/test/resources/freemarker/test/templatesuite/expected/new-defaultresolver.txt
@@ -1,2 +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.
+-->
 works
 works
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/new-optin.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/new-optin.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/new-optin.txt
index f040e9f..894a042 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/new-optin.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/new-optin.txt
@@ -1,3 +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.
+-->
 works
 fails
 

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/new-safer.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/new-safer.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/new-safer.txt
index 05b1d09..20ada0a 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/new-safer.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/new-safer.txt
@@ -1,2 +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.
+-->
 works
 fails
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/new-unrestricted.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/new-unrestricted.txt
 
b/src/test/resources/freemarker/test/templatesuite/expected/new-unrestricted.txt
index 719734a..b139a43 100644
--- 
a/src/test/resources/freemarker/test/templatesuite/expected/new-unrestricted.txt
+++ 
b/src/test/resources/freemarker/test/templatesuite/expected/new-unrestricted.txt
@@ -1,2 +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.
+-->
 works
 works
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/newlines1.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/newlines1.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/newlines1.txt
index 1417f59..d05be53 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/newlines1.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/newlines1.txt
@@ -1,3 +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.
+-->
 <html>
 <head>
 <title>FreeMarker: Newlines Test</title>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/newlines2.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/newlines2.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/newlines2.txt
index 4afa949..243dd40 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/newlines2.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/newlines2.txt
@@ -1,3 +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.
+-->
 <html>
 <head>
 <title>FreeMarker: Newlines the Second Test</title>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/non-strict-syntax.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/non-strict-syntax.txt
 
b/src/test/resources/freemarker/test/templatesuite/expected/non-strict-syntax.txt
index 8e75ac6..0ec48fd 100644
--- 
a/src/test/resources/freemarker/test/templatesuite/expected/non-strict-syntax.txt
+++ 
b/src/test/resources/freemarker/test/templatesuite/expected/non-strict-syntax.txt
@@ -1,3 +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.
+-->
 <html>
 <head>
 <title>FreeMarker: Identifier Test</title>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/noparse.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/noparse.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/noparse.txt
index f8a9687..1277659 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/noparse.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/noparse.txt
@@ -1,3 +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.
+-->
 <html>
 <head>
 <title>FreeMarker: NoParse Test</title>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/number-format.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/number-format.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/number-format.txt
index dee1ab3..46a6a1f 100644
--- 
a/src/test/resources/freemarker/test/templatesuite/expected/number-format.txt
+++ 
b/src/test/resources/freemarker/test/templatesuite/expected/number-format.txt
@@ -1,3 +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.
+-->
 1
 1
 1 234 567,89

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/number-literal.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/number-literal.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/number-literal.txt
index 595b22f..d0b8aef 100644
--- 
a/src/test/resources/freemarker/test/templatesuite/expected/number-literal.txt
+++ 
b/src/test/resources/freemarker/test/templatesuite/expected/number-literal.txt
@@ -1,3 +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.
+-->
 <html>
 <head>
 <title>FreeMarker: Number Literal Test</title>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/number-to-date.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/number-to-date.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/number-to-date.txt
index 0307bba..0ba4d6d 100644
--- 
a/src/test/resources/freemarker/test/templatesuite/expected/number-to-date.txt
+++ 
b/src/test/resources/freemarker/test/templatesuite/expected/number-to-date.txt
@@ -1,3 +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.
+-->
 2011-05-16T19:47:55.54Z == 2011-05-16T19:47:55.54Z
 2011-05-16 == 2011-05-16
 19:47:55.54Z == 19:47:55.54Z

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/numerical-cast.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/numerical-cast.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/numerical-cast.txt
index 9c427af..4e8826e 100644
--- 
a/src/test/resources/freemarker/test/templatesuite/expected/numerical-cast.txt
+++ 
b/src/test/resources/freemarker/test/templatesuite/expected/numerical-cast.txt
@@ -1,3 +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.
+-->
 
 ?int:
     0?int=0

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/output-encoding1.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/output-encoding1.txt
 
b/src/test/resources/freemarker/test/templatesuite/expected/output-encoding1.txt
index b86be9d..0c080c3 100644
--- 
a/src/test/resources/freemarker/test/templatesuite/expected/output-encoding1.txt
+++ 
b/src/test/resources/freemarker/test/templatesuite/expected/output-encoding1.txt
@@ -1,3 +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.
+-->
 Output charset: UTF-8
 URL escaping charset: undefined
 

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/output-encoding2.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/output-encoding2.txt
 
b/src/test/resources/freemarker/test/templatesuite/expected/output-encoding2.txt
index e3e8519..2afd95b 100644
Binary files 
a/src/test/resources/freemarker/test/templatesuite/expected/output-encoding2.txt
 and 
b/src/test/resources/freemarker/test/templatesuite/expected/output-encoding2.txt
 differ

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/output-encoding3.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/output-encoding3.txt
 
b/src/test/resources/freemarker/test/templatesuite/expected/output-encoding3.txt
index 8e5cbaa..27e9c6b 100644
--- 
a/src/test/resources/freemarker/test/templatesuite/expected/output-encoding3.txt
+++ 
b/src/test/resources/freemarker/test/templatesuite/expected/output-encoding3.txt
@@ -1,3 +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.
+-->
 Output charset: ISO-8859-1
 URL escaping charset: UTF-16
 

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/precedence.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/precedence.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/precedence.txt
index 57cbe96..092a7ce 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/precedence.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/precedence.txt
@@ -1,3 +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.
+-->
 <html>
 <head>
 <title>FreeMarker: Operator Precedence Test</title>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/recover.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/recover.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/recover.txt
index f6754e0..b40090f 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/recover.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/recover.txt
@@ -1,3 +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.
+-->
  Hello, World
  Well, that did not work.
  Now we nest another attempt/recover here:

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/root.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/root.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/root.txt
index 3467bc8..38962ea 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/root.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/root.txt
@@ -1,3 +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.
+-->
 <html>
 <head>
 <title>FreeMarker: Root Lookup Test</title>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/sequence-builtins.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/sequence-builtins.txt
 
b/src/test/resources/freemarker/test/templatesuite/expected/sequence-builtins.txt
index 9ff50f8..0377aa1 100644
--- 
a/src/test/resources/freemarker/test/templatesuite/expected/sequence-builtins.txt
+++ 
b/src/test/resources/freemarker/test/templatesuite/expected/sequence-builtins.txt
@@ -1,3 +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.
+-->
 Sorting scalars:
 ----------------
 

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/specialvars.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/specialvars.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/specialvars.txt
index 33befd6..a562f99 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/specialvars.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/specialvars.txt
@@ -1,3 +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.
+-->
 en == en
 en_US == en_US
 utf-8 == utf-8

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/strictinheader.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/strictinheader.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/strictinheader.txt
index 89a3991..61830d9 100644
--- 
a/src/test/resources/freemarker/test/templatesuite/expected/strictinheader.txt
+++ 
b/src/test/resources/freemarker/test/templatesuite/expected/strictinheader.txt
@@ -1,3 +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.
+-->
 1
 <include "test1.ftl">
 34
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/string-builtins-regexps-matches.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/string-builtins-regexps-matches.txt
 
b/src/test/resources/freemarker/test/templatesuite/expected/string-builtins-regexps-matches.txt
index e4d3517..aa90183 100644
--- 
a/src/test/resources/freemarker/test/templatesuite/expected/string-builtins-regexps-matches.txt
+++ 
b/src/test/resources/freemarker/test/templatesuite/expected/string-builtins-regexps-matches.txt
@@ -1,3 +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.
+-->
 
 List mode:
 Size: 4

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/string-builtins-regexps.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/string-builtins-regexps.txt
 
b/src/test/resources/freemarker/test/templatesuite/expected/string-builtins-regexps.txt
index eed49b2..761c7ab 100644
--- 
a/src/test/resources/freemarker/test/templatesuite/expected/string-builtins-regexps.txt
+++ 
b/src/test/resources/freemarker/test/templatesuite/expected/string-builtins-regexps.txt
@@ -1,3 +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.
+-->
 true == true
 true == true
 

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/string-builtins1.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/string-builtins1.txt
 
b/src/test/resources/freemarker/test/templatesuite/expected/string-builtins1.txt
index 0b11497..c0e24d1 100644
--- 
a/src/test/resources/freemarker/test/templatesuite/expected/string-builtins1.txt
+++ 
b/src/test/resources/freemarker/test/templatesuite/expected/string-builtins1.txt
@@ -1,3 +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.
+-->
 FreeMarker: Encoding string built-in tests
 
   

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/string-builtins2.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/string-builtins2.txt
 
b/src/test/resources/freemarker/test/templatesuite/expected/string-builtins2.txt
index 212e913..9a39cb1 100644
--- 
a/src/test/resources/freemarker/test/templatesuite/expected/string-builtins2.txt
+++ 
b/src/test/resources/freemarker/test/templatesuite/expected/string-builtins2.txt
@@ -1,3 +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.
+-->
 --
 1 = 1
 5 = 5

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/stringbimethods.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/stringbimethods.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/stringbimethods.txt
index a5a0394..b3c040a 100644
--- 
a/src/test/resources/freemarker/test/templatesuite/expected/stringbimethods.txt
+++ 
b/src/test/resources/freemarker/test/templatesuite/expected/stringbimethods.txt
@@ -1,3 +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.
+-->
 3.00
 3.00
 01:02:03.000

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/stringliteral.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/stringliteral.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/stringliteral.txt
index 0496c1b..118e1d5 100644
Binary files 
a/src/test/resources/freemarker/test/templatesuite/expected/stringliteral.txt 
and 
b/src/test/resources/freemarker/test/templatesuite/expected/stringliteral.txt 
differ

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/switch.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/switch.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/switch.txt
index 148506f..5b983c7 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/switch.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/switch.txt
@@ -1,3 +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.
+-->
 <html>
 <head>
 <title>FreeMarker: Switch-Case Test</title>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/transforms.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/transforms.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/transforms.txt
index ea8631f..f0f4809 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/transforms.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/transforms.txt
@@ -1,3 +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.
+-->
 <html>
 <head>
 <title>FreeMarker: Transformation Test</title>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/type-builtins-ici-2.3.21.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/type-builtins-ici-2.3.21.txt
 
b/src/test/resources/freemarker/test/templatesuite/expected/type-builtins-ici-2.3.21.txt
index 74e1436..07a1364 100644
--- 
a/src/test/resources/freemarker/test/templatesuite/expected/type-builtins-ici-2.3.21.txt
+++ 
b/src/test/resources/freemarker/test/templatesuite/expected/type-builtins-ici-2.3.21.txt
@@ -1,3 +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.
+-->
 StNuBoMeTaMaHaHxSeCoCxEnInDiNo
 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0
 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/type-builtins-ici-2.3.24.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/type-builtins-ici-2.3.24.txt
 
b/src/test/resources/freemarker/test/templatesuite/expected/type-builtins-ici-2.3.24.txt
index b96f6f9..f7564b3 100644
--- 
a/src/test/resources/freemarker/test/templatesuite/expected/type-builtins-ici-2.3.24.txt
+++ 
b/src/test/resources/freemarker/test/templatesuite/expected/type-builtins-ici-2.3.24.txt
@@ -1,3 +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.
+-->
 StNuBoMeTaMaHaHxSeCoCxEnInDiNo
 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0
 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/type-builtins.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/type-builtins.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/type-builtins.txt
index f325299..7038964 100644
--- 
a/src/test/resources/freemarker/test/templatesuite/expected/type-builtins.txt
+++ 
b/src/test/resources/freemarker/test/templatesuite/expected/type-builtins.txt
@@ -1,3 +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.
+-->
 StNuBoMeTaMaHaHxSeCoCxEnInDiNo
 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0
 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/var-layers.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/var-layers.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/var-layers.txt
index 20424de..384de55 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/var-layers.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/var-layers.txt
@@ -1,3 +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.
+-->
   1 = 1
   2 = 2
   3 = 3

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/varargs.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/varargs.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/varargs.txt
index d7a6948..043e5e7 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/varargs.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/varargs.txt
@@ -1,3 +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.
+-->
 
 0 == 0
 0 == 0

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/variables.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/variables.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/variables.txt
index 5e788bb..8aaf82a 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/variables.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/variables.txt
@@ -1,3 +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.
+-->
 <html>
 <head>
 <title>FreeMarker: Variable Test</title>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/whitespace-trim.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/whitespace-trim.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/whitespace-trim.txt
index 98c94ec..6b7520b 100644
--- 
a/src/test/resources/freemarker/test/templatesuite/expected/whitespace-trim.txt
+++ 
b/src/test/resources/freemarker/test/templatesuite/expected/whitespace-trim.txt
@@ -1,3 +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.
+-->
 LB
 LB
 LB

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/wstrip-in-header.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/wstrip-in-header.txt
 
b/src/test/resources/freemarker/test/templatesuite/expected/wstrip-in-header.txt
index c87f0ba..7f7c484 100644
--- 
a/src/test/resources/freemarker/test/templatesuite/expected/wstrip-in-header.txt
+++ 
b/src/test/resources/freemarker/test/templatesuite/expected/wstrip-in-header.txt
@@ -1,3 +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.
+-->
 a
 
 b

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/wstripping.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/wstripping.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/wstripping.txt
index 6bdec20..4714c0d 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/wstripping.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/wstripping.txt
@@ -1,3 +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.
+-->
 a
 b
 c 

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/xml-fragment.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/xml-fragment.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/xml-fragment.txt
index 363cb1a..7ae3f2b 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/xml-fragment.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/xml-fragment.txt
@@ -1,3 +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.
+-->
 b = b
 @document = @document
 @document = @document

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/xml-ns_prefix-scope.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/xml-ns_prefix-scope.txt
 
b/src/test/resources/freemarker/test/templatesuite/expected/xml-ns_prefix-scope.txt
index 7e9dc26..b3a3ea7 100644
--- 
a/src/test/resources/freemarker/test/templatesuite/expected/xml-ns_prefix-scope.txt
+++ 
b/src/test/resources/freemarker/test/templatesuite/expected/xml-ns_prefix-scope.txt
@@ -1,3 +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.
+-->
 //e: e in NS namespace-test, e in NS namespace-test
 //n:e: e in NS foo, e in NS foo
 //bar:e: e in NS bar, e in NS bar

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/xml.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/xml.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/xml.txt
index 94c4d95..8860948 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/xml.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/xml.txt
@@ -1,3 +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.
+-->
   <?firstPi customKey="something"?>
   firstPi
   customKey="something"

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/xmlns1.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/xmlns1.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/xmlns1.txt
index 4983926..258c353 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/xmlns1.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/xmlns1.txt
@@ -1,3 +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.
+-->
 
 <book xmlns="http://example.com/eBook";>
   <title>Test Book</title>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/xmlns3.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/xmlns3.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/xmlns3.txt
index d868b0b..8f0dbcb 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/xmlns3.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/xmlns3.txt
@@ -1,3 +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.
+-->
   <html>
     <head>
       <title>Test Book</title>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/xmlns4.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/xmlns4.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/xmlns4.txt
index d868b0b..8f0dbcb 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/xmlns4.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/xmlns4.txt
@@ -1,3 +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.
+-->
   <html>
     <head>
       <title>Test Book</title>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/xmlns5.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/xmlns5.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/xmlns5.txt
index 43a9ef0..a622d8c 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/xmlns5.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/xmlns5.txt
@@ -1,3 +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.
+-->
 No NS = No NS
 x NS = x NS
 y NS = y NS

Reply via email to