Permalink
Browse files

Revert "Fix error: docrails is a fork, not a branch."

Reason: Calling docrails a "branch" is fine, no need to change the terminology. It is a remote in my machine, and it has been called branch since the very beginning: http://weblog.rubyonrails.org/2008/5/2/help-improve-rails-documentation-on-git-branch

This reverts commit 35a266e.
  • Loading branch information...
1 parent f4ddb4d commit 5444ed56ab38a742b3ddf6612eadd8cf50d8d517 @fxn fxn committed Feb 15, 2011
Showing with 1 addition and 1 deletion.
  1. +1 −1 railties/guides/source/contributing_to_ruby_on_rails.textile
@@ -253,7 +253,7 @@ h3. Contributing to the Rails Documentation
Ruby on Rails has two main sets of documentation: The guides help you to learn Ruby on Rails, and the API is a reference.
-You can create a ticket in Lighthouse to fix or expand documentation. However, if you're confident about your changes you can push them yourself directly via "docrails":http://github.com/lifo/docrails/tree/master. docrails is a fork of the Rails repository with an *open commit policy* and public write access. Commits to docrails are still reviewed, but that happens after they are pushed. docrails is merged with master regularly, so you are effectively editing the Ruby on Rails documentation.
+You can create a ticket in Lighthouse to fix or expand documentation. However, if you're confident about your changes you can push them yourself directly via "docrails":http://github.com/lifo/docrails/tree/master. docrails is a branch with an *open commit policy* and public write access. Commits to docrails are still reviewed, but that happens after they are pushed. docrails is merged with master regularly, so you are effectively editing the Ruby on Rails documentation.
When working with documentation, please take into account the "API Documentation Guidelines":api_documentation_guidelines.html and the "Ruby on Rails Guides Guidelines":ruby_on_rails_guides_guidelines.html.

1 comment on commit 5444ed5

@r00k
Contributor
r00k commented on 5444ed5 Feb 19, 2011

Fair enough :) Thanks for giving a reason for reverting.

Please sign in to comment.