Permalink
Switch branches/tags
Nothing to show
Commits on Dec 6, 2008
  1. fixing TOC conflicts

    akitaonrails committed Dec 6, 2008
  2. Merge branch 'master' of git://github.com/arthurgeek/merb-book

    * 'master' of git://github.com/arthurgeek/merb-book:
      Better translation for TOC
      Translated Appendix
      Translated new texts on ruby.markdown
      Fixing some translations and typos
      Pequenas correções gramaticais
      Merging english changes
      Translating ruby.markdown
      Oops, wrong encoding
      Translating the front-matter to pt-br
      Fixing typo
    mattetti committed Dec 6, 2008
  3. minor fixes

    mattetti committed Dec 6, 2008
  4. Merge branch 'master' of git://github.com/Oshuma/merb-book

    * 'master' of git://github.com/Oshuma/merb-book:
      adding es language
    mattetti committed Dec 6, 2008
  5. Merge commit 'mattetti/master' into mattetti

    Dale Campbell committed Dec 6, 2008
  6. adding es language

    Dale Campbell committed Dec 6, 2008
  7. Merge branch 'master' of git://github.com/Oshuma/merb-book

    * 'master' of git://github.com/Oshuma/merb-book:
      fleshing out the product structure page
      initial commit of project structure file
      a few grammatical updates
      adding specs for english chapters
      adding the missing appendix for english
      removing incorrect and empty file
      grammar edits
      fleshing out the product structure page
      initial commit of project structure file
      a few grammatical updates
      adding specs for english chapters
      adding the missing appendix for english
      removing incorrect and empty file
      fixing TOC to reflect chapter 5 rename
      renaming chapter 5 from more-merb to merb-more
      cleanups
      updating install section
      a few clarifications
      grammar edits
    mattetti committed Dec 6, 2008
  8. Merge branch 'mattetti'

    Dale Campbell committed Dec 6, 2008
  9. fleshing out the product structure page

    Dale Campbell committed Dec 6, 2008
  10. initial commit of project structure file

    Dale Campbell committed Dec 6, 2008
  11. a few grammatical updates

    Dale Campbell committed Dec 5, 2008
  12. adding specs for english chapters

    Dale Campbell committed Dec 5, 2008
  13. adding the missing appendix for english

    Dale Campbell committed Dec 4, 2008
  14. removing incorrect and empty file

    Dale Campbell committed Dec 4, 2008
  15. grammar edits

    Dale Campbell committed Dec 4, 2008
  16. fleshing out the product structure page

    Dale Campbell committed Dec 6, 2008
  17. Merge branch 'master' of git://github.com/logansama/merb-book

    * 'master' of git://github.com/logansama/merb-book:
      added Spanish Folder with translated TOC.
    mattetti committed Dec 6, 2008
  18. initial commit of project structure file

    Dale Campbell committed Dec 6, 2008
  19. Modified language name and code in config.rb for Chinese Language acc…

    …ording to 'ISO 639'
    zhhz committed Dec 6, 2008
Commits on Dec 5, 2008
  1. a few grammatical updates

    Dale Campbell committed Dec 5, 2008
  2. Better translation for TOC

    arthurgeek committed Dec 5, 2008
  3. Translated Appendix

    arthurgeek committed Dec 5, 2008
  4. adding specs for english chapters

    Dale Campbell committed Dec 5, 2008
  5. Merge commit 'mattetti/master'

    Dale Campbell committed Dec 5, 2008
  6. Merge branch 'piclez/master'

    Conflicts:
    	book-content/pt/0-front-matter/2-contributors.markdown
    	book-content/pt/toc.markdown
    arthurgeek committed Dec 5, 2008
  7. Pequenas correções gramaticais

    Peter Dirickson committed Dec 5, 2008
  8. Fixed TOC link error

    6.5 Slices pointed to the Exceptions page
    StarTrader committed Dec 5, 2008