<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -85,13 +85,12 @@ end
 # ==== Pick what you test with
 #
 
-# This defines which test framework the generators will use
-# rspec is turned on by default
+# This defines which test framework the generators will use.
+# RSpec is turned on by default.
 #
-# Note that you need to install the merb_rspec if you want to ue
-# rspec and merb_test_unit if you want to use test_unit.
-# merb_rspec is installed by default if you did gem install
-# merb.
+# To use Test::Unit, you need to install the merb_test_unit gem.
+# To use RSpec, you don't have to install any additional gems, since
+# merb-core provides support for RSpec.
 #
 &lt;%= &quot;# &quot; unless default_test_suite?(:test) %&gt;use_test :test_unit
 &lt;%= &quot;# &quot; unless default_test_suite?(:spec) %&gt;use_test :rspec</diff>
      <filename>merb-gen/app_generators/merb/templates/config/init.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>48fa415a891b00881eda2e14d05020b01e04183e</id>
    </parent>
  </parents>
  <author>
    <name>David James</name>
    <email>djwonk@collectiveinsight.net</email>
  </author>
  <url>http://github.com/wycats/merb-more/commit/825d94f27ab3448d76f8f37bf16cc8e13ae06b3c</url>
  <id>825d94f27ab3448d76f8f37bf16cc8e13ae06b3c</id>
  <committed-date>2008-05-05T14:46:31-07:00</committed-date>
  <authored-date>2008-05-05T14:43:51-07:00</authored-date>
  <message>Removed mention of merb_rspec from auto-generated docs.</message>
  <tree>3cca05589d82cac51735225e35f627b746c98b2b</tree>
  <committer>
    <name>David James</name>
    <email>djwonk@collectiveinsight.net</email>
  </committer>
</commit>
