summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzzak <zzak@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-01-11 17:44:16 +0000
committerzzak <zzak@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-01-11 17:44:16 +0000
commitb239611b06c7ecc79fb92c05e7ecd9bc563d98e3 (patch)
treeecd4c06a08ee88e7bd91777a0001c73efca775eb
parent09f564b15fbbd9ae18bf945d15736b093e00cf1e (diff)
* man/ruby.1 (options): include --*-encoding from r38784
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38785 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--man/ruby.14
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 089ac99..e38ef24 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Jan 12 02:45:00 2013 Zachary Scott <zachary@zacharyscott.net>
+
+ * man/ruby.1 (options): include --*-encoding from r38784
+
Fri Jan 11 23:34:48 2013 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
* ruby.c (usage): sort --*-encoding in help. (same order of -E)
diff --git a/man/ruby.1 b/man/ruby.1
index ebdca19..3a60215 100644
--- a/man/ruby.1
+++ b/man/ruby.1
@@ -163,6 +163,10 @@ Specifies the default value(s) for external encodings and internal encoding. Val
You can omit the one for internal encodings, then the value
.Pf ( Li "Encoding.default_internal" ) will be nil.
.Pp
+.It Fl -external-encoding Ns = Ns Ar encoding
+.It Fl -internal-encoding Ns = Ns Ar encoding
+Specify the default external or internal character encoding
+.Pp
.It Fl F Ar pattern
Specifies input field separator
.Pf ( Li "$;" ) .