Permalink
Commits on Dec 21, 2008
Commits on Dec 18, 2008
  1. Merge branch 'master' into chinese

    zhhz committed Dec 18, 2008
Commits on Dec 17, 2008
  1. Merge branch 'english'

    * english:
      don't show richmorin question marks on the published book
    committed Dec 17, 2008
  2. Fixed the links on toc.markdown of 2-getting-started

    Added translated 1-install-instructions.markdown
    zhhz committed Dec 17, 2008
Commits on Dec 16, 2008
  1. Merge branch 'master' into chinese

    zhhz committed Dec 16, 2008
Commits on Dec 15, 2008
  1. Merge branch 'english'

    * english:
      made Joaquin the official Spanish translation líder ;)
    committed Dec 15, 2008
  2. merged things

    committed Dec 15, 2008
  3. Merge branch 'english'

    * english:
      numerous small tweaks
      typo 'git' => 'get'
      Actual help switch is -H or --help or -?, not -h. Fixed a typo
    committed Dec 15, 2008
  4. Merge branch 'rdm_2' of git://github.com/RichMorin/merb-book into eng…

    …lish
    
    * 'rdm_2' of git://github.com/RichMorin/merb-book:
      numerous small tweaks
      change "english" to "LANGUAGE", for consistency
      Save file and try again :-/
      Add a few missing steps; tweak instruction text.
    committed Dec 15, 2008
  5. numerous small tweaks

    RichMorin committed Dec 15, 2008
Commits on Dec 14, 2008
Commits on Dec 13, 2008
  1. typo is css

    pvelder committed Dec 13, 2008
  2. typo in 5.1

    pvelder committed Dec 13, 2008
  3. typo 'git' => 'get'

    Jannik Schürg committed Dec 13, 2008
  4. Proofread chapter 3.2

    sidonath committed Dec 13, 2008
  5. Merge branch 'bosnian'

    * bosnian:
      Translated 2.2 Generate an Application
      Translated 3.2 Project Structure
      (Re)generated TOCs for Bosnian
      Translated RSpec chapter
      Translated front matter (except for Foreword)
      Applied implicit reference-style format for links
      Fixed various whitespace problems
    committed Dec 13, 2008
Commits on Dec 12, 2008
  1. Small fixes and types

    pvelder committed Dec 12, 2008
  2. dutch translation 1.2, 1.4

    pvelder committed Dec 12, 2008
  3. 7-deployment in Dutch

    peter.de.velder committed with pvelder Dec 11, 2008