<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>website/template.html.erb</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -1,8 +1,12 @@
 #!/usr/bin/env ruby
 
+GEM_NAME = 'tranexp' # what ppl will type to install your gem
+RUBYFORGE_PROJECT = 'tranexp'
+
 require 'rubygems'
 begin
   require 'newgem'
+  require 'rubyforge'
 rescue LoadError
   puts &quot;\n\nGenerating the website requires the newgem RubyGem&quot;
   puts &quot;Install: gem install newgem\n\n&quot;
@@ -11,10 +15,14 @@ end
 require 'redcloth'
 require 'syntax/convertors/html'
 require 'erb'
-require File.dirname(__FILE__) + '/../lib/tranexp/version.rb'
+require File.dirname(__FILE__) + &quot;/../lib/#{GEM_NAME}/version.rb&quot;
 
 version  = Tranexp::VERSION::STRING
-download = 'http://rubyforge.org/projects/tranexp'
+download = &quot;http://rubyforge.org/projects/#{RUBYFORGE_PROJECT}&quot;
+
+def rubyforge_project_id
+  RubyForge.new.autoconfig[&quot;group_ids&quot;][RUBYFORGE_PROJECT]
+end
 
 class Fixnum
   def ordinal
@@ -42,10 +50,9 @@ end
 
 if ARGV.length &gt;= 1
   src, template = ARGV
-  template ||= File.join(File.dirname(__FILE__), '/../website/template.rhtml')
-  
+  template ||= File.join(File.dirname(__FILE__), '/../website/template.html.erb')
 else
