freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject [18/19] incubator-freemarker git commit: Separated src and bin distribution archives, as per Apache requirements. The bin distro contains both freemarker.jar and the documentation, because these are all the build artifacts of the src. Adjusted plain text
Date Sat, 02 Jan 2016 00:47:21 GMT
Separated src and bin distribution archives, as per Apache requirements. The bin distro contains both freemarker.jar and the documentation, because these are all the build artifacts of the src. Adjusted plain text file names to apache conventions, updated their contents. Simplified the distro index.html in the documentation artifact, so that no content is duplicated from the Manual.


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

Branch: refs/heads/master
Commit: 64f2cd19b18cd507caeea54fe47f0f5ad23b8bc3
Parents: a94e78c
Author: ddekany <ddekany@apache.org>
Authored: Sat Jan 2 01:07:05 2016 +0100
Committer: ddekany <ddekany@apache.org>
Committed: Sat Jan 2 01:11:38 2016 +0100

----------------------------------------------------------------------
 README                                | 134 +++++++++++++++
 README.txt                            | 132 ---------------
 RELEASE-NOTES                         |   6 +
 build.xml                             | 128 ++++++++++----
 codestyle.xml                         |  18 ++
 src/dist/DISCLAIMER                   |   8 -
 src/dist/LICENSE                      | 257 -----------------------------
 src/dist/NOTICE                       |  30 ----
 src/dist/bin/LICENSE                  | 257 +++++++++++++++++++++++++++++
 src/dist/bin/NOTICE                   |  30 ++++
 src/dist/bin/documentation/index.html |  65 ++++++++
 src/dist/documentation/index.html     |  98 -----------
 12 files changed, 608 insertions(+), 555 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/64f2cd19/README
