From 2f24e1d9f06f5902ff8088cf64b285cc9329c692 Mon Sep 17 00:00:00 2001
From: JP Simard <jp@jpsim.com>
Date: Thu, 11 Feb 2016 15:22:41 -0800
Subject: [PATCH] add changelog entry

---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 52c906bfb5..875635de93 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,6 +29,11 @@
   [JP Simard](https://github.com/jpsim)
   [#479](https://github.com/realm/SwiftLint/issues/479)
 
+* All instances of the abbreviation "config" in the API have been expanded to
+  "configuration". The `--config` command line parameter and
+  `use_nested_configs` configuration key are unaffected.  
+  [JP Simard](https://github.com/jpsim)
+
 ##### Enhancements
 
 * `swiftlint lint` now accepts an optional `--reporter` parameter which