aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2011-06-06 22:50:09 +0200
committerXavier Noria <fxn@hashref.com>2011-06-06 22:50:09 +0200
commit6cf458823f650ca9c0d25e8c589b5000d7754a92 (patch)
tree85bfa7f4c7dc55c2393d5971649b2c16ba8db4ea
parent445c0607f7a85a0bb091764a132eed25b6ebf716 (diff)
parent1f272538bde9549a89d75a0abaa50f156f95252e (diff)
downloadrails-6cf458823f650ca9c0d25e8c589b5000d7754a92.tar.gz
rails-6cf458823f650ca9c0d25e8c589b5000d7754a92.tar.bz2
rails-6cf458823f650ca9c0d25e8c589b5000d7754a92.zip
Merge branch 'master' of git://github.com/lifo/docrails
-rw-r--r--railties/guides/source/contributing_to_ruby_on_rails.textile2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/guides/source/contributing_to_ruby_on_rails.textile b/railties/guides/source/contributing_to_ruby_on_rails.textile
index 45a0254cbe..2ce8ddc702 100644
--- a/railties/guides/source/contributing_to_ruby_on_rails.textile
+++ b/railties/guides/source/contributing_to_ruby_on_rails.textile
@@ -264,7 +264,7 @@ When working with documentation, please take into account the "API Documentation
NOTE: As explained above, ordinary code patches should have proper documentation coverage. docrails is only used for isolated documentation improvements.
-WARNING: docrails has a very strict policy: no code can be touched whatsoever, no matter how trivial or small the change. Only RDoc and guides can be edited via docrails.
+WARNING: docrails has a very strict policy: no code can be touched whatsoever, no matter how trivial or small the change. Only RDoc and guides can be edited via docrails. Also, CHANGELOGs should never be edited in docrails.
If you have an idea for a new guide you can refer to the "contribution page":contribute.html for instructions on getting involved.