You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@freemarker.apache.org by dd...@apache.org on 2017/03/01 14:18:26 UTC

[13/13] incubator-freemarker git commit: Changing copyright header format to be identical to IntelliJ generated copyright headers

Changing copyright header format to be identical to IntelliJ generated copyright headers


Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/f0ec63c2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/f0ec63c2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/f0ec63c2

Branch: refs/heads/3
Commit: f0ec63c2d66640647b2defcc82bf499599427f21
Parents: ff186d0
Author: ddekany <dd...@apache.org>
Authored: Wed Mar 1 14:16:53 2017 +0100
Committer: ddekany <dd...@apache.org>
Committed: Wed Mar 1 15:15:45 2017 +0100

----------------------------------------------------------------------
 src/dist/bin/documentation/index.html            |   4 ++--
 .../Eclipse/Formatter-profile-FreeMarker.xml     |   4 ++--
 .../IntelliJ-IDEA/Java-code-style-FreeMarker.xml |   4 ++--
 .../core/APINotSupportedTemplateException.java   |   4 ++--
 .../org/apache/freemarker/core/ASTComment.java   |   4 ++--
 .../apache/freemarker/core/ASTDebugBreak.java    |   4 ++--
 .../apache/freemarker/core/ASTDirAssignment.java |   4 ++--
 .../core/ASTDirAssignmentsContainer.java         |   4 ++--
 .../core/ASTDirAttemptRecoverContainer.java      |   4 ++--
 .../apache/freemarker/core/ASTDirAutoEsc.java    |   4 ++--
 .../org/apache/freemarker/core/ASTDirBreak.java  |   4 ++--
 .../core/ASTDirCapturingAssignment.java          |   4 ++--
 .../org/apache/freemarker/core/ASTDirCase.java   |   4 ++--
 .../apache/freemarker/core/ASTDirCompress.java   |   4 ++--
 .../apache/freemarker/core/ASTDirElseOfList.java |   4 ++--
 .../org/apache/freemarker/core/ASTDirEscape.java |   4 ++--
 .../apache/freemarker/core/ASTDirFallback.java   |   4 ++--
 .../org/apache/freemarker/core/ASTDirFlush.java  |   4 ++--
 .../core/ASTDirIfElseIfElseContainer.java        |   4 ++--
 .../freemarker/core/ASTDirIfOrElseOrElseIf.java  |   4 ++--
 .../org/apache/freemarker/core/ASTDirImport.java |   4 ++--
 .../apache/freemarker/core/ASTDirInclude.java    |   4 ++--
 .../org/apache/freemarker/core/ASTDirItems.java  |   4 ++--
 .../org/apache/freemarker/core/ASTDirList.java   |   4 ++--
 .../freemarker/core/ASTDirListElseContainer.java |   4 ++--
 .../org/apache/freemarker/core/ASTDirMacro.java  |   4 ++--
 .../org/apache/freemarker/core/ASTDirNested.java |   4 ++--
 .../apache/freemarker/core/ASTDirNoAutoEsc.java  |   4 ++--
 .../apache/freemarker/core/ASTDirNoEscape.java   |   4 ++--
 .../freemarker/core/ASTDirOutputFormat.java      |   4 ++--
 .../apache/freemarker/core/ASTDirRecover.java    |   4 ++--
 .../apache/freemarker/core/ASTDirRecurse.java    |   4 ++--
 .../org/apache/freemarker/core/ASTDirReturn.java |   4 ++--
 .../org/apache/freemarker/core/ASTDirSep.java    |   4 ++--
 .../apache/freemarker/core/ASTDirSetting.java    |   4 ++--
 .../org/apache/freemarker/core/ASTDirStop.java   |   4 ++--
 .../org/apache/freemarker/core/ASTDirSwitch.java |   4 ++--
 .../apache/freemarker/core/ASTDirTOrTrOrTl.java  |   4 ++--
 .../apache/freemarker/core/ASTDirTransform.java  |   4 ++--
 .../freemarker/core/ASTDirUserDefined.java       |   4 ++--
 .../org/apache/freemarker/core/ASTDirVisit.java  |   4 ++--
 .../org/apache/freemarker/core/ASTDirective.java |   4 ++--
 .../freemarker/core/ASTDollarInterpolation.java  |   4 ++--
 .../org/apache/freemarker/core/ASTElement.java   |   4 ++--
 .../freemarker/core/ASTExpAddOrConcat.java       |   4 ++--
 .../org/apache/freemarker/core/ASTExpAnd.java    |   4 ++--
 .../apache/freemarker/core/ASTExpBoolean.java    |   4 ++--
 .../freemarker/core/ASTExpBooleanLiteral.java    |   4 ++--
 .../apache/freemarker/core/ASTExpBuiltIn.java    |   4 ++--
 .../freemarker/core/ASTExpBuiltInVariable.java   |   4 ++--
 .../apache/freemarker/core/ASTExpComparison.java |   4 ++--
 .../apache/freemarker/core/ASTExpDefault.java    |   4 ++--
 .../org/apache/freemarker/core/ASTExpDot.java    |   4 ++--
 .../freemarker/core/ASTExpDynamicKeyName.java    |   4 ++--
 .../org/apache/freemarker/core/ASTExpExists.java |   4 ++--
 .../freemarker/core/ASTExpHashLiteral.java       |   4 ++--
 .../freemarker/core/ASTExpListLiteral.java       |   4 ++--
 .../apache/freemarker/core/ASTExpMethodCall.java |   4 ++--
 .../freemarker/core/ASTExpNegateOrPlus.java      |   4 ++--
 .../org/apache/freemarker/core/ASTExpNot.java    |   4 ++--
 .../freemarker/core/ASTExpNumberLiteral.java     |   4 ++--
 .../org/apache/freemarker/core/ASTExpOr.java     |   4 ++--
 .../freemarker/core/ASTExpParenthesis.java       |   4 ++--
 .../org/apache/freemarker/core/ASTExpRange.java  |   4 ++--
 .../freemarker/core/ASTExpStringLiteral.java     |   4 ++--
 .../apache/freemarker/core/ASTExpVariable.java   |   4 ++--
 .../apache/freemarker/core/ASTExpression.java    |   4 ++--
 .../freemarker/core/ASTHashInterpolation.java    |   4 ++--
 .../freemarker/core/ASTImplicitParent.java       |   4 ++--
 .../apache/freemarker/core/ASTInterpolation.java |   4 ++--
 .../java/org/apache/freemarker/core/ASTNode.java |   4 ++--
 .../apache/freemarker/core/ASTStaticText.java    |   4 ++--
 .../freemarker/core/ArithmeticExpression.java    |   4 ++--
 .../freemarker/core/BoundedRangeModel.java       |   4 ++--
 .../core/BuiltInBannedWhenAutoEscaping.java      |   4 ++--
 .../apache/freemarker/core/BuiltInForDate.java   |   4 ++--
 .../apache/freemarker/core/BuiltInForHashEx.java |   4 ++--
 .../core/BuiltInForLegacyEscaping.java           |   4 ++--
 .../freemarker/core/BuiltInForLoopVariable.java  |   4 ++--
 .../freemarker/core/BuiltInForMarkupOutput.java  |   4 ++--
 .../apache/freemarker/core/BuiltInForNode.java   |   4 ++--
 .../apache/freemarker/core/BuiltInForNodeEx.java |   4 ++--
 .../apache/freemarker/core/BuiltInForNumber.java |   4 ++--
 .../freemarker/core/BuiltInForSequence.java      |   4 ++--
 .../apache/freemarker/core/BuiltInForString.java |   4 ++--
 .../core/BuiltInWithParseTimeParameters.java     |   4 ++--
 .../apache/freemarker/core/BuiltInsForDates.java |   4 ++--
 .../core/BuiltInsForExistenceHandling.java       |   4 ++--
 .../freemarker/core/BuiltInsForHashes.java       |   4 ++--
 .../core/BuiltInsForLoopVariables.java           |   4 ++--
 .../core/BuiltInsForMarkupOutputs.java           |   4 ++--
 .../core/BuiltInsForMultipleTypes.java           |   4 ++--
 .../apache/freemarker/core/BuiltInsForNodes.java |   4 ++--
 .../freemarker/core/BuiltInsForNumbers.java      |   4 ++--
 .../core/BuiltInsForOutputFormatRelated.java     |   4 ++--
 .../freemarker/core/BuiltInsForSequences.java    |   4 ++--
 .../freemarker/core/BuiltInsForStringsBasic.java |   4 ++--
 .../core/BuiltInsForStringsEncoding.java         |   4 ++--
 .../freemarker/core/BuiltInsForStringsMisc.java  |   4 ++--
 .../core/BuiltInsForStringsRegexp.java           |   4 ++--
 .../core/BuiltInsWithParseTimeParameters.java    |   4 ++--
 ...llPlaceCustomDataInitializationException.java |   4 ++--
 .../org/apache/freemarker/core/Configurable.java |   4 ++--
 .../apache/freemarker/core/Configuration.java    |   4 ++--
 .../freemarker/core/ConfigurationException.java  |   4 ++--
 ...ConfigurationSettingValueStringException.java |   4 ++--
 .../apache/freemarker/core/CustomAttribute.java  |   4 ++--
 .../freemarker/core/DirectiveCallPlace.java      |   4 ++--
 .../org/apache/freemarker/core/Environment.java  |   4 ++--
 .../core/InvalidReferenceException.java          |   4 ++--
 .../core/ListableRightUnboundedRangeModel.java   |   4 ++--
 .../org/apache/freemarker/core/LocalContext.java |   4 ++--
 .../freemarker/core/LocalContextStack.java       |   4 ++--
 .../core/MarkupOutputFormatBoundBuiltIn.java     |   4 ++--
 .../org/apache/freemarker/core/MessageUtil.java  |   4 ++--
 .../org/apache/freemarker/core/MiscUtil.java     |   4 ++--
 .../core/NestedContentNotSupportedException.java |   4 ++--
 .../freemarker/core/NonBooleanException.java     |   4 ++--
 .../apache/freemarker/core/NonDateException.java |   4 ++--
 .../core/NonExtendedHashException.java           |   4 ++--
 .../core/NonExtendedNodeException.java           |   4 ++--
 .../apache/freemarker/core/NonHashException.java |   4 ++--
 .../core/NonMarkupOutputException.java           |   4 ++--
 .../freemarker/core/NonMethodException.java      |   4 ++--
 .../freemarker/core/NonNamespaceException.java   |   4 ++--
 .../apache/freemarker/core/NonNodeException.java |   4 ++--
 .../freemarker/core/NonNumericalException.java   |   4 ++--
 .../freemarker/core/NonSequenceException.java    |   4 ++--
 .../core/NonSequenceOrCollectionException.java   |   4 ++--
 .../freemarker/core/NonStringException.java      |   4 ++--
 .../core/NonStringOrTemplateOutputException.java |   4 ++--
 .../NonUserDefinedDirectiveLikeException.java    |   4 ++--
 .../core/OutputFormatBoundBuiltIn.java           |   4 ++--
 .../apache/freemarker/core/ParameterRole.java    |   4 ++--
 .../apache/freemarker/core/ParseException.java   |   4 ++--
 .../freemarker/core/ParserConfiguration.java     |   4 ++--
 .../org/apache/freemarker/core/RangeModel.java   |   4 ++--
 .../org/apache/freemarker/core/RegexpHelper.java |   4 ++--
 .../core/RightUnboundedRangeModel.java           |   4 ++--
 .../apache/freemarker/core/SpecialBuiltIn.java   |   4 ++--
 .../apache/freemarker/core/StopException.java    |   4 ++--
 .../org/apache/freemarker/core/Template.java     |   4 ++--
 .../freemarker/core/TemplateClassResolver.java   |   4 ++--
 .../freemarker/core/TemplateConfiguration.java   |   4 ++--
 .../core/TemplateElementArrayBuilder.java        |   4 ++--
 .../freemarker/core/TemplateElementsToVisit.java |   4 ++--
 .../freemarker/core/TemplateException.java       |   4 ++--
 .../core/TemplateExceptionHandler.java           |   4 ++--
 .../core/TemplateNotFoundException.java          |   4 ++--
 .../freemarker/core/TemplatePostProcessor.java   |   4 ++--
 .../core/TemplatePostProcessorException.java     |   4 ++--
 ...InterruptionSupportTemplatePostProcessor.java |   4 ++--
 .../apache/freemarker/core/TokenMgrError.java    |   4 ++--
 .../freemarker/core/UnexpectedTypeException.java |   4 ++--
 .../UnknownConfigurationSettingException.java    |   4 ++--
 .../java/org/apache/freemarker/core/Version.java |   4 ++--
 .../org/apache/freemarker/core/_CoreAPI.java     |   4 ++--
 .../org/apache/freemarker/core/_CoreLogs.java    |   4 ++--
 .../java/org/apache/freemarker/core/_Debug.java  |   4 ++--
 .../apache/freemarker/core/_DelayedAOrAn.java    |   4 ++--
 .../core/_DelayedConversionToString.java         |   4 ++--
 .../core/_DelayedFTLTypeDescription.java         |   4 ++--
 .../core/_DelayedGetCanonicalForm.java           |   4 ++--
 .../freemarker/core/_DelayedGetMessage.java      |   4 ++--
 .../core/_DelayedGetMessageWithoutStackTop.java  |   4 ++--
 .../apache/freemarker/core/_DelayedJQuote.java   |   4 ++--
 .../freemarker/core/_DelayedJoinWithComma.java   |   4 ++--
 .../apache/freemarker/core/_DelayedOrdinal.java  |   4 ++--
 .../freemarker/core/_DelayedShortClassName.java  |   4 ++--
 .../apache/freemarker/core/_DelayedToString.java |   4 ++--
 .../core/_ErrorDescriptionBuilder.java           |   4 ++--
 .../org/apache/freemarker/core/_EvalUtil.java    |   4 ++--
 .../freemarker/core/_MiscTemplateException.java  |   4 ++--
 ..._ObjectBuilderSettingEvaluationException.java |   4 ++--
 .../core/_ObjectBuilderSettingEvaluator.java     |   4 ++--
 .../_ParserConfigurationWithInheritedFormat.java |   4 ++--
 .../core/_SettingEvaluationEnvironment.java      |   4 ++--
 .../freemarker/core/_TemplateModelException.java |   4 ++--
 .../apache/freemarker/core/_TimeZoneBuilder.java |   4 ++--
 ...nexpectedTypeErrorExplainerTemplateModel.java |   4 ++--
 .../core/arithmetic/ArithmeticEngine.java        |   4 ++--
 .../impl/BigDecimalArithmeticEngine.java         |   4 ++--
 .../impl/ConservativeArithmeticEngine.java       |   4 ++--
 .../apache/freemarker/core/debug/Breakpoint.java |   4 ++--
 .../apache/freemarker/core/debug/DebugModel.java |   4 ++--
 .../core/debug/DebuggedEnvironment.java          |   4 ++--
 .../apache/freemarker/core/debug/Debugger.java   |   4 ++--
 .../freemarker/core/debug/DebuggerClient.java    |   4 ++--
 .../freemarker/core/debug/DebuggerListener.java  |   4 ++--
 .../core/debug/EnvironmentSuspendedEvent.java    |   4 ++--
 .../core/debug/impl/DebuggerServer.java          |   4 ++--
 .../core/debug/impl/DebuggerService.java         |   4 ++--
 .../core/debug/impl/RmiDebugModelImpl.java       |   4 ++--
 .../debug/impl/RmiDebuggedEnvironmentImpl.java   |   4 ++--
 .../core/debug/impl/RmiDebuggerImpl.java         |   4 ++--
 .../core/debug/impl/RmiDebuggerListenerImpl.java |   4 ++--
 .../core/debug/impl/RmiDebuggerService.java      |   4 ++--
 .../freemarker/core/debug/impl/SoftCache.java    |   4 ++--
 .../apache/freemarker/core/debug/package.html    |   4 ++--
 .../core/model/AdapterTemplateModel.java         |   4 ++--
 .../apache/freemarker/core/model/Constants.java  |   4 ++--
 .../core/model/FalseTemplateBooleanModel.java    |   4 ++--
 .../core/model/GeneralPurposeNothing.java        |   4 ++--
 .../freemarker/core/model/ObjectWrapper.java     |   4 ++--
 .../core/model/ObjectWrapperAndUnwrapper.java    |   4 ++--
 .../core/model/ObjectWrapperWithAPISupport.java  |   4 ++--
 .../freemarker/core/model/RichObjectWrapper.java |   4 ++--
 .../model/SerializableTemplateBooleanModel.java  |   4 ++--
 .../core/model/TemplateBooleanModel.java         |   4 ++--
 .../core/model/TemplateCollectionModel.java      |   4 ++--
 .../core/model/TemplateCollectionModelEx.java    |   4 ++--
 .../freemarker/core/model/TemplateDateModel.java |   4 ++--
 .../core/model/TemplateDirectiveBody.java        |   4 ++--
 .../core/model/TemplateDirectiveModel.java       |   4 ++--
 .../freemarker/core/model/TemplateHashModel.java |   4 ++--
 .../core/model/TemplateHashModelEx.java          |   4 ++--
 .../core/model/TemplateHashModelEx2.java         |   4 ++--
 .../core/model/TemplateMarkupOutputModel.java    |   4 ++--
 .../core/model/TemplateMethodModel.java          |   4 ++--
 .../core/model/TemplateMethodModelEx.java        |   4 ++--
 .../freemarker/core/model/TemplateModel.java     |   4 ++--
 .../core/model/TemplateModelAdapter.java         |   4 ++--
 .../core/model/TemplateModelException.java       |   4 ++--
 .../core/model/TemplateModelIterator.java        |   4 ++--
 .../core/model/TemplateModelWithAPISupport.java  |   4 ++--
 .../freemarker/core/model/TemplateNodeModel.java |   4 ++--
 .../core/model/TemplateNodeModelEx.java          |   4 ++--
 .../core/model/TemplateNumberModel.java          |   4 ++--
 .../core/model/TemplateScalarModel.java          |   4 ++--
 .../core/model/TemplateSequenceModel.java        |   4 ++--
 .../core/model/TemplateTransformModel.java       |   4 ++--
 .../freemarker/core/model/TransformControl.java  |   4 ++--
 .../core/model/TrueTemplateBooleanModel.java     |   4 ++--
 .../core/model/WrapperTemplateModel.java         |   4 ++--
 .../core/model/WrappingTemplateModel.java        |   4 ++--
 .../freemarker/core/model/impl/APIModel.java     |   4 ++--
 .../core/model/impl/ArgumentTypes.java           |   4 ++--
 .../core/model/impl/BeanAndStringModel.java      |   4 ++--
 .../freemarker/core/model/impl/BeanModel.java    |   4 ++--
 .../model/impl/CallableMemberDescriptor.java     |   4 ++--
 .../core/model/impl/CharacterOrString.java       |   4 ++--
 .../core/model/impl/ClassBasedModelFactory.java  |   4 ++--
 .../core/model/impl/ClassChangeNotifier.java     |   4 ++--
 .../core/model/impl/ClassIntrospector.java       |   4 ++--
 .../model/impl/ClassIntrospectorBuilder.java     |   4 ++--
 .../core/model/impl/CollectionAdapter.java       |   4 ++--
 .../core/model/impl/CollectionAndSequence.java   |   4 ++--
 .../core/model/impl/DefaultArrayAdapter.java     |   4 ++--
 .../model/impl/DefaultEnumerationAdapter.java    |   4 ++--
 .../core/model/impl/DefaultIterableAdapter.java  |   4 ++--
 .../core/model/impl/DefaultIteratorAdapter.java  |   4 ++--
 .../core/model/impl/DefaultListAdapter.java      |   4 ++--
 .../core/model/impl/DefaultMapAdapter.java       |   4 ++--
 .../impl/DefaultNonListCollectionAdapter.java    |   4 ++--
 .../core/model/impl/DefaultObjectWrapper.java    |   4 ++--
 .../model/impl/DefaultObjectWrapperBuilder.java  |   4 ++--
 .../impl/DefaultObjectWrapperConfiguration.java  |   4 ++--
 .../impl/DefaultUnassignableIteratorAdapter.java |   4 ++--
 .../impl/EmptyCallableMemberDescriptor.java      |   4 ++--
 .../core/model/impl/EmptyMemberAndArguments.java |   4 ++--
 .../freemarker/core/model/impl/EnumModels.java   |   4 ++--
 .../freemarker/core/model/impl/HashAdapter.java  |   4 ++--
 .../model/impl/InvalidPropertyException.java     |   4 ++--
 .../model/impl/JRebelClassChangeNotifier.java    |   4 ++--
 .../core/model/impl/JavaMethodModel.java         |   4 ++--
 .../core/model/impl/MapKeyValuePairIterator.java |   4 ++--
 .../impl/MaybeEmptyCallableMemberDescriptor.java |   4 ++--
 .../model/impl/MaybeEmptyMemberAndArguments.java |   4 ++--
 .../core/model/impl/MemberAndArguments.java      |   4 ++--
 .../model/impl/MethodAppearanceFineTuner.java    |   4 ++--
 .../freemarker/core/model/impl/MethodSorter.java |   4 ++--
 .../NonPrimitiveArrayBackedReadOnlyList.java     |   4 ++--
 .../model/impl/OverloadedFixArgsMethods.java     |   4 ++--
 .../core/model/impl/OverloadedMethods.java       |   4 ++--
 .../core/model/impl/OverloadedMethodsModel.java  |   4 ++--
 .../core/model/impl/OverloadedMethodsSubset.java |   4 ++--
 .../core/model/impl/OverloadedNumberUtil.java    |   4 ++--
 .../model/impl/OverloadedVarArgsMethods.java     |   4 ++--
 .../impl/PrimtiveArrayBackedReadOnlyList.java    |   4 ++--
 .../impl/ReflectionCallableMemberDescriptor.java |   4 ++--
 .../core/model/impl/ResourceBundleModel.java     |   4 ++--
 .../core/model/impl/SequenceAdapter.java         |   4 ++--
 .../freemarker/core/model/impl/SetAdapter.java   |   4 ++--
 .../core/model/impl/SimpleCollection.java        |   4 ++--
 .../freemarker/core/model/impl/SimpleDate.java   |   4 ++--
 .../freemarker/core/model/impl/SimpleHash.java   |   4 ++--
 .../freemarker/core/model/impl/SimpleMethod.java |   4 ++--
 .../freemarker/core/model/impl/SimpleNumber.java |   4 ++--
 .../core/model/impl/SimpleObjectWrapper.java     |   4 ++--
 .../freemarker/core/model/impl/SimpleScalar.java |   4 ++--
 .../core/model/impl/SimpleSequence.java          |   4 ++--
 .../core/model/impl/SingletonCustomizer.java     |   4 ++--
 .../freemarker/core/model/impl/StaticModel.java  |   4 ++--
 .../freemarker/core/model/impl/StaticModels.java |   4 ++--
 .../model/impl/TemplateModelListSequence.java    |   4 ++--
 .../freemarker/core/model/impl/TypeFlags.java    |   4 ++--
 .../core/model/impl/UnsafeMethods.java           |   4 ++--
 .../freemarker/core/model/impl/_MethodUtil.java  |   4 ++--
 .../freemarker/core/model/impl/_ModelAPI.java    |   4 ++--
 .../core/model/impl/_StaticObjectWrappers.java   |   4 ++--
 .../freemarker/core/model/impl/package.html      |   4 ++--
 .../apache/freemarker/core/model/package.html    |   4 ++--
 .../outputformat/CommonMarkupOutputFormat.java   |   4 ++--
 .../CommonTemplateMarkupOutputModel.java         |   4 ++--
 .../core/outputformat/MarkupOutputFormat.java    |   4 ++--
 .../core/outputformat/OutputFormat.java          |   4 ++--
 .../UnregisteredOutputFormatException.java       |   4 ++--
 .../core/outputformat/impl/CSSOutputFormat.java  |   4 ++--
 .../impl/CombinedMarkupOutputFormat.java         |   4 ++--
 .../core/outputformat/impl/HTMLOutputFormat.java |   4 ++--
 .../core/outputformat/impl/JSONOutputFormat.java |   4 ++--
 .../impl/JavaScriptOutputFormat.java             |   4 ++--
 .../outputformat/impl/PlainTextOutputFormat.java |   4 ++--
 .../core/outputformat/impl/RTFOutputFormat.java  |   4 ++--
 .../impl/TemplateCombinedMarkupOutputModel.java  |   4 ++--
 .../impl/TemplateHTMLOutputModel.java            |   4 ++--
 .../impl/TemplateRTFOutputModel.java             |   4 ++--
 .../impl/TemplateXHTMLOutputModel.java           |   4 ++--
 .../impl/TemplateXMLOutputModel.java             |   4 ++--
 .../outputformat/impl/UndefinedOutputFormat.java |   4 ++--
 .../outputformat/impl/XHTMLOutputFormat.java     |   4 ++--
 .../core/outputformat/impl/XMLOutputFormat.java  |   4 ++--
 .../java/org/apache/freemarker/core/package.html |   4 ++--
 .../core/templateresolver/AndMatcher.java        |   4 ++--
 .../core/templateresolver/CacheStorage.java      |   4 ++--
 .../CacheStorageWithGetSize.java                 |   4 ++--
 .../ConditionalTemplateConfigurationFactory.java |   4 ++--
 .../templateresolver/FileExtensionMatcher.java   |   4 ++--
 .../templateresolver/FileNameGlobMatcher.java    |   4 ++--
 .../FirstMatchTemplateConfigurationFactory.java  |   4 ++--
 .../core/templateresolver/GetTemplateResult.java |   4 ++--
 .../MalformedTemplateNameException.java          |   4 ++--
 .../MergingTemplateConfigurationFactory.java     |   4 ++--
 .../core/templateresolver/NotMatcher.java        |   4 ++--
 .../core/templateresolver/OrMatcher.java         |   4 ++--
 .../core/templateresolver/PathGlobMatcher.java   |   4 ++--
 .../core/templateresolver/PathRegexMatcher.java  |   4 ++--
 .../TemplateConfigurationFactory.java            |   4 ++--
 .../TemplateConfigurationFactoryException.java   |   4 ++--
 .../core/templateresolver/TemplateLoader.java    |   4 ++--
 .../templateresolver/TemplateLoaderSession.java  |   4 ++--
 .../templateresolver/TemplateLoadingResult.java  |   4 ++--
 .../TemplateLoadingResultStatus.java             |   4 ++--
 .../templateresolver/TemplateLoadingSource.java  |   4 ++--
 .../templateresolver/TemplateLookupContext.java  |   4 ++--
 .../templateresolver/TemplateLookupResult.java   |   4 ++--
 .../templateresolver/TemplateLookupStrategy.java |   4 ++--
 .../templateresolver/TemplateNameFormat.java     |   4 ++--
 .../core/templateresolver/TemplateResolver.java  |   4 ++--
 .../templateresolver/TemplateSourceMatcher.java  |   4 ++--
 .../core/templateresolver/_CacheAPI.java         |   4 ++--
 .../impl/ByteArrayTemplateLoader.java            |   4 ++--
 .../impl/ClassTemplateLoader.java                |   4 ++--
 .../impl/DefaultTemplateLookupStrategy.java      |   4 ++--
 .../impl/DefaultTemplateNameFormat.java          |   4 ++--
 .../impl/DefaultTemplateNameFormatFM2.java       |   4 ++--
 .../impl/DefaultTemplateResolver.java            |   4 ++--
 .../impl/FileTemplateLoader.java                 |   4 ++--
 .../templateresolver/impl/MruCacheStorage.java   |   4 ++--
 .../impl/MultiTemplateLoader.java                |   4 ++--
 .../templateresolver/impl/NullCacheStorage.java  |   4 ++--
 .../templateresolver/impl/SoftCacheStorage.java  |   4 ++--
 .../impl/StringTemplateLoader.java               |   4 ++--
 .../impl/StrongCacheStorage.java                 |   4 ++--
 ...TemplateLoaderBasedTemplateLookupContext.java |   4 ++--
 .../TemplateLoaderBasedTemplateLookupResult.java |   4 ++--
 .../templateresolver/impl/URLTemplateLoader.java |   4 ++--
 .../impl/URLTemplateLoadingSource.java           |   4 ++--
 .../impl/_TemplateLoaderUtils.java               |   4 ++--
 .../core/templateresolver/package.html           |   4 ++--
 .../freemarker/core/util/BugException.java       |   4 ++--
 .../freemarker/core/util/CaptureOutput.java      |   4 ++--
 .../apache/freemarker/core/util/DeepUnwrap.java  |   4 ++--
 .../org/apache/freemarker/core/util/FTLUtil.java |   4 ++--
 .../core/util/GenericParseException.java         |   4 ++--
 .../apache/freemarker/core/util/HtmlEscape.java  |   4 ++--
 .../freemarker/core/util/NormalizeNewlines.java  |   4 ++--
 .../freemarker/core/util/ObjectFactory.java      |   4 ++--
 .../core/util/OptInTemplateClassResolver.java    |   4 ++--
 .../freemarker/core/util/StandardCompress.java   |   4 ++--
 .../core/util/UndeclaredThrowableException.java  |   4 ++--
 .../core/util/UnrecognizedTimeZoneException.java |   4 ++--
 .../util/UnsupportedNumberClassException.java    |   4 ++--
 .../freemarker/core/util/WriteProtectable.java   |   4 ++--
 .../apache/freemarker/core/util/XmlEscape.java   |   4 ++--
 .../freemarker/core/util/_ArrayEnumeration.java  |   4 ++--
 .../freemarker/core/util/_ArrayIterator.java     |   4 ++--
 .../apache/freemarker/core/util/_ClassUtil.java  |   4 ++--
 .../freemarker/core/util/_CollectionUtil.java    |   4 ++--
 .../apache/freemarker/core/util/_DateUtil.java   |   4 ++--
 .../org/apache/freemarker/core/util/_Java8.java  |   4 ++--
 .../apache/freemarker/core/util/_Java8Impl.java  |   4 ++--
 .../freemarker/core/util/_JavaVersions.java      |   4 ++--
 .../apache/freemarker/core/util/_LocaleUtil.java |   4 ++--
 .../core/util/_NullArgumentException.java        |   4 ++--
 .../apache/freemarker/core/util/_NullWriter.java |   4 ++--
 .../apache/freemarker/core/util/_NumberUtil.java |   4 ++--
 .../freemarker/core/util/_SecurityUtil.java      |   4 ++--
 .../freemarker/core/util/_SortedArraySet.java    |   4 ++--
 .../apache/freemarker/core/util/_StringUtil.java |   4 ++--
 .../core/util/_UnmodifiableCompositeSet.java     |   4 ++--
 .../freemarker/core/util/_UnmodifiableSet.java   |   4 ++--
 .../org/apache/freemarker/core/util/package.html |   4 ++--
 .../InvalidFormatParametersException.java        |   4 ++--
 .../InvalidFormatStringException.java            |   4 ++--
 .../ParsingNotSupportedException.java            |   4 ++--
 .../core/valueformat/TemplateDateFormat.java     |   4 ++--
 .../valueformat/TemplateDateFormatFactory.java   |   4 ++--
 .../core/valueformat/TemplateFormatUtil.java     |   4 ++--
 .../core/valueformat/TemplateNumberFormat.java   |   4 ++--
 .../valueformat/TemplateNumberFormatFactory.java |   4 ++--
 .../core/valueformat/TemplateValueFormat.java    |   4 ++--
 .../TemplateValueFormatException.java            |   4 ++--
 .../valueformat/TemplateValueFormatFactory.java  |   4 ++--
 .../UndefinedCustomFormatException.java          |   4 ++--
 .../valueformat/UnformattableValueException.java |   4 ++--
 ...wnDateTypeFormattingUnsupportedException.java |   4 ++--
 ...knownDateTypeParsingUnsupportedException.java |   4 ++--
 .../valueformat/UnparsableValueException.java    |   4 ++--
 .../AliasTargetTemplateValueFormatException.java |   4 ++--
 .../impl/AliasTemplateDateFormatFactory.java     |   4 ++--
 .../impl/AliasTemplateNumberFormatFactory.java   |   4 ++--
 .../impl/ExtendedDecimalFormatParser.java        |   4 ++--
 .../impl/ISOLikeTemplateDateFormat.java          |   4 ++--
 .../impl/ISOLikeTemplateDateFormatFactory.java   |   4 ++--
 .../valueformat/impl/ISOTemplateDateFormat.java  |   4 ++--
 .../impl/ISOTemplateDateFormatFactory.java       |   4 ++--
 .../valueformat/impl/JavaTemplateDateFormat.java |   4 ++--
 .../impl/JavaTemplateDateFormatFactory.java      |   4 ++--
 .../impl/JavaTemplateNumberFormat.java           |   4 ++--
 .../impl/JavaTemplateNumberFormatFactory.java    |   4 ++--
 .../valueformat/impl/XSTemplateDateFormat.java   |   4 ++--
 .../impl/XSTemplateDateFormatFactory.java        |   4 ++--
 .../java/org/apache/freemarker/dom/AtAtKey.java  |   4 ++--
 .../freemarker/dom/AttributeNodeModel.java       |   4 ++--
 .../freemarker/dom/CharacterDataNodeModel.java   |   4 ++--
 .../org/apache/freemarker/dom/DocumentModel.java |   4 ++--
 .../apache/freemarker/dom/DocumentTypeModel.java |   4 ++--
 .../java/org/apache/freemarker/dom/DomLog.java   |   4 ++--
 .../org/apache/freemarker/dom/DomStringUtil.java |   4 ++--
 .../org/apache/freemarker/dom/ElementModel.java  |   4 ++--
 .../apache/freemarker/dom/JaxenXPathSupport.java |   4 ++--
 .../org/apache/freemarker/dom/NodeListModel.java |   4 ++--
 .../org/apache/freemarker/dom/NodeModel.java     |   4 ++--
 .../org/apache/freemarker/dom/NodeOutputter.java |   4 ++--
 .../org/apache/freemarker/dom/PINodeModel.java   |   4 ++--
 .../dom/SunInternalXalanXPathSupport.java        |   4 ++--
 .../org/apache/freemarker/dom/XPathSupport.java  |   4 ++--
 .../apache/freemarker/dom/XalanXPathSupport.java |   4 ++--
 .../java/org/apache/freemarker/dom/package.html  |   4 ++--
 .../servlet/AllHttpScopesHashModel.java          |   4 ++--
 .../freemarker/servlet/FreemarkerServlet.java    |   4 ++--
 .../freemarker/servlet/HttpRequestHashModel.java |   4 ++--
 .../servlet/HttpRequestParametersHashModel.java  |   4 ++--
 .../freemarker/servlet/HttpSessionHashModel.java |   4 ++--
 .../apache/freemarker/servlet/IncludePage.java   |   4 ++--
 .../freemarker/servlet/InitParamParser.java      |   4 ++--
 .../servlet/ServletContextHashModel.java         |   4 ++--
 .../freemarker/servlet/WebAppTemplateLoader.java |   4 ++--
 .../apache/freemarker/servlet/_ServletLogs.java  |   4 ++--
 .../jsp/CustomTagAndELFunctionCombiner.java      |   4 ++--
 .../freemarker/servlet/jsp/EventForwarding.java  |   4 ++--
 .../jsp/FreeMarkerJspApplicationContext.java     |   4 ++--
 .../servlet/jsp/FreeMarkerJspFactory.java        |   4 ++--
 .../servlet/jsp/FreeMarkerJspFactory21.java      |   4 ++--
 .../servlet/jsp/FreeMarkerPageContext.java       |   4 ++--
 .../freemarker/servlet/jsp/JspContextModel.java  |   4 ++--
 .../freemarker/servlet/jsp/JspTagModelBase.java  |   4 ++--
 .../freemarker/servlet/jsp/JspWriterAdapter.java |   4 ++--
 .../servlet/jsp/PageContextFactory.java          |   4 ++--
 .../servlet/jsp/SimpleTagDirectiveModel.java     |   4 ++--
 .../servlet/jsp/TagTransformModel.java           |   4 ++--
 .../freemarker/servlet/jsp/TaglibFactory.java    |   4 ++--
 .../freemarker/servlet/jsp/TaglibMethodUtil.java |   4 ++--
 .../servlet/jsp/_FreeMarkerPageContext21.java    |   4 ++--
 .../apache/freemarker/servlet/jsp/package.html   |   4 ++--
 .../org/apache/freemarker/servlet/package.html   |   4 ++--
 .../adhoc/IdentifierCharGenerator.java           |   4 ++--
 src/main/misc/overloadedNumberRules/README.txt   |   4 ++--
 src/main/misc/overloadedNumberRules/config.fmpp  |   4 ++--
 .../misc/overloadedNumberRules/generator.ftl     |   4 ++--
 .../core/model/impl/unsafeMethods.properties     |   4 ++--
 .../apache/freemarker/core/version.properties    |   4 ++--
 src/manual/en_US/FM3-CHANGE-LOG.txt              |   4 ++--
 src/manual/en_US/book.xml                        |   4 ++--
 src/manual/en_US/docgen-help/editors-readme.txt  |   4 ++--
 .../figures/odg-convert-howto.txt                |   4 ++--
 src/manual/zh_CN/book.xml                        |   4 ++--
 .../core/ASTBasedErrorMessagesTest.java          |   4 ++--
 .../org/apache/freemarker/core/ASTPrinter.java   |   4 ++--
 .../java/org/apache/freemarker/core/ASTTest.java |   4 ++--
 .../core/ActualNamingConvetionTest.java          |   4 ++--
 .../freemarker/core/ActualTagSyntaxTest.java     |   4 ++--
 .../freemarker/core/BreakPlacementTest.java      |   4 ++--
 .../apache/freemarker/core/CamelCaseTest.java    |   4 ++--
 .../freemarker/core/CanonicalFormTest.java       |   4 ++--
 .../freemarker/core/CoercionToTextualTest.java   |   4 ++--
 .../apache/freemarker/core/ConfigurableTest.java |   4 ++--
 .../freemarker/core/ConfigurationTest.java       |   4 ++--
 .../freemarker/core/CoreLocaleUtilsTest.java     |   4 ++--
 .../freemarker/core/CustomAttributeTest.java     |   4 ++--
 .../apache/freemarker/core/DateFormatTest.java   |   4 ++--
 .../freemarker/core/DirectiveCallPlaceTest.java  |   4 ++--
 .../freemarker/core/EncodingOverrideTest.java    |   4 ++--
 .../core/EnvironmentCustomStateTest.java         |   4 ++--
 .../core/EnvironmentGetTemplateVariantsTest.java |   4 ++--
 .../apache/freemarker/core/ExceptionTest.java    |   4 ++--
 .../apache/freemarker/core/GetSourceTest.java    |   4 ++--
 .../freemarker/core/HeaderParsingTest.java       |   4 ++--
 .../IncludeAndImportConfigurableLayersTest.java  |   4 ++--
 .../freemarker/core/IncludeAndImportTest.java    |   4 ++--
 .../freemarker/core/IncudeFromNamelessTest.java  |   4 ++--
 .../core/InterpretAndEvalTemplateNameTest.java   |   4 ++--
 .../core/InterpretSettingInheritanceTest.java    |   4 ++--
 .../freemarker/core/IteratorIssuesTest.java      |   4 ++--
 .../core/JavaCCExceptionAsEOFFixTest.java        |   4 ++--
 .../apache/freemarker/core/ListErrorsTest.java   |   4 ++--
 .../freemarker/core/MiscErrorMessagesTest.java   |   4 ++--
 .../core/MistakenlyPublicImportAPIsTest.java     |   4 ++--
 .../core/MistakenlyPublicMacroAPIsTest.java      |   4 ++--
 .../freemarker/core/MockServletContext.java      |   4 ++--
 .../core/ObjectBuilderSettingsTest.java          |   4 ++--
 .../core/OptInTemplateClassResolverTest.java     |   4 ++--
 .../apache/freemarker/core/OutputFormatTest.java |   4 ++--
 .../ParseTimeParameterBIErrorMessagesTest.java   |   4 ++--
 .../core/ParsingErrorMessagesTest.java           |   4 ++--
 .../apache/freemarker/core/SQLTimeZoneTest.java  |   4 ++--
 .../freemarker/core/SettingDirectiveTest.java    |   4 ++--
 .../freemarker/core/SimpleObjectWrapperTest.java |   4 ++--
 .../freemarker/core/SimpleObjetWrapperTest.java  |   4 ++--
 .../freemarker/core/SpecialVariableTest.java     |   4 ++--
 .../core/StringLiteralInterpolationTest.java     |   4 ++--
 .../org/apache/freemarker/core/TabSizeTest.java  |   4 ++--
 .../freemarker/core/TagSyntaxVariationsTest.java |   4 ++--
 .../freemarker/core/TemplatGetEncodingTest.java  |   4 ++--
 .../core/TemplateConfigurationTest.java          |   4 ++--
 ...ateConfigurationWithTemplateResolverTest.java |   4 ++--
 .../core/TemplateConstructorsTest.java           |   4 ++--
 .../core/TemplateLanguageVersionTest.java        |   4 ++--
 .../freemarker/core/TemplateLevelSettings.java   |   4 ++--
 .../core/TemplateLookupStrategyTest.java         |   4 ++--
 .../core/TemplateNameSpecialVariablesTest.java   |   4 ++--
 .../core/TemplateNotFoundMessageTest.java        |   4 ++--
 .../core/TheadInterruptingSupportTest.java       |   4 ++--
 .../freemarker/core/TypeErrorMessagesTest.java   |   4 ++--
 .../freemarker/core/UnclosedCommentTest.java     |   4 ++--
 .../org/apache/freemarker/core/VersionTest.java  |   4 ++--
 .../freemarker/core/WhitespaceStrippingTest.java |   4 ++--
 .../freemarker/core/XHTMLOutputFormatTest.java   |   4 ++--
 .../freemarker/core/XMLOutputFormatTest.java     |   4 ++--
 .../impl/AbstractParallelIntrospectionTest.java  |   4 ++--
 .../model/impl/AlphabeticalMethodSorter.java     |   4 ++--
 .../CommonSupertypeForUnwrappingHintTest.java    |   4 ++--
 .../model/impl/DefaultObjectWrapperDesc.java     |   4 ++--
 .../core/model/impl/DefaultObjectWrapperInc.java |   4 ++--
 ...bjectWrapperModelFactoryRegistrationTest.java |   4 ++--
 .../impl/DefaultObjectWrapperReadOnlyTest.java   |   4 ++--
 .../impl/DefaultObjectWrapperSingletonsTest.java |   4 ++--
 .../model/impl/DefaultObjectWrapperTest.java     |   4 ++--
 .../DefaultObjectWrapperWithShortedMethods.java  |   4 ++--
 .../DefaultObjectWrapperWithSortedMethods.java   |   4 ++--
 .../core/model/impl/EnumModelsTest.java          |   4 ++--
 .../core/model/impl/ErrorMessagesTest.java       |   4 ++--
 .../model/impl/FineTuneMethodAppearanceTest.java |   4 ++--
 .../GetlessMethodsAsPropertyGettersRule.java     |   4 ++--
 .../core/model/impl/IsApplicableTest.java        |   4 ++--
 .../impl/IsMoreSpecificParameterTypeTest.java    |   4 ++--
 .../Java7MembersOnlyDefaultObjectWrapper.java    |   4 ++--
 .../impl/ManyObjectsOfDifferentClasses.java      |   4 ++--
 .../impl/ManyStaticsOfDifferentClasses.java      |   4 ++--
 .../model/impl/MiscNumericalOperationsTest.java  |   4 ++--
 .../core/model/impl/ModelAPINewInstanceTest.java |   4 ++--
 .../core/model/impl/ModelCacheTest.java          |   4 ++--
 .../model/impl/OverloadedNumberUtilTest.java     |   4 ++--
 .../impl/ParameterListPreferabilityTest.java     |   4 ++--
 .../impl/PrallelObjectIntrospectionTest.java     |   4 ++--
 .../impl/PrallelStaticIntrospectionTest.java     |   4 ++--
 .../core/model/impl/RationalNumber.java          |   4 ++--
 .../core/model/impl/StaticModelsTest.java        |   4 ++--
 .../core/model/impl/TypeFlagsTest.java           |   4 ++--
 .../core/outputformat/_OutputFormatTestAPI.java  |   4 ++--
 .../impl/CombinedMarkupOutputFormatTest.java     |   4 ++--
 .../outputformat/impl/HTMLOutputFormatTest.java  |   4 ++--
 .../outputformat/impl/RTFOutputFormatTest.java   |   4 ++--
 .../DefaultTemplateResolverTest.java             |   4 ++--
 .../templateresolver/FileTemplateLoaderTest.java |   4 ++--
 .../MultiTemplateLoaderTest.java                 |   4 ++--
 .../TemplateConfigurationFactoryTest.java        |   4 ++--
 .../templateresolver/TemplateNameFormatTest.java |   4 ++--
 .../TemplateSourceMatcherTest.java               |   4 ++--
 .../AppMetaTemplateDateFormatFactory.java        |   4 ++--
 .../BaseNTemplateNumberFormatFactory.java        |   4 ++--
 .../core/userpkg/CustomHTMLOutputFormat.java     |   4 ++--
 .../core/userpkg/CustomTemplateHTMLModel.java    |   4 ++--
 .../core/userpkg/DummyOutputFormat.java          |   4 ++--
 .../EpochMillisDivTemplateDateFormatFactory.java |   4 ++--
 .../EpochMillisTemplateDateFormatFactory.java    |   4 ++--
 .../HTMLISOTemplateDateFormatFactory.java        |   4 ++--
 .../userpkg/HexTemplateNumberFormatFactory.java  |   4 ++--
 ...cAndTZSensitiveTemplateDateFormatFactory.java |   4 ++--
 ...caleSensitiveTemplateNumberFormatFactory.java |   4 ++--
 .../core/userpkg/PackageVisibleAll.java          |   4 ++--
 .../userpkg/PackageVisibleAllWithBuilder.java    |   4 ++--
 .../PackageVisibleAllWithBuilderBuilder.java     |   4 ++--
 .../PackageVisibleWithPublicConstructor.java     |   4 ++--
 .../PrintfGTemplateNumberFormatFactory.java      |   4 ++--
 .../freemarker/core/userpkg/PublicAll.java       |   4 ++--
 .../userpkg/PublicWithMixedConstructors.java     |   4 ++--
 .../PublicWithPackageVisibleConstructor.java     |   4 ++--
 .../core/userpkg/SeldomEscapedOutputFormat.java  |   4 ++--
 .../core/userpkg/TemplateDummyOutputModel.java   |   4 ++--
 .../TemplateSeldomEscapedOutputModel.java        |   4 ++--
 .../freemarker/core/util/DateUtilTest.java       |   4 ++--
 .../apache/freemarker/core/util/FTLUtilTest.java |   4 ++--
 .../freemarker/core/util/NumberUtilTest.java     |   4 ++--
 .../freemarker/core/util/StringUtilTest.java     |   4 ++--
 .../core/valueformat/NumberFormatTest.java       |   4 ++--
 .../impl/ExtendedDecimalFormatTest.java          |   4 ++--
 .../apache/freemarker/dom/DOMSiblingTest.java    |   4 ++--
 .../freemarker/dom/DOMSimplifiersTest.java       |   4 ++--
 .../java/org/apache/freemarker/dom/DOMTest.java  |   4 ++--
 .../manualtest/AutoEscapingExample.java          |   4 ++--
 .../ConfigureOutputFormatExamples.java           |   4 ++--
 .../manualtest/CustomFormatsExample.java         |   4 ++--
 .../freemarker/manualtest/ExamplesTest.java      |   4 ++--
 .../manualtest/GettingStartedExample.java        |   4 ++--
 .../apache/freemarker/manualtest/Product.java    |   4 ++--
 .../TemplateConfigurationExamples.java           |   4 ++--
 .../UnitAwareTemplateNumberFormatFactory.java    |   4 ++--
 .../manualtest/UnitAwareTemplateNumberModel.java |   4 ++--
 .../servlet/FreemarkerServletTest.java           |   4 ++--
 .../freemarker/servlet/InitParamParserTest.java  |   4 ++--
 .../servlet/jsp/JspTestFreemarkerServlet.java    |   4 ++--
 ...TestFreemarkerServletWithDefaultOverride.java |   4 ++--
 .../servlet/jsp/RealServletContainertTest.java   |   4 ++--
 .../freemarker/servlet/jsp/TLDParsingTest.java   |   4 ++--
 .../servlet/jsp/TaglibMethodUtilTest.java        |   4 ++--
 .../jsp/taglibmembers/AttributeAccessorTag.java  |   4 ++--
 .../jsp/taglibmembers/AttributeInfoTag.java      |   4 ++--
 .../jsp/taglibmembers/EnclosingClass.java        |   4 ++--
 .../servlet/jsp/taglibmembers/GetAndSetTag.java  |   4 ++--
 .../servlet/jsp/taglibmembers/TestFunctions.java |   4 ++--
 .../servlet/jsp/taglibmembers/TestSimpleTag.java |   4 ++--
 .../jsp/taglibmembers/TestSimpleTag2.java        |   4 ++--
 .../jsp/taglibmembers/TestSimpleTag3.java        |   4 ++--
 .../servlet/jsp/taglibmembers/TestTag.java       |   4 ++--
 .../servlet/jsp/taglibmembers/TestTag2.java      |   4 ++--
 .../servlet/jsp/taglibmembers/TestTag3.java      |   4 ++--
 .../config/WebappLocalFreemarkerServlet.java     |   4 ++--
 .../CopyrightCommentRemoverTemplateLoader.java   |   4 ++--
 .../freemarker/test/MonitoredTemplateLoader.java |   4 ++--
 .../freemarker/test/ResourcesExtractor.java      |   4 ++--
 .../org/apache/freemarker/test/TemplateTest.java |   4 ++--
 .../freemarker/test/hamcerst/Matchers.java       |   4 ++--
 .../hamcerst/StringContainsIgnoringCase.java     |   4 ++--
 .../java/org/apache/freemarker/test/package.html |   4 ++--
 .../test/servlet/DefaultModel2TesterAction.java  |   4 ++--
 .../freemarker/test/servlet/Model2Action.java    |   4 ++--
 .../test/servlet/Model2TesterServlet.java        |   4 ++--
 .../freemarker/test/servlet/WebAppTestCase.java  |   4 ++--
 .../test/templatesuite/TemplateTestCase.java     |   4 ++--
 .../test/templatesuite/TemplateTestSuite.java    |   4 ++--
 .../templatesuite/models/AllTemplateModels.java  |   4 ++--
 .../test/templatesuite/models/BeanTestClass.java |   4 ++--
 .../templatesuite/models/BeanTestInterface.java  |   4 ++--
 .../templatesuite/models/BeanTestSuperclass.java |   4 ++--
 .../models/BooleanAndScalarModel.java            |   4 ++--
 .../models/BooleanAndStringTemplateModel.java    |   4 ++--
 .../test/templatesuite/models/BooleanHash1.java  |   4 ++--
 .../test/templatesuite/models/BooleanHash2.java  |   4 ++--
 .../test/templatesuite/models/BooleanList1.java  |   4 ++--
 .../test/templatesuite/models/BooleanList2.java  |   4 ++--
 .../models/BooleanVsStringMethods.java           |   4 ++--
 .../test/templatesuite/models/EnumTestClass.java |   4 ++--
 .../templatesuite/models/ExceptionModel.java     |   4 ++--
 .../templatesuite/models/HashAndScalarModel.java |   4 ++--
 .../templatesuite/models/JavaObjectInfo.java     |   4 ++--
 .../test/templatesuite/models/LegacyList.java    |   4 ++--
 .../test/templatesuite/models/Listables.java     |   4 ++--
 .../test/templatesuite/models/MultiModel1.java   |   4 ++--
 .../test/templatesuite/models/MultiModel2.java   |   4 ++--
 .../test/templatesuite/models/MultiModel3.java   |   4 ++--
 .../test/templatesuite/models/MultiModel4.java   |   4 ++--
 .../test/templatesuite/models/MultiModel5.java   |   4 ++--
 .../test/templatesuite/models/NewTestModel.java  |   4 ++--
 .../test/templatesuite/models/NewTestModel2.java |   4 ++--
 .../models/NumberAndStringModel.java             |   4 ++--
 .../models/OverloadedConstructor.java            |   4 ++--
 .../templatesuite/models/OverloadedMethods.java  |   4 ++--
 .../templatesuite/models/OverloadedMethods2.java |   4 ++--
 .../templatesuite/models/SimpleTestMethod.java   |   4 ++--
 .../models/TransformHashWrapper.java             |   4 ++--
 .../models/TransformMethodWrapper1.java          |   4 ++--
 .../models/TransformMethodWrapper2.java          |   4 ++--
 .../templatesuite/models/TransformModel1.java    |   4 ++--
 .../templatesuite/models/VarArgTestModel.java    |   4 ++--
 .../freemarker/test/templatesuite/package.html   |   4 ++--
 .../freemarker/test/util/AssertDirective.java    |   4 ++--
 .../test/util/AssertEqualsDirective.java         |   4 ++--
 .../test/util/AssertFailsDirective.java          |   4 ++--
 .../AssertationFailedInTemplateException.java    |   4 ++--
 .../test/util/BadParameterTypeException.java     |   4 ++--
 .../freemarker/test/util/FileTestCase.java       |   4 ++--
 .../util/MissingRequiredParameterException.java  |   4 ++--
 .../freemarker/test/util/NoOutputDirective.java  |   4 ++--
 .../freemarker/test/util/ParameterException.java |   4 ++--
 .../SimpleMapAndCollectionObjectWrapper.java     |   4 ++--
 .../apache/freemarker/test/util/TestUtil.java    |   4 ++--
 .../test/util/UnsupportedParameterException.java |   4 ++--
 .../apache/freemarker/test/util/XMLLoader.java   |   4 ++--
 src/test/resources/META-INF/malformed.tld        |   4 ++--
 .../tldDiscovery MetaInfTldSources-1.tld         |   4 ++--
 src/test/resources/logback-test.xml              |   4 ++--
 .../org/apache/freemarker/core/ast-1.ast         |   4 ++--
 .../org/apache/freemarker/core/ast-1.ftl         |   4 ++--
 .../apache/freemarker/core/ast-assignments.ast   |   4 ++--
 .../apache/freemarker/core/ast-assignments.ftl   |   4 ++--
 .../org/apache/freemarker/core/ast-builtins.ast  |   4 ++--
 .../org/apache/freemarker/core/ast-builtins.ftl  |   4 ++--
 .../org/apache/freemarker/core/ast-locations.ast |   4 ++--
 .../org/apache/freemarker/core/ast-locations.ftl |   4 ++--
 .../core/ast-mixedcontentsimplifications.ast     |   4 ++--
 .../core/ast-mixedcontentsimplifications.ftl     |   4 ++--
 .../core/ast-multipleignoredchildren.ast         |   4 ++--
 .../core/ast-multipleignoredchildren.ftl         |   4 ++--
 .../core/ast-nestedignoredchildren.ast           |   4 ++--
 .../core/ast-nestedignoredchildren.ftl           |   4 ++--
 .../org/apache/freemarker/core/ast-range.ast     |   4 ++--
 .../org/apache/freemarker/core/ast-range.ftl     |   4 ++--
 .../freemarker/core/ast-strlitinterpolation.ast  |   4 ++--
 .../freemarker/core/ast-strlitinterpolation.ftl  |   4 ++--
 .../freemarker/core/ast-whitespacestripping.ast  |   4 ++--
 .../freemarker/core/ast-whitespacestripping.ftl  |   4 ++--
 .../apache/freemarker/core/cano-assignments.ftl  |   4 ++--
 .../freemarker/core/cano-assignments.ftl.out     |   4 ++--
 .../org/apache/freemarker/core/cano-builtins.ftl |   4 ++--
 .../apache/freemarker/core/cano-builtins.ftl.out |   4 ++--
 .../freemarker/core/cano-identifier-escaping.ftl |   4 ++--
 .../core/cano-identifier-escaping.ftl.out        |   4 ++--
 .../org/apache/freemarker/core/cano-macros.ftl   |   4 ++--
 .../apache/freemarker/core/cano-macros.ftl.out   |   4 ++--
 .../freemarker/core/cano-strlitinterpolation.ftl |   4 ++--
 .../core/cano-strlitinterpolation.ftl.out        |   4 ++--
 .../core/encodingOverride-ISO-8859-1.ftl         |   4 ++--
 .../freemarker/core/encodingOverride-UTF-8.ftl   |   4 ++--
 .../freemarker/core/templateresolver/test.ftl    |   4 ++--
 .../org/apache/freemarker/core/toCache1.ftl      |   4 ++--
 .../org/apache/freemarker/core/toCache2.ftl      |   4 ++--
 .../org/apache/freemarker/dom/DOMSiblingTest.xml |   4 ++--
 .../manualtest/AutoEscapingExample-capture.ftlh  |   4 ++--
 .../AutoEscapingExample-capture.ftlh.out         |   4 ++--
 .../manualtest/AutoEscapingExample-convert.ftlh  |   4 ++--
 .../AutoEscapingExample-convert.ftlh.out         |   4 ++--
 .../manualtest/AutoEscapingExample-convert2.ftl  |   4 ++--
 .../AutoEscapingExample-convert2.ftl.out         |   4 ++--
 .../manualtest/AutoEscapingExample-infoBox.ftlh  |   4 ++--
 .../AutoEscapingExample-infoBox.ftlh.out         |   4 ++--
 .../manualtest/AutoEscapingExample-markup.ftlh   |   4 ++--
 .../AutoEscapingExample-markup.ftlh.out          |   4 ++--
 .../AutoEscapingExample-stringConcat.ftlh        |   4 ++--
 .../AutoEscapingExample-stringConcat.ftlh.out    |   4 ++--
 .../AutoEscapingExample-stringLiteral.ftlh       |   4 ++--
 .../AutoEscapingExample-stringLiteral.ftlh.out   |   4 ++--
 .../AutoEscapingExample-stringLiteral2.ftlh      |   4 ++--
 .../AutoEscapingExample-stringLiteral2.ftlh.out  |   4 ++--
 .../ConfigureOutputFormatExamples1.properties    |   4 ++--
 .../ConfigureOutputFormatExamples2.properties    |   4 ++--
 .../manualtest/CustomFormatsExample-alias1.ftlh  |   4 ++--
 .../CustomFormatsExample-alias1.ftlh.out         |   4 ++--
 .../manualtest/CustomFormatsExample-alias2.ftlh  |   4 ++--
 .../CustomFormatsExample-alias2.ftlh.out         |   4 ++--
 .../CustomFormatsExample-modelAware.ftlh         |   4 ++--
 .../CustomFormatsExample-modelAware.ftlh.out     |   4 ++--
 .../TemplateConfigurationExamples1.properties    |   4 ++--
 .../TemplateConfigurationExamples2.properties    |   4 ++--
 .../TemplateConfigurationExamples3.properties    |   4 ++--
 .../org/apache/freemarker/manualtest/test.ftlh   |   4 ++--
 .../freemarker/servlet/jsp/TLDParsingTest.tld    |   4 ++--
 .../servlet/jsp/templates/classpath-test.ftl     |   4 ++--
 .../servlet/jsp/tldDiscovery-ClassPathTlds-1.tld |   4 ++--
 .../servlet/jsp/tldDiscovery-ClassPathTlds-2.tld |   4 ++--
 .../servlet/jsp/webapps/basic/CONTENTS.txt       |   4 ++--
 .../basic/WEB-INF/el-function-tag-name-clash.tld |   4 ++--
 .../jsp/webapps/basic/WEB-INF/el-functions.tld   |   4 ++--
 .../WEB-INF/expected/attributes-modernModels.txt |   4 ++--
 .../basic/WEB-INF/expected/attributes.txt        |   4 ++--
 .../basic/WEB-INF/expected/customTags1.txt       |   4 ++--
 .../servlet/jsp/webapps/basic/WEB-INF/test.tld   |   4 ++--
 .../servlet/jsp/webapps/basic/WEB-INF/web.xml    |   4 ++--
 .../servlet/jsp/webapps/basic/attributes.ftl     |   4 ++--
 .../jsp/webapps/basic/customELFunctions1.ftl     |   4 ++--
 .../jsp/webapps/basic/customELFunctions1.jsp     |   4 ++--
 .../servlet/jsp/webapps/basic/customTags1.ftl    |   4 ++--
 .../webapps/basic/elFunctionsTagNameClash.ftl    |   4 ++--
 .../webapps/basic/elFunctionsTagNameClash.jsp    |   4 ++--
 .../jsp/webapps/basic/trivial-jstl-@Ignore.ftl   |   4 ++--
 .../servlet/jsp/webapps/basic/trivial.ftl        |   4 ++--
 .../servlet/jsp/webapps/basic/trivial.jsp        |   4 ++--
 .../servlet/jsp/webapps/config/CONTENTS.txt      |   4 ++--
 .../webapps/config/WEB-INF/classes/sub/test.ftl  |   4 ++--
 .../jsp/webapps/config/WEB-INF/classes/test.ftl  |   4 ++--
 .../WEB-INF/lib/templates.jar/sub/test2.ftl      |   4 ++--
 .../webapps/config/WEB-INF/templates/test.ftl    |   4 ++--
 .../servlet/jsp/webapps/config/WEB-INF/web.xml   |   4 ++--
 .../servlet/jsp/webapps/config/test.ftl          |   4 ++--
 .../servlet/jsp/webapps/errors/CONTENTS.txt      |   4 ++--
 .../servlet/jsp/webapps/errors/WEB-INF/web.xml   |   4 ++--
 .../jsp/webapps/errors/failing-parsetime.jsp     |   4 ++--
 .../jsp/webapps/errors/failing-runtime.ftl       |   4 ++--
 .../jsp/webapps/errors/failing-runtime.jsp       |   4 ++--
 .../servlet/jsp/webapps/errors/not-failing.ftl   |   4 ++--
 .../jsp/webapps/multipleLoaders/CONTENTS.txt     |   4 ++--
 .../multipleLoaders/WEB-INF/templates/test.ftl   |   4 ++--
 .../jsp/webapps/multipleLoaders/WEB-INF/web.xml  |   4 ++--
 .../jsp/webapps/tldDiscovery/CONTENTS.txt        |   4 ++--
 .../WEB-INF/expected/subdir/test-rel.txt         |   4 ++--
 .../WEB-INF/expected/test-noClasspath.txt        |   4 ++--
 .../tldDiscovery/WEB-INF/expected/test1.txt      |   4 ++--
 .../webapps/tldDiscovery/WEB-INF/fmtesttag 2.tld |   4 ++--
 .../webapps/tldDiscovery/WEB-INF/fmtesttag4.tld  |   4 ++--
 .../lib/taglib-foo.jar/META-INF/foo bar.tld      |   4 ++--
 .../WEB-INF/subdir-with-tld/fmtesttag3.tld       |   4 ++--
 .../WEB-INF/taglib 2.jar/META-INF/taglib.tld     |   4 ++--
 .../jsp/webapps/tldDiscovery/WEB-INF/web.xml     |   4 ++--
 .../tldDiscovery/not-auto-scanned/fmtesttag.tld  |   4 ++--
 .../jsp/webapps/tldDiscovery/subdir/test-rel.ftl |   4 ++--
 .../webapps/tldDiscovery/test-noClasspath.ftl    |   4 ++--
 .../servlet/jsp/webapps/tldDiscovery/test1.ftl   |   4 ++--
 .../org/apache/freemarker/test/servlet/web.xml   |   4 ++--
 .../test/templatesuite/expected/arithmetic.txt   |   4 ++--
 .../expected/boolean-formatting.txt              |   4 ++--
 .../test/templatesuite/expected/boolean.txt      |   4 ++--
 .../templatesuite/expected/charset-in-header.txt |   4 ++--
 .../test/templatesuite/expected/comment.txt      |   4 ++--
 .../test/templatesuite/expected/comparisons.txt  |   4 ++--
 .../test/templatesuite/expected/compress.txt     |   4 ++--
 .../templatesuite/expected/dateformat-java.txt   |   4 ++--
 .../expected/default-object-wrapper.txt          |   4 ++--
 .../templatesuite/expected/default-xmlns.txt     |   4 ++--
 .../test/templatesuite/expected/default.txt      |   4 ++--
 .../templatesuite/expected/encoding-builtins.txt |   4 ++--
 .../test/templatesuite/expected/escapes.txt      |   4 ++--
 .../test/templatesuite/expected/exception.txt    |   4 ++--
 .../test/templatesuite/expected/exception2.txt   |   4 ++--
 .../test/templatesuite/expected/exception3.txt   |   4 ++--
 .../test/templatesuite/expected/exthash.txt      |   4 ++--
 .../test/templatesuite/expected/hashconcat.txt   |   4 ++--
 .../test/templatesuite/expected/hashliteral.txt  |   4 ++--
 .../test/templatesuite/expected/helloworld.txt   |   4 ++--
 .../expected/identifier-escaping.txt             |   4 ++--
 .../expected/identifier-non-ascii.txt            |   4 ++--
 .../test/templatesuite/expected/if.txt           |   4 ++--
 .../test/templatesuite/expected/import.txt       |   4 ++--
 .../test/templatesuite/expected/include.txt      |   4 ++--
 .../test/templatesuite/expected/include2.txt     |   4 ++--
 .../test/templatesuite/expected/interpret.txt    |   4 ++--
 .../test/templatesuite/expected/iterators.txt    |   4 ++--
 .../templatesuite/expected/lastcharacter.txt     |   4 ++--
 .../test/templatesuite/expected/list-bis.txt     |   4 ++--
 .../test/templatesuite/expected/list.txt         |   4 ++--
 .../test/templatesuite/expected/list2.txt        |   4 ++--
 .../test/templatesuite/expected/list3.txt        |   4 ++--
 .../test/templatesuite/expected/listhash.txt     |   4 ++--
 .../templatesuite/expected/listhashliteral.txt   |   4 ++--
 .../test/templatesuite/expected/listliteral.txt  |   4 ++--
 .../test/templatesuite/expected/localization.txt |   4 ++--
 .../test/templatesuite/expected/logging.txt      |   4 ++--
 .../test/templatesuite/expected/loopvariable.txt |   4 ++--
 .../templatesuite/expected/macros-return.txt     |   4 ++--
 .../test/templatesuite/expected/macros.txt       |   4 ++--
 .../test/templatesuite/expected/macros2.txt      |   4 ++--
 .../test/templatesuite/expected/multimodels.txt  |   4 ++--
 .../test/templatesuite/expected/nested.txt       |   4 ++--
 .../templatesuite/expected/new-allowsnothing.txt |   4 ++--
 .../expected/new-defaultresolver.txt             |   4 ++--
 .../test/templatesuite/expected/new-optin.txt    |   4 ++--
 .../test/templatesuite/expected/newlines1.txt    |   4 ++--
 .../test/templatesuite/expected/newlines2.txt    |   4 ++--
 .../test/templatesuite/expected/noparse.txt      |   4 ++--
 .../templatesuite/expected/number-format.txt     |   4 ++--
 .../templatesuite/expected/number-literal.txt    |   4 ++--
 .../templatesuite/expected/number-to-date.txt    |   4 ++--
 .../templatesuite/expected/numerical-cast.txt    |   4 ++--
 .../templatesuite/expected/output-encoding1.txt  |   4 ++--
 .../templatesuite/expected/output-encoding2.txt  | Bin 1976 -> 1972 bytes
 .../templatesuite/expected/output-encoding3.txt  |   4 ++--
 .../test/templatesuite/expected/precedence.txt   |   4 ++--
 .../test/templatesuite/expected/recover.txt      |   4 ++--
 .../test/templatesuite/expected/root.txt         |   4 ++--
 .../templatesuite/expected/sequence-builtins.txt |   4 ++--
 .../test/templatesuite/expected/specialvars.txt  |   4 ++--
 .../expected/string-builtins-regexps-matches.txt |   4 ++--
 .../expected/string-builtins-regexps.txt         |   4 ++--
 .../templatesuite/expected/string-builtins1.txt  |   4 ++--
 .../templatesuite/expected/string-builtins2.txt  |   4 ++--
 .../templatesuite/expected/stringbimethods.txt   |   4 ++--
 .../templatesuite/expected/stringliteral.txt     | Bin 1552 -> 1550 bytes
 .../test/templatesuite/expected/switch.txt       |   4 ++--
 .../test/templatesuite/expected/transforms.txt   |   4 ++--
 .../templatesuite/expected/type-builtins.txt     |   4 ++--
 .../test/templatesuite/expected/var-layers.txt   |   4 ++--
 .../test/templatesuite/expected/varargs.txt      |   4 ++--
 .../test/templatesuite/expected/variables.txt    |   4 ++--
 .../templatesuite/expected/whitespace-trim.txt   |   4 ++--
 .../templatesuite/expected/wstrip-in-header.txt  |   4 ++--
 .../test/templatesuite/expected/wstripping.txt   |   4 ++--
 .../test/templatesuite/expected/xml-fragment.txt |   4 ++--
 .../expected/xml-ns_prefix-scope.txt             |   4 ++--
 .../test/templatesuite/expected/xml.txt          |   4 ++--
 .../test/templatesuite/expected/xmlns1.txt       |   4 ++--
 .../test/templatesuite/expected/xmlns3.txt       |   4 ++--
 .../test/templatesuite/expected/xmlns4.txt       |   4 ++--
 .../test/templatesuite/expected/xmlns5.txt       |   4 ++--
 .../models/BeansTestResources.properties         |   4 ++--
 .../test/templatesuite/models/defaultxmlns1.xml  |   4 ++--
 .../templatesuite/models/xml-ns_prefix-scope.xml |   4 ++--
 .../freemarker/test/templatesuite/models/xml.xml |   4 ++--
 .../test/templatesuite/models/xmlfragment.xml    |   4 ++--
 .../test/templatesuite/models/xmlns.xml          |   4 ++--
 .../test/templatesuite/models/xmlns2.xml         |   4 ++--
 .../test/templatesuite/models/xmlns3.xml         |   4 ++--
 .../templatesuite/templates/api-builtins.ftl     |   4 ++--
 .../test/templatesuite/templates/arithmetic.ftl  |   4 ++--
 .../test/templatesuite/templates/assignments.ftl |   4 ++--
 .../templates/boolean-formatting.ftl             |   4 ++--
 .../test/templatesuite/templates/boolean.ftl     |   4 ++--
 .../templates/charset-in-header.ftl              |   4 ++--
 .../templates/charset-in-header_inc1.ftl         |   4 ++--
 .../templates/charset-in-header_inc2.ftl         |   4 ++--
 .../test/templatesuite/templates/comment.ftl     |   4 ++--
 .../test/templatesuite/templates/comparisons.ftl |   4 ++--
 .../test/templatesuite/templates/compress.ftl    |   4 ++--
 .../templates/date-type-builtins.ftl             |   4 ++--
 .../templates/dateformat-iso-bi.ftl              |   4 ++--
 .../templates/dateformat-iso-like.ftl            |   4 ++--
 .../templatesuite/templates/dateformat-java.ftl  |   4 ++--
 .../test/templatesuite/templates/dateparsing.ftl |   4 ++--
 .../templates/default-object-wrapper.ftl         |   4 ++--
 .../templatesuite/templates/default-xmlns.ftl    |   4 ++--
 .../test/templatesuite/templates/default.ftl     |   4 ++--
 .../templates/encoding-builtins.ftl              |   4 ++--
 .../test/templatesuite/templates/escapes.ftl     |   4 ++--
 .../test/templatesuite/templates/exception.ftl   |   4 ++--
 .../test/templatesuite/templates/exception2.ftl  |   4 ++--
 .../test/templatesuite/templates/exception3.ftl  |   4 ++--
 .../templates/existence-operators.ftl            |   4 ++--
 .../test/templatesuite/templates/exthash.ftl     |   4 ++--
 .../test/templatesuite/templates/hashconcat.ftl  |   4 ++--
 .../test/templatesuite/templates/hashliteral.ftl |   4 ++--
 .../test/templatesuite/templates/helloworld.ftl  |   4 ++--
 .../templates/identifier-escaping.ftl            |   4 ++--
 .../templates/identifier-non-ascii.ftl           |   4 ++--
 .../test/templatesuite/templates/if.ftl          |   4 ++--
 .../test/templatesuite/templates/import.ftl      |   4 ++--
 .../test/templatesuite/templates/import_lib.ftl  |   4 ++--
 .../test/templatesuite/templates/include.ftl     |   4 ++--
 .../templates/include2-included-encoding.ftl     |   4 ++--
 .../templates/include2-included.ftl              |   4 ++--
 .../test/templatesuite/templates/include2.ftl    |   4 ++--
 .../test/templatesuite/templates/included.ftl    |   4 ++--
 .../test/templatesuite/templates/interpret.ftl   |   4 ++--
 .../test/templatesuite/templates/iterators.ftl   |   4 ++--
 .../templatesuite/templates/lastcharacter.ftl    |   4 ++--
 .../test/templatesuite/templates/list-bis.ftl    |   4 ++--
 .../test/templatesuite/templates/list.ftl        |   4 ++--
 .../test/templatesuite/templates/list2.ftl       |   4 ++--
 .../test/templatesuite/templates/list3.ftl       |   4 ++--
 .../test/templatesuite/templates/listhash.ftl    |   4 ++--
 .../templatesuite/templates/listhashliteral.ftl  |   4 ++--
 .../test/templatesuite/templates/listliteral.ftl |   4 ++--
 .../templatesuite/templates/localization.ftl     |   4 ++--
 .../templatesuite/templates/localization_en.ftl  |   4 ++--
 .../templates/localization_en_AU.ftl             |   4 ++--
 .../test/templatesuite/templates/logging.ftl     |   4 ++--
 .../templatesuite/templates/loopvariable.ftl     |   4 ++--
 .../templatesuite/templates/macros-return.ftl    |   4 ++--
 .../test/templatesuite/templates/macros.ftl      |   4 ++--
 .../test/templatesuite/templates/macros2.ftl     |   4 ++--
 .../test/templatesuite/templates/multimodels.ftl |   4 ++--
 .../test/templatesuite/templates/nested.ftl      |   4 ++--
 .../templatesuite/templates/nestedinclude.ftl    |   4 ++--
 .../templates/new-defaultresolver.ftl            |   4 ++--
 .../test/templatesuite/templates/new-optin.ftl   |   4 ++--
 .../test/templatesuite/templates/newlines1.ftl   |   4 ++--
 .../test/templatesuite/templates/newlines2.ftl   |   4 ++--
 .../test/templatesuite/templates/noparse.ftl     |   4 ++--
 .../templatesuite/templates/number-format.ftl    |   4 ++--
 .../templatesuite/templates/number-literal.ftl   |   4 ++--
 .../templates/number-math-builtins.ftl           |   4 ++--
 .../templatesuite/templates/number-to-date.ftl   |   4 ++--
 .../templatesuite/templates/numerical-cast.ftl   |   4 ++--
 .../templatesuite/templates/output-encoding1.ftl |   4 ++--
 .../templatesuite/templates/output-encoding2.ftl |   4 ++--
 .../templatesuite/templates/output-encoding3.ftl |   4 ++--
 .../templates/overloaded-methods.ftl             |   4 ++--
 .../test/templatesuite/templates/precedence.ftl  |   4 ++--
 .../templatesuite/templates/range-common.ftl     |   4 ++--
 .../test/templatesuite/templates/range.ftl       |   4 ++--
 .../test/templatesuite/templates/recover.ftl     |   4 ++--
 .../test/templatesuite/templates/root.ftl        |   4 ++--
 .../templates/sequence-builtins.ftl              |   4 ++--
 .../test/templatesuite/templates/setting.ftl     |   4 ++--
 .../templates/simplehash-char-key.ftl            |   4 ++--
 .../test/templatesuite/templates/specialvars.ftl |   4 ++--
 .../templates/string-builtin-coercion.ftl        |   4 ++--
 .../string-builtins-regexps-matches.ftl          |   4 ++--
 .../templates/string-builtins-regexps.ftl        |   4 ++--
 .../templatesuite/templates/string-builtins1.ftl |   4 ++--
 .../templatesuite/templates/string-builtins2.ftl |   4 ++--
 .../templatesuite/templates/string-builtins3.ftl |   4 ++--
 .../templatesuite/templates/stringbimethods.ftl  |   4 ++--
 .../templatesuite/templates/stringliteral.ftl    |   4 ++--
 .../templates/subdir/include-subdir.ftl          |   4 ++--
 .../templates/subdir/include-subdir2.ftl         |   4 ++--
 .../templates/subdir/new-optin-2.ftl             |   4 ++--
 .../templatesuite/templates/subdir/new-optin.ftl |   4 ++--
 .../templates/subdir/subsub/new-optin.ftl        |   4 ++--
 .../templatesuite/templates/switch-builtin.ftl   |   4 ++--
 .../test/templatesuite/templates/switch.ftl      |   4 ++--
 .../templatesuite/templates/then-builtin.ftl     |   4 ++--
 .../test/templatesuite/templates/transforms.ftl  |   4 ++--
 .../templatesuite/templates/type-builtins.ftl    |   4 ++--
 .../test/templatesuite/templates/undefined.ftl   |   4 ++--
 .../test/templatesuite/templates/url.ftl         |   4 ++--
 .../test/templatesuite/templates/var-layers.ftl  |   4 ++--
 .../test/templatesuite/templates/varargs.ftl     |   4 ++--
 .../test/templatesuite/templates/variables.ftl   |   4 ++--
 .../templatesuite/templates/varlayers_lib.ftl    |   4 ++--
 .../templatesuite/templates/whitespace-trim.ftl  |   4 ++--
 .../templates/wsstripinheader_inc.ftl            |   4 ++--
 .../templatesuite/templates/wstrip-in-header.ftl |   4 ++--
 .../templatesuite/templates/xml-fragment.ftl     |   4 ++--
 .../templates/xml-ns_prefix-scope-lib.ftl        |   4 ++--
 .../templates/xml-ns_prefix-scope-main.ftl       |   4 ++--
 .../test/templatesuite/templates/xml.ftl         |   4 ++--
 .../test/templatesuite/templates/xmlns1.ftl      |   4 ++--
 .../test/templatesuite/templates/xmlns3.ftl      |   4 ++--
 .../test/templatesuite/templates/xmlns4.ftl      |   4 ++--
 .../test/templatesuite/templates/xmlns5.ftl      |   4 ++--
 .../freemarker/test/templatesuite/testcases.xml  |   4 ++--
 1040 files changed, 2076 insertions(+), 2076 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/dist/bin/documentation/index.html
