freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject incubator-freemarker-site git commit: (Typo, etc.)
Date Sat, 30 Sep 2017 11:03:38 GMT
Repository: incubator-freemarker-site
Updated Branches:
  refs/heads/master f8fc2e118 -> 43b44e388


(Typo, etc.)


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/43b44e38
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/tree/43b44e38
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/diff/43b44e38

Branch: refs/heads/master
Commit: 43b44e3889d2779fd1d2db1dc96a8118e38dfd6d
Parents: f8fc2e1
Author: ddekany <ddekany@apache.org>
Authored: Sat Sep 30 13:03:32 2017 +0200
Committer: ddekany <ddekany@apache.org>
Committed: Sat Sep 30 13:03:32 2017 +0200

----------------------------------------------------------------------
 src/main/docgen/book.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/43b44e38/src/main/docgen/book.xml
----------------------------------------------------------------------
diff --git a/src/main/docgen/book.xml b/src/main/docgen/book.xml
index aad16cc..a93bae2 100644
--- a/src/main/docgen/book.xml
+++ b/src/main/docgen/book.xml
@@ -1479,9 +1479,9 @@ two freemarker.jar-s and unpredictable behavior!
           <listitem>
             <para>In the 2.3.x branch, we release two products, the normal and
             the GAE (Google App Engine) version. Hence when executing the
-            release steps, you do many of them twice. Changes are made into
-            the 2.3-gae branch, and then they are merged into the 2.3 branch
-            (unless a change only applies to 2.3).</para>
+            release steps, you do many of them twice. Note that source code
+            changes should be made in the 2.3-gae branch, and then merged into
+            the 2.3 branch (unless a change only applies to 2.3).</para>
           </listitem>
         </itemizedlist>
 


Mime
View raw message