diff options
| author | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-01-07 02:52:15 +0000 |
|---|---|---|
| committer | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-01-07 02:52:15 +0000 |
| commit | c5c1e251862415bc0ecdcd419c316ecb41c4f048 (patch) | |
| tree | 1d843e4b26e1f4b59757ce6980b9e61df7cdd887 /lib/rdoc/options.rb | |
| parent | 8cecfd6b562f5805ab40bcf409e331a769d9968a (diff) | |
| download | ruby-c5c1e251862415bc0ecdcd419c316ecb41c4f048.tar.gz ruby-c5c1e251862415bc0ecdcd419c316ecb41c4f048.tar.xz ruby-c5c1e251862415bc0ecdcd419c316ecb41c4f048.zip | |
Merge documentation from the same class on ri generation.
Fixes bug where documentation could disappear.
Fix typo in lib/rdoc/options.rb
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@14923 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rdoc/options.rb')
| -rw-r--r-- | lib/rdoc/options.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/rdoc/options.rb b/lib/rdoc/options.rb index 259fef487..0b12efe9b 100644 --- a/lib/rdoc/options.rb +++ b/lib/rdoc/options.rb @@ -352,7 +352,7 @@ class Options @op_name = nil @show_all = false @main_page = nil - @marge = false + @merge = false @exclude = [] @quiet = false @generator_name = 'html' |