From b903bbe4bfd8c3b75cbfa231a6ee3d15ef1370d2 Mon Sep 17 00:00:00 2001 From: nagachika Date: Wed, 19 Feb 2014 17:14:45 +0000 Subject: [PATCH] merge revision(s) r43750,r43940: * ext/openssl/lib/openssl/buffering.rb: [DOC] Fix HEREDOC comment for OpenSSL::Buffering which breaks overview because of RDoc bug * ext/openssl/lib/openssl/buffering.rb: Fix warning in copyright git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@45053 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 9 ++++++++ ext/openssl/lib/openssl/buffering.rb | 31 ++++++++++++++-------------- version.h | 2 +- 3 files changed, 26 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index 60130e2406..454fbc074f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Thu Feb 20 02:14:18 2014 Zachary Scott + + * ext/openssl/lib/openssl/buffering.rb: Fix warning in copyright + +Thu Feb 20 02:14:18 2014 Zachary Scott + + * ext/openssl/lib/openssl/buffering.rb: [DOC] Fix HEREDOC comment for + OpenSSL::Buffering which breaks overview because of RDoc bug + Thu Feb 20 02:04:09 2014 Eric Hodel * ext/.document: Add syslog/lib to documentable items. [Bug #9228] diff --git a/ext/openssl/lib/openssl/buffering.rb b/ext/openssl/lib/openssl/buffering.rb index 51bc968e3a..e191a00877 100644 --- a/ext/openssl/lib/openssl/buffering.rb +++ b/ext/openssl/lib/openssl/buffering.rb @@ -1,18 +1,19 @@ -=begin -= $RCSfile$ -- Buffering mix-in module. - -= Info - 'OpenSSL for Ruby 2' project - Copyright (C) 2001 GOTOU YUUZOU - All rights reserved. - -= Licence - This program is licenced under the same licence as Ruby. - (See the file 'LICENCE'.) - -= Version - $Id$ -=end +# +#-- +#= $RCSfile$ -- Buffering mix-in module. +# +#= Info +# 'OpenSSL for Ruby 2' project +# Copyright (C) 2001 GOTOU YUUZOU +# All rights reserved. +# +#= Licence +# This program is licenced under the same licence as Ruby. +# (See the file 'LICENCE'.) +# +#= Version +# $Id$ +#++ ## # OpenSSL IO buffering mix-in module. diff --git a/version.h b/version.h index 03b6791228..9014337bad 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2014-02-20" -#define RUBY_PATCHLEVEL 441 +#define RUBY_PATCHLEVEL 442 #define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_MONTH 2