Merge pull request #319 from vim-jp/update_filetype

Update filetype.{txt,jax}

Author: h-east

doc/filetype.jax

@@ -637,6 +637,26 @@ PYTHON						*ft-python-plugin* *PEP8*
 
 
 
+R MARKDOWN						*ft-rmd-plugin*
+
+デフォルトでは、ftplugin/html.vimは読み込まれない。読み込みたい場合は、以下を
+あなたの |vimrc| に追加する: >
+	let rmd_include_html = 1
+
+'formatexpr' オプションは、Rコード用とMarkdownコード用の異なる値で動的に設定さ
+れる。'formatexpr' が設定されていない方が良い場合は、以下をあなたの |vimrc| に
+追加する: >
+	let rmd_dynamic_comments = 0
+
+
+R RESTRUCTURED TEXT					*ft-rrst-plugin*
+
+'formatexpr' オプションは、Rコード用とreStructuredText用の異なる値で動的に設定
+される。'formatexpr' が設定されていない方が良い場合は、以下をあなたの |vimrc|
+に追加する: >
+	let rrst_dynamic_comments = 0
+
+
 RPM SPEC						*ft-spec-plugin*
 
 このプラグインに関する説明は非常に多いので、別のファイル |pi_spec.txt| に記述

en/filetype.txt

@@ -320,8 +320,8 @@ then Vim will load all plugins in these directories and below:
 Note that the last one is the value of $VIMRUNTIME which has been expanded.
 
 Note that when using a plugin manager or |packages| many directories will be
-added to 'runtimepath'.  These plugins earch require their own directory,
-don't put them directly in ~/.vim/plugin.
+added to 'runtimepath'.  These plugins each require their own directory, don't
+put them directly in ~/.vim/plugin.
 
 What if it looks like your plugin is not being loaded?  You can find out what
 happens when Vim starts up by using the |-V| argument: >
@@ -638,11 +638,31 @@ By default the following options are set, in accordance with PEP8: >
 
 	setlocal expandtab shiftwidth=4 softtabstop=4 tabstop=8
 
-To disable this behaviour, set the following variable in your vimrc: >
+To disable this behavior, set the following variable in your vimrc: >
 
 	let g:python_recommended_style = 0
 
 
+R MARKDOWN						*ft-rmd-plugin*
+
+By default ftplugin/html.vim is not sourced. If you want it sourced, add to
+your |vimrc|: >
+	let rmd_include_html = 1
+
+The 'formatexpr' option is set dynamically with different values for R code
+and for Markdown code. If you prefer that 'formatexpr' is not set, add to your
+|vimrc|: >
+	let rmd_dynamic_comments = 0
+
+
+R RESTRUCTURED TEXT					*ft-rrst-plugin*
+
+The 'formatexpr' option is set dynamically with different values for R code
+and for ReStructured text. If you prefer that 'formatexpr' is not set, add to
+your |vimrc|: >
+	let rrst_dynamic_comments = 0
+
+
 RPM SPEC						*ft-spec-plugin*
 
 Since the text for this plugin is rather long it has been put in a separate