summaryrefslogtreecommitdiff
path: root/lib/rdoc/markup
diff options
context:
space:
mode:
authordrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-02-02 00:32:30 +0000
committerdrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-02-02 00:32:30 +0000
commitcc2a16d94d744d14d4a5eb06eca22137f8a9b79e (patch)
tree2907a20e2d9ae3a2831707056bb3fe2d384b066d /lib/rdoc/markup
parent918f625a5eeba35b9b191cb39c1d634b4cc7efee (diff)
Import RDoc 3.5.1
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30760 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rdoc/markup')
-rw-r--r--lib/rdoc/markup/attribute_manager.rb1
-rw-r--r--lib/rdoc/markup/heading.rb2
-rw-r--r--lib/rdoc/markup/inline.rb2
-rw-r--r--lib/rdoc/markup/parser.rb2
-rw-r--r--lib/rdoc/markup/to_html.rb2
-rw-r--r--lib/rdoc/markup/to_html_crossref.rb6
-rw-r--r--lib/rdoc/markup/to_rdoc.rb2
7 files changed, 8 insertions, 9 deletions
diff --git a/lib/rdoc/markup/attribute_manager.rb b/lib/rdoc/markup/attribute_manager.rb
index 2ee243ab0b..d2402f1b1d 100644
--- a/lib/rdoc/markup/attribute_manager.rb
+++ b/lib/rdoc/markup/attribute_manager.rb
@@ -74,7 +74,6 @@ class RDoc::Markup::AttributeManager
add_html "code", :TT
end
-
##
# Return an attribute object with the given turn_on and turn_off bits set
diff --git a/lib/rdoc/markup/heading.rb b/lib/rdoc/markup/heading.rb
index 081d637729..3bda77a1e1 100644
--- a/lib/rdoc/markup/heading.rb
+++ b/lib/rdoc/markup/heading.rb
@@ -4,7 +4,7 @@
class RDoc::Markup::Heading < Struct.new :level, :text
##
- # Calls #accept_heading on +wisitor+
+ # Calls #accept_heading on +visitor+
def accept visitor
visitor.accept_heading self
diff --git a/lib/rdoc/markup/inline.rb b/lib/rdoc/markup/inline.rb
index f5bf98a071..932ed536b7 100644
--- a/lib/rdoc/markup/inline.rb
+++ b/lib/rdoc/markup/inline.rb
@@ -29,7 +29,7 @@ class RDoc::Markup
end
##
- # Returns a string reperesentation of +bitmap+
+ # Returns a string representation of +bitmap+
def self.as_string(bitmap)
return "none" if bitmap.zero?
diff --git a/lib/rdoc/markup/parser.rb b/lib/rdoc/markup/parser.rb
index ea02ee3c5b..c94b900154 100644
--- a/lib/rdoc/markup/parser.rb
+++ b/lib/rdoc/markup/parser.rb
@@ -321,7 +321,7 @@ class RDoc::Markup::Parser
next
end
- # indentation change: break or verbattim
+ # indentation change: break or verbatim
if column < indent then
unget
break
diff --git a/lib/rdoc/markup/to_html.rb b/lib/rdoc/markup/to_html.rb
index 66f5c1986d..d587a8abbc 100644
--- a/lib/rdoc/markup/to_html.rb
+++ b/lib/rdoc/markup/to_html.rb
@@ -130,7 +130,7 @@ class RDoc::Markup::ToHtml < RDoc::Markup::Formatter
end
##
- # Here's a hypedlink where the label is different to the URL
+ # Here's a hyperlink where the label is different to the URL
# <label>[url] or {long label}[url]
def handle_special_TIDYLINK(special)
diff --git a/lib/rdoc/markup/to_html_crossref.rb b/lib/rdoc/markup/to_html_crossref.rb
index a3feb848a2..026defb862 100644
--- a/lib/rdoc/markup/to_html_crossref.rb
+++ b/lib/rdoc/markup/to_html_crossref.rb
@@ -34,10 +34,10 @@ class RDoc::Markup::ToHtmlCrossref < RDoc::Markup::ToHtml
# A::B::C.meth
#{CLASS_REGEXP_STR}(?:[.#]|::)#{METHOD_REGEXP_STR}
- # Stand-alone method (preceeded by a #)
+ # Stand-alone method (preceded by a #)
| \\?\##{METHOD_REGEXP_STR}
- # Stand-alone method (preceeded by ::)
+ # Stand-alone method (preceded by ::)
| ::#{METHOD_REGEXP_STR}
# A::B::C
@@ -51,7 +51,7 @@ class RDoc::Markup::ToHtmlCrossref < RDoc::Markup::ToHtml
# In order that words like "can't" not
# be flagged as potential cross-references, only
# flag potential class cross-references if the character
- # after the cross-referece is a space, sentence
+ # after the cross-reference is a space, sentence
# punctuation, tag start character, or attribute
# marker.
| #{CLASS_REGEXP_STR}(?=[\s\)\.\?\!\,\;<\000]|\z)
diff --git a/lib/rdoc/markup/to_rdoc.rb b/lib/rdoc/markup/to_rdoc.rb
index b1ac59e5b0..b10af036d9 100644
--- a/lib/rdoc/markup/to_rdoc.rb
+++ b/lib/rdoc/markup/to_rdoc.rb
@@ -217,7 +217,7 @@ class RDoc::Markup::ToRdoc < RDoc::Markup::Formatter
end
##
- # Removes preceeding \\ from the suppressed crossref +special+
+ # Removes preceding \\ from the suppressed crossref +special+
def handle_special_SUPPRESSED_CROSSREF special
text = special.text