----------------------------------------------------------------------
diff --git a/README b/README
new file mode 100644
index 0000000..54c5238
--- /dev/null
+++ b/README
@@ -0,0 +1,134 @@
+/*
+ * 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.
+ */
+
+===============================================================================
+
+ Apache FreeMarker {version}
+
+ For the latest version or to report bugs visit:
+
+ http://freemarker.org/
+
+===============================================================================
+
+
+What is Apache FreeMarker?
+--------------------------
+
+FreeMarker is a "template engine"; a generic tool to generate text
+output (anything from HTML to auto generated source code) based on
+templates. It's a Java package, a class library for Java programmers.
+It's not an application for end-users in itself, but something that
+programmers can embed into their products. FreeMarker is designed to
+be practical for the generation of HTML Web pages, particularly by
+servlet-based applications following the MVC (Model View Controller)
+pattern.
+
+
+Licensing
+---------
+
+FreeMarker is licensed under the Apache License, Version 2.0.
+
+See the LICENSE file for more details!
+
+
+Documentation
+-------------
+
+Online: http://freemarker.org/docs/
+
+Offline: The full documentation is available in the binary distribution
+in the documentation/index.html directory.
+
+
+Installing
+----------
+
+If you are using Maven, just add this dependency:
+
+  <!--
+  Attention: Be sure nothing pulls in an old dependency with groupId
+  "freemarker" (without the "org."), because then you will end up with
+  two freemarker.jar-s and unpredictable behavior on runtime!
+  -->
+  <dependency>
+    <groupId>org.freemarker</groupId>
+    <artifactId>freemarker</artifactId>
+    <version>{version}</version>
+  </dependency>
+
+Otherwise simply copy freemarker.jar to a location where your Java
+application's ClassLoader will find it. For example, if you are using
+FreeMarker in a web application, you probably want to put
+freemarker.jar into the WEB-INF/lib directory of your web application.
+
+FreeMarker has no required dependencies. It has several optional
+dependencies, but usually you don't have to deal with them, because if
+you are using an optional feature that's certainly because your
+application already uses the related library.
+
+
+Change log
+----------
+
+Online:
+http://freemarker.org/docs/app_versions.html
+
+Offline:
+In the binary release, open documentation/index.html, and you will find the
+link.
+
+
+Building
+--------
+
+First of all, if you haven't yet, download the source release, or check
+out FreeMarker from the source code repository.
+
+You need JDK 8(!), Apache Ant and Ivy to be installed. (As of this writing
+it was tested with Ant 1.8.1 and Ivy 2.3.0.)
+
+If you need to ensure compliance with certain J2SE versions, copy
+build.properties.sample into build.properties, and edit it
+accordingly.
+
+To build freemarker.jar, just issue "ant" in the project root
+directory, and it should download all dependencies automatically and
+build freemarker.jar.
+
+If later you change the dependencies in ivy.xml, or otherwise want to
+re-download some of them, it will not happen automatically anymore.
+You have to issue "ant update-deps" for that.
+
+
+Eclipse and other IDE-s
+-----------------------
+
+Run "ant ide-dependencies"; This will create an "ide-dependencies" library
+that contains all the jars that you have to add to the classpath in the IDE.
+Note that here we assume that you have run the build or at least
+"ant update-deps" earlier. 
+
+Known issue with workaround: An old org.jaxen is included in dom4j-*.jar,
+which conflicts with jaxen-*.jar. If dom4j wins, your IDE will show some
+errors in the XML related parts. To fix that, always add dom4j-*.jar last.
+
+You could also use IvyDE instead, with configuration "IDE", but as the
+dependencies hardly ever change, it might not worth the trouble.

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/64f2cd19/README.txt
----------------------------------------------------------------------
diff --git a/README.txt b/README.txt
deleted file mode 100644
index d5cd9e1..0000000
--- a/README.txt
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-===============================================================================
-
- FreeMarker {version}
-
- For the latest version or to report bugs visit:
-
- http://freemarker.org/
- (Mirror: http://freemarker.sourceforge.net/)
-
-===============================================================================
-
-
-What is FreeMarker?
--------------------
-
-FreeMarker is a "template engine"; a generic tool to generate text
-output (anything from HTML to auto generated source code) based on
-templates. It's a Java package, a class library for Java programmers.
-It's not an application for end-users in itself, but something that
-programmers can embed into their products. FreeMarker is designed to
-be practical for the generation of HTML Web pages, particularly by
-servlet-based applications following the MVC (Model View Controller)
-pattern.
-
-
-Licensing
----------
-
-FreeMarker is licensed under the Apache License, Version 2.0.
-
-See LICENSE.txt for more details.
-
-
-Documentation
--------------
-
-The full documentation is available offline in this distribution, here:
-documentation/index.html
-
-Or, you can read it online: http://freemarker.org/docs/
-(Mirror: http://freemarker.sourceforge.net/docs/)
-
-
-Installing
-----------
-
-If you are using Maven, just add this dependency:
-
-  <!--
-  Attention: Be sure nothing pulls in an old dependency with groupId
-  "freemarker" (without the "org."), because then you will end up with
-  two freemarker.jar-s and unpredictable behavior on runtime!
-  -->
-  <dependency>
-    <groupId>org.freemarker</groupId>
-    <artifactId>freemarker</artifactId>
-    <version>{version}</version>
-  </dependency>
-
-Otherwise simply copy freemarker.jar to a location where your Java
-application's ClassLoader will find it. For example, if you are using
-FreeMarker in a web application, you probably want to put
-freemarker.jar into the WEB-INF/lib directory of your web application.
-
-FreeMarker has no required dependencies. It has several optional
-dependencies, but usually you don't have to deal with them, because if
-you are using an optional feature that's certainly because your
-application already uses the related library.
-
-
-Building
---------
-
-You need JDK 8(!), Apache Ant and Ivy be installed. (As of this writing
-it was tested with Ant 1.8.1 and Ivy 2.3.0.)
-
-If you need to ensure compliance with certain J2SE versions, copy
-build.properties.sample into build.properties, and edit it
-accordingly.
-
-To build freemarker.jar, just issue "ant" in the project root
-directory, and it should download all dependencies automatically and
-build freemarker.jar.
-
-If later you change the dependencies in ivy.xml, or otherwise want to
-re-download some of them, it will not happen automatically anymore.
-You have to issue "ant update-deps" for that.
-
-
-Eclipse and other IDE-s
------------------------
-
-Run "ant ide-dependencies"; This will create an "ide-dependencies" library
-that contains all the jars that you have to add to the classpath in the IDE.
-Note that here we assume that you have run the build or at least
-"ant update-deps" earlier. 
-
-Known issue with workaround: An old org.jaxen is included in dom4j-*.jar,
-which conflicts with jaxen-*.jar. If dom4j wins, your IDE will show some
-errors in the XML related parts. To fix that, always add dom4j-*.jar last.
-
-You could also use IvyDE instead, with configuration "IDE", but as the
-dependencies hardly ever change, it might not worth the trouble.
-
-
-Change log
-----------
-
-Open documentation/index.html, and you will find the link.
-
-Online:
-http://freemarker.org/docs/app_versions.html
-(Mirror: http://freemarker.sourceforge.net/docs/app_versions.html)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/64f2cd19/RELEASE-NOTES
----------------------------------------------------------------------
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
new file mode 100644
index 0000000..19e8842
--- /dev/null
+++ b/RELEASE-NOTES
@@ -0,0 +1,6 @@
+Where to find the change log:
+
+- http://freemarker.org/docs/app_versions.html
+
+- It's included in the binary release:
+  Open documentation/index.html, and you will find the offline link.

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/64f2cd19/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 416225e..b36009b 100644
--- a/build.xml
+++ b/build.xml
@@ -102,7 +102,7 @@
   <delete file="build/version.properties.tmp" />
   <filter token="version" value="${version}" />
   
-  <property name="dist.dir" value="build/dist/freemarker-${version}" />
+  <property name="dist.dir" value="build/dist" />
   
   
   <!-- ================================================================== -->
@@ -683,47 +683,87 @@
   >
     <!-- Copy jars and sources and such into the distro -->
     <delete dir="${dist.dir}" />
-    <mkdir dir="${dist.dir}" />
+    <mkdir dir="${dist.dir}/bin" />
+    <mkdir dir="${dist.dir}/src" />
+    
+    <!-- ..................................... -->
+    <!-- Binary distribution                   -->
+    <!-- ..................................... -->
     
     <!-- Copy txt-s -->
-    <copy todir="${dist.dir}" includeEmptyDirs="no">
+    <copy todir="${dist.dir}/bin" includeEmptyDirs="no">
       <fileset dir="." defaultexcludes="no">
-        <include name="*.txt" />
-        <!-- Because of the documentation fonts, the distribution has an extended version of these: -->
-        <exclude name="LICENSE.txt" />
-        <exclude name="NOTICE.txt" />
+        <include name="README" />
+        <include name="DISCLAIMER" />
+        <include name="RELEASE-NOTES" />
+        <!-- LICENSE and NOTICE are binary-distribution-specific, and are copied later. -->
       </fileset>
     </copy>
     <replace
-      file="${dist.dir}/README.txt"
+      file="${dist.dir}/bin/README"
       token="{version}"
       value="${version}"
     />
+    <!-- Copy binary-distribution-specific files: -->
+    <copy todir="${dist.dir}/bin/">
+      <fileset dir="src/dist/bin/" />
+    </copy>
 
     <!-- Copy binary -->
-    <copy file="build/freemarker.jar" tofile="${dist.dir}/freemarker.jar" />
+    <copy file="build/freemarker.jar" tofile="${dist.dir}/bin/freemarker.jar" />
 
     <!-- Copy documentation -->
-    <mkdir dir="${dist.dir}/documentation" />
-    <copy todir="${dist.dir}/">
-      <fileset dir="src/dist/" />
-    </copy>
+    <mkdir dir="${dist.dir}/bin/documentation" />
+    
     <!--
-      The US English Manual is the source of any translations and this it's the
-      only one that is guaranteed to be up to date when doing the release, so we only pack
-      that into it.
+      The US English Manual is the source of any translations and thus it's the
+      only one that is guaranteed to be up to date when doing the release, so we
+      only pack that into it.
     -->
-    <copy todir="${dist.dir}/documentation/_html" includeEmptyDirs="no">
-      <fileset dir="build/manual/en-US" />
+    <copy todir="${dist.dir}/bin/documentation/_html" includeEmptyDirs="no">
+      <fileset dir="build/manual/en_US" />
     </copy>
-    <copy todir="${dist.dir}/documentation/_html/api" includeEmptyDirs="no">
+    <copy todir="${dist.dir}/bin/documentation/_html/api" includeEmptyDirs="no">
       <fileset dir="build/api" />
     </copy>
     
-    <copy todir="${dist.dir}/source" includeEmptyDirs="no">
+    <!-- Package -->
+    <property name="bin.tar" value="build/dist/apache-freemarker-${version}-bin.tar" />
+    <property name="bin.gzip" value="${bin.tar}.gz" />
+    <delete file="${bin.tar}" />
+    <tar tarfile="${bin.tar}" basedir="${dist.dir}/bin" />
+    <delete file="${bin.gzip}" />
+    <gzip zipfile="${bin.gzip}" src="${bin.tar}" />
+    <delete file="${bin.tar}" />
+
+    <!-- Sign and hash: -->
+    <!-- TODO -->
+
+    <!-- ..................................... -->
+    <!-- Source distribution                        -->
+    <!-- ..................................... -->
+
+    <!-- Copy txt-s -->
+    <copy todir="${dist.dir}/src" includeEmptyDirs="no">
+      <fileset dir="." defaultexcludes="no">
+        <include name="README" />
+        <include name="LICENSE" />
+        <include name="NOTICE" />
+        <include name="DISCLAIMER" />
+        <include name="RELEASE-NOTES" />
+      </fileset>
+    </copy>
+    <replace
+      file="${dist.dir}/src/README"
+      token="{version}"
+      value="${version}"
+    />
+    
+    <copy todir="${dist.dir}/src" includeEmptyDirs="no">
       <fileset dir="." defaultexcludes="no">
         <exclude name="**/*.bak" />
         <exclude name="**/*.~*" />
+        <exclude name="**/*.*~" />
         <include name="src/**" />
         <include name="examples/**" />
         <include name=".settings/**" />
@@ -737,18 +777,40 @@
       </fileset>
     </copy>
     
-    <!-- Package the distro -->
-    <property name="freemarker.tar" value="build/freemarker-${version}.tar" />
-    <property name="freemarker.gzip" value="${freemarker.tar}.gz" />
-    <delete file="${freemarker.tar}" />
-    <tar tarfile="${freemarker.tar}" basedir="${dist.dir}" />
-    <delete file="${freemarker.gzip}" />
-    <gzip zipfile="${freemarker.gzip}" src="${freemarker.tar}" />
-    <delete file="${freemarker.tar}" />
+    <!-- Package -->
+    <property name="src.tar" value="build/dist/apache-freemarker-${version}-src.tar" />
+    <property name="src.gzip" value="${src.tar}.gz" />
+    <delete file="${src.tar}" />
+    <tar tarfile="${src.tar}" basedir="${dist.dir}/src" />
+    <delete file="${src.gzip}" />
+    <gzip zipfile="${src.gzip}" src="${src.tar}" />
+    <delete file="${src.tar}" />
+    
+    <!-- Sign and hash: -->
+    <!-- TODO -->
   </target>
 
   <target name="maven-pom">
     <echo file="build/pom.xml"><![CDATA[<?xml version="1.0" encoding="utf-8"?>
+<!--
+  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.
+-->
+    
 <project xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
@@ -1147,11 +1209,17 @@ Proceed? </input>
       classpathref="ivy.dep"
     />  
     
-    <rat:report reportFile="build/rat-report.txt">
+    <rat:report reportFile="build/rat-report-src.txt">
         <fileset dir="src"/>
     </rat:report>
+    <rat:report reportFile="build/rat-report-dist-src.txt">
+        <fileset dir="build/dist/src"/>
+    </rat:report>
+    <rat:report reportFile="build/rat-report-dist-bin.txt">
+        <fileset dir="build/dist/bin"/>
+    </rat:report>
     <echo level="info"><!--
-    -->Rat report was written into build/rat-report.txt<!--
+    -->Rat reports were written into build/rat-report-*.txt<!--
     --></echo>
   </target>
 

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/64f2cd19/codestyle.xml
----------------------------------------------------------------------
diff --git a/codestyle.xml b/codestyle.xml
index caf7049..8fe15f0 100644
--- a/codestyle.xml
+++ b/codestyle.xml
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+  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.
+-->
 <profiles version="12">
 <profile kind="CodeFormatterProfile" name="FreeMarker" version="12">
 <setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/64f2cd19/src/dist/DISCLAIMER
----------------------------------------------------------------------
diff --git a/src/dist/DISCLAIMER b/src/dist/DISCLAIMER
deleted file mode 100644
index b56f1c4..0000000
--- a/src/dist/DISCLAIMER
+++ /dev/null
@@ -1,8 +0,0 @@
-Apache FreeMarker is an effort undergoing incubation at The Apache
-Software Foundation (ASF). Incubation is required of all newly accepted
-projects until a further review indicates that the infrastructure,
-communications, and decision making process have stabilized in a manner
-consistent with other successful ASF projects. While incubation status is
-not necessarily a reflection of the completeness or stability of the
-code, it does indicate that the project has yet to be fully endorsed by
-the ASF.

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/64f2cd19/src/dist/LICENSE
----------------------------------------------------------------------
diff --git a/src/dist/LICENSE b/src/dist/LICENSE
deleted file mode 100644
index 694a39a..0000000
--- a/src/dist/LICENSE
+++ /dev/null
@@ -1,257 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-==============================================================================
-END LICENSE
-
-
-Files developed outside the FreeMarker project
-----------------------------------------------
-
-FreeMarker, both in its source code and binary form (freemarker.jar)
-includes a number of files that are licensed by the Apache Software
-Foundation under the Apache License, Version 2.0. This is the same
-license as the license of FreeMaker. These files are:
-  
-    freemarker/ext/jsp/web-app_2_2.dtd
-    freemarker/ext/jsp/web-app_2_3.dtd
-    freemarker/ext/jsp/web-jsptaglibrary_1_1.dtd
-    freemarker/ext/jsp/web-jsptaglibrary_1_2.dtd
-
-The "icomoon" font files (icomoon.eot, icomoon.svg, icomoon.ttf, and
-icomoon.woff) under the "documentation" directory of the FreeMarker
-distribution contains a selection from the fonts listed below. Note that
-the fonts are only used as part of the included documentation, and
-aren't used for the operation of FreeMarker, nor are they included in
-the binary, freemarker.jar. The fonts are:
-
-* Entypo pictograms, version 2.0, by Daniel Bruce (www.entypo.com).
-  Each included pictogram is either licensed under Creative
-  Commons Attribution-ShareAlike 3.0 (CC BY-SA 3.0)
-  (http://creativecommons.org/licenses/by-sa/3.0/legalcode), or
-  under SIL Open Font License 1.1 (http://scripts.sil.org/OFL).
-
-* Font Awesome by Dave Gandy (http://fontawesome.io), licensed under
-  SIL Open Font License 1.1 (http://scripts.sil.org/OFL).
-  
-* Material Design icons by Google
-  (http://google.github.io/material-design-icons/), licensed under
-  Creative Common Attribution 4.0 International License (CC-BY 4.0)
-  (https://creativecommons.org/licenses/by/4.0/).
-    
-
-Historical notes
-----------------
-
-FreeMarker 1.x was released under the LGPL license. Later, by
-community consensus, we have switched over to a BSD-style license. As
-of FreeMarker 2.2pre1, the original author, Benjamin Geer, has
-relinquished the copyright in behalf of Visigoth Software Society.
-
-With FreeMarker 2.3.21 the license has changed to Apache License,
-Version 2.0, and the owner has changed from Visigoth Software Society
-to three of the FreeMarker 2.x developers, Attila Szegedi, Daniel
-Dekany, and Jonathan Revusky.
-
-After FreeMarker 2.3.24-pre01 (2015-09-02), the owner changes to the
-Apache Software Foundation.

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/64f2cd19/src/dist/NOTICE
----------------------------------------------------------------------
diff --git a/src/dist/NOTICE b/src/dist/NOTICE
deleted file mode 100644
index 74f4830..0000000
--- a/src/dist/NOTICE
+++ /dev/null
@@ -1,30 +0,0 @@
-=========================================================================
-
-Apache FreeMarker
-Copyright 2015 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-=========================================================================
-
-The documentation includes icons from Entypo pictograms, version 2.0,
-by Daniel Bruce (http://www.entypo.com/, http://www.danielbruce.se/),
-licensed under Creative Commons Attribution-ShareAlike 3.0 (CC BY-SA 3.0)
-(http://creativecommons.org/licenses/by-sa/3.0/legalcode) and under SIL
-Open Font License 1.1 (http://scripts.sil.org/OFL).
-
-=========================================================================
-
-The documentation includes icons from Font Awesome by Dave Gandy
-(http://fontawesome.io), licensed under SIL Open Font License 1.1
-(http://scripts.sil.org/OFL).
-
-=========================================================================
-
-The documentation includes icons from Material Design icons by Google
-(http://google.github.io/material-design-icons/), licensed under
-Creative Common Attribution 4.0 International License (CC-BY 4.0)
-(https://creativecommons.org/licenses/by/4.0/).
-
-=========================================================================

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/64f2cd19/src/dist/bin/LICENSE
----------------------------------------------------------------------
diff --git a/src/dist/bin/LICENSE b/src/dist/bin/LICENSE
new file mode 100644
index 0000000..694a39a
--- /dev/null
+++ b/src/dist/bin/LICENSE
@@ -0,0 +1,257 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed 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.
+
+==============================================================================
+END LICENSE
+
+
+Files developed outside the FreeMarker project
+----------------------------------------------
+
+FreeMarker, both in its source code and binary form (freemarker.jar)
+includes a number of files that are licensed by the Apache Software
+Foundation under the Apache License, Version 2.0. This is the same
+license as the license of FreeMaker. These files are:
+  
+    freemarker/ext/jsp/web-app_2_2.dtd
+    freemarker/ext/jsp/web-app_2_3.dtd
+    freemarker/ext/jsp/web-jsptaglibrary_1_1.dtd
+    freemarker/ext/jsp/web-jsptaglibrary_1_2.dtd
+
+The "icomoon" font files (icomoon.eot, icomoon.svg, icomoon.ttf, and
+icomoon.woff) under the "documentation" directory of the FreeMarker
+distribution contains a selection from the fonts listed below. Note that
+the fonts are only used as part of the included documentation, and
+aren't used for the operation of FreeMarker, nor are they included in
+the binary, freemarker.jar. The fonts are:
+
+* Entypo pictograms, version 2.0, by Daniel Bruce (www.entypo.com).
+  Each included pictogram is either licensed under Creative
+  Commons Attribution-ShareAlike 3.0 (CC BY-SA 3.0)
+  (http://creativecommons.org/licenses/by-sa/3.0/legalcode), or
+  under SIL Open Font License 1.1 (http://scripts.sil.org/OFL).
+
+* Font Awesome by Dave Gandy (http://fontawesome.io), licensed under
+  SIL Open Font License 1.1 (http://scripts.sil.org/OFL).
+  
+* Material Design icons by Google
+  (http://google.github.io/material-design-icons/), licensed under
+  Creative Common Attribution 4.0 International License (CC-BY 4.0)
+  (https://creativecommons.org/licenses/by/4.0/).
+    
+
+Historical notes
+----------------
+
+FreeMarker 1.x was released under the LGPL license. Later, by
+community consensus, we have switched over to a BSD-style license. As
+of FreeMarker 2.2pre1, the original author, Benjamin Geer, has
+relinquished the copyright in behalf of Visigoth Software Society.
+
+With FreeMarker 2.3.21 the license has changed to Apache License,
+Version 2.0, and the owner has changed from Visigoth Software Society
+to three of the FreeMarker 2.x developers, Attila Szegedi, Daniel
+Dekany, and Jonathan Revusky.
+
+After FreeMarker 2.3.24-pre01 (2015-09-02), the owner changes to the
+Apache Software Foundation.

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/64f2cd19/src/dist/bin/NOTICE
----------------------------------------------------------------------
diff --git a/src/dist/bin/NOTICE b/src/dist/bin/NOTICE
new file mode 100644
index 0000000..74f4830
--- /dev/null
+++ b/src/dist/bin/NOTICE
@@ -0,0 +1,30 @@
+=========================================================================
+
+Apache FreeMarker
+Copyright 2015 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+=========================================================================
+
+The documentation includes icons from Entypo pictograms, version 2.0,
+by Daniel Bruce (http://www.entypo.com/, http://www.danielbruce.se/),
+licensed under Creative Commons Attribution-ShareAlike 3.0 (CC BY-SA 3.0)
+(http://creativecommons.org/licenses/by-sa/3.0/legalcode) and under SIL
+Open Font License 1.1 (http://scripts.sil.org/OFL).
+
+=========================================================================
+
+The documentation includes icons from Font Awesome by Dave Gandy
+(http://fontawesome.io), licensed under SIL Open Font License 1.1
+(http://scripts.sil.org/OFL).
+
+=========================================================================
+
+The documentation includes icons from Material Design icons by Google
+(http://google.github.io/material-design-icons/), licensed under
+Creative Common Attribution 4.0 International License (CC-BY 4.0)
+(https://creativecommons.org/licenses/by/4.0/).
+
+=========================================================================

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/64f2cd19/src/dist/bin/documentation/index.html
----------------------------------------------------------------------
diff --git a/src/dist/bin/documentation/index.html b/src/dist/bin/documentation/index.html
new file mode 100644
index 0000000..6d98acd
--- /dev/null
+++ b/src/dist/bin/documentation/index.html
@@ -0,0 +1,65 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--
+  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 lang="hu">
+
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <meta http-equiv="Content-Script-Type" content="text/javascript">
+  <title>FreeMarker Documention</title>
+  <style type="text/css">
+    body {
+      background: #FFF;
+      padding: 2em;
+      color: #000000;
+      font-family: Arial,sans-serif;
+      font-size: 20px;
+    }
+    h1 {
+      font-size: 166%;
+      margin-top: 1.5em;
+      margin-bottom: 0.75em;
+      color: #0050B2;
+      font-family: Arial,sans-serif;
+      font-weight: bold;
+    }
+    .top {
+      margin-top: 0;
+    }
+    a:link,
+    a:visited,
+    a:hover,
+    a:active {
+      color:#00C;
+      text-decoration: none;
+    }
+  </style>
+</head>
+
+<body>
+    <p class="top">Offline FreeMarker Documentation:</p>
+    <ul>
+      <li><a href="_html/index.html">Manual</a></li>
+      <li><a href="_html/api/index.html">Java API</a></li>
+    </ul>
+    
+    <p><a href="http://freemarker.org/">Visit the FreeMarker home page</a> (help, editor plugins, latest downloads, etc.)</p>
+</body>
+</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/64f2cd19/src/dist/documentation/index.html
----------------------------------------------------------------------
diff --git a/src/dist/documentation/index.html b/src/dist/documentation/index.html
deleted file mode 100644
index 933b9c8..0000000
--- a/src/dist/documentation/index.html
+++ /dev/null
@@ -1,98 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--
-  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 lang="hu">
-
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <meta http-equiv="Content-Script-Type" content="text/javascript">
-  <title>FreeMarker Documention</title>
-  <style type="text/css">
-    body {
-      background: #FFF;
-      padding: 2em;
-      color: #000000;
-      font-family: Arial,sans-serif;
-      font-size: 16px;
-    }
-    h1 {
-      font-size: 166%;
-      margin-top: 1.5em;
-      margin-bottom: 0.75em;
-      color: #0050B2;
-      font-family: Arial,sans-serif;
-      font-weight: bold;
-    }
-    .top {
-      margin-top: 0;
-    }
-    .big {
-      font-size: 125%;
-    }
-    .normal {
-      font-size: 16px;
-    }
-    a:link,
-    a:visited,
-    a:hover,
-    a:active {
-      color:#00C;
-      text-decoration: none;
-    }
-  </style>
-</head>
-
-<body>
-    <h1 class="top">FreeMarker Documentation</h1>
-    
-    <ul>
-      <li class="big">
-        <p><a href="_html/index.html">Manual</a></p>
-        <div class="normal">
-          <p>Bookmarks:</p>
-          <ul>
-            <li><a class="nav" href="_html/dgui.html">Template Author's Guide</a></li>
-            <li><a class="nav" href="_html/pgui.html">Programmer's Guide</a></li>
-            <li><a class="nav" href="_html/dgui_template_exp.html#exp_cheatsheet">Expressions cheat sheet</a></li>
-            <li><a class="nav" href="_html/ref_builtins_alphaidx.html">Index of <tt>?<i>built_ins</i></tt></a></li>
-            <li><a class="nav" href="_html/ref_directive_alphaidx.html">Index of <tt>#<i>directives</i></tt></a></li>
-            <li><a class="nav" href="_html/ref_specvar.html">List of <tt><i>.special_variables</i></tt></a></li>
-            <li><a class="nav" href="_html/app_faq.html">FAQ</a></li>
-            <li><a class="nav" href="_html/gloss.html">Glossary</a></li>
-            <li><a class="nav" href="_html/app_versions.html">Change Log (versions)</a></li>
-            <li><a class="nav" href="_html/alphaidx.html">Alphabetical Index</a></li>
-          </ul>
-        </div>
-      </li>
-      <li class="big">
-        <p><a href="_html/api/index.html">Java API</a></p>
-      </li>
-    </ul>
-    
-    <h1>External links</h1>
-    
-    <ul>
-      <li><a href="http://freemarker.org/">FreeMarker home page</a> (editor plugins, latest downloads, etc.)</li>
-      <li><a href="http://stackoverflow.com/questions/ask?tags=freemarker">Ask Help on Stack Overflow, with tag "freemarker"</a></li>
-      <li><a href="https://sourceforge.net/p/freemarker/bugs/new/">Report a bug</a></li>
-      <li><a href="https://github.com/freemarker/freemarker">Source code on GitHub</a></li>
-    </ul>
-</body>
-</html>
\ No newline at end of file


Mime
View raw message