<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -3,15 +3,13 @@ Maintainable PHP Framework
 
 This is a framework that is based around the Model-View-Controller 
 pattern and is modeled after Ruby on Rails.  It aims for compatibility 
-with PHP version 5.1.4 and later.  
+with PHP version 5.1.4 and later.  More information can be found at: 
+[http://framework.maintainable.com](http://framework.maintainable.com).
 
 The framework was developed at 
 [Maintainable Software](http://maintainable.com), a software development
 company in the San Francisco Bay Area.
 
-More information can be found at: 
-[http://framework.maintainable.com](http://framework.maintainable.com).
-
 
 Repository Layout
 -----------------
@@ -56,8 +54,10 @@ the required files out of this repository:
       generate
       task
     /test
-      AllTests.php
       /fixtures
+      /functional
+      /unit
+      AllTests.php
     /tmp
     /log
     /vendor
@@ -83,7 +83,7 @@ names for methods (e.g. `respondTo` rather than `respond_to`).
 
 You can generate stubs with `./script/generate`.  You'll probably want to
 start with `./script/generate model post`, which will create a `Post` model
-file with associated migration and test files.  Type `./script/generate`
+file with associated migration and test files.  Use `./script/generate`
 with no arguments for help.
 
 Tasks such as `db:migrate` are run as `./script/task db:migrate`.  For a
@@ -127,7 +127,7 @@ State of Development
 --------------------
 
 Most of the development was done around the time Rails 1.2.  As such, Rails 
-developers will notice many of the important additions from Rails 2.0 
+developers will notice many of the important additions since Rails 2.0 
 are not implemented.
 
 The Maintainable Framework was built almost entirely by two people 
@@ -159,16 +159,20 @@ include reasonable test coverage.  Please refrain from sending us huge
 patches.  Incremental improvements are best.
 
 
-Contributors
-------------
+Developers
+----------
 
-We'd like to thank the following individuals who have contributed to
-this effort in a significant way:
-                                             
-* [Chuck Hagenbuch](http://github.com/chuck)
-* [Derek DeVries](http://github.com/devrieda)
 * [Mike Naberezny](http://github.com/mnaberez)
-* [Sebastian Bergmann](http://github.com/sebastianbergmann)
+* [Derek DeVries](http://github.com/devrieda)
+
+
+Acknowledgements
+----------------
+
+We would like to thank [Chuck Hagenbuch](http://github.com/chuck) of the
+[Horde Project](http://horde.org) and [Sebastian Bergmann](http://github.com/sebastianbergmann)
+of [PHPUnit](http://phpunit.de) for helping us with maintenance by
+integrating some of our code into their projects.
 
-We would also like to thank all the folks who have provided patches or
-support in other ways.
+We would also like to thank all the folks who have provided patches 
+or support in other ways.
\ No newline at end of file</diff>
      <filename>README.markdown</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>4bad3bad4dcb2106aad2ba998555578e734e3ad3</id>
    </parent>
  </parents>
  <author>
    <name>Mike Naberezny</name>
    <email>mike@naberezny.com</email>
  </author>
  <url>http://github.com/maintainable/framework/commit/d47b8c6d300119df19b88a045342be518e5a28d9</url>
  <id>d47b8c6d300119df19b88a045342be518e5a28d9</id>
  <committed-date>2009-03-29T17:56:50-07:00</committed-date>
  <authored-date>2009-03-29T17:56:50-07:00</authored-date>
  <message>Added missing directories, Acknowledgements.</message>
  <tree>03c6d006a060286e54e15f29efb991f33ec8516b</tree>
  <committer>
    <name>Mike Naberezny</name>
    <email>mike@naberezny.com</email>
  </committer>
</commit>