----------------------------------------------------------------------
diff --git a/src/dist/bin/documentation/index.html b/src/dist/bin/documentation/index.html
index cc5ce08..a482423 100644
--- a/src/dist/bin/documentation/index.html
+++ b/src/dist/bin/documentation/index.html
@@ -7,9 +7,9 @@
   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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/ide-settings/Eclipse/Formatter-profile-FreeMarker.xml
----------------------------------------------------------------------
diff --git a/src/ide-settings/Eclipse/Formatter-profile-FreeMarker.xml b/src/ide-settings/Eclipse/Formatter-profile-FreeMarker.xml
index e881eaa..2070004 100644
--- a/src/ide-settings/Eclipse/Formatter-profile-FreeMarker.xml
+++ b/src/ide-settings/Eclipse/Formatter-profile-FreeMarker.xml
@@ -7,9 +7,9 @@
   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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/ide-settings/IntelliJ-IDEA/Java-code-style-FreeMarker.xml
----------------------------------------------------------------------
diff --git a/src/ide-settings/IntelliJ-IDEA/Java-code-style-FreeMarker.xml b/src/ide-settings/IntelliJ-IDEA/Java-code-style-FreeMarker.xml
index ae87ca3..c4bbf97 100644
--- a/src/ide-settings/IntelliJ-IDEA/Java-code-style-FreeMarker.xml
+++ b/src/ide-settings/IntelliJ-IDEA/Java-code-style-FreeMarker.xml
@@ -6,9 +6,9 @@
   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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/APINotSupportedTemplateException.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/APINotSupportedTemplateException.java b/src/main/java/org/apache/freemarker/core/APINotSupportedTemplateException.java
