aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--activesupport/README.rdoc1
-rw-r--r--railties/guides/source/contributing_to_ruby_on_rails.textile2
2 files changed, 2 insertions, 1 deletions
diff --git a/activesupport/README.rdoc b/activesupport/README.rdoc
index 77b8a64304..7237f7386a 100644
--- a/activesupport/README.rdoc
+++ b/activesupport/README.rdoc
@@ -1,4 +1,5 @@
= Active Support -- Utility classes and Ruby extensions from Rails
+fasdf
Active Support is a collection of utility classes and standard library
extensions that were found useful for the Rails framework. These additions
diff --git a/railties/guides/source/contributing_to_ruby_on_rails.textile b/railties/guides/source/contributing_to_ruby_on_rails.textile
index 504cd92d90..4f51c0f859 100644
--- a/railties/guides/source/contributing_to_ruby_on_rails.textile
+++ b/railties/guides/source/contributing_to_ruby_on_rails.textile
@@ -231,7 +231,7 @@ git checkout -b testing_branch
Then you can apply their patch:
<shell>
-git apply their-patch-file.diff
+git am their-patch-file.diff
</shell>
After applying a patch, test it out! Here are some things to think about: