Repository: incubator-freemarker-site Updated Branches: refs/heads/master 2c47b4d20 -> 52a6c6049
Moved Security link next to bug reporting link. Removed link to the sf.net project page 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/424f3c1f Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/tree/424f3c1f Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/diff/424f3c1f Branch: refs/heads/master Commit: 424f3c1fd5650cadb7feeaa8ae3b8e7e9e299a6b Parents: 2c47b4d Author: ddekany <[email protected]> Authored: Sat Nov 11 19:45:04 2017 +0100 Committer: ddekany <[email protected]> Committed: Sat Nov 11 19:45:04 2017 +0100 ---------------------------------------------------------------------- src/main/docgen/book.xml | 47 +++++++++++++++++---------------------- src/main/docgen/docgen.cjson | 1 - 2 files changed, 20 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/424f3c1f/src/main/docgen/book.xml ---------------------------------------------------------------------- diff --git a/src/main/docgen/book.xml b/src/main/docgen/book.xml index 575c5cd..e29e3a2 100644 --- a/src/main/docgen/book.xml +++ b/src/main/docgen/book.xml @@ -168,8 +168,8 @@ public keys used for signing are here: <link xlink:href="https://www.apache.org/dist/incubator/freemarker/KEYS";>KEYS</link> (also must come from www.apache.org). <link - xlink:href="https://www.apache.org/dyn/closer.cgi#verify";>More about how to - verify releases...</link> Note that such verification is only possible + xlink:href="https://www.apache.org/dyn/closer.cgi#verify";>More about how + to verify releases...</link> Note that such verification is only possible since 2.3.24.</para> <simplesect> @@ -186,8 +186,8 @@ site</link>.</para> <para><link - xlink:href="https://freemarker.apache.org/docs/versions_2_3_27.html";>See what's - new...</link></para> + xlink:href="https://freemarker.apache.org/docs/versions_2_3_27.html";>See + what's new...</link></para> <para>Downloads:</para> @@ -537,13 +537,6 @@ two freemarker.jar-s and unpredictable behavior! <para/> </section> - <section> - <title><olink targetdoc="oldBugTracker">Bugs still in the old - tracker</olink></title> - - <para/> - </section> - <section xml:id="report-security-vulnerabilities"> <title>Report security vulnerability</title> @@ -567,6 +560,13 @@ two freemarker.jar-s and unpredictable behavior! </section> <section> + <title><olink targetdoc="oldBugTracker">Bugs still in the old + tracker</olink></title> + + <para/> + </section> + + <section> <title><olink targetdoc="newStackOverflowQuestion">Ask help on Stack Overflow</olink></title> @@ -1938,9 +1938,9 @@ 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 - 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> + 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> <orderedlist> <listitem> @@ -1950,8 +1950,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>https://freemarker.apache.org/repos/ivy/</literal>. See how to - update the contents of freemarker.apache.org <link + <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> @@ -2046,10 +2046,10 @@ two freemarker.jar-s and unpredictable behavior! </listitem> <listitem> - <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> + <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> </listitem> <listitem> @@ -2187,12 +2187,5 @@ two freemarker.jar-s and unpredictable behavior! </listitem> </itemizedlist> </section> - - <section> - <title><olink targetdoc="sourceforgeProject">Sourceforge.net project - page</olink></title> - - <para/> - </section> </chapter> </book> http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/424f3c1f/src/main/docgen/docgen.cjson ---------------------------------------------------------------------- diff --git a/src/main/docgen/docgen.cjson b/src/main/docgen/docgen.cjson index e14b6d5..e665b44 100644 --- a/src/main/docgen/docgen.cjson +++ b/src/main/docgen/docgen.cjson @@ -67,7 +67,6 @@ olinks: { // External URL-s: onlineTemplateTester: "http://try.freemarker.org/"; twitter: "https://twitter.com/freemarker"; - sourceforgeProject: "https://sourceforge.net/projects/freemarker/"; gitFreemarker: "https://git-wip-us.apache.org/repos/asf/incubator-freemarker.git"; githubMirrorFreemarker: "https://github.com/apache/incubator-freemarker"; gitDocgen: "https://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen.git";
