diff --git a/.editorconfig b/.editorconfig
index ca97ab47dfea49..a1df58daf869c8 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -8,9 +8,6 @@ trim_trailing_whitespace = true
 [vcbuild.bat]
 end_of_line = crlf
 
-[*.{md,markdown}]
-trim_trailing_whitespace = false
-
 [{lib,src,test}/**.js]
 indent_style = space
 indent_size = 2
diff --git a/BUILDING.md b/BUILDING.md
index d0c0def6f16905..5051da343353b3 100644
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -20,7 +20,7 @@ Prerequisites:
 
 On OS X, you will also need:
 * [Xcode](https://developer.apple.com/xcode/download/)
-  * You also need to install the `Command Line Tools` via Xcode. You can find 
+  * You also need to install the `Command Line Tools` via Xcode. You can find
     this under the menu `Xcode -> Preferences -> Downloads`
   * This step will install `gcc` and the related toolchain containing `make`
 
diff --git a/doc/changelogs/CHANGELOG_V010.md b/doc/changelogs/CHANGELOG_V010.md
index a81d589d7c55ac..5d608325523316 100644
--- a/doc/changelogs/CHANGELOG_V010.md
+++ b/doc/changelogs/CHANGELOG_V010.md
@@ -66,7 +66,7 @@
   * [io.js](CHANGELOG_IOJS.md)
   * [Archive](CHANGELOG_ARCHIVE.md)
 
-**Note:** Node.js v0.10 is covered by the 
+**Note:** Node.js v0.10 is covered by the
 [Node.js Long Term Support Plan](https://github.com/nodejs/LTS) and
 will be maintained until October 2016.
 
@@ -294,11 +294,11 @@ https://github.com/nodejs/node/commit/8d045a30e95602b443eb259a5021d33feb4df079
 * child_process: properly support optional args (cjihrig)
 * crypto: Disable autonegotiation for SSLv2/3 by default (Fedor Indutny,
   Timothy J Fontaine, Alexis Campailla)
- 
+
   This is a behavior change, by default we will not allow the negotiation to
   SSLv2 or SSLv3. If you want this behavior, run Node.js with either
   `--enable-ssl2` or `--enable-ssl3` respectively.
- 
+
   This does not change the behavior for users specifically requesting
   `SSLv2_method` or `SSLv3_method`. While this behavior is not advised, it is
   assumed you know what you're doing since you're specifically asking to use
diff --git a/doc/changelogs/CHANGELOG_V012.md b/doc/changelogs/CHANGELOG_V012.md
index 42aff48f95feb4..db7eece83b86ba 100644
--- a/doc/changelogs/CHANGELOG_V012.md
+++ b/doc/changelogs/CHANGELOG_V012.md
@@ -33,7 +33,7 @@
   * [io.js](CHANGELOG_IOJS.md)
   * [Archive](CHANGELOG_ARCHIVE.md)
 
-**Note:** Node.js v0.12 is covered by the 
+**Note:** Node.js v0.12 is covered by the
 [Node.js Long Term Support Plan](https://github.com/nodejs/LTS) and
 will be maintained until December 31st, 2016.
 
diff --git a/test/README.md b/test/README.md
index 736de97b71a848..1c3303435db517 100644
--- a/test/README.md
+++ b/test/README.md
@@ -146,7 +146,7 @@ and `setInterval`).
 ## Common module API
 
 The common.js module is used by tests for consistency across repeated
-tasks. It has a number of helpful functions and properties to help with 
+tasks. It has a number of helpful functions and properties to help with
 writing tests.
 
 ### allowGlobals(...whitelist)
@@ -177,7 +177,7 @@ Check if there is more than 1gb of total memory.
 * `name` [<String>](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Data_structures#String_type)
 * `expected` [<String>](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Data_structures#String_type) | [<Array>](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array)
 
-Tests whether `name` and `expected` are part of a raised warning. 
+Tests whether `name` and `expected` are part of a raised warning.
 
 ### hasCrypto
 * return [<Boolean>](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Data_structures#Boolean_type)