-  puts(&quot;Usage: #{File.split($0).last} source.txt [template.rhtml] &gt; output.html&quot;)
+  puts(&quot;Usage: #{File.split($0).last} source.txt [template.html.erb] &gt; output.html&quot;)
   exit!
 end
 
@@ -55,7 +62,8 @@ title = nil
 body = nil
 File.open(src) do |fsrc|
   title_text = fsrc.readline
-  body_text = fsrc.read
+  body_text_template = fsrc.read
+  body_text = ERB.new(body_text_template).result(binding)
   syntax_items = []
   body_text.gsub!(%r!&lt;(pre|code)[^&gt;]*?syntax=['&quot;]([^'&quot;]+)[^&gt;]*&gt;(.*?)&lt;/\1&gt;!m){
     ident = syntax_items.length</diff>
      <filename>script/txt2html</filename>
    </modified>
    <modified>
      <diff>@@ -146,26 +146,25 @@ I would like a bottle of wine
 
 
 	&lt;ul&gt;
-	&lt;li&gt;github: &lt;a href=&quot;http://github.com/drnic/tranexp/tree/master&quot;&gt;http://github.com/drnic/tranexp/tree/master&lt;/a&gt;&lt;/li&gt;
+	&lt;li&gt;rubyforge: &lt;a href=&quot;http://rubyforge.org/scm/?group_id=6064&quot;&gt;http://rubyforge.org/scm/?group_id=6064&lt;/a&gt;&lt;/li&gt;
 	&lt;/ul&gt;
 
 
-&lt;pre&gt;git clone git://github.com/drnic/tranexp.git
-cd tranexp
-rake test
-rake install_gem
-&lt;/pre&gt;
+&lt;pre&gt;git clone git://rubyforge.org/tranexp.git&lt;/pre&gt;
 
 	&lt;ul&gt;
-	&lt;li&gt;rubyforge: &lt;a href=&quot;http://rubyforge.org/scm/?group_id=6064&quot;&gt;http://rubyforge.org/scm/?group_id=6064&lt;/a&gt;&lt;/li&gt;
+	&lt;li&gt;github: &lt;a href=&quot;http://github.com/drnic/tranexp/tree/master&quot;&gt;http://github.com/drnic/tranexp/tree/master&lt;/a&gt;&lt;/li&gt;
 	&lt;/ul&gt;
 
 
-&lt;pre&gt;git clone git://rubyforge.org/tranexp.git
-cd tranexp
+&lt;pre&gt;git clone git://github.com/drnic/tranexp.git&lt;/pre&gt;
+
+	&lt;h3&gt;Build and test instructions&lt;/h3&gt;
+
+
+&lt;pre&gt;cd tranexp
 rake test
-rake install_gem
-&lt;/pre&gt;
+rake install_gem&lt;/pre&gt;
 
 	&lt;h2&gt;License&lt;/h2&gt;
 
@@ -178,7 +177,7 @@ rake install_gem
 
 	&lt;p&gt;Comments are welcome. Send an email to &lt;a href=&quot;mailto:drnicwilliams@gmail.com&quot;&gt;Dr Nic Williams&lt;/a&gt; via the &lt;a href=&quot;http://groups.google.com/group/drnicutilities&quot;&gt;forum&lt;/a&gt;&lt;/p&gt;
     &lt;p class=&quot;coda&quot;&gt;
-      &lt;a href=&quot;drnicwilliams@gmail.com&quot;&gt;Dr Nic Williams&lt;/a&gt;, 16th April 2008&lt;br&gt;
+      &lt;a href=&quot;drnicwilliams@gmail.com&quot;&gt;Dr Nic Williams&lt;/a&gt;, 17th April 2008&lt;br&gt;
       Theme extended from &lt;a href=&quot;http://rb2js.rubyforge.org/&quot;&gt;Paul Battley&lt;/a&gt;
     &lt;/p&gt;
 &lt;/div&gt;</diff>
      <filename>website/index.html</filename>
    </modified>
    <modified>
      <diff>@@ -87,21 +87,19 @@ Read the &quot;8 steps for fixing other people's code&quot;:http://drnicwilliams.com/2007/
 
 You can fetch the source from either:
 
+* rubyforge: &quot;http://rubyforge.org/scm/?group_id=&lt;%= rubyforge_project_id %&gt;&quot;:http://rubyforge.org/scm/?group_id=&lt;%= rubyforge_project_id %&gt;
+
+&lt;pre&gt;git clone git://rubyforge.org/tranexp.git&lt;/pre&gt;
+
 * github: &quot;http://github.com/drnic/tranexp/tree/master&quot;:http://github.com/drnic/tranexp/tree/master
 
-&lt;pre&gt;git clone git://github.com/drnic/tranexp.git
-cd tranexp
-rake test
-rake install_gem
-&lt;/pre&gt;
+&lt;pre&gt;git clone git://github.com/drnic/tranexp.git&lt;/pre&gt;
 
-* rubyforge: &quot;http://rubyforge.org/scm/?group_id=6064&quot;:http://rubyforge.org/scm/?group_id=6064
+h3. Build and test instructions
 
-&lt;pre&gt;git clone git://rubyforge.org/tranexp.git
-cd tranexp
+&lt;pre&gt;cd tranexp
 rake test
-rake install_gem
-&lt;/pre&gt;
+rake install_gem&lt;/pre&gt;
 
 h2. License
 </diff>
      <filename>website/index.txt</filename>
    </modified>
  </modified>
  <removed type="array">
    <removed>
      <filename>website/template.rhtml</filename>
    </removed>
  </removed>
  <parents type="array">
    <parent>
      <id>b058c68499faccc49a1cc6ea78e490a52741ab78</id>
    </parent>
  </parents>
  <author>
    <name>Dr Nic Williams</name>
    <email>drnicwilliams@gmail.com</email>
  </author>
  <url>http://github.com/drnic/tranexp/commit/5d29de95326fb4df23211ce0e30055cb65b1828e</url>
  <id>5d29de95326fb4df23211ce0e30055cb65b1828e</id>
  <committed-date>2008-04-16T19:07:03-07:00</committed-date>
  <authored-date>2008-04-16T19:07:03-07:00</authored-date>
  <message>updated website with git instructions</message>
  <tree>357a424dbce1e51f109016fc99d7efc090c6cbc1</tree>
  <committer>
    <name>Dr Nic Williams</name>
    <email>drnicwilliams@gmail.com</email>
  </committer>
</commit>
