Repository: incubator-freemarker-site Updated Branches: refs/heads/master 388389ea4 -> db794b522
Changing official domain from freemarker.org to freemarker.apache.org. Some Release how-to clarifications. 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/db794b52 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/tree/db794b52 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/diff/db794b52 Branch: refs/heads/master Commit: db794b522ae5136c620e8fba4aa6064bd7d270c2 Parents: 388389e Author: ddekany <[email protected]> Authored: Sat Nov 4 10:47:40 2017 +0100 Committer: ddekany <[email protected]> Committed: Sat Nov 4 11:07:17 2017 +0100 ---------------------------------------------------------------------- src/main/docgen/book.xml | 15 +++++++++++---- src/main/docgen/docgen.cjson | 4 ++-- 2 files changed, 13 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/db794b52/src/main/docgen/book.xml ---------------------------------------------------------------------- diff --git a/src/main/docgen/book.xml b/src/main/docgen/book.xml index 186692b..4bf3891 100644 --- a/src/main/docgen/book.xml +++ b/src/main/docgen/book.xml @@ -1748,13 +1748,14 @@ two freemarker.jar-s and unpredictable behavior! </listitem> <listitem> - <para>Update release date in the Manual, regenerate it.</para> + <para>Update release date in the Manual in the Version history + (now that we know it), then generate the Manual with + <literal>ant manualOnline</literal>.</para> </listitem> <listitem> - <para>Upload the new Manual (the online version, that is, the - one made with <literal>ant - manualFreemarkerOrg</literal>)</para> + <para>Upload the new Manual (the online version you have + generated in the last step, not the offline one)</para> </listitem> </itemizedlist> </listitem> @@ -1806,6 +1807,12 @@ two freemarker.jar-s and unpredictable behavior! <para>On the old FreeMarker mailing lists: freemarker-user, freemarker-devel, freemarker-announce</para> </listitem> + + <listitem> + <para>Close issues on Jira that were resolved by this release + (the Version history in the Manual should contain links to + them)</para> + </listitem> </itemizedlist> </listitem> </orderedlist> http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/db794b52/src/main/docgen/docgen.cjson ---------------------------------------------------------------------- diff --git a/src/main/docgen/docgen.cjson b/src/main/docgen/docgen.cjson index 38b8e4d..35f35c2 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.org/"; +deployUrl: "http://freemarker.apache.org/"; onlineTrackerHTML: "docgen-misc/googleAnalytics.html" offline: false simpleNavigationMode @@ -44,7 +44,7 @@ seoMeta: { } logo: { - href: "http://freemarker.org/"; + href: "http://freemarker.apache.org/"; src: logo.png alt: "FreeMarker" }
