Permalink
Commits on Dec 11, 2008
  1. Merge branch 'indonesian' of git://github.com/ripta/merb-book into in…

    mattetti committed Dec 11, 2008
    …donesian
    
    * 'indonesian' of git://github.com/ripta/merb-book:
      Completed chapter 0: front matter
      Add the Indonesian translation of the TOC
      Update README with the Indonesian translation
  2. Merge branch 'master' of git://github.com/joahking/merb-book into spa…

    mattetti committed Dec 11, 2008
    …nish
    
    * 'master' of git://github.com/joahking/merb-book:
      getting-started section first 3 chapters updated to english version
      section 1-introduction updated to english version
      section front-matter updated to new english contents
      little fixings to TOC
      toc compliant with guidelines
Commits on Dec 10, 2008
  1. Merge branch 'english'

    mattetti committed Dec 10, 2008
    * english:
      improved the page titles
  2. improved the page titles

    mattetti committed Dec 10, 2008
  3. re generated the chapter tocs

    mattetti committed Dec 10, 2008
  4. Merge branch 'english'

    mattetti committed Dec 10, 2008
    * english:
      re generated the chapter TOCs after adding a ul and fixing a bug
  5. added a rake task to generate chapter tocs. (I still need to clean it…

    mattetti committed Dec 10, 2008
    … up and add a wrapping <ul>)
  6. little fixings to TOC

    joahking committed Dec 10, 2008
  7. toc compliant with guidelines

    joahking committed Dec 9, 2008
    little wordings fixed
  8. updated stylesheet

    mattetti committed Dec 10, 2008
  9. Merged branch 'maruku-ext' of git://github.com/cheba/merb-book into e…

    mattetti committed Dec 10, 2008
    …nglish and started reviewing the controllers chapter
    
    * 'maruku-ext' of git://github.com/cheba/merb-book:
      English TOC reformatted to use maruku div markup
      Div extension to Maruku
      Enabled div extension for maruku
  10. Merge branch 'master' of git://github.com/startrader/merb-book into e…

    mattetti committed Dec 10, 2008
    …nglish
    
    * 'master' of git://github.com/startrader/merb-book:
      2.5 Controllers (en) mostly complete
      2.8 Request Path
      Fixed Formatting of 2.5 Controllers(en)
      First Half of 2.5 Controllers (en)
  11. Merge branch 'arabic'

    mattetti committed Dec 10, 2008
    * arabic:
      adding front matter
      adding front matter
      a correction
      a correction
      a correction
      first trans
  12. Merge branch 'spanish'

    mattetti committed Dec 10, 2008
    * spanish:
      little fixings in words
      getting started section 3 first chapters
      changing TOC too polite 3rd person to friendly 2nd
      Corrected some minor accentuation ans translation mistakes.
      getting started section 3 first chapters
      changing TOC too polite 3rd person to friendly 2nd
      Corrected some minor accentuation ans translation mistakes.
  13. Merge branch 'akita-br'

    mattetti committed Dec 10, 2008
    * akita-br:
      Translated 4-rspec.markdown
      Translation review and new guideline changes
      Updating files to follow guidelines
      Adding myself as a contributor
      Translating 1-install-instructions and toc
      Better translation for TOC
      Translated Appendix
      Translated new texts on ruby.markdown
      Fixing some translations and typos
      Merging english changes
      Merging english changes
  14. Merge commit 'mattetti/master'

    StarTrader committed Dec 10, 2008
  15. 2.5 Controllers (en) mostly complete

    StarTrader committed Dec 10, 2008
    Finished the second half of the controllers chapter.
    
    There are 4 TODO lines in places where I don't have enough experence to
    write coherently.  I would appriciate help filling them in.  I have
    placed list of things I would like to see covered after the TODO line.
    
    More examples and links woudl also be helpful.
    
    There was a bug in my previous version that linked View to the MVC page.
    It has been fixed.
Commits on Dec 9, 2008
  1. 2.8 Request Path

    StarTrader committed Dec 9, 2008
    First draft of this chapter.  People with Jave experence need to read it
    and add to/confirm the information in it.There are some links that need
    to be filled in as appropriate.
    
    Formatted as per Guidelines.
    
    "All web applications begin with an HTTP request by a client. They all
    end with a response from our server. In this chapter, we are
    going to follow the program flow from the client request through to the
    response."
  2. adding front matter

    khelll committed Dec 9, 2008
  3. little fixings in words

    Joaquin Rivera Padron committed Dec 9, 2008
  4. adding front matter

    khelll committed Dec 9, 2008
  5. Merge branch 'master' of git@github.com:joahking/merb-book

    Joaquin Rivera Padron committed Dec 9, 2008
  6. getting started section 3 first chapters

    joahking committed with Joaquin Rivera Padron Dec 7, 2008
  7. changing TOC too polite 3rd person to friendly 2nd

    joahking committed with Joaquin Rivera Padron Dec 7, 2008
    preface minor fix
  8. Corrected some minor accentuation ans translation mistakes.

    mr-rock committed with Joaquin Rivera Padron Dec 6, 2008