aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzzak <zzak@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-12-22 18:21:14 +0000
committerzzak <zzak@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-12-22 18:21:14 +0000
commitcadd66068984064df5d7c2ee135bc04432ff2e65 (patch)
treec46fe377556d13cb599d64723ea6b87a5b7d5500
parentba128644691dceabf53481970723b3effec22678 (diff)
downloadruby-cadd66068984064df5d7c2ee135bc04432ff2e65.tar.gz
* doc/ChangeLog-1.9.3: [DOC] Fix typos by @dvsuresh
[Fixes GH-485] https://github.com/ruby/ruby/pull/485 * ext/openssl/ossl_config.c: ditto * lib/rss/utils.rb, lib/time.rb: ditto * test/ruby/envutil.rb: ditto git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44349 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog8
-rw-r--r--doc/ChangeLog-1.9.32
-rw-r--r--ext/openssl/ossl_config.c2
-rw-r--r--lib/rss/utils.rb2
-rw-r--r--test/ruby/envutil.rb2
5 files changed, 12 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index d290d63215..a70f0e76bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Mon Dec 23 03:18:09 2013 Zachary Scott <e@zzak.io>
+
+ * doc/ChangeLog-1.9.3: [DOC] Fix typos by @dvsuresh
+ [Fixes GH-485] https://github.com/ruby/ruby/pull/485
+ * ext/openssl/ossl_config.c: ditto
+ * lib/rss/utils.rb, lib/time.rb: ditto
+ * test/ruby/envutil.rb: ditto
+
Sun Dec 22 23:56:56 2013 Zachary Scott <e@zzak.io>
* lib/{rake,rdoc,rss}/*, test/rexml/test_listener.rb: [DOC] Fix typos
diff --git a/doc/ChangeLog-1.9.3 b/doc/ChangeLog-1.9.3
index b8e3162511..e9ede641f5 100644
--- a/doc/ChangeLog-1.9.3
+++ b/doc/ChangeLog-1.9.3
@@ -86877,7 +86877,7 @@ Sun Feb 1 18:21:00 2004 Gavin Sinclair <gsinclair@soyabean.com.au>
Sun Feb 1 05:30:06 2004 Tanaka Akira <akr@m17n.org>
* lib/open-uri.rb (URI::Generic#find_proxy): warn HTTP_PROXY.
- raise an errror on non-http proxy URI.
+ raise an error on non-http proxy URI.
(OpenURI::Buffer#<<): make a tempfile binmode. [ruby-talk:90793]
Sun Feb 1 00:57:41 2004 Kouhei Sutou <kou@cozmixng.org>
diff --git a/ext/openssl/ossl_config.c b/ext/openssl/ossl_config.c
index 0f25a19e50..140f5c3ad0 100644
--- a/ext/openssl/ossl_config.c
+++ b/ext/openssl/ossl_config.c
@@ -17,7 +17,7 @@
VALUE cConfig;
/* Document-class: OpenSSL::ConfigError
*
- * General error for openssl library configuration files. Including formating,
+ * General error for openssl library configuration files. Including formatting,
* parsing errors, etc.
*/
VALUE eConfigError;
diff --git a/lib/rss/utils.rb b/lib/rss/utils.rb
index 5ed214159f..b420e6b24c 100644
--- a/lib/rss/utils.rb
+++ b/lib/rss/utils.rb
@@ -3,7 +3,7 @@ module RSS
##
# RSS::Utils is a module that holds various utility functions that are used
# across many parts of the rest of the RSS library. Like most modules named
- # some variant of 'util', its methods are probably not particuarly useful
+ # some variant of 'util', its methods are probably not particularly useful
# to those who aren't developing the library itself.
module Utils
module_function
diff --git a/test/ruby/envutil.rb b/test/ruby/envutil.rb
index 079658bfbd..8bddd65eb3 100644
--- a/test/ruby/envutil.rb
+++ b/test/ruby/envutil.rb
@@ -355,7 +355,7 @@ eom
# really is it succeed?
unless ignore_stderr
- # the body of assert_separately must not output anything to detect errror
+ # the body of assert_separately must not output anything to detect error
assert_equal("", stderr, "assert_separately failed with error message")
end
assert_equal(0, status, "assert_separately failed: '#{stderr}'")