summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkazu <kazu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-01-11 14:38:57 +0000
committerkazu <kazu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-01-11 14:38:57 +0000
commit09f564b15fbbd9ae18bf945d15736b093e00cf1e (patch)
tree18da0100cca928aa33a12bc89a3500385c16869e
parent51914fcce6ed0fdb8ae63e51c6ae53d72e4cd755 (diff)
* ruby.c (usage): sort --*-encoding in help. (same order of -E)
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38784 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--ruby.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index c0f2a4b..089ac99 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Jan 11 23:34:48 2013 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
+
+ * ruby.c (usage): sort --*-encoding in help. (same order of -E)
+
Fri Jan 11 16:56:29 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* tool/mkconfig.rb: use configured libdir value to fix
diff --git a/ruby.c b/ruby.c
index 0ec8219..9e11262 100644
--- a/ruby.c
+++ b/ruby.c
@@ -174,8 +174,8 @@ usage(const char *name, int help)
M("--copyright", "", "print the copyright"),
M("--enable=feature[,...]", ", --disable=feature[,...]",
"enable or disable features"),
- M("--internal-encoding=encoding", ", --external-encoding=encoding",
- "specify the default internal and external character encoding"),
+ M("--external-encoding=encoding", ", --internal-encoding=encoding",
+ "specify the default external or internal character encoding"),
M("--version", "", "print the version"),
M("--help", "", "show this message, -h for short message"),
};