svn commit: r780540 - /websites/staging/river/trunk/content/river/coding.html

[bu...@apache.org]

Author: buildbot
Date: Mon Dec 13 07:38:52 2010
New Revision: 780540

Log:
Staging update by buildbot

Modified:
    websites/staging/river/trunk/content/river/coding.html

Modified: websites/staging/river/trunk/content/river/coding.html
==============================================================================
--- websites/staging/river/trunk/content/river/coding.html (original)
+++ websites/staging/river/trunk/content/river/coding.html Mon Dec 13 07:38:52 2010
@@ -61,6 +61,11 @@
 <h2 id="other">Other</h2>
 <p>Contributors are advised to read <a href="http://www.oracle.com/technetwork/java/codeconv-138413.html">http://www.oracle.com/technetwork/java/codeconv-138413.html</a> 
 and try to adhere as much as possible to these conventions.</p>
+<h2 id="reformatting">Reformatting</h2>
+<p>If the reformatting involves a large part of the code, 
+a clearly labeled 'reformatting' commit in between is recommended. 
+Keeping your reformatting changes limited, 
+reduces the change of merging conflicts by your fellow committers.</p>
 <h2 id="older_sources">Older sources</h2>
 <p>We do not actively search and reformat source files 
 that are not formatted according to this convention.</p>