Skip to content

Commit

Permalink
Merge branch 'master' of git@github.com:lifo/docrails
Browse files Browse the repository at this point in the history
  • Loading branch information
radar committed Feb 7, 2009
2 parents a9b5655 + c85ce1b commit b7d4d8d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
4 changes: 2 additions & 2 deletions railties/guides/source/index.erb.textile
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -97,15 +97,15 @@ h3. Digging Deeper
This guide covers the various ways of performance testing a Ruby on Rails application. This guide covers the various ways of performance testing a Ruby on Rails application.
<% end %> <% end %>


<% guide("The Basics of Creating Rails Plugins", 'plugins.html') do %> <% guide("The Basics of Creating Rails Plugins", 'plugins.html', :ticket => 32) do %>
This guide covers how to build a plugin to extend the functionality of Rails. This guide covers how to build a plugin to extend the functionality of Rails.
<% end %> <% end %>


<% guide("Configuring Rails Applications", 'configuring.html') do %> <% guide("Configuring Rails Applications", 'configuring.html') do %>
This guide covers the basic configuration settings for a Rails application. This guide covers the basic configuration settings for a Rails application.
<% end %> <% end %>


<% guide("Rails Command Line Tools and Rake tasks", 'command_line.html') do %> <% guide("Rails Command Line Tools and Rake tasks", 'command_line.html', :ticket => 29) do %>
This guide covers the command line tools and rake tasks provided by Rails. This guide covers the command line tools and rake tasks provided by Rails.
<% end %> <% end %>


Expand Down
5 changes: 3 additions & 2 deletions railties/guides/source/layout.html.erb
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -62,10 +62,11 @@
<dd><a href="performance_testing.html">Performance Testing Rails Applications</a></dd> <dd><a href="performance_testing.html">Performance Testing Rails Applications</a></dd>
<dd><a href="plugins.html">The Basics of Creating Rails Plugins</a></dd> <dd><a href="plugins.html">The Basics of Creating Rails Plugins</a></dd>
<dd><a href="configuring.html">Configuring Rails Applications</a></dd> <dd><a href="configuring.html">Configuring Rails Applications</a></dd>
<dd><a href="rails_on_rack.html">Rails on Rack</a></dd>
</dl> </dl>
</div> </div>
</li> </li>
<li><a href="http://hackfest.rubyonrails.org">Contribute</a></li> <li><a href="contribute.html">Contribute</a></li>
<li><a href="credits.html">Credits</a></li> <li><a href="credits.html">Credits</a></li>
</ul> </ul>
</div> </div>
Expand All @@ -91,7 +92,7 @@
<hr class="hide" /> <hr class="hide" />
<div id="footer"> <div id="footer">
<div class="wrapper"> <div class="wrapper">
<p>Authors who have contributed to complete guides are listed <a href="credits.html">here</a>.<br />This work is licensed under a <a href="http://creativecommons.org/licenses/by-sa/3.0">Creative Commons Attribution-Share Alike 3.0</a> License</a></p> <p>This work is licensed under a <a href="http://creativecommons.org/licenses/by-sa/3.0">Creative Commons Attribution-Share Alike 3.0</a> License</a></p>
<p>"Rails", "Ruby on Rails", and the Rails logo are trademarks of David Heinemeier Hansson. All rights reserved.</p> <p>"Rails", "Ruby on Rails", and the Rails logo are trademarks of David Heinemeier Hansson. All rights reserved.</p>
</div> </div>
</div> </div>
Expand Down

0 comments on commit b7d4d8d

Please sign in to comment.