summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authork0kubun <k0kubun@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-12-16 14:24:20 +0000
committerk0kubun <k0kubun@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-12-16 14:24:20 +0000
commitf84ae88b2c7261b7ad679f29aeb7937367bfbdb4 (patch)
tree5258fac95b3b472cf0fa0183cf73e403e3877d32
parent9446db408ce9fec8116aa767ce159513558a3638 (diff)
bin/erb: improve documentation of -P flag
man/erb.1: ditto [Bug #15421] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66419 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rwxr-xr-xbin/erb4
-rw-r--r--man/erb.17
2 files changed, 5 insertions, 6 deletions
diff --git a/bin/erb b/bin/erb
index d060caba90..d5e51ee969 100755
--- a/bin/erb
+++ b/bin/erb
@@ -114,9 +114,9 @@ class ERB
-d set $DEBUG to true
-r library load a library
-E ex[:in] set default external/internal encodings
- -U set default encoding to UTF-8.
+ -U set default encoding to UTF-8
-T trim_mode specify trim_mode (0..2, -)
- -P ignore lines which start with "%"
+ -P disable ruby code evaluation for lines beginning with %
var=value set variable
EOU
exit 1
diff --git a/man/erb.1 b/man/erb.1
index e2821acb6d..d8739a7639 100644
--- a/man/erb.1
+++ b/man/erb.1
@@ -1,5 +1,5 @@
.\"Ruby is copyrighted by Yukihiro Matsumoto <matz@netlab.jp>.
-.Dd October 21, 2017
+.Dd December 16, 2018
.Dt ERB \&1 "Ruby Programmer's Reference Guide"
.Os UNIX
.Sh NAME
@@ -45,9 +45,8 @@ You can omit the one for internal encodings, then the value
.Pf ( Li "Encoding.default_internal" ) will be nil.
.Pp
.It Fl P
-Evaluates lines starting with
-.Li "%"
-as Ruby code and removes the tailing EOLs.
+Disables ruby code evaluation for lines beginning with
+.Li "%" .
.Pp
.It Fl S Ar level
Specifies the safe level in which eRuby script will run.