diff options
Diffstat (limited to 'lib/rdoc/generators')
| -rw-r--r-- | lib/rdoc/generators/html_generator.rb | 6 | ||||
| -rw-r--r-- | lib/rdoc/generators/ri_generator.rb | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/rdoc/generators/html_generator.rb b/lib/rdoc/generators/html_generator.rb index f9c72a4df2..d263a14784 100644 --- a/lib/rdoc/generators/html_generator.rb +++ b/lib/rdoc/generators/html_generator.rb @@ -314,7 +314,7 @@ module Generators def collect_methods list = @context.method_list unless @options.show_all - list = list.find_all {|m| m.visibility == :public || m.force_documentation } + list = list.find_all {|m| m.visibility == :public || m.visibility == :protected || m.force_documentation } end @methods = list.collect {|m| HtmlMethod.new(m, self, @options) } end @@ -681,13 +681,13 @@ module Generators res = [] atts.each do |att| next unless att.section == section - if att.visibility == :public || @options.show_all + if att.visibility == :public || att.visibility == :protected || @options.show_all entry = { "name" => CGI.escapeHTML(att.name), "rw" => att.rw, "a_desc" => markup(att.comment, true) } - unless att.visibility == :public + unless att.visibility == :public || att.visibility == :protected entry["rw"] << "-" end res << entry diff --git a/lib/rdoc/generators/ri_generator.rb b/lib/rdoc/generators/ri_generator.rb index 8d94579347..c4b4a7e17c 100644 --- a/lib/rdoc/generators/ri_generator.rb +++ b/lib/rdoc/generators/ri_generator.rb @@ -172,7 +172,7 @@ module Generators list = cls.method_list unless @options.show_all list = list.find_all do |m| - m.visibility == :public || m.force_documentation + m.visibility == :public || m.visibility == :protected || m.force_documentation end end |