aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2011-04-03 22:22:03 +0200
committerXavier Noria <fxn@hashref.com>2011-04-03 22:22:03 +0200
commit3e24e9ebc22f96f9124d3a5d1c83b93c1bea937d (patch)
tree31698977fbf077d079c70e5b258abc87042b5346 /railties/lib
parenta000fc58b8bc288ca9c60566afc1e1943f5d6083 (diff)
parent4c323bc25a69ba8fd8b080775335184fe6868747 (diff)
downloadrails-3e24e9ebc22f96f9124d3a5d1c83b93c1bea937d.tar.gz
rails-3e24e9ebc22f96f9124d3a5d1c83b93c1bea937d.tar.bz2
rails-3e24e9ebc22f96f9124d3a5d1c83b93c1bea937d.zip
Merge branch 'master' of git://github.com/lifo/docrails
Diffstat (limited to 'railties/lib')
-rw-r--r--railties/lib/rails/source_annotation_extractor.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/source_annotation_extractor.rb b/railties/lib/rails/source_annotation_extractor.rb
index 591fd6f6bd..302206bbcd 100644
--- a/railties/lib/rails/source_annotation_extractor.rb
+++ b/railties/lib/rails/source_annotation_extractor.rb
@@ -11,7 +11,7 @@
#
# Annotations are looked for in comments and modulus whitespace they have to
# start with the tag optionally followed by a colon. Everything up to the end
-# of the line (or closing ERb comment tag) is considered to be their text.
+# of the line (or closing ERB comment tag) is considered to be their text.
class SourceAnnotationExtractor
class Annotation < Struct.new(:line, :tag, :text)
@@ -99,4 +99,4 @@ class SourceAnnotationExtractor
puts
end
end
-end \ No newline at end of file
+end