Clarified when ICLA/CCLA is not needed for merging a Github PR. (This policy was agreed upon months ago on the list.)
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/a5fca11d Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/tree/a5fca11d Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/diff/a5fca11d Branch: refs/heads/master Commit: a5fca11dcc71da6cf1d87f2c0a7f50e695b91b94 Parents: 9221ea2 Author: ddekany <ddek...@apache.org> Authored: Sat Nov 11 18:45:18 2017 +0100 Committer: ddekany <ddek...@apache.org> Committed: Sat Nov 11 18:45:18 2017 +0100 ---------------------------------------------------------------------- src/main/docgen/book.xml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/a5fca11d/src/main/docgen/book.xml ---------------------------------------------------------------------- diff --git a/src/main/docgen/book.xml b/src/main/docgen/book.xml index e977d41..46e338a 100644 --- a/src/main/docgen/book.xml +++ b/src/main/docgen/book.xml @@ -1359,8 +1359,19 @@ two freemarker.jar-s and unpredictable behavior! <itemizedlist> <listitem> + <para>You have checked all the changes. In particular, the files + (with a few exceptions like the <literal>README.md</literal>) must + have the standard Apache copyright headers, and must not state + that they have a different license.</para> + </listitem> + + <listitem> <para>The contributor has an ICLA or CCLA at Apache (see on <link - xlink:href="http://people.apache.org/";>http://people.apache.org/</link>)</para> + xlink:href="http://people.apache.org/";>http://people.apache.org/</link>). + If not, the pull request can be merged only if the commit only did + trivial changes (like fixing typos) that would be easy to + replicate in case legal issues are raised later. In particular, + new files added is a sign that ICLA/CCLA will be needed.</para> </listitem> <listitem>
