# HG changeset patch
# User diego
# Date 1274627254 0
# Node ID 72638e3330a3c88ab5ecc5c740c6916f06b64d18
# Parent  b50bb3e564d67f1aad77b750f13b1d1b68c16209
K&R coding style should be applied to new code.

diff -r b50bb3e564d6 -r 72638e3330a3 DOCS/tech/svn-howto.txt
--- a/DOCS/tech/svn-howto.txt	Sun May 23 14:15:27 2010 +0000
+++ b/DOCS/tech/svn-howto.txt	Sun May 23 15:07:34 2010 +0000
@@ -261,13 +261,9 @@
    not apply to files you wrote and/or maintain.
 
 
-6. We refuse source indentation and other cosmetic changes if they are mixed
-   with functional changes, such commits will be rejected and removed. Every
-   developer has his own indentation style, you should not change it. Of course
-   if you (re)write something, you can use your own style... (Many projects
-   force a given indentation style - we don't.) If you really need to make
-   indentation changes (try to avoid this), separate them strictly from real
-   changes.
+6. Do not mix cosmetic changes (indentation, function / variable renaming and
+   similar) with functional changes in a single commit. Instead, commit such
+   changes as a separate commit of their own.
 
    NOTE: If you had to put if(){ .. } over a large (> 5 lines) chunk of code,
    do NOT change the indentation of the inner part (don't move it to the right)!
@@ -328,6 +324,12 @@
     with our local changes.
 
 
+15. Use K&R style with 4 space indentation, no tabs and no trailing whitespace.
+    Unnecessary braces should be avoided. This policy applies to new files. In
+    existing files that don't follow K&R style, try to respect the surrounding
+    style, but in doubt, go for K&R.
+
+
 Also read DOCS/tech/patches.txt !!!!
 
 We think our rules are not too hard. If you have comments, contact us.