Replaced "dispute" with "discussion": the latter better describes what usually happens during a commit review by the community.
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/17156466 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/tree/17156466 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/diff/17156466 Branch: refs/heads/master Commit: 171564660a9a54456ba37a98a205e8cb2dc02470 Parents: d2d3c4e Author: Jacopo Cappellato <[email protected]> Authored: Thu Jan 5 07:36:51 2017 +0100 Committer: Jacopo Cappellato <[email protected]> Committed: Thu Jan 5 07:36:51 2017 +0100 ---------------------------------------------------------------------- src/main/docgen/book.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/17156466/src/main/docgen/book.xml ---------------------------------------------------------------------- diff --git a/src/main/docgen/book.xml b/src/main/docgen/book.xml index c7bcca5..bb713f7 100644 --- a/src/main/docgen/book.xml +++ b/src/main/docgen/book.xml @@ -1292,9 +1292,9 @@ 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 disputed by the community, (s)he + 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 disputes were resolved (on some way described by Apache + finished and discussions were resolved (on some way described by Apache policies), it can be merged back into the <quote>main</quote> branch.</para>