index 6f4ec02..732f5e2 100644
--- a/src/main/java/org/apache/freemarker/core/APINotSupportedTemplateException.java
+++ b/src/main/java/org/apache/freemarker/core/APINotSupportedTemplateException.java
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/ASTComment.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/ASTComment.java b/src/main/java/org/apache/freemarker/core/ASTComment.java
index d1a4a1f..7ee2695 100644
--- a/src/main/java/org/apache/freemarker/core/ASTComment.java
+++ b/src/main/java/org/apache/freemarker/core/ASTComment.java
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/ASTDebugBreak.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/ASTDebugBreak.java b/src/main/java/org/apache/freemarker/core/ASTDebugBreak.java
index ae2711b..b85c10b 100644
--- a/src/main/java/org/apache/freemarker/core/ASTDebugBreak.java
+++ b/src/main/java/org/apache/freemarker/core/ASTDebugBreak.java
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/ASTDirAssignment.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/ASTDirAssignment.java b/src/main/java/org/apache/freemarker/core/ASTDirAssignment.java
index d95ee62..4961f7f 100644
--- a/src/main/java/org/apache/freemarker/core/ASTDirAssignment.java
+++ b/src/main/java/org/apache/freemarker/core/ASTDirAssignment.java
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/ASTDirAssignmentsContainer.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/ASTDirAssignmentsContainer.java b/src/main/java/org/apache/freemarker/core/ASTDirAssignmentsContainer.java
index b2b67ea..fd2873d 100644
--- a/src/main/java/org/apache/freemarker/core/ASTDirAssignmentsContainer.java
+++ b/src/main/java/org/apache/freemarker/core/ASTDirAssignmentsContainer.java
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/ASTDirAttemptRecoverContainer.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/ASTDirAttemptRecoverContainer.java b/src/main/java/org/apache/freemarker/core/ASTDirAttemptRecoverContainer.java
index d2c7835..c01c453 100644
--- a/src/main/java/org/apache/freemarker/core/ASTDirAttemptRecoverContainer.java
+++ b/src/main/java/org/apache/freemarker/core/ASTDirAttemptRecoverContainer.java
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/ASTDirAutoEsc.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/ASTDirAutoEsc.java b/src/main/java/org/apache/freemarker/core/ASTDirAutoEsc.java
index ec4e11b..b27dc0a 100644
--- a/src/main/java/org/apache/freemarker/core/ASTDirAutoEsc.java
+++ b/src/main/java/org/apache/freemarker/core/ASTDirAutoEsc.java
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/ASTDirBreak.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/ASTDirBreak.java b/src/main/java/org/apache/freemarker/core/ASTDirBreak.java
index 58c7a06..19a0c25 100644
--- a/src/main/java/org/apache/freemarker/core/ASTDirBreak.java
+++ b/src/main/java/org/apache/freemarker/core/ASTDirBreak.java
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/ASTDirCapturingAssignment.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/ASTDirCapturingAssignment.java b/src/main/java/org/apache/freemarker/core/ASTDirCapturingAssignment.java
index 82c2e4c..1df39d3 100644
--- a/src/main/java/org/apache/freemarker/core/ASTDirCapturingAssignment.java
+++ b/src/main/java/org/apache/freemarker/core/ASTDirCapturingAssignment.java
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/ASTDirCase.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/ASTDirCase.java b/src/main/java/org/apache/freemarker/core/ASTDirCase.java
index 88f4419..0f87778 100644
--- a/src/main/java/org/apache/freemarker/core/ASTDirCase.java
+++ b/src/main/java/org/apache/freemarker/core/ASTDirCase.java
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/ASTDirCompress.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/ASTDirCompress.java b/src/main/java/org/apache/freemarker/core/ASTDirCompress.java
index 7d5e3ac..8810381 100644
--- a/src/main/java/org/apache/freemarker/core/ASTDirCompress.java
+++ b/src/main/java/org/apache/freemarker/core/ASTDirCompress.java
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/ASTDirElseOfList.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/ASTDirElseOfList.java b/src/main/java/org/apache/freemarker/core/ASTDirElseOfList.java
index 612efa8..7aafd2f 100644
--- a/src/main/java/org/apache/freemarker/core/ASTDirElseOfList.java
+++ b/src/main/java/org/apache/freemarker/core/ASTDirElseOfList.java
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/ASTDirEscape.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/ASTDirEscape.java b/src/main/java/org/apache/freemarker/core/ASTDirEscape.java
index eff29e0..c3db14e 100644
--- a/src/main/java/org/apache/freemarker/core/ASTDirEscape.java
+++ b/src/main/java/org/apache/freemarker/core/ASTDirEscape.java
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/ASTDirFallback.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/ASTDirFallback.java b/src/main/java/org/apache/freemarker/core/ASTDirFallback.java
index 655ac08..08b5c42 100644
--- a/src/main/java/org/apache/freemarker/core/ASTDirFallback.java
+++ b/src/main/java/org/apache/freemarker/core/ASTDirFallback.java
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/ASTDirFlush.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/ASTDirFlush.java b/src/main/java/org/apache/freemarker/core/ASTDirFlush.java
index 9fb5d9d..ad7aff4 100644
--- a/src/main/java/org/apache/freemarker/core/ASTDirFlush.java
+++ b/src/main/java/org/apache/freemarker/core/ASTDirFlush.java
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/ASTDirIfElseIfElseContainer.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/ASTDirIfElseIfElseContainer.java b/src/main/java/org/apache/freemarker/core/ASTDirIfElseIfElseContainer.java
index 71146e2..d04b0a0 100644
--- a/src/main/java/org/apache/freemarker/core/ASTDirIfElseIfElseContainer.java
+++ b/src/main/java/org/apache/freemarker/core/ASTDirIfElseIfElseContainer.java
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/ASTDirIfOrElseOrElseIf.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/ASTDirIfOrElseOrElseIf.java b/src/main/java/org/apache/freemarker/core/ASTDirIfOrElseOrElseIf.java
index 2398219..136b5b7 100644
--- a/src/main/java/org/apache/freemarker/core/ASTDirIfOrElseOrElseIf.java
+++ b/src/main/java/org/apache/freemarker/core/ASTDirIfOrElseOrElseIf.java
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/ASTDirImport.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/ASTDirImport.java b/src/main/java/org/apache/freemarker/core/ASTDirImport.java
index e883f3b..72009a8 100644
--- a/src/main/java/org/apache/freemarker/core/ASTDirImport.java
+++ b/src/main/java/org/apache/freemarker/core/ASTDirImport.java
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/ASTDirInclude.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/ASTDirInclude.java b/src/main/java/org/apache/freemarker/core/ASTDirInclude.java
index 9796cb6..68c376b 100644
--- a/src/main/java/org/apache/freemarker/core/ASTDirInclude.java
+++ b/src/main/java/org/apache/freemarker/core/ASTDirInclude.java
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/ASTDirItems.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/ASTDirItems.java b/src/main/java/org/apache/freemarker/core/ASTDirItems.java
index f7b4ae0..292d767 100644
--- a/src/main/java/org/apache/freemarker/core/ASTDirItems.java
+++ b/src/main/java/org/apache/freemarker/core/ASTDirItems.java
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/ASTDirList.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/ASTDirList.java b/src/main/java/org/apache/freemarker/core/ASTDirList.java
index 9f05ca7..5ed1d39 100644
--- a/src/main/java/org/apache/freemarker/core/ASTDirList.java
+++ b/src/main/java/org/apache/freemarker/core/ASTDirList.java
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/ASTDirListElseContainer.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/ASTDirListElseContainer.java b/src/main/java/org/apache/freemarker/core/ASTDirListElseContainer.java
index 52ba9f5..a85b81c 100644
--- a/src/main/java/org/apache/freemarker/core/ASTDirListElseContainer.java
+++ b/src/main/java/org/apache/freemarker/core/ASTDirListElseContainer.java
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/ASTDirMacro.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/ASTDirMacro.java b/src/main/java/org/apache/freemarker/core/ASTDirMacro.java
index d5a8f15..5bb2712 100644
--- a/src/main/java/org/apache/freemarker/core/ASTDirMacro.java
+++ b/src/main/java/org/apache/freemarker/core/ASTDirMacro.java
@@ -6,9 +6,9 @@
  * 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