From d4d14c198801b3965da32d1b88cf6594dfc7e0a2 Mon Sep 17 00:00:00 2001
From: zzak <zzak@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 4 Mar 2013 01:24:40 +0000
Subject: [PATCH] * encoding.c: Typo in Encoding overview by Tom Wardrop [GH
 fixes #255]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39575 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog  | 4 ++++
 encoding.c | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 5ffb2f40e5..4a11f9d940 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Mar  4 10:23:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* encoding.c: Typo in Encoding overview by Tom Wardrop [GH fixes #255]
+
 Sun Mar  3 12:35:08 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/mkmf.rb (MakeMakefile#libpath_env): set runtime library path for
diff --git a/encoding.c b/encoding.c
index c94dc90a7e..0c92dfedef 100644
--- a/encoding.c
+++ b/encoding.c
@@ -1676,7 +1676,7 @@ rb_enc_aliases(VALUE klass)
  *   #=> "R\xC3\xA9sum\xC3\xA9"
  *   string.encoding
  *   #=> #<Encoding:ISO-8859-1>
- *   string.force_encoding(Encoding::UTF-8)
+ *   string.force_encoding(Encoding::UTF_8)
  *   #=> "R\u00E9sum\u00E9"
  *
  * Second, it is possible to transcode a string, i.e. translate its internal