diff options
author | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-06 08:05:24 +0000 |
---|---|---|
committer | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-06 08:05:24 +0000 |
commit | 061fd36d75bff6335d2c6fdced5a70eb14bc8322 (patch) | |
tree | 19e04b8c92576201ace9e7f828047a44776383a4 /lib/rdoc | |
parent | 70bde7a3b5347e6e68a6cb82714ef03304c13bb1 (diff) |
* ext/openssl/ossl_ssl_session.c (ossl_ssl_session_initialize):
Add a null check for ssl; submitted by akira yamada
in [ruby-dev:34950].
* ext/openssl/ossl_ssl.c (Init_ossl_ssl): Define OP_NO_TICKET if
SSL_OP_NO_TICKET is present; submitted by akira yamada
in [ruby-dev:34944].
* test/openssl/test_ssl.rb (OpenSSL#test_server_session): Add a
workaround for the case where OpenSSL is configured with
--enable-tlsext; submitted by akira yamada in [ruby-dev:34944].
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@16857 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rdoc')
-rw-r--r-- | lib/rdoc/parsers/parse_c.rb | 8 | ||||
-rw-r--r-- | lib/rdoc/parsers/parse_f95.rb | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/lib/rdoc/parsers/parse_c.rb b/lib/rdoc/parsers/parse_c.rb index 25fc66af3f..7eefa29706 100644 --- a/lib/rdoc/parsers/parse_c.rb +++ b/lib/rdoc/parsers/parse_c.rb @@ -117,10 +117,10 @@ module RDoc # method in the HTML output. This method must be in the same source file # as the rb_define_method. # - # C classes can be diagramed (see /tc/dl/ruby/ruby/error.c), and RDoc + # C classes can be diagrammed (see /tc/dl/ruby/ruby/error.c), and RDoc # integrates C and Ruby source into one tree # - # The comment blocks may include special direcives: + # The comment blocks may include special directives: # # [Document-class: <i>name</i>] # This comment block is documentation for the given class. Use this @@ -131,10 +131,10 @@ module RDoc # automatically find the method from it's declaration # # [call-seq: <i>text up to an empty line</i>] - # Because C source doesn't give descripive names to Ruby-level parameters, + # Because C source doesn't give descriptive names to Ruby-level parameters, # you need to document the calling sequence explicitly # - # In additon, RDoc assumes by default that the C method implementing a + # In addition, RDoc assumes by default that the C method implementing a # Ruby function is in the same source file as the rb_define_method call. # If this isn't the case, add the comment # diff --git a/lib/rdoc/parsers/parse_f95.rb b/lib/rdoc/parsers/parse_f95.rb index f3f6d76103..f1a1ae4d4b 100644 --- a/lib/rdoc/parsers/parse_f95.rb +++ b/lib/rdoc/parsers/parse_f95.rb @@ -201,7 +201,7 @@ module RDoc @progress = $stderr unless options.quiet end - # devine code constructs + # define code constructs def scan # remove private comment @@ -1065,7 +1065,7 @@ module RDoc # # If "all" argument is true, information of all arguments are returned. # If "modified_params" is true, list of arguments are decorated, - # for exameple, optional arguments are parenthetic as "[arg]". + # for example, optional arguments are parenthetic as "[arg]". # def find_arguments(args, text, all=nil, indent=nil, modified_params=nil) return unless args || all @@ -1143,8 +1143,8 @@ EOF # # Comments just after module or subprogram, or arguments are - # returnd. If "COMMENTS_ARE_UPPER" is true, comments just before - # modules or subprograms are returnd + # returned. If "COMMENTS_ARE_UPPER" is true, comments just before + # modules or subprograms are returned # def find_comments text return "" unless text |