Mailing-List: contact notifications-help@freemarker.incubator.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@freemarker.incubator.apache.org
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: ddekany@apache.org
To: notifications@freemarker.incubator.apache.org
Message-Id: <0f06e48f14d646b9b7b1b2e4b1376684@git.apache.org>
Subject: incubator-freemarker-site git commit: Word wrapping differences (due
 to editing without XXE)
Date: Thu,  5 Jan 2017 07:30:32 +0000 (UTC)
archived-at: Thu, 05 Jan 2017 07:30:37 -0000

Repository: incubator-freemarker-site
Updated Branches:
  refs/heads/master cbafd5e20 -> 47f65fd7b


Word wrapping differences (due to editing without XXE)


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

Branch: refs/heads/master
Commit: 47f65fd7bef2097783ae4b467cbd7e760f2e1ebc
Parents: cbafd5e
Author: ddekany <ddekany@apache.org>
Authored: Thu Jan 5 08:30:16 2017 +0100
Committer: ddekany <ddekany@apache.org>
Committed: Thu Jan 5 08:30:16 2017 +0100

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


http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/47f65fd7/src/main/docgen/book.xml
----------------------------------------------------------------------
diff --git a/src/main/docgen/book.xml b/src/main/docgen/book.xml
index 0de3d13..22a71f1 100644
--- a/src/main/docgen/book.xml
+++ b/src/main/docgen/book.xml
@@ -1292,10 +1292,10 @@ two freemarker.jar-s and unpredictable behavior!
         into the <quote>main</quote> branch (or branches), and (s)he is
         expected to use that wisely. Depending on the complexity of the
         feature, the number of active Committers in the time period, and
-        whether the feature is expected to be discussed by the community, (s)he
-        may should work in a feature branch instead. If the feature is
-        finished and discussions were resolved (on some way described by Apache
-        policies), it can be merged back into the <quote>main</quote>
+        whether the feature is expected to be discussed by the community,
+        (s)he may should work in a feature branch instead. If the feature is
+        finished and discussions were resolved (on some way described by
+        Apache policies), it can be merged back into the <quote>main</quote>
         branch.</para>
 
         <para>All commits should have helpful comments; don't be afraid of
@@ -1355,9 +1355,9 @@ two freemarker.jar-s and unpredictable behavior!
       <simplesect>
         <title>Making releases</title>
 
-        <para>For each release, one of the Committers plays the role of Release
-        Manager. The Release Manager should follow the procedure here, and
-        (s)he should update this page where (s)he has to deviate from
+        <para>For each release, one of the Committers plays the role of
+        Release Manager. The Release Manager should follow the procedure here,
+        and (s)he should update this page where (s)he has to deviate from
         it.</para>
 
         <para>For general info about making releases, please read <link
@@ -1389,11 +1389,11 @@ two freemarker.jar-s and unpredictable behavior!
           </listitem>
 
           <listitem>
-            <para>The official release is provided as source code to build
-            the project (src tar.gz). For the convenience of users the release
-            is also accompanied by compiled binaries (bin tar.gz).
-            Both artifacts are downloadable from the Apache Software Foundation,
-            as usual</para>
+            <para>The official release is provided as source code to build the
+            project (src tar.gz). For the convenience of users the release is
+            also accompanied by compiled binaries (bin tar.gz). Both artifacts
+            are downloadable from the Apache Software Foundation, as
+            usual</para>
           </listitem>
 
           <listitem>