Merge pull request #214 from pitr-ch/master

jdantonio · jdantonio · commit 8e921c601301 · 2014-12-29T08:13:45.000-05:00
Keep thread pools documentation separate
diff --git a/.yardopts b/.yardopts
@@ -10,5 +10,6 @@
 ./lib/**/*.rb
 ./ext/concurrent_ruby_ext/**/*.c
 -
+doc/thread_pools.md
 README.md
 LICENSE.txt
diff --git a/README.md b/README.md
@@ -66,7 +66,7 @@ This library contains a variety of concurrency abstractions at high and low leve
 
 ### Java-inspired ThreadPools and other executors
 
-* See [ThreadPool](http://ruby-concurrency.github.io/concurrent-ruby/Concurrent/ThreadPoolExecutor.html) overview, which also contains a list of other Executors available.
+* See [ThreadPool](http://ruby-concurrency.github.io/concurrent-ruby/file.thread_pools.html) overview, which also contains a list of other Executors available.
 
 ### Thread-safe Observers
 
diff --git a/lib/concurrent/executor/thread_pool_executor.rb b/lib/concurrent/executor/thread_pool_executor.rb
@@ -49,8 +49,6 @@ module Concurrent
     #   * `:discard`: Discard the task and return false.
     #   * `:caller_runs`: Execute the task on the calling thread.
     #
-    #   {include:file:doc/thread_pools.md}
-    #
     #   @note When running on the JVM (JRuby) this class will inherit from `JavaThreadPoolExecutor`.
     #     On all other platforms it will inherit from `RubyThreadPoolExecutor`.
     #

Original file line number	Diff line number	Diff line change
`@@ -49,8 +49,6 @@ module Concurrent`
`49`	`49`	# * `:discard`: Discard the task and return false.
`50`	`50`	# * `:caller_runs`: Execute the task on the calling thread.
`51`	`51`	`#`
`52`		`- # {include:file:doc/thread_pools.md}`
`53`		`- #`
`54`	`52`	# @note When running on the JVM (JRuby) this class will inherit from `JavaThreadPoolExecutor`.
`55`	`53`	# On all other platforms it will inherit from `RubyThreadPoolExecutor`.
`56`	`54`	`#`