From d0104546bae4bc2fb12569fa734970e14d60f76c Mon Sep 17 00:00:00 2001
From: Johannes Raggam <raggam-nl@adm.at>
Date: Tue, 3 Dec 2013 12:41:45 +0100
Subject: [PATCH] indentation clarification

---
 docs/contribute/conventions.rst | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/docs/contribute/conventions.rst b/docs/contribute/conventions.rst
index 8781665..6b21c7f 100644
--- a/docs/contribute/conventions.rst
+++ b/docs/contribute/conventions.rst
@@ -89,6 +89,22 @@ This package follows all rules above, `check out the source
 in action.
 
 
+Indentation
+===========
+
+For Python files, we stick with the `PEP 8 recommondation
+<http://www.python.org/dev/peps/pep-0008/#indentation>`_: Use 4 spaces per
+indentation level.
+
+For ZCML and XML (GenericSetup) files, we recommend the `Zope Toolkit's coding
+style on ZCML <http://docs.zope.org/zopetoolkit/codingstyle/zcml-style.html>`_
+::
+
+  Indentation of 2 characters to show nesting, 4 characters to list attributes
+  on separate lines. This distinction makes it easier to see the difference
+  between attributes and nested elements.
+
+
 Quoting
 =======