From d36508766d80fdfd2b8f6aab11b7af90e1155f31 Mon Sep 17 00:00:00 2001
From: Jakob Borg <jakob@nym.se>
Date: Wed, 1 Jul 2015 17:27:17 +0200
Subject: [PATCH] Coding style

---
 dev/contributing.rst | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/dev/contributing.rst b/dev/contributing.rst
index ef6a4d4d7..2f6fe7630 100644
--- a/dev/contributing.rst
+++ b/dev/contributing.rst
@@ -23,15 +23,24 @@ acceptable.
 Coding Style
 ------------
 
+General
+~~~~~~~
+
+- All text files use Unix line endings. The git settings already present in
+  the repository attempts to enforce this.
+
+- When making changes, follow the brace and paranthesis style of the
+  surrounding code.
+
+Go Specific
+~~~~~~~~~~~
+
 - Follow the conventions laid out in `Effective
   Go <https://golang.org/doc/effective_go.html>`__ as much as makes
   sense. The review guidelines in `Go Code Review Comments
   <https://github.com/golang/go/wiki/CodeReviewComments>`__ should generally
   be followed.
 
-- All text files use Unix line endings. The git settings already present in
-  the repository attempts to enforce this.
-
 - Each commit should be ``go fmt`` clean.
 
 - Imports are grouped per ``goimports`` standard; that is, standard