From 124a20d3d2f469a7836029eb5bfa083f66683bd0 Mon Sep 17 00:00:00 2001
From: dave <dave@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 24 Mar 2004 02:14:18 +0000
Subject: Allow templates to be specified outside the RDoc tree

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

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 00b2b13d04..bbba6104d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Mar 24 11:11:26 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/generators/html_generator.rb (Generators::HTMLGenerator::load_html_template): 
+	  Allow non-RDoc templates by putting a slash in the template name
+
 Wed Mar 24 10:05:22 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/tempfile.rb (Tempfile::_close): should not clear @tmpname
@@ -91,6 +96,7 @@ Sat Mar 20 21:21:03 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 	* ext/extmk.rb: rm -rf $extout, not extout.
 
+>>>>>>> 1.3082
 Sat Mar 20 15:25:36 2004  Dave Thomas  <dave@pragprog.com>
 
 	* lib/rdoc/generators/template/html/html.rb (RDoc::Page): Force
-- 
cgit v1.2.3