aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--railties/guides/source/credits.erb.textile2
-rw-r--r--railties/guides/source/getting_started.textile1
-rw-r--r--railties/guides/source/index.erb.textile4
3 files changed, 6 insertions, 1 deletions
diff --git a/railties/guides/source/credits.erb.textile b/railties/guides/source/credits.erb.textile
index 441ea60ffe..f0e8a469f0 100644
--- a/railties/guides/source/credits.erb.textile
+++ b/railties/guides/source/credits.erb.textile
@@ -18,7 +18,7 @@ p. We'd like to thank the following people for their tireless contributions to t
<% 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.
+ 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 %>
diff --git a/railties/guides/source/getting_started.textile b/railties/guides/source/getting_started.textile
index 3d6c16f11c..6e02cfe1bd 100644
--- a/railties/guides/source/getting_started.textile
+++ b/railties/guides/source/getting_started.textile
@@ -115,6 +115,7 @@ If you’d like more details on REST as an architectural style, these resources
* "A Brief Introduction to REST":http://www.infoq.com/articles/rest-introduction by Stefan Tilkov
* "An Introduction to REST":http://bitworking.org/news/373/An-Introduction-to-REST (video tutorial) by Joe Gregorio
* "Representational State Transfer":http://en.wikipedia.org/wiki/Representational_State_Transfer article in Wikipedia
+* "How to GET a Cup of Coffee":http://www.infoq.com/articles/webber-rest-workflow by Jim Webber, Savas Parastatidis & Ian Robinson
h3. Creating a New Rails Project
diff --git a/railties/guides/source/index.erb.textile b/railties/guides/source/index.erb.textile
index 49d8cad404..edf371d925 100644
--- a/railties/guides/source/index.erb.textile
+++ b/railties/guides/source/index.erb.textile
@@ -117,4 +117,8 @@ h3. Digging Deeper
Various caching techniques provided by Rails.
<% end %>
+<% guide("Contributing to Rails", 'contributing.html', :ticket => 64) do %>
+ Rails is not "somebody else's framework." This guide covers a variety of ways that you can get involved in the ongoing development of Rails.
+<% end %>
+
</dl>