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/11/11 17:59:05 UTC
[2/7] incubator-freemarker-site git commit: Fix freemarker site urls
Fix freemarker site urls
Change all internal links to https
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/commit/eb213563
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/tree/eb213563
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/diff/eb213563
Branch: refs/heads/master
Commit: eb2135632f8ba9d5bb2b0add666d4fa592a8f696
Parents: 07242ee
Author: Michael Riehemann <mi...@coremedia.com>
Authored: Thu Nov 9 18:54:19 2017 +0100
Committer: Michael Riehemann <mi...@coremedia.com>
Committed: Thu Nov 9 18:54:19 2017 +0100
----------------------------------------------------------------------
README | 2 +-
build.xml | 2 +-
src/main/docgen/book.xml | 16 ++++++++--------
src/main/docgen/docgen.cjson | 2 +-
src/main/docgen/sitemap-index.xml | 4 ++--
5 files changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/eb213563/README
----------------------------------------------------------------------
diff --git a/README b/README
index 3c576d7..c2cf987 100644
--- a/README
+++ b/README
@@ -27,6 +27,6 @@ a dependency of this project.
To publish the built site, commit the output into the "asf-site" branch.
Note that as of this writing, the "docgen" dependency is get from the Ivy
-repo on the published homepage (http://freemarker.apache.org/repos/ivy/). Those
+repo on the published homepage (https://freemarker.apache.org/repos/ivy/). Those
modifying docgen should upload the fresh docgen jar there. Then you need to
run `ant update-deps` here to grab the latest version.
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/eb213563/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 995bfa3..e00b4a3 100644
--- a/build.xml
+++ b/build.xml
@@ -95,7 +95,7 @@
>
<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"
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/eb213563/src/main/docgen/book.xml
----------------------------------------------------------------------
diff --git a/src/main/docgen/book.xml b/src/main/docgen/book.xml
index 420b2f7..0a5cbf6 100644
--- a/src/main/docgen/book.xml
+++ b/src/main/docgen/book.xml
@@ -186,7 +186,7 @@
site</link>.</para>
<para><link
- xlink:href="http://freemarker.apache.org/docs/versions_2_3_27.html">See what's
+ xlink:href="https://freemarker.apache.org/docs/versions_2_3_27.html">See what's
new...</link></para>
<para>Downloads:</para>
@@ -1076,7 +1076,7 @@ two freemarker.jar-s and unpredictable behavior!
<tr valign="top">
<td><link
- xlink:href="http://freemarker.apache.org">freemarker.apache.org</link></td>
+ xlink:href="https://freemarker.apache.org">freemarker.apache.org</link></td>
<td>Not surprisingly, the pages you view right now are generated
using FreeMarker.</td>
@@ -1460,7 +1460,7 @@ two freemarker.jar-s and unpredictable behavior!
<listitem>
<para>RC documentation (Manual + JavaDoc) is only published
under
- http://freemarker.apache.org/builds/<replaceable>X.X.X</replaceable>-rc<replaceable>X</replaceable>/</para>
+ https://freemarker.apache.org/builds/<replaceable>X.X.X</replaceable>-rc<replaceable>X</replaceable>/</para>
</listitem>
</itemizedlist>
</listitem>
@@ -1587,7 +1587,7 @@ two freemarker.jar-s and unpredictable behavior!
<listitem>
<para>Upload the content of <literal>documentation/_html</literal>
- from the binary release to http://freemarker.apache.org/<emphasis
+ from the binary release to https://freemarker.apache.org/<emphasis
role="bold">builds/<replaceable>X.X.X</replaceable>-voting</emphasis>/documentation/
(by committing it into the <quote>asf-site</quote> branch of
https://git-wip-us.apache.org/repos/asf/incubator-freemarker-site.git).
@@ -1665,7 +1665,7 @@ two freemarker.jar-s and unpredictable behavior!
<listitem>
<para>Link the change log (page under
- http://freemarker.apache.org/builds/<replaceable>X.X.X</replaceable>/)</para>
+ https://freemarker.apache.org/builds/<replaceable>X.X.X</replaceable>/)</para>
</listitem>
<listitem>
@@ -1748,7 +1748,7 @@ two freemarker.jar-s and unpredictable behavior!
</listitem>
<listitem>
- <para>Update http://freemarker.apache.org:</para>
+ <para>Update https://freemarker.apache.org:</para>
<itemizedlist>
<listitem>
@@ -1927,7 +1927,7 @@ two freemarker.jar-s and unpredictable behavior!
<para>Docgen is not published to the Maven Central Repository, as it's
only used as an internal build dependency. Currently, it's published
manually to the internal Ivy repository of the project, which is under
- http://freemarker.apache.org/repos/ivy/. If you modify Docgen, don't forget
+ https://freemarker.apache.org/repos/ivy/. If you modify Docgen, don't forget
to publish there, or else the next site update or FreeMarker release
will use an outdated version. For that:</para>
@@ -1939,7 +1939,7 @@ two freemarker.jar-s and unpredictable behavior!
<listitem>
<para>Upload the content of the resulting
<literal>build\dummy-server-ivy-repo</literal> directory to
- <literal>http://freemarker.apache.org/repos/ivy/</literal>. See how to
+ <literal>https://freemarker.apache.org/repos/ivy/</literal>. See how to
update the contents of freemarker.apache.org <link
linkend="updating-homepage">here...</link></para>
</listitem>
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/eb213563/src/main/docgen/docgen.cjson
----------------------------------------------------------------------
diff --git a/src/main/docgen/docgen.cjson b/src/main/docgen/docgen.cjson
index 089062c..c0a2d07 100644
--- a/src/main/docgen/docgen.cjson
+++ b/src/main/docgen/docgen.cjson
@@ -44,7 +44,7 @@ seoMeta: {
}
logo: {
- href: "http://freemarker.apache.org/"
+ href: "https://freemarker.apache.org/"
src: logo.png
alt: "FreeMarker"
}
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/eb213563/src/main/docgen/sitemap-index.xml
----------------------------------------------------------------------
diff --git a/src/main/docgen/sitemap-index.xml b/src/main/docgen/sitemap-index.xml
index c4ce3fb..c0d09de 100644
--- a/src/main/docgen/sitemap-index.xml
+++ b/src/main/docgen/sitemap-index.xml
@@ -19,11 +19,11 @@
-->
<sitemapindex xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
<sitemap>
- <loc>http://freemarker.apache.org/sitemap.xml</loc>
+ <loc>https://freemarker.apache.org/sitemap.xml</loc>
<lastmod>2015-07-20</lastmod>
</sitemap>
<sitemap>
- <loc>http://freemarker.apache.org/docs/sitemap.xml</loc>
+ <loc>https://freemarker.apache.org/docs/sitemap.xml</loc>
<lastmod>2015-07-20</lastmod>
</sitemap>
</sitemapindex>