Merge branch 'master' into fix-clang-analizer-warnings

* master:
  update add_confict document; ref #2391
  Update document by regenerating it.
  Add :doc task to run document generator.
  Add document for `add_conflict` and `add_conflicts`.

1 files changed, 5 insertions, 0 deletions

diff --git a/Rakefile b/Rakefile
index 681c20d05..135c7a6a2 100644
--- a/Rakefile
+++ b/Rakefile
@@ -123,3 +123,8 @@ task :deep_clean => ["clean"] do
   end
   puts "Cleaned up mrbgems build folder"
 end
+
+desc 'generate document'
+task :doc do
+  load "#{MRUBY_ROOT}/doc/language/generator.rb"
+end