Add the team

2 files changed, 26 insertions, 19 deletions

diff --git a/railties/guides/source/contribute.textile b/railties/guides/source/contribute.textile
index 48f1a51d02..c8e3b9c202 100644
--- a/railties/guides/source/contribute.textile
+++ b/railties/guides/source/contribute.textile
@@ -44,26 +44,21 @@ For each completed guide, the lead contributor will receive all of the following
 
 h3. Rules
 
-* Guides are licensed under a Creative Commons Attribution-Noncommercial-Share Alike 3.0 License.
+* Guides are licensed under a Creative Commons Attribution-Share Alike 3.0 License.
 * If you're not sure whether a guide is actively being worked on, stop by IRC and ask.
 * If the same guide writer wants to write multiple guides, that's ideally the situation we'd love to be in! However, that guide writer will only receive the cash prize for all the subsequent guides (and not the GitHub or RPM prizes).
 * Our review team will have the final say on whether the guide is complete and of good enough quality.
 
-h3. Reviewers
-
-These are the main reviewers and editors for the guides:
-
-* Hongli Lai
-* Mike Gunderloy
-* Pratik Naik
-* Xavier Noria
-
 All authors should read and follow the "Rails Guides Conventions":http://wiki.github.com/lifo/docrails/rails-guides-conventions and the "Rails API Documentation Conventions":http://wiki.github.com/lifo/docrails/rails-api-documentation-conventions.
 
 h3. Translations
 
 The translation effort for the Rails Guides is just getting underway. We know about projects to translate the Guides into Spanish, Portuguese, Polish, and French. For more details or to get involved see the "Translating Rails Guides":http://wiki.github.com/lifo/docrails/translating-rails-guides page.
 
+h3. Mailing List
+
+"Ruby on Rails: Documentation":http://groups.google.com/group/rubyonrails-docs is the mailing list for all the guides/documentation related discussions.
+
 h3. IRC Channel
 
 ==#docrails @ irc.freenode.net==
@@ -72,6 +67,5 @@ h3. Contact
 
 If you have any questions or need any clarification, feel free to contact:
 
-* IRC : lifo, mikeg1a, fxn, or FooBarWidget in #docrails
+* IRC : lifo, mikeg1a or fxn in #docrails
 * Email : pratiknaik aT gmail
-
diff --git a/railties/guides/source/credits.erb.textile b/railties/guides/source/credits.erb.textile
index f0e8a469f0..2dd1477af4 100644
--- a/railties/guides/source/credits.erb.textile
+++ b/railties/guides/source/credits.erb.textile
@@ -5,6 +5,22 @@ p. We'd like to thank the following people for their tireless contributions to t
 
 <% end %>
 
+<h3 class="section">Rails Documentation Team</h2>
+
+<% author('Pratik Naik', 'lifo') do %>
+  Pratik Naik is a Ruby on Rails consultant with "ActionRails":http://www.actionrails.com and also a member of the "Rails core team":http://rubyonrails.com/core. He maintains a blog at "has_many :bugs, :through => :rails":http://m.onkey.org and has an active "twitter account":http://twitter.com/lifo.
+<% end %>
+
+<% author('Mike Gunderloy', 'mgunderloy') do %>
+  Mike Gunderloy is a consultant with "ActionRails":http://www.actionrails.com and also a member of the "Rails activism team":http://rubyonrails.org/activists . He brings 25 years of experience in a variety of languages to bear on his current work with Rails. His near-daily links and other blogging can be found at "A Fresh Cup":http://afreshcup.com and he "twitters":http://twitter.com/MikeG1 too much.
+<% end %>
+
+<% author('Xavier Noria', 'fxn') do %>
+  Xavier Noria has been around dynamic languages since 2000. He fell in love with Rails back in 2005, and cofounded Rails-based software company <a href="http://www.aspgems.com">ASPgems</a> in mid-2006. Xavier is president of the <a href="http://www.srug.org/">Spanish Ruby Users Group</a> and has been involved in Rails in several ways. He enjoys combining his passion for Rails and his past life as a proofreader of math textbooks.
+<% end %>
+
+<h3 class="section">Rails Guides Authors</h3>
+
 <% author('Frederick Cheung', 'fcheung') do %>
   Frederick Cheung is Chief Wizard at Texperts where he has been using Rails since 2006. He is based in Cambridge (UK) and when not consuming fine ales he blogs at "spacevatican.org":http://www.spacevatican.org.
 <% end %>
@@ -17,17 +33,10 @@ p. We'd like to thank the following people for their tireless contributions to t
   Jeff Dean is a software engineer with "Pivotal Labs":http://pivotallabs.com.
 <% end %>
 
-<% author('Mike Gunderloy', 'mgunderloy') do %>
-  Mike Gunderloy is a consultant with "ActionRails":http://www.actionrails.com and "Lark Group":http://larkware.com and also a member of the "Rails activism team":http://rubyonrails.org/activists . He brings 25 years of experience in a variety of languages to bear on his current work with Rails. His near-daily links and other blogging can be found at "A Fresh Cup":http://afreshcup.com and he "twitters":http://twitter.com/MikeG1 too much.
-<% end %>
-
 <% author('Cássio Marques', 'cmarques') do %>
   Cássio Marques is a Brazilian software developer working with different programming languages such as Ruby, JavaScript, CPP and Java, as an independent consultant. He blogs at "/* CODIFICANDO */":http://cassiomarques.wordpress.com, which is mainly written in Portuguese, but will soon get a new section for posts with English translation.
 <% end %>
 
-<% author('Pratik Naik', 'lifo') do %>
-  Pratik Naik is a Ruby on Rails consultant with "ActionRails":http://www.actionrails.com and also a member of the "Rails core team":http://rubyonrails.com/core. He maintains a blog at "has_many :bugs, :through => :rails":http://m.onkey.org and has an active "twitter account":http://twitter.com/lifo.
-
 <% author('Emilio Tagua', 'miloops') do %>
   Emilio Tagua -- a.k.a. miloops -- is an Argentinian entrepreneur, developer, open source contributor and Rails evangelist. Cofounder of "Eventioz":http://www.eventioz.com. He has been using Rails since 2006 and contributing since early 2008. Can be found at gmail, twitter, freenode, everywhere as miloops.
 <% end %>
@@ -36,4 +45,8 @@ p. We'd like to thank the following people for their tireless contributions to t
   Heiko Webers is the founder of "bauland42":http://www.bauland42.de, a German web application security consulting and development company focused on Ruby on Rails. He blogs at the "Ruby on Rails Security Project":http://www.rorsecurity.info. After 10 years of desktop application development, Heiko has rarely looked back.
 <% end %>
 
+<h3 class="section">Rails Guides Designers</h3>
+
+<% author('Jason Zimdars', 'jz') do %>
+  Jason Zimdars is an experienced creative director and web designer who has lead UI and UX design for numerous websites and web applications. You can see more of his design and writing at <a href="http://www.thinkcage.com/">Thinkcage.com</a> or follow him on <a href="http://www.twitter.com/JZ">Twitter</a>.
 <% end %>