Skip to content

Commit

Permalink
Merge pull request #10871 from arunagw/lifo-to-rails
Browse files Browse the repository at this point in the history
As we have moved to rails/docrails from lifo/docrails
  • Loading branch information
fxn committed Jun 6, 2013
2 parents 7d40aa4 + f8005de commit ec64749
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions guides/source/contributing_to_ruby_on_rails.md
Expand Up @@ -182,9 +182,9 @@ Contributing to the Rails Documentation


Ruby on Rails has two main sets of documentation: the guides help you in learning about Ruby on Rails, and the API is a reference. Ruby on Rails has two main sets of documentation: the guides help you in learning about Ruby on Rails, and the API is a reference.


You can help improve the Rails guides by making them more coherent, consistent or readable, adding missing information, correcting factual errors, fixing typos, or bringing it up to date with the latest edge Rails. To get involved in the translation of Rails guides, please see [Translating Rails Guides](https://wiki.github.com/lifo/docrails/translating-rails-guides). You can help improve the Rails guides by making them more coherent, consistent or readable, adding missing information, correcting factual errors, fixing typos, or bringing it up to date with the latest edge Rails. To get involved in the translation of Rails guides, please see [Translating Rails Guides](https://wiki.github.com/rails/docrails/translating-rails-guides).


If you're confident about your changes, you can push them directly yourself via [docrails](https://github.com/lifo/docrails). Docrails is a branch with an **open commit policy** and public write access. Commits to docrails are still reviewed, but this happens after they are pushed. Docrails is merged with master regularly, so you are effectively editing the Ruby on Rails documentation. If you're confident about your changes, you can push them directly yourself via [docrails](https://github.com/rails/docrails). Docrails is a branch with an **open commit policy** and public write access. Commits to docrails are still reviewed, but this happens after they are pushed. Docrails is merged with master regularly, so you are effectively editing the Ruby on Rails documentation.


If you are unsure of the documentation changes, you can create an issue in the [Rails](https://github.com/rails/rails/issues) issues tracker on GitHub. If you are unsure of the documentation changes, you can create an issue in the [Rails](https://github.com/rails/rails/issues) issues tracker on GitHub.


Expand Down
2 changes: 1 addition & 1 deletion guides/source/getting_started.md
Expand Up @@ -64,7 +64,7 @@ Creating a New Rails Project
The best way to use this guide is to follow each step as it happens, no code or The best way to use this guide is to follow each step as it happens, no code or
step needed to make this example application has been left out, so you can step needed to make this example application has been left out, so you can
literally follow along step by step. You can get the complete code literally follow along step by step. You can get the complete code
[here](https://github.com/lifo/docrails/tree/master/guides/code/getting_started). [here](https://github.com/rails/docrails/tree/master/guides/code/getting_started).


By following along with this guide, you'll create a Rails project called By following along with this guide, you'll create a Rails project called
`blog`, a `blog`, a
Expand Down
4 changes: 2 additions & 2 deletions guides/source/layout.html.erb
Expand Up @@ -102,10 +102,10 @@
</p> </p>
<p> <p>
If you see any typos or factual errors you are confident to If you see any typos or factual errors you are confident to
patch, please clone <%= link_to 'docrails', 'https://github.com/lifo/docrails' %> patch, please clone <%= link_to 'docrails', 'https://github.com/rails/docrails' %>
and push the change yourself. That branch of Rails has public write access. and push the change yourself. That branch of Rails has public write access.
Commits are still reviewed, but that happens after you've submitted your Commits are still reviewed, but that happens after you've submitted your
contribution. <%= link_to 'docrails', 'https://github.com/lifo/docrails' %> is contribution. <%= link_to 'docrails', 'https://github.com/rails/docrails' %> is
cross-merged with master periodically. cross-merged with master periodically.
</p> </p>
<p> <p>
Expand Down

0 comments on commit ec64749

Please sign in to comment.