Merge branch 'master' of git://github.com/malomalo/book_mdar
Fixed minor typos and pluralisation of Comment class.
Add docs for creating primary key in the Post model.
I needed templater to get merb-plugins and merb-more to install
patch applied from makoto kuwata
Note Maruku support in README
Add Maruku support.
I've put Maruku after RDiscount and PEG-Markdown as its a Ruby implementation and is likely to be slower than the other two.
Fix some whitespaces git diff highlighted
Update README about new supported Markdown parsers
Merge branch 'tasks'
Merge branch 'deimos1986/master'
You can put your own tasks in this file and they won't be pushed up to the master.
Split up the book tasks.
Also extract the BookBuilder::Book creation and output_dir creation into their own tasks.
fixed messed up database.yml (+ added commented out entries for extra…
added DM yml rack task info + using a bootloader after app loads to d…
…efine the DB to use.
added note about Model.delete_all vs Model.all.destroy!
fixed a color syntax error :(
quick note about accessing invalid object's errors
Merge branch 'master' of git://github.com/mattetti/book_mdar
minor fix before push
updated few DM related stuff (generator and lazy attribute)
Move rake tasks to tasks/book.rake.
You can now create your own tasks/*.rake files to do things like update your branches or whatever.
Add more Markdown parsers which can be used
Resolved a bit of confusion that I was having with the auto_migrate o…
…f the Post model.
Merge branch 'master' of git://github.com/mattcollegewikis/book_mdar
Add a note that Extlib is actually shared by Merb and DM.
Refer to Sake tasks maintained by Merb and DataMapper communities.
Merge branch 'master' of git://github.com/mattcollegewikis/book_mdar …
Added a few commas, a period, and reworded a sentence to make it clearer.
Merge commit 'origin/master'; commit 'deimos/master'