From 7b78dc48c3352fc0bab30bc77160e450a1f17314 Mon Sep 17 00:00:00 2001
From: WouterJ <waldio.webdesign@gmail.com>
Date: Sun, 20 Jul 2014 19:53:56 +0200
Subject: [PATCH 1/2] Added editorconfig

---
 .editorconfig | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 .editorconfig

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000000..58cc01b600e
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,8 @@
+root = true
+
+[*.rst]
+indent_style = space
+indent_size = 2
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true

From af8a4ceca24422c8e87630be038c300b7dd020a8 Mon Sep 17 00:00:00 2001
From: Wouter J <waldio.webdesign@gmail.com>
Date: Wed, 23 Jul 2014 16:15:13 +0200
Subject: [PATCH 2/2] Also apply it for .rst.inc files

---
 .editorconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.editorconfig b/.editorconfig
index 58cc01b600e..6f5286431d4 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,6 +1,6 @@
 root = true
 
-[*.rst]
+[*.{rst,rst.inc}]
 indent_style = space
 indent_size = 2
 charset = utf-8