aboutsummaryrefslogtreecommitdiffstats
path: root/railties/doc/guides/source/authors.txt
diff options
context:
space:
mode:
authorPratik Naik <pratiknaik@gmail.com>2009-01-18 18:10:58 +0000
committerPratik Naik <pratiknaik@gmail.com>2009-01-18 18:10:58 +0000
commit39e1ac658efc80e4c54abef4f1c7679e4b3dc2ac (patch)
tree78cc8f3aaecf75ea1fde4229170027e840eb9cd3 /railties/doc/guides/source/authors.txt
parent085991891e610ed0ab616ce434eabf42a9437039 (diff)
downloadrails-39e1ac658efc80e4c54abef4f1c7679e4b3dc2ac.tar.gz
rails-39e1ac658efc80e4c54abef4f1c7679e4b3dc2ac.tar.bz2
rails-39e1ac658efc80e4c54abef4f1c7679e4b3dc2ac.zip
Merge docrails
Diffstat (limited to 'railties/doc/guides/source/authors.txt')
-rw-r--r--railties/doc/guides/source/authors.txt12
1 files changed, 12 insertions, 0 deletions
diff --git a/railties/doc/guides/source/authors.txt b/railties/doc/guides/source/authors.txt
index 987238eb4c..d4862fe4b9 100644
--- a/railties/doc/guides/source/authors.txt
+++ b/railties/doc/guides/source/authors.txt
@@ -43,3 +43,15 @@ and unobtrusive JavaScript. His home on the internet is his blog http://tore.dar
***********************************************************
Jeff Dean is a software engineer with http://pivotallabs.com/[Pivotal Labs].
***********************************************************
+
+.Cássio Marques
+[[cmarques]]
+***********************************************************
+Cássio Marques is a Brazilian software developer working with different programming languages such as Ruby, JavaScript, C++ and Java, as an independent consultant. He blogs at http://cassiomarques.wordpress.com, which is mainly written in portuguese, but will soon get a new section for posts with english translation.
+***********************************************************
+
+.Pratik Naik
+[[lifo]]
+***********************************************************
+Pratik Naik is an independent Ruby on Rails consultant and also a member of the http://rubyonrails.com/core[Rails core team]. He blogs semi-regularly at http://m.onkey.org[has_many :bugs, :through => :rails] and has an active http://twitter.com/lifo[twitter account] .
+***********************************************************