Changing official domain from freemarker.org to freemarker.apache.org. Some Release how-to clarifications.
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 @@
</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 @@
<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>
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 @@
}
logo: {
- href: "http://freemarker.org/"
+ href: "http://freemarker.apache.org/"
src: logo.png
alt: "FreeMarker"
}
