Skip to content

Commit

Permalink
Fix freemarker site urls
Browse files Browse the repository at this point in the history
Change all internal links to https.
  • Loading branch information
pitgrap committed Nov 9, 2017
1 parent bc69b84 commit 0678afc
Show file tree
Hide file tree
Showing 15 changed files with 55 additions and 55 deletions.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Apache FreeMarker {version}
[![Build Status](https://travis-ci.org/apache/incubator-freemarker.svg?branch=2.3-gae)](https://travis-ci.org/apache/incubator-freemarker)

For the latest version or to report bugs visit:
http://freemarker.apache.org/
https://freemarker.apache.org/


DISCLAIMER
Expand Down Expand Up @@ -44,7 +44,7 @@ See the LICENSE file for more details!
Documentation
-------------

Online: http://freemarker.apache.org/docs/
Online: https://freemarker.apache.org/docs/

Offline: The full documentation is available in the binary distribution
in the documentation/index.html directory.
Expand Down Expand Up @@ -93,7 +93,7 @@ Change log
----------

Online (for stable releases only):
http://freemarker.apache.org/docs/app_versions.html
https://freemarker.apache.org/docs/app_versions.html

Offline:
In the binary release, open documentation/index.html, and you will find the
Expand All @@ -105,7 +105,7 @@ Building FreeMarker

If you haven't yet, download the source release, or checkout FreeMarker from
the source code repository. See repository locations here:
http://freemarker.apache.org/sourcecode.html
https://freemarker.apache.org/sourcecode.html

You need JDK 8 (not JDK 9!), Apache Ant (tested with 1.9.6) and Ivy (tested
with 2.4.0) to be installed. To install Ivy (but be sure it's not already
Expand Down
2 changes: 1 addition & 1 deletion RELEASE-NOTES
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Where to find the change log:

- Online (for stable releases only):
http://freemarker.apache.org/docs/app_versions.html
https://freemarker.apache.org/docs/app_versions.html

- Offline:
In the binary release, open documentation/index.html, click "Manual", then
Expand Down
4 changes: 2 additions & 2 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -838,7 +838,7 @@
Google App Engine compliant variation of FreeMarker.
FreeMarker is a "template engine"; a generic tool to generate text output based on templates.
</description>
<url>http://freemarker.apache.org/</url>
<url>https://freemarker.apache.org/</url>
<organization>
<name>Apache Software Foundation</name>
<url>http://apache.org</url>
Expand Down Expand Up @@ -1001,7 +1001,7 @@ Proceed? </input>
>
<echo>Getting dependencies...</echo>
<echo>-------------------------------------------------------</echo>
<ivy:settings id="remote" url="http://freemarker.apache.org/repos/ivy/ivysettings-remote.xml" />
<ivy:settings id="remote" url="https://freemarker.apache.org/repos/ivy/ivysettings-remote.xml" />
<!-- Build an own repository that will serve us even offline: -->
<ivy:retrieve settingsRef="remote" sync="true"
ivypattern=".ivy.part/repo/[organisation]/[module]/ivy-[revision].xml"
Expand Down
4 changes: 2 additions & 2 deletions ivy.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
]>
<ivy-module version="2.0">
<info organisation="org.freemarker" module="freemarker">
<license name="Apache License, Version 2.0" url="http://freemarker.apache.org/docs/app_license.html" />
<description homepage="http://freemarker.apache.org/">
<license name="Apache License, Version 2.0" url="https://freemarker.apache.org/docs/app_license.html" />
<description homepage="https://freemarker.apache.org/">
FreeMarker is a &quot;template engine&quot;; a generic tool to
generate text output (anything from HTML to autogenerated source
code) based on templates.
Expand Down
2 changes: 1 addition & 1 deletion src/dist/bin/documentation/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
<li><a href="_html/api/index.html">Java API</a></li>
</ul>

<p><a href="http://freemarker.apache.org/">Visit the FreeMarker home page</a> (help, editor plugins, latest downloads, etc.)</p>
<p><a href="https://freemarker.apache.org/">Visit the FreeMarker home page</a> (help, editor plugins, latest downloads, etc.)</p>

<p><i><b>Disclaimer:</b> Apache FreeMarker is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. 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.</i></p>
</body>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/freemarker/core/BuiltIn.java
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ static BuiltIn newBuiltIn(int incompatibleImprovements, Expression target, Token
StringBuilder buf = new StringBuilder("Unknown built-in: ").append(StringUtil.jQuote(key)).append(". ");

buf.append(
"Help (latest version): http://freemarker.apache.org/docs/ref_builtins.html; "
"Help (latest version): https://freemarker.apache.org/docs/ref_builtins.html; "
+ "you're using FreeMarker ").append(Configuration.getVersion()).append(".\n"
+ "The alphabetical list of built-ins:");
List names = new ArrayList(BUILT_INS_BY_NAME.keySet().size());
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/freemarker/ext/dom/package.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<body>

<p>Exposes DOM XML nodes to templates as easily traversable trees;
see <a href="http://freemarker.apache.org/docs/xgui.html" target="_blank">in the Manual</a>.
see <a href="https://freemarker.apache.org/docs/xgui.html" target="_blank">in the Manual</a>.
The {@link freemarker.template.DefaultObjectWrapper default object wrapper} of FreeMarker
automatically wraps W3C nodes with this.

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/freemarker/ext/servlet/package.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@
<body>
<p>Servlet for legacy "Model 2" frameworks that allows using FreeMarker
templates instead of JSP as the MVC View
(see <a href="http://freemarker.apache.org/docs/pgui_misc_servlet.html" target="_blank">in the Manual</a>).</p>
(see <a href="https://freemarker.apache.org/docs/pgui_misc_servlet.html" target="_blank">in the Manual</a>).</p>
</body>
</html>
2 changes: 1 addition & 1 deletion src/main/java/freemarker/template/Template.java
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@ public void process(Object dataModel, Writer out)
/**
* Like {@link #process(Object, Writer)}, but also sets a (XML-)node to be recursively processed by the template.
* That node is accessed in the template with <tt>.node</tt>, <tt>#recurse</tt>, etc. See the
* <a href="http://freemarker.apache.org/docs/xgui_declarative.html" target="_blank">Declarative XML Processing</a> as a
* <a href="https://freemarker.apache.org/docs/xgui_declarative.html" target="_blank">Declarative XML Processing</a> as a
* typical example of recursive node processing.
*
* @param rootNode The root node for recursive processing or {@code null}.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/freemarker/template/TemplateNodeModel.java
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
* design pattern (or simply through being able to get the parent
* and child nodes).
*
* <p>See the <a href="http://freemarker.apache.org/docs/xgui.html" target="_blank">XML
* <p>See the <a href="https://freemarker.apache.org/docs/xgui.html" target="_blank">XML
* Processing Guide</a> for a concrete application.
*
* @since FreeMarker 2.3
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/freemarker/template/package.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@
<body>
<p><b>The fundamental, most commonly used API-s of FreeMarker;</b>
start with {@link freemarker.template.Configuration Configuration} (see also the
<a href="http://freemarker.apache.org/docs/pgui_quickstart.html" target="_blank">Getting Stared</a> in the Manual.)</p>
<a href="https://freemarker.apache.org/docs/pgui_quickstart.html" target="_blank">Getting Stared</a> in the Manual.)</p>
</body>
</html>
26 changes: 13 additions & 13 deletions src/manual/en_US/book.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5332,9 +5332,9 @@ [email protected], [email protected], [email protected]</programlisting>
FreeMarker 2.3.25), which means that they are only done when the
imported library is actually used in the template. See the Java API
documentation for more details: <link
xlink:href="http://freemarker.apache.org/docs/api/freemarker/template/Configuration.html#setAutoImports-java.util.Map-">Configuration.setAutoImports</link>,
xlink:href="https://freemarker.apache.org/docs/api/freemarker/template/Configuration.html#setAutoImports-java.util.Map-">Configuration.setAutoImports</link>,
<link
xlink:href="http://freemarker.apache.org/docs/api/freemarker/template/Configuration.html#setLazyAutoImports-java.lang.Boolean-">Configuration.setLazyAutoImports</link>.</para>
xlink:href="https://freemarker.apache.org/docs/api/freemarker/template/Configuration.html#setLazyAutoImports-java.lang.Boolean-">Configuration.setLazyAutoImports</link>.</para>
</section>
</section>

Expand Down Expand Up @@ -7698,7 +7698,7 @@ public class RepeatDirective implements TemplateDirectiveModel {
<para><literal>DefaultObjectWrapper</literal> has an
<literal>incompatibleImprovements</literal> property, that's
highly recommended to set it to a high value (see the <link
xlink:href="http://freemarker.apache.org/docs/api/freemarker/template/DefaultObjectWrapper.html#DefaultObjectWrapper-freemarker.template.Version-">API
xlink:href="https://freemarker.apache.org/docs/api/freemarker/template/DefaultObjectWrapper.html#DefaultObjectWrapper-freemarker.template.Version-">API
documentation</link> for the effects). How to set it:</para>

<itemizedlist>
Expand Down Expand Up @@ -8069,7 +8069,7 @@ cfg.setSharedVariable("company", "Foo Inc.");</programlisting>
<literal>default_encoding</literal>,
<literal>template_exception_handler</literal>. The full list of
settings can be found in the <link
xlink:href="http://freemarker.apache.org/docs/api/freemarker/template/Configuration.html#setSetting-java.lang.String-java.lang.String-">Java
xlink:href="https://freemarker.apache.org/docs/api/freemarker/template/Configuration.html#setSetting-java.lang.String-java.lang.String-">Java
API documentation of
<literal>Configuration.setSetting(...)</literal></link>.</para>

Expand Down Expand Up @@ -8208,7 +8208,7 @@ myCfg.setObjectWrapper(owb.build());</programlisting>
<literal>Confguration.setSetting(String name, String
value)</literal> method; see available setting names and the
format of the values in the <link
xlink:href="http://freemarker.apache.org/docs/api/freemarker/template/Configuration.html#setSetting-java.lang.String-java.lang.String-">API
xlink:href="https://freemarker.apache.org/docs/api/freemarker/template/Configuration.html#setSetting-java.lang.String-java.lang.String-">API
documentation of <literal>setSetting</literal></link>. Example for
Spring Framework:</para>

Expand Down Expand Up @@ -10040,7 +10040,7 @@ cfg.setNumberFormat("@ua 0.####;; roundingMode=halfUp");</programlisting>
that you are actually using. In older projects it's also usually
better to keep this high, however you better check the changes
activated (find them in <link
xlink:href="http://freemarker.apache.org/docs/api/freemarker/template/Configuration.html#Configuration-freemarker.template.Version-">the
xlink:href="https://freemarker.apache.org/docs/api/freemarker/template/Configuration.html#Configuration-freemarker.template.Version-">the
API JavaDoc of the <literal>Configuration(Version)</literal>
constructor</link>), at least if not only the 3rd version number
(the micro version) of <quote>incompatible improvements</quote>
Expand Down Expand Up @@ -11280,7 +11280,7 @@ TemplateHashModel roundingModeEnums =

&lt;!--
Init-param documentation:
<link xlink:href="http://freemarker.apache.org/docs/api/freemarker/ext/servlet/FreemarkerServlet.html">http://freemarker.apache.org/docs/api/freemarker/ext/servlet/FreemarkerServlet.html</link>
<link xlink:href="https://freemarker.apache.org/docs/api/freemarker/ext/servlet/FreemarkerServlet.html">https://freemarker.apache.org/docs/api/freemarker/ext/servlet/FreemarkerServlet.html</link>
--&gt;

&lt;!-- FreemarkerServlet settings: --&gt;
Expand Down Expand Up @@ -11309,7 +11309,7 @@ TemplateHashModel roundingModeEnums =
&lt;param-value&gt;2.3.27&lt;/param-value&gt;
&lt;!--
Recommended to set to a high value.
See: http://freemarker.apache.org/docs/pgui_config_incompatible_improvements.html
See: https://freemarker.apache.org/docs/pgui_config_incompatible_improvements.html
--&gt;
&lt;/init-param&gt;
&lt;init-param&gt;
Expand Down Expand Up @@ -28333,7 +28333,7 @@ TemplateModel x = env.getVariable("x"); // get variable x</programlisting>
<listitem>
<para>New <literal>FreemarkerServlet</literal> init-params (see
<link
xlink:href="http://freemarker.apache.org/docs/api/freemarker/ext/servlet/FreemarkerServlet.html">the
xlink:href="https://freemarker.apache.org/docs/api/freemarker/ext/servlet/FreemarkerServlet.html">the
<literal>FreemarkerSerlvet</literal> API documentation</link>
for details):</para>

Expand Down Expand Up @@ -29515,7 +29515,7 @@ TemplateModel x = env.getVariable("x"); // get variable x</programlisting>
<literal>ClasspathTlds</literal>
<literal>FreemarkerServlet</literal> init-params (see the
<link
xlink:href="http://freemarker.apache.org/docs/api/freemarker/ext/servlet/FreemarkerServlet.html">Java
xlink:href="https://freemarker.apache.org/docs/api/freemarker/ext/servlet/FreemarkerServlet.html">Java
API documentation of
<literal>FreemarkerServlet</literal></link> for the
description of these). For example, if you run your
Expand Down Expand Up @@ -29543,7 +29543,7 @@ TemplateModel x = env.getVariable("x"); // get variable x</programlisting>
respectively. Thus one can adjust these in the Eclipse run
configuration without modifying the
<literal>web.xml</literal>. (See the <link
xlink:href="http://freemarker.apache.org/docs/api/freemarker/ext/servlet/FreemarkerServlet.html">Java
xlink:href="https://freemarker.apache.org/docs/api/freemarker/ext/servlet/FreemarkerServlet.html">Java
API documentation of
<literal>FreemarkerServlet</literal></link> for
more.)</para>
Expand Down Expand Up @@ -29913,7 +29913,7 @@ TemplateModel x = env.getVariable("x"); // get variable x</programlisting>
of <literal>..</literal> after special steps like
<literal>.</literal> or <literal>*</literal>. See the full
list of differences in the <link
xlink:href="http://freemarker.apache.org/docs/api/freemarker/cache/TemplateNameFormat.html#DEFAULT_2_4_0">Java
xlink:href="https://freemarker.apache.org/docs/api/freemarker/cache/TemplateNameFormat.html#DEFAULT_2_4_0">Java
API documentation of
<literal>TemplateNameFormat.DEFAULT_2_4_0</literal></link>.</para>
</listitem>
Expand Down Expand Up @@ -31821,7 +31821,7 @@ TemplateModel x = env.getVariable("x"); // get variable x</programlisting>
<listitem>
<para>If you set the
<literal>incompatible_improvements</literal> setting (see <link
xlink:href="http://freemarker.apache.org/docs/api/freemarker/template/Configuration.html#setIncompatibleImprovements%28freemarker.core.Version%29">here</link>)
xlink:href="https://freemarker.apache.org/docs/api/freemarker/template/Configuration.html#setIncompatibleImprovements%28freemarker.core.Version%29">here</link>)
to <literal>2.3.20</literal> or higher, <literal>?html</literal>
will escape apostrophe-quotes just like
<literal>?xhtml</literal> does. Utilizing this is highly
Expand Down
16 changes: 8 additions & 8 deletions src/manual/en_US/docgen.cjson
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
// specific language governing permissions and limitations
// under the License.

deployUrl: "http://freemarker.apache.org/docs/"
deployUrl: "https://freemarker.apache.org/docs/"
onlineTrackerHTML: "docgen-misc/googleAnalytics.html"
searchKey: "003127866208504630097:arjqbv_znfw"
validation: {
Expand Down Expand Up @@ -49,21 +49,21 @@ seoMeta: {
}

logo: {
href: "http://freemarker.apache.org"
href: "https://freemarker.apache.org"
src: logo.png,
alt: "FreeMarker"
}

olinks: {
homepage: "http://freemarker.apache.org/"
homepage: "https://freemarker.apache.org/"
api: "api/index.html"

// Homepage links:
freemarkerdownload: "http://freemarker.apache.org/freemarkerdownload.html"
contribute: "http://freemarker.apache.org/contribute.html"
history: "http://freemarker.apache.org/history.html"
what-is-freemarker: "http://freemarker.apache.org/"
mailing-lists: "http://freemarker.apache.org/mailing-lists.html"
freemarkerdownload: "https://freemarker.apache.org/freemarkerdownload.html"
contribute: "https://freemarker.apache.org/contribute.html"
history: "https://freemarker.apache.org/history.html"
what-is-freemarker: "https://freemarker.apache.org/"
mailing-lists: "https://freemarker.apache.org/mailing-lists.html"

// External URL-s:
onlineTemplateTester: "http://freemarker-online.kenshoo.com/"
Expand Down
Loading

0 comments on commit 0678afc

Please sign in to comment.