Merge branch 'master' of github.com:rdoc/rdoc into no-hoe

Author: Zachary Scott

.travis.yml

@@ -9,13 +9,16 @@ rvm:
   - 1.8.7
   - 1.9.3
   - 2.0.0
-  - 2.1.0
-  - 2.2.0
+  - 2.1.10
+  - 2.2.5
+  - 2.3.1
   - ruby-head
   - rbx-2
+  - jruby-1.7.25
+  - jruby-9.1.0.0
 script: rake
 matrix:
   allow_failures:
-    - rvm: 1.8.7
+    - rvm: jruby-1.7.25
+    - rvm: jruby-9.1.0.0
     - rvm: rbx-2
-    - rvm: ruby-head

History.rdoc

@@ -133,4 +133,3 @@ task :diff_rubinius do
   sh "diff #{diff_options} lib/rdoc #{rubinius_dir}/lib/rdoc; true"
   sh "diff #{diff_options} test #{rubinius_dir}/test/rdoc; true"
 end
-

LEGAL.rdoc

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 $DEBUG_RDOC = nil
 
 # :main: README.rdoc
@@ -64,7 +65,7 @@ class Error < RuntimeError; end
   ##
   # RDoc version you are using
 
-  VERSION = '4.3.0-alpha'
+  VERSION = '4.2.3'
 
   ##
   # Method visibilities

Rakefile

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 ##
 # Represent an alias, which is an old_name/new_name pair associated with a
 # particular context

lib/rdoc.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 ##
 # An anonymous class like:
 #

lib/rdoc/alias.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 ##
 # AnyMethod is the base class for objects representing methods
 

lib/rdoc/anon_class.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 ##
 # An attribute created by \#attr, \#attr_reader, \#attr_writer or
 # \#attr_accessor

lib/rdoc/any_method.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 ##
 # ClassModule is the base class for objects representing either a class or a
 # module.