From 407b9b577bf3699274274433af2f64c5d52abeca Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Wed, 19 Feb 2014 11:14:09 -0500
Subject: [PATCH] Update configuration docs to indicate that utf-8 is now the
 default

Docs for #2031, /cc #2029.
---
 site/docs/configuration.md | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/site/docs/configuration.md b/site/docs/configuration.md
index 96042bed..e2011142 100644
--- a/site/docs/configuration.md
+++ b/site/docs/configuration.md
@@ -109,10 +109,11 @@ class="flag">flags</code> (specified on the command-line) that control them.
         <p class="description">
             Set the encoding of files by name. Only available for Ruby
             1.9 or later).
-            The default value is nil, which uses the Ruby default,
-            <code>ASCII-8BIT</code>.
-            Available encoding for the ruby in use, can be shown by
-            command <code>ruby -e 'puts Encoding::list.join("\n")'</code>
+            The default value is <code>utf-8</code> starting in 2.0.0,
+            and <code>nil</code> before 2.0.0, which will yield the Ruby
+            default of <code>ASCII-8BIT</code>.
+            Available encodings can be shown by the
+            command <code>ruby -e 'puts Encoding::list.join("\n")'</code>.
         </p>
       </td>
       <td class='align-center'>