From 84d34ed4f985d86bc452c696ae1a6a00dd5830ed Mon Sep 17 00:00:00 2001
From: dave <dave@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 6 Feb 2004 13:49:54 +0000
Subject: Support https in hyperlinks

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@5636 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 74236a6e4b..c6e4792b11 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Fri Feb  6 22:48:16 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/generators/html_generator.rb (gen_url): Support 
+	  https in RDoc hyperlinks
+
+<<<<<<< ChangeLog
+Thu Jan 29 22:41:53 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/generators/html_generator.rb: Allow 'link:' in Tidylinks.
+	  THis means you can write "see f1[link:files/f1_rb.html]".
+
+=======
 Fri Feb  6 22:41:22 2004  NAKAMURA, Hiroshi  <nakahiro@sarion.co.jp>
 
 	* lib/pp.rb (PPInspectTest#test_to_s_with_iv): rollback the previous
@@ -127,6 +139,7 @@ Thu Jan 29 15:33:23 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* sample/openssl/gen_csr.rb: use OpenSSL::X509::Name.parse.
 
+>>>>>>> 1.2673.2.103
 Tue Jan 27 11:09:29 2004  FUKUMOTO Atsushi  <fukumoto@nospam.imasy.or.jp>
 
 	* ext/socket/socket.c (s_recvfrom): sending length should be an
-- 
cgit v1.2.3