Repository: incubator-freemarker-site Updated Branches: refs/heads/master 9221ea299 -> 2c47b4d20
Fix freemarker site urls Change all freemarker.org to freemarker.apache.org 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/07242ee5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/tree/07242ee5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/diff/07242ee5 Branch: refs/heads/master Commit: 07242ee5b6f469383d768ce3b87b165f6802732b Parents: 9221ea2 Author: Michael Riehemann <[email protected]> Authored: Thu Nov 9 18:53:08 2017 +0100 Committer: Michael Riehemann <[email protected]> Committed: Thu Nov 9 18:53:08 2017 +0100 ---------------------------------------------------------------------- README | 4 ++-- build.xml | 4 ++-- src/main/docgen/book.xml | 20 ++++++++++---------- src/main/docgen/docgen.cjson | 2 +- src/main/docgen/sitemap-index.xml | 4 ++-- 5 files changed, 17 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/07242ee5/README ---------------------------------------------------------------------- diff --git a/README b/README index ab0e59c..3c576d7 100644 --- a/README +++ b/README @@ -20,13 +20,13 @@ Apache FreeMarker Site ---------------------- -This is the project with which we generate the freemarker.org home page. +This is the project with which we generate the freemarker.apache.org home page. Note that most of the work is done by Apache FreeMarker Docgen, which is 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.org/repos/ivy/). Those +repo on the published homepage (http://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/07242ee5/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index b892dd5..995bfa3 100644 --- a/build.xml +++ b/build.xml @@ -95,7 +95,7 @@ > <echo>Getting dependencies...</echo> <echo>-------------------------------------------------------</echo> - <ivy:settings id="remote" url="http://freemarker.org/repos/ivy/ivysettings-remote.xml"; /> + <ivy:settings id="remote" url="http://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" @@ -174,7 +174,7 @@ <!-- This meant to be called on the Continuous Integration server, so the - integration builds appear in the freemarker.org public Ivy repository. + integration builds appear in the freemarker.apache.org public Ivy repository. The artifacts must be already built. --> <target name="server-publish-last-build" http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/07242ee5/src/main/docgen/book.xml ---------------------------------------------------------------------- diff --git a/src/main/docgen/book.xml b/src/main/docgen/book.xml index e977d41..420b2f7 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.org/docs/versions_2_3_27.html";>See what's + xlink:href="http://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.org";>freemarker.org</link></td> + xlink:href="http://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.org/builds/<replaceable>X.X.X</replaceable>-rc<replaceable>X</replaceable>/</para> + http://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.org/<emphasis + from the binary release to http://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.org/builds/<replaceable>X.X.X</replaceable>/)</para> + http://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.org:</para> + <para>Update http://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.org/repos/ivy/. If you modify Docgen, don't forget + http://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,8 +1939,8 @@ 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.org/repos/ivy/</literal>. See how to - update the contents of freemarker.org <link + <literal>http://freemarker.apache.org/repos/ivy/</literal>. See how to + update the contents of freemarker.apache.org <link linkend="updating-homepage">here...</link></para> </listitem> @@ -2035,7 +2035,7 @@ two freemarker.jar-s and unpredictable behavior! </listitem> <listitem> - <para><literal>freemarker-site</literal>: Web site (freemarker.org) + <para><literal>freemarker-site</literal>: Web site (freemarker.apache.org) contents. URL: <olink targetdoc="gitSite"/>. GitHub mirror: <olink targetdoc="githubMirrorSite"/>. Relevant branches: <literal>master</literal></para> http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/07242ee5/src/main/docgen/docgen.cjson ---------------------------------------------------------------------- diff --git a/src/main/docgen/docgen.cjson b/src/main/docgen/docgen.cjson index 9c80282..089062c 100644 --- a/src/main/docgen/docgen.cjson +++ b/src/main/docgen/docgen.cjson @@ -17,7 +17,7 @@ // specific language governing permissions and limitations // under the License. -deployUrl: "http://freemarker.apache.org/"; +deployUrl: "https://freemarker.apache.org/"; onlineTrackerHTML: "docgen-misc/googleAnalytics.html" offline: false simpleNavigationMode http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/07242ee5/src/main/docgen/sitemap-index.xml ---------------------------------------------------------------------- diff --git a/src/main/docgen/sitemap-index.xml b/src/main/docgen/sitemap-index.xml index 68fef2f..c4ce3fb 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://www.freemarker.org/sitemap.xml</loc> + <loc>http://freemarker.apache.org/sitemap.xml</loc> <lastmod>2015-07-20</lastmod> </sitemap> <sitemap> - <loc>http://www.freemarker.org/docs/sitemap.xml</loc> + <loc>http://freemarker.apache.org/docs/sitemap.xml</loc> <lastmod>2015-07-20</lastmod> </sitemap> </sitemapindex>
