summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornahi <nahi@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-03-26 16:47:16 +0000
committernahi <nahi@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-03-26 16:47:16 +0000
commit223d1cb77b595b2eb4b2653fd9a54af44118b7e0 (patch)
tree6de750eed56e6e331a4d1ac17848c4f6fef52c9c
parentd6dc168b22e59de4802bbcbe60ea265f11259de3 (diff)
downloadruby-223d1cb77b595b2eb4b2653fd9a54af44118b7e0.tar.gz
* lib/logger.rb: trim tail space of each line. no user visible change.
* lib/rss/dublincore.rb: fixed class definition mismatch. * sample/openssl/gen_csr.rb: fixed wrong usage text. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6030 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog8
-rw-r--r--lib/logger.rb14
-rw-r--r--lib/rss/dublincore.rb10
-rw-r--r--sample/openssl/gen_csr.rb2
4 files changed, 21 insertions, 13 deletions
diff --git a/ChangeLog b/ChangeLog
index 00308e018c..8dd359c963 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Sat Mar 27 01:47:09 2004 NAKAMURA, Hiroshi <nakahiro@sarion.co.jp>
+
+ * lib/logger.rb: trim tail space of each line. no user visible change.
+
+ * lib/rss/dublincore.rb: fixed class definition mismatch.
+
+ * sample/openssl/gen_csr.rb: fixed wrong usage text.
+
Thu Mar 25 23:15:24 2004 Dave Thomas <dave@pragprog.com>
* lib/rdoc/ri/ri_options.rb (RI::Options::show_version):
diff --git a/lib/logger.rb b/lib/logger.rb
index 682ab3c457..8cccee58b8 100644
--- a/lib/logger.rb
+++ b/lib/logger.rb
@@ -167,7 +167,7 @@
# I, [Wed Mar 03 02:34:24 JST 1999 895701 #19074] INFO -- Main: info.
#
# You may change the date and time format in this manner:
-#
+#
# logger.datetime_format = "%Y-%m-%d %H:%M:%S"
# # e.g. "2004-01-03 00:54:26"
#
@@ -259,7 +259,7 @@ class Logger
#
# === Synopsis
- #
+ #
# Logger#add(severity, message = nil, progname = nil) { ... }
#
# === Args
@@ -355,18 +355,18 @@ class Logger
#
# === Examples
#
- # logger.info("MainApp") { "Received connection from #{ip}" }
+ # logger.info("MainApp") { "Received connection from #{ip}" }
# # ...
# logger.info "Waiting for input from user"
# # ...
# logger.info { "User typed #{input}" }
#
# You'll probably stick to the second form above, unless you want to provide a
- # program name (which you can do with <tt>Logger#progname=</tt> as well).
+ # program name (which you can do with <tt>Logger#progname=</tt> as well).
#
# === Return
#
- # See #add.
+ # See #add.
#
def info(progname = nil, &block)
add(INFO, nil, progname, &block)
@@ -487,7 +487,7 @@ private
# IO object). The beginning of each file created by this class is tagged
# with a header message.
#
- # This class is unlikely to be used directly; it is a backend for Logger.
+ # This class is unlikely to be used directly; it is a backend for Logger.
#
def initialize(log = nil, opt = {})
@dev = @filename = @shift_age = @shift_size = nil
@@ -517,7 +517,7 @@ private
end
end
- @dev.write(message)
+ @dev.write(message)
end
#
diff --git a/lib/rss/dublincore.rb b/lib/rss/dublincore.rb
index dcf8e46c65..06cb73ec97 100644
--- a/lib/rss/dublincore.rb
+++ b/lib/rss/dublincore.rb
@@ -46,11 +46,11 @@ module RSS
# For backward compatibility
DublincoreModel = DublinCoreModel
- class RDF
- class Channel; include DublinCoreModel; end
- class Image; include DublinCoreModel; end
- class Item; include DublinCoreModel; end
- class Textinput; include DublinCoreModel; end
+ class RDF < Element
+ class Channel < Element; include DublinCoreModel; end
+ class Image < Element; include DublinCoreModel; end
+ class Item < Element; include DublinCoreModel; end
+ class Textinput < Element; include DublinCoreModel; end
end
prefix_size = DC_PREFIX.size + 1
diff --git a/sample/openssl/gen_csr.rb b/sample/openssl/gen_csr.rb
index 7c7f559995..d3da5741bc 100644
--- a/sample/openssl/gen_csr.rb
+++ b/sample/openssl/gen_csr.rb
@@ -8,7 +8,7 @@ include OpenSSL
def usage
myname = File::basename($0)
$stderr.puts <<EOS
-Usage: #{myname} name [keypair_file]
+Usage: #{myname} [--key keypair_file] name
name ... ex. /C=JP/O=RRR/OU=CA/CN=NaHi/emailAddress=nahi@example.org
EOS
